Make RefMaps Great Again!

Update GradleWrapper! Make Mixin-Forge a CorePatch!
CrucibleMC · Jan 25, 2020 · b8c0464 · b8c0464
1 parent b3ff2de
commit b8c0464
Show file tree

Hide file tree

Showing 35 changed files with 52 additions and 39 deletions.
diff --git a/Mixin-Avaritia/build.gradle b/Mixin-Avaritia/build.gradle
@@ -1,7 +1,7 @@
 description = "A coremod full of patches and fixes made from black magic and suffering."
 
 archivesBaseName = "Avaritia-Mixin"
-version = "1.0.1a"
+version = "1.0.1b"
 
 
 dependencies {

diff --git a/Mixin-Avaritia/src/main/resources/mixins.avaritia.json b/Mixin-Avaritia/src/main/resources/mixins.avaritia.json
@@ -11,5 +11,5 @@
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.7.11",
   "target": "@env(DEFAULT)",
-  "refmap":"grimoire.refmap.json"
+  "refmap":"@MIXIN_REFMAP_NAME@",
 }
diff --git a/Mixin-Baubles/build.gradle b/Mixin-Baubles/build.gradle
@@ -1,7 +1,7 @@
 description = "A coremod full of patches and fixes made from black magic and suffering."
 
 archivesBaseName = "Baubles-Mixin"
-version = "1.0.1a"
+version = "1.0.1b"
 
 
 dependencies {

diff --git a/Mixin-Baubles/src/main/resources/mixins.baubles.json b/Mixin-Baubles/src/main/resources/mixins.baubles.json
@@ -9,5 +9,5 @@
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.7.11",
   "target": "@env(INIT)",
-  "refmap":"grimoire.refmap.json"
+  "refmap":"@MIXIN_REFMAP_NAME@"
 }
diff --git a/Mixin-Botania/build.gradle b/Mixin-Botania/build.gradle
@@ -1,7 +1,7 @@
 description = "A coremod full of patches and fixes made from black magic and suffering."
 
 archivesBaseName = "Botania-Mixin"
-version = "1.0.1a"
+version = "1.0.1b"
 
 
 dependencies {

diff --git a/Mixin-Botania/src/main/resources/mixins.botania.json b/Mixin-Botania/src/main/resources/mixins.botania.json
@@ -23,5 +23,5 @@
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.7.11",
   "target": "@env(DEFAULT)",
-  "refmap":"grimoire.refmap.json"
+  "refmap":"@MIXIN_REFMAP_NAME@"
 }
diff --git a/Mixin-CarpentersBlocks/build.gradle b/Mixin-CarpentersBlocks/build.gradle
@@ -1,7 +1,7 @@
 description = "A coremod full of patches and fixes made from black magic and suffering."
 
 archivesBaseName = "CarpentersBlocks-Mixin"
-version = "1.0.1a"
+version = "1.0.1b"
 
 
 dependencies {

diff --git a/Mixin-CarpentersBlocks/src/main/resources/mixins.carpentersblocks.json b/Mixin-CarpentersBlocks/src/main/resources/mixins.carpentersblocks.json
@@ -10,5 +10,5 @@
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.7.11",
   "target": "@env(DEFAULT)",
-  "refmap":"grimoire.refmap.json"
+  "refmap":"@MIXIN_REFMAP_NAME@"
 }
diff --git a/Mixin-CoFH/build.gradle b/Mixin-CoFH/build.gradle
@@ -1,7 +1,7 @@
 description = "A coremod full of patches and fixes made from black magic and suffering."
 
 archivesBaseName = "CoFH-Mixin"
-version = "1.0.1a"
+version = "1.0.1b"
 
 
 dependencies {

diff --git a/Mixin-CoFH/src/main/resources/mixins.cofh.json b/Mixin-CoFH/src/main/resources/mixins.cofh.json
@@ -10,5 +10,5 @@
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.7.11",
   "target": "@env(DEFAULT)",
-  "refmap":"grimoire.refmap.json"
+  "refmap":"@MIXIN_REFMAP_NAME@"
 }
diff --git a/Mixin-DraconicEvolution/build.gradle b/Mixin-DraconicEvolution/build.gradle
@@ -1,7 +1,7 @@
 description = "A coremod full of patches and fixes made from black magic and suffering."
 
 archivesBaseName = "DraconicEvolution-Mixin"
-version = "1.0.1a"
+version = "1.0.1b"
 
 
 dependencies {

diff --git a/Mixin-DraconicEvolution/src/main/resources/mixins.draconic.json b/Mixin-DraconicEvolution/src/main/resources/mixins.draconic.json
@@ -9,5 +9,5 @@
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.7.11",
   "target": "@env(DEFAULT)",
-  "refmap":"grimoire.refmap.json"
+  "refmap":"@MIXIN_REFMAP_NAME@"
 }
diff --git a/Mixin-EnderIO/build.gradle b/Mixin-EnderIO/build.gradle
@@ -1,7 +1,7 @@
 description = "A coremod full of patches and fixes made from black magic and suffering."
 
 archivesBaseName = "EnderIO-Mixin"
-version = "1.0.1a"
+version = "1.0.1b"
 
 
 dependencies {

diff --git a/Mixin-EnderIO/src/main/resources/mixins.enderio.json b/Mixin-EnderIO/src/main/resources/mixins.enderio.json
@@ -17,5 +17,5 @@
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.7.11",
   "target": "@env(DEFAULT)",
-  "refmap":"grimoire.refmap.json"
+  "refmap":"@MIXIN_REFMAP_NAME@"
 }
diff --git a/Mixin-ExtraUtilities/build.gradle b/Mixin-ExtraUtilities/build.gradle
@@ -1,7 +1,7 @@
 description = "A coremod full of patches and fixes made from black magic and suffering."
 
 archivesBaseName = "ExtraUtilities-Mixin"
-version = "1.0.1a"
+version = "1.0.1b"
 
 
 dependencies {

diff --git a/Mixin-ExtraUtilities/src/main/resources/mixins.extrautilities.json b/Mixin-ExtraUtilities/src/main/resources/mixins.extrautilities.json
@@ -11,5 +11,5 @@
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.7.11",
   "target": "@env(INIT)",
-  "refmap":"grimoire.refmap.json"
+  "refmap":"@MIXIN_REFMAP_NAME@"
 }
diff --git a/Mixin-Forge/build.gradle b/Mixin-Forge/build.gradle
@@ -1,7 +1,7 @@
 description = "A coremod full of patches and fixes made from black magic and suffering."
 
 archivesBaseName = "Forge-Mixin"
-version = "1.0.1a"
+version = "1.0.1b"
 
 
 dependencies {
@@ -16,6 +16,7 @@ jar {
     manifest {
         attributes(
                 'GRIMOIRE_PRIORITY': 99999,
+                'GRIMOIRE_COREPATCH': true
         )
     }
 }
diff --git a/Mixin-Forge/src/main/resources/mixins.forge.json b/Mixin-Forge/src/main/resources/mixins.forge.json
@@ -1,18 +1,17 @@
 {
   "required": true,
   "package": "io.github.crucible.grimoire.mixins.forge",
-  "mixins":[],
-  "server": [
+  "mixins":[
     "MixinEntityThrowable",
     "MixinTileEntity"
   ],
+  "server": [],
   "client": [
     "MixinItemStack",
     "MixinRenderItem",
     "MixinRenderManager"
   ],
   "compatibilityLevel": "JAVA_8",
-  "minVersion": "0.7.11",
-  "target": "@env(PREINIT)",
-  "refmap":"grimoire.refmap.json"
+  "refmap":"@MIXIN_REFMAP_NAME@",
+  "verbose": true
 }
diff --git a/Mixin-IC2/build.gradle b/Mixin-IC2/build.gradle
@@ -1,7 +1,7 @@
 description = "A coremod full of patches and fixes made from black magic and suffering."
 
 archivesBaseName = "IC2-Mixin"
-version = "1.0.1a"
+version = "1.0.1b"
 
 
 dependencies {

diff --git a/Mixin-IC2/src/main/resources/mixins.industrialcraft.json b/Mixin-IC2/src/main/resources/mixins.industrialcraft.json
@@ -9,5 +9,5 @@
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.7.11",
   "target": "@env(DEFAULT)",
-  "refmap":"grimoire.refmap.json"
+  "refmap":"@MIXIN_REFMAP_NAME@"
 }
diff --git a/Mixin-Mekanism/build.gradle b/Mixin-Mekanism/build.gradle
@@ -1,7 +1,7 @@
 description = "A coremod full of patches and fixes made from black magic and suffering."
 
 archivesBaseName = "Mekanism-Mixin"
-version = "1.0.1a"
+version = "1.0.1b"
 
 
 dependencies {

diff --git a/Mixin-Mekanism/src/main/resources/mixins.mekanism.json b/Mixin-Mekanism/src/main/resources/mixins.mekanism.json
@@ -12,5 +12,5 @@
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.7.11",
   "target": "@env(DEFAULT)",
-  "refmap":"grimoire.refmap.json"
+  "refmap":"@MIXIN_REFMAP_NAME@"
 }
diff --git a/Mixin-MineFactoryReloaded/build.gradle b/Mixin-MineFactoryReloaded/build.gradle
@@ -1,7 +1,7 @@
 description = "A coremod full of patches and fixes made from black magic and suffering."
 
 archivesBaseName = "MineFactoryReloaded-Mixin"
-version = "1.0.1a"
+version = "1.0.1b"
 
 
 dependencies {

diff --git a/Mixin-MineFactoryReloaded/src/main/resources/mixins.minefactoryreloaded.json b/Mixin-MineFactoryReloaded/src/main/resources/mixins.minefactoryreloaded.json
@@ -9,5 +9,5 @@
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.7.11",
   "target": "@env(DEFAULT)",
-  "refmap":"grimoire.refmap.json"
+  "refmap":"@MIXIN_REFMAP_NAME@"
 }
diff --git a/Mixin-NEI/build.gradle b/Mixin-NEI/build.gradle
@@ -1,7 +1,7 @@
 description = "A coremod full of patches and fixes made from black magic and suffering."
 
 archivesBaseName = "NEI-Mixin"
-version = "1.0.1a"
+version = "1.0.1b"
 
 
 dependencies {

diff --git a/Mixin-NEI/src/main/resources/mixins.nei.json b/Mixin-NEI/src/main/resources/mixins.nei.json
@@ -9,5 +9,5 @@
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.7.11",
   "target": "@env(INIT)",
-  "refmap":"grimoire.refmap.json"
+  "refmap":"@MIXIN_REFMAP_NAME@"
 }
diff --git a/Mixin-OpenBlocks/build.gradle b/Mixin-OpenBlocks/build.gradle
@@ -1,7 +1,7 @@
 description = "A coremod full of patches and fixes made from black magic and suffering."
 
 archivesBaseName = "OpenBlocks-Mixin"
-version = "1.0.1a"
+version = "1.0.1b"
 
 
 dependencies {

diff --git a/Mixin-OpenBlocks/src/main/resources/mixins.openblocks.json b/Mixin-OpenBlocks/src/main/resources/mixins.openblocks.json
@@ -9,5 +9,5 @@
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.7.11",
   "target": "@env(INIT)",
-  "refmap":"grimoire.refmap.json"
+  "refmap":"@MIXIN_REFMAP_NAME@"
 }
diff --git a/Mixin-Thaumcraft/build.gradle b/Mixin-Thaumcraft/build.gradle
@@ -1,7 +1,7 @@
 description = "A coremod full of patches and fixes made from black magic and suffering."
 
 archivesBaseName = "Thaumcraft-Mixin"
-version = "1.0.1a"
+version = "1.0.1b"
 
 
 dependencies {

diff --git a/Mixin-Thaumcraft/src/main/resources/mixins.thaumcraft.json b/Mixin-Thaumcraft/src/main/resources/mixins.thaumcraft.json
@@ -20,5 +20,5 @@
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.7.11",
   "target": "@env(INIT)",
-  "refmap":"grimoire.refmap.json"
+  "refmap":"@MIXIN_REFMAP_NAME@"
 }
diff --git a/Mixin-ThaumicEnergistics/build.gradle b/Mixin-ThaumicEnergistics/build.gradle
@@ -1,7 +1,7 @@
 description = "A coremod full of patches and fixes made from black magic and suffering."
 
 archivesBaseName = "ThaumicEnergistics-Mixin"
-version = "1.0.1a"
+version = "1.0.1b"
 
 
 dependencies {

diff --git a/Mixin-ThaumicEnergistics/src/main/resources/mixins.thaumicenergistics.json b/Mixin-ThaumicEnergistics/src/main/resources/mixins.thaumicenergistics.json
@@ -9,5 +9,5 @@
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.7.11",
   "target": "@env(INIT)",
-  "refmap":"grimoire.refmap.json"
+  "refmap":"@MIXIN_REFMAP_NAME@"
 }
diff --git a/build.gradle b/build.gradle
@@ -15,10 +15,16 @@ buildscript {
     }
 }
 
-subprojects {
+import org.apache.tools.ant.filters.ReplaceTokens
+
+allprojects {
     apply plugin: 'java'
+}
+
+subprojects {
     apply plugin: 'idea'
     apply plugin: 'forge'
+    apply plugin: 'base'
 
     minecraft {
         version = "1.7.10-10.13.4.1614-1.7.10"
@@ -46,7 +52,8 @@ subprojects {
 
     ext {
         mixinSrg = new File(project.buildDir, 'mixins/mixin.grimoire.srg')
-        mixinRefMap = new File(project.buildDir, "mixins/grimoire.refmap.json")
+        mixinRefMapName = name.toLowerCase() + ".refmap.json"; //Sub-Project Name
+        mixinRefMap = new File(project.buildDir, "mixins/" + mixinRefMapName)
     }
 
     jar {
@@ -66,6 +73,12 @@ subprojects {
         ]
     }
 
+    processResources{
+        eachFile{
+            filter ReplaceTokens, tokens:[MIXIN_REFMAP_NAME: mixinRefMapName]
+        }
+    }
+
     task copySrgs(type: Copy, dependsOn: 'genSrgs') {
         from plugins.getPlugin("forge").delayedFile('{SRG_DIR}')
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip