Merge branch 'master' into sb-longer-chat-messages

GTNewHorizons · Nov 3, 2023 · e18c628 · e18c628
2 parents eab2382 + 089f046
commit e18c628
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 0 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -38,6 +38,7 @@ dependencies {
     transformedMod("com.github.GTNewHorizons:harvestcraft:1.1.1-GTNH:dev")
     transformedModCompileOnly deobf('https://media.forgecdn.net/files/4091/561/LOTRMod+v36.15.jar')
     transformedModCompileOnly deobf("https://mediafiles.forgecdn.net/files/2523/840/Better+HUD+by+NukeDuck+%5b1.7.10%5d%5b1.3.5%5d.jar")
+    transformedMod deobf("https://mediafiles.forgecdn.net/files/2299/292/ExtraTiC-1.7.10-1.4.6.jar")
     // Contains an outdated copy of thaumcraft api that breaks class loading at runtime
     transformedModCompileOnly(deobf("https://mediafiles.forgecdn.net/files/2241/397/Pam%27s+Harvest+the+Nether+1.7.10a.jar"))
     transformedMod(deobf("https://mediafiles.forgecdn.net/files/2340/786/ProjectE-1.7.10-PE1.10.1.jar"))

diff --git a/src/main/java/com/mitchej123/hodgepodge/LoadingConfig.java b/src/main/java/com/mitchej123/hodgepodge/LoadingConfig.java
@@ -47,6 +47,7 @@ public class LoadingConfig {
     public boolean fixExtraUtilitiesItemRendering;
     public boolean fixExtraUtilitiesUnEnchanting;
     public boolean fixExtraUtilitiesDrumEatingCells;
+    public boolean fixExtraTiCTEConflict;
     public boolean fixFenceConnections;
     public boolean fixFireSpread;
     public boolean fixFluidContainerRegistryKey;
@@ -233,6 +234,7 @@ public LoadingConfig(File file) {
         fixExtraUtilitiesItemRendering = config.get(Category.FIXES.toString(), "fixExtraUtilitiesItemRendering", true, "Fixes rendering issues with transparent items from extra utilities").getBoolean();
         fixExtraUtilitiesUnEnchanting = config.get(Category.FIXES.toString(), "fixExtraUtilitiesUnEnchanting", true, "Fix dupe bug with division sigil removing enchantment").getBoolean();
         fixExtraUtilitiesDrumEatingCells = config.get(Category.FIXES.toString(), "fixExtraUtilitiesDrumEatingCells", true, "Fix Extra Utilities drums eating ic2 cells and forestry capsules").getBoolean();
+        fixExtraTiCTEConflict = config.get(Category.FIXES.toString(), "fixExtraTiCTEConflict", false, "Disable ExtraTic's Integration with Metallurgy 3 Precious Materials Module: [Brass, Silver, Electrum & Platinum]").getBoolean();
         fixFenceConnections = config.get(Category.FIXES.toString(), "fixFenceConnections", true, "Fix fence connections with other types of fence").getBoolean();
         fixFireSpread = config.get(Category.FIXES.toString(), "fixFireSpread", true, "Fix vanilla fire spread sometimes cause NPE on thermos").getBoolean();
         fixFluidContainerRegistryKey = config.get(Category.FIXES.toString(), "fixFluidContainerRegistryKey", true, "Fix Forge fluid container registry key").getBoolean();

diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/Mixins.java b/src/main/java/com/mitchej123/hodgepodge/mixins/Mixins.java
@@ -477,6 +477,11 @@ public enum Mixins {
                     .setApplyIf(() -> Common.config.fixPotionRenderOffset)
                     .addMixinClasses("tconstruct.MixinTabRegistry")),
 
+    // Extra Tinkers
+    Fix_EXTRATIC_TECONFLICT(new Builder(
+            "Disable ExtraTic's Integration with Metallurgy 3 Precious Materials Module: [Brass, Silver, Electrum & Platinum]")
+                    .addMixinClasses("extratic.MixinPartsHandler").setSide(Side.BOTH)
+                    .setApplyIf(() -> Common.config.fixExtraTiCTEConflict).addTargetedMod(TargetedMod.EXTRATIC)),
     // Extra Utilities
     FIX_EXTRA_UTILITIES_UNENCHANTING(new Builder("Fix Exu Unenchanting")
             .addMixinClasses("extrautilities.MixinRecipeUnEnchanting").setSide(Side.BOTH)

diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/TargetedMod.java b/src/main/java/com/mitchej123/hodgepodge/mixins/TargetedMod.java
@@ -33,6 +33,7 @@ public enum TargetedMod {
     RAILCRAFT("Railcraft", null, "Railcraft"),
     THAUMCRAFT("Thaumcraft", null, "Thaumcraft"), // "thaumcraft.codechicken.core.launch.DepLoader"
     TINKERSCONSTRUCT("TConstruct", null, "TConstruct"),
+    EXTRATIC("ExtraTiC", null, "ExtraTiC"),
     TRAVELLERSGEAR("TravellersGear", null, "TravellersGear"),
     VANILLA("Minecraft", null),
     WITCHERY("Witchery", null, "witchery"),

diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/extratic/MixinPartsHandler.java b/src/main/java/com/mitchej123/hodgepodge/mixins/late/extratic/MixinPartsHandler.java
@@ -0,0 +1,36 @@
+package com.mitchej123.hodgepodge.mixins.late.extratic;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import cpw.mods.fml.common.FMLLog;
+import glassmaker.extratic.common.PartsHandler;
+
+@Mixin(PartsHandler.class)
+public class MixinPartsHandler {
+
+    /**
+     * @author DrParadox
+     * @reason Breaks Thermal Foundation's TConstruct material integration
+     */
+    @Redirect(
+            method = "addMatrials",
+            at = @At(value = "INVOKE", target = "Lglassmaker/extratic/common/PartsHandler;_addM3PreciousMaterials()V"),
+            remap = false)
+    private static void hodgepodge$disableM3PreciousMaterials() {
+        FMLLog.info("Disabled ExtraTiC material integration with Metallurgy 3 Precious Materials");
+    }
+
+    /**
+     * @author DrParadox
+     * @reason Breaks Thermal Foundation's TConstruct parts integration
+     */
+    @Redirect(
+            method = "addParts",
+            at = @At(value = "INVOKE", target = "Lglassmaker/extratic/common/PartsHandler;_addM3PreciousParts()V"),
+            remap = false)
+    private static void hodgepodge$disableM3PreciousParts() {
+        FMLLog.info("Disabled ExtraTiC part integration with Metallurgy 3 Precious Materials");
+    }
+}