Datagen achievements, textures, models

Author: robotgryphon

build.gradle

@@ -34,19 +34,23 @@ sourceSets {
         java {
             srcDir "src/api/java"
         }
+
+        resources.srcDirs = []
         compileClasspath += configurations.getByName("minecraft")
     }
 
     main {
         java {
-            srcDir "src/api/java"
             srcDir "src/main/java"
         }
 
         resources {
             srcDir "src/main/resources"
-            srcDir 'src/generated/resources'
+            srcDir "src/generated/resources"
         }
+
+        compileClasspath += sourceSets.api.output
+        runtimeClasspath += sourceSets.api.output
     }
 }
 
@@ -77,6 +81,7 @@ minecraft {
             mods {
                 compactmachines {
                     source sourceSets.main
+                    source sourceSets.api
                 }
             }
         }
@@ -96,6 +101,7 @@ minecraft {
             mods {
                 compactmachines {
                     source sourceSets.main
+                    source sourceSets.api
                 }
             }
         }
@@ -120,53 +126,14 @@ minecraft {
             mods {
                 compactmachines {
                     source sourceSets.main
+                    source sourceSets.api
                 }
             }
         }
     }
 }
 
-def getModVersion(filename) {
-    // println(filename);
-    def pattern = /^(?<modid>[^-]+)(?:-(?<mcversion>[0-9.]+))?(?:-(?<modver>[0-9.\-]+))\.jar$/;
-
-    def matcher = filename =~ pattern
-
-    def found = matcher.find()
-
-    if (found) {
-        def mod = matcher.group("modid");
-
-        // Extract MC version or default
-        def mcVersion = matcher.group("mcversion");
-
-        // Extract mod version
-        def version = matcher.group("modver");
-
-        // println("> mod: ${mod}; mc: ${mcVersion}; version: ${version}");
-
-        if (mcVersion == null)
-            return "${mod}:${mod}:${version}";
-        else
-            return "${mod}:${mod}-${mcVersion}:${version}";
-
-    } else {
-        println("> not a mod filename")
-        return filename;
-    }
-}
-
-def dev_mods_dir = "mods"
-
-task("dev") {
-    println(sourceSets.main.output.classesDirs[0]);
-}
 repositories {
-    // Built mods
-    flatDir {
-        dirs dev_mods_dir
-    }
-
     maven {
         url "https://www.cursemaven.com"
         content {
@@ -187,19 +154,12 @@ repositories {
     }
 }
 
-def dev_mods = fileTree(dev_mods_dir).filter { it -> it.isFile() }.files.name.collect({ getModVersion(it) })
-
 dependencies {
     // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
-
-    // Deobfuscate each dev mod for runtime
-    dev_mods.each { implementation(fg.deobf(it)) }
-
-
     // JEI
     compileOnly fg.deobf("mezz.jei:jei-${jei_mc_version}:${jei_version}:api")
     runtimeOnly fg.deobf("mezz.jei:jei-${jei_mc_version}:${jei_version}")
@@ -218,13 +178,17 @@ dependencies {
 //    runtimeOnly(fg.deobf("curse.maven:mekanismgenerators-268566:3206395"))
 }
 
-// Example for how to get properties into the manifest for reading by the runtime..
+processResources {
+    duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
+}
+
 jar {
-    from sourceSets.api.output
     from sourceSets.main.output
+    from sourceSets.api.output
     destinationDirectory = file("$rootDir/build-out")
 
     finalizedBy('reobfJar')
+
     manifest {
         attributes([
                 "Specification-Title"     : "compactmachines",
@@ -245,14 +209,6 @@ task apiJar(type: Jar) {
     destinationDirectory = file("$rootDir/build-out")
 }
 
-processApiResources {
-    duplicatesStrategy = DuplicatesStrategy.WARN
-}
-
-processResources {
-    duplicatesStrategy = DuplicatesStrategy.WARN
-}
-
 artifacts {
     archives jar, apiJar
 }

src/generated/resources/.cache/cache

@@ -1,4 +1,11 @@
 1fedf6d545654e233de36085df4d0e8e771524ff assets/compactmachines/blockstates/machine_giant.json
+f8e983d75656fe6193baa1e7f0c205b8ed8c427f assets/compactmachines/blockstates/machine_large.json
+297d4e76f74478f078d7dacceb417e611ce0ec85 assets/compactmachines/blockstates/machine_maximum.json
+33c907f9d1ca01f77726966c0ff955b56637b877 assets/compactmachines/blockstates/machine_normal.json
+f235e57af63375b0bf48b6eabecab7074d8f06ef assets/compactmachines/blockstates/machine_small.json
+bb7d80f69e3ddb219302b58a556c2f5c4ba6dcb0 assets/compactmachines/blockstates/machine_tiny.json
+1f2b16b6aa527e2e4a63a71c2bc80681e8ce92b3 assets/compactmachines/blockstates/solid_wall.json
+1f2b16b6aa527e2e4a63a71c2bc80681e8ce92b3 assets/compactmachines/blockstates/wall.json
 5209eb9eac1c0bf576abc4cbc5b63589508f3439 assets/compactmachines/models/block/machine/machine_giant.json
 18afef1e36852ed4922c445ff417f8e63e72c331 assets/compactmachines/models/block/machine/machine_large.json
 7ce6981c034b18fbc969db9f74eef0106c528a78 assets/compactmachines/models/block/machine/machine_maximum.json
@@ -12,26 +19,29 @@ bea2a57a336b22361580ae07d9bd6a5127d8d6af assets/compactmachines/models/item/mach
 871a0378d8459fbae1d17f6dddba6a56d9aa0380 assets/compactmachines/models/item/machine_normal.json
 50554f7ff7c5313b9b861837d5dd2e1f9fd8ab0d assets/compactmachines/models/item/machine_small.json
 dddd8574d998f7f8a67ab32fe7c8df074b3380af assets/compactmachines/models/item/machine_tiny.json
-84e5dc284b654bef91f8efc7c671164e4362217f assets/compactmachines/models/item/personal_shrinking_device.json
+10e68b769935b2a940c9c9e188b50b762e46eb6e assets/compactmachines/models/item/personal_shrinking_device.json
+1957ef1bf7541029e2bae7c56acae8e3bce9c491 assets/compactmachines/models/item/solid_wall.json
+33b46aafb4147f7cacd6254a2c93cde7a09791dc assets/compactmachines/models/item/tunnel.json
+1957ef1bf7541029e2bae7c56acae8e3bce9c491 assets/compactmachines/models/item/wall.json
 7611e10d6cb874469fee3209687504a964c1b7a5 data/compactmachines/advancements/claimed_machine_giant.json
 c221bb570100c820a1fe904064492fcdaf245120 data/compactmachines/advancements/claimed_machine_large.json
 82bae3a5d1558f86d39b69a31ef015ca25c64dc3 data/compactmachines/advancements/claimed_machine_max.json
 fe844f6dfc795652f9b3c659b72a1edbf1a84438 data/compactmachines/advancements/claimed_machine_normal.json
 f4bbe5fccc3b629f578958c90b84cce5776618d0 data/compactmachines/advancements/claimed_machine_small.json
 5e06a5ab20a4d26b4301e24457546b618b7cee7c data/compactmachines/advancements/claimed_machine_tiny.json
-29a4ead6392a01e2572b8047d84752ea461540e8 data/compactmachines/advancements/foundations.json
-e08cdedde718a20284432a33903792518801d66c data/compactmachines/advancements/got_shrinking_device.json
+7db9f6379ed353bf7fafff3da60b979487a53be3 data/compactmachines/advancements/foundations.json
+3a0fb8cddc24135ba15c7018398be318d6a63060 data/compactmachines/advancements/got_shrinking_device.json
 26f679025def0ce9b0a9ec9d0e5f6ee83ea50bc3 data/compactmachines/advancements/how_did_you_get_here.json
-e012e4b65799a56d195a6324c82e2cdf7a5a91be data/compactmachines/advancements/recipes/compactmachines/personal_shrinking_device.json
+d611c78e0b2b590bdbd5b17c37b295fb91739397 data/compactmachines/advancements/recipes/compactmachines/personal_shrinking_device.json
 fd7ccf69e4445ba0a2d7b2cd405ebe2ae85be240 data/compactmachines/advancements/recipes/compactmachines/wall.json
 2e9d5509d633970b1dd01bd99b535fd107e6e91a data/compactmachines/advancements/root.json
-fb5c7560898ae604661d0655c2a39e923eb1d4b4 data/compactmachines/loot_tables/blocks/machine_giant.json
-056d363f46ab1cc37c16f08428a3d2a9e0dd66d2 data/compactmachines/loot_tables/blocks/machine_large.json
-38a7648eb331daf18f5076126f31f31b6021ac51 data/compactmachines/loot_tables/blocks/machine_maximum.json
-212c5dbbbd0340d65b14661af6fedad70dbeabf8 data/compactmachines/loot_tables/blocks/machine_normal.json
-146f8a0b3b04224d2abb9051ec0f411c1bc501e4 data/compactmachines/loot_tables/blocks/machine_small.json
-4660cb18863036593d5ec879bd93f21571f1e5d5 data/compactmachines/loot_tables/blocks/machine_tiny.json
-5a1a6cc860595b0a2ebed37fad89cd9d924d4f58 data/compactmachines/loot_tables/blocks/wall.json
+8db7e50caf8d54a0e209fcd173b3f2e8461baf6a data/compactmachines/loot_tables/blocks/machine_giant.json
+19e7d71765db587639d5d09af0bee792cc222f83 data/compactmachines/loot_tables/blocks/machine_large.json
+6db7932ebd4de362a97bbffef28ec1e70b20ee45 data/compactmachines/loot_tables/blocks/machine_maximum.json
+94834ba82c55dc2095392c6bba870588a54843c7 data/compactmachines/loot_tables/blocks/machine_normal.json
+b17bb71ee964841011a833a69ef16cb4fd3acb82 data/compactmachines/loot_tables/blocks/machine_small.json
+493f48ba88eae8ee9431fb2da9bee7dd2f609877 data/compactmachines/loot_tables/blocks/machine_tiny.json
+2469b514d592ad18c98cde0228ecb12bc4e75b61 data/compactmachines/loot_tables/blocks/wall.json
 5fb413dd4c0417fa8ba1be75618482529b92a161 data/compactmachines/recipes/machine_giant.json
 b613629629931df8e56830f394af5bf22e995e55 data/compactmachines/recipes/machine_large.json
 2e038eb51a7f9807e562f0870a944a441944e84a data/compactmachines/recipes/machine_maximum.json