Merge pull request #33 from GTNewHorizons/fix/avaritia-tinker-parts

Don't register Tinker's parts recipes in GTNH
GTNewHorizons · May 17, 2023 · 5acd289 · 5acd289
2 parents 3f914dd + d5a2615
commit 5acd289
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 43 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1683705740
+//version: 1684218858
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -69,7 +69,7 @@ plugins {
     id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version
     id 'com.modrinth.minotaur' version '2.+' apply false
     id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
-    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.11'
+    id 'com.gtnewhorizons.retrofuturagradle' version '1.3.14'
 }
 
 print("You might want to check out './gradlew :faq' if your build fails.\n")
@@ -730,7 +730,7 @@ dependencies {
         java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
     }
     if (modId != 'hodgepodge') {
-        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.8')
+        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.13')
     }
 
     java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false}

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,34 +1,30 @@
 // Add your dependencies here
 
 dependencies {
+    devOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.3.53-GTNH:dev")
 
-    runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.3.45-GTNH:dev")
-
-    compileOnly("com.github.GTNewHorizons:ForestryMC:4.6.5:api") {
+    compileOnly("com.github.GTNewHorizons:ForestryMC:4.6.7:api") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:Botania:1.9.17-GTNH:dev") {
+    compileOnly("com.github.GTNewHorizons:Botania:1.9.22-GTNH:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:CodeChickenLib:1.1.8:dev") {
+    compileOnly("com.github.GTNewHorizons:Mantle:0.3.6:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.1.11:dev") {
+    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.9.32-GTNH:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:Mantle:0.3.6:dev") {
+    compileOnly("com.github.GTNewHorizons:BloodMagic:1.4.1:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.3.45-GTNH:dev") {
+    compileOnly("com.github.GTNewHorizons:CraftTweaker:3.2.12:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.9.27-GTNH:dev") {
+    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.2.13:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:BloodMagic:1.4.0:dev") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:CraftTweaker:3.2.12:dev") {
+    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.43.39:dev") {
         transitive = false
     }
 
@@ -44,10 +40,4 @@ dependencies {
     compileOnly("curse.maven:witchery-69673:2234410") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.2.8:dev") {
-        transitive = false
-    }
-    compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.42.80:dev") {
-        transitive = false
-    }
 }
diff --git a/repositories.gradle b/repositories.gradle
@@ -1,11 +1,4 @@
 // Add any additional repositories for your dependencies here
 
 repositories {
-    maven {
-        name = "GTNH Maven"
-        url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
-    }
-    maven {
-        url "https://cursemaven.com"
-    }
 }
diff --git a/src/main/java/fox/spiteful/avaritia/compat/ticon/Tonkers.java b/src/main/java/fox/spiteful/avaritia/compat/ticon/Tonkers.java
@@ -6,6 +6,7 @@
 import net.minecraftforge.common.MinecraftForge;
 
 import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.Loader;
 import fox.spiteful.avaritia.crafting.ExtremeCraftingManager;
 import fox.spiteful.avaritia.items.LudicrousItems;
 import tconstruct.library.TConstructRegistry;
@@ -90,6 +91,22 @@ public static void buildstruct() {
         MinecraftForge.EVENT_BUS.register(events);
         FMLCommonHandler.instance().bus().register(events);
 
+        // extra modifiers from catalyst
+        ModifyBuilder.registerModifier(
+                new ModExtraModifier(new ItemStack[] { new ItemStack(LudicrousItems.resource, 1, 5) }, "AvaritiaFree") {
+
+                    @Override
+                    public void modify(ItemStack[] recipe, ItemStack input) {
+                        NBTTagCompound tags = this.getModifierTag(input);
+                        tags.setBoolean(key, true);
+                        int modifiers = tags.getInteger("Modifiers");
+                        modifiers += 5;
+                        tags.setInteger("Modifiers", modifiers);
+                    }
+                });
+
+        if (Loader.isModLoaded("dreamcraft")) return;
+
         // recipes
         ItemStack ingot = new ItemStack(LudicrousItems.resource, 1, 6);
 
@@ -357,20 +374,6 @@ public static void buildstruct() {
                 'X',
                 ingot);
 
-        // extra modifiers from catalyst
-        ModifyBuilder.registerModifier(
-                new ModExtraModifier(new ItemStack[] { new ItemStack(LudicrousItems.resource, 1, 5) }, "AvaritiaFree") {
-
-                    @Override
-                    public void modify(ItemStack[] recipe, ItemStack input) {
-                        NBTTagCompound tags = this.getModifierTag(input);
-                        tags.setBoolean(key, true);
-                        int modifiers = tags.getInteger("Modifiers");
-                        modifiers += 5;
-                        tags.setInteger("Modifiers", modifiers);
-                    }
-                });
-
         ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(
                 getBolt(neutroniumId, neutroniumId),
                 "XX",