Add Mixins to skip Forestry fluid registration and redirect to GregTech fluids

Author: tier940

src/main/java/com/github/gtexpert/gtbm/integration/forestry/loaders/FFMFarmingLoader.java

@@ -24,11 +24,13 @@ public static void init() {
         IFarmProperties ceuFarm = ForestryFarmHelper.registerFarmType("farmCEu", FarmLogicCEu::new,
                 EnumElectronTube.TIN);
 
-        String rubberId = "farmCEu.rubber";
-        ceuFarm.registerFarmables(rubberId);
-        farmRegistry.registerFarmables(rubberId,
-                new FarmableGTCEuSapling(MetaBlocks.RUBBER_SAPLING,
-                        new ItemStack[] { MetaItems.STICKY_RESIN.getStackForm() }));
+        if (ceuFarm != null) {
+            String rubberId = "farmCEu.rubber";
+            ceuFarm.registerFarmables(rubberId);
+            farmRegistry.registerFarmables(rubberId,
+                    new FarmableGTCEuSapling(MetaBlocks.RUBBER_SAPLING,
+                            new ItemStack[] { MetaItems.STICKY_RESIN.getStackForm() }));
+        }
 
         // GregTech Fertilizer
         farmRegistry.registerFertilizer(MetaItems.FERTILIZER.getStackForm(), 500);

src/main/java/com/github/gtexpert/gtbm/integration/forestry/util/ForestryFarmHelper.java

@@ -24,6 +24,7 @@ public static IFarmProperties registerFarmType(String farmId,
                                                    EnumElectronTube tube) {
         if (ForestryAPI.farmRegistry == null) return null;
         IFarmProperties farm = ForestryAPI.farmRegistry.registerLogic(farmId, logicFactory);
+        if (farm == null) return null;
         farm.registerSoil(new ItemStack(Blocks.DIRT),
                 Block.getBlockFromItem(Mods.Forestry.getItem("humus").getItem()).getDefaultState());
 

src/main/java/com/github/gtexpert/gtbm/mixins/forestry/FluidsMixin.java

@@ -0,0 +1,73 @@
+package com.github.gtexpert.gtbm.mixins.forestry;
+
+import java.util.Map;
+
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import forestry.core.fluids.Fluids;
+
+/**
+ * Redirects Forestry's {@link Fluids} enum to return GregTech fluid objects
+ * for fluids whose registration was skipped by {@link ModuleFluidsMixin}.
+ * <p>
+ * BIO_ETHANOL (tag "bio.ethanol") maps to GT's "ethanol",
+ * SEED_OIL (tag "seed.oil") maps to GT's "seed_oil".
+ * Other skipped fluids (biomass, glass, ice, milk) share the same name
+ * and are resolved correctly without redirection.
+ * <p>
+ * Also extends the {@code tagToFluid} map so that
+ * {@link Fluids#getFluidDefinition(FluidStack)} works with GT fluid names.
+ */
+@Mixin(value = Fluids.class, remap = false)
+public class FluidsMixin {
+
+    @Shadow
+    @Final
+    private static Map<String, Fluids> tagToFluid;
+
+    /**
+     * Returns the GregTech fluid name for fluids whose Forestry tag differs
+     * from the GregTech registration name, or {@code null} if no redirect is needed.
+     */
+    private static String gtbm$getRedirectedName(Fluids self) {
+        if (self == Fluids.SEED_OIL) {
+            return "seed_oil";
+        }
+        if (self == Fluids.BIO_ETHANOL) {
+            return "ethanol";
+        }
+        return null;
+    }
+
+    @Inject(method = "getFluid()Lnet/minecraftforge/fluids/Fluid;", at = @At("HEAD"), cancellable = true)
+    private void gtbm$redirectGetFluid(CallbackInfoReturnable<Fluid> cir) {
+        String redirected = gtbm$getRedirectedName((Fluids) (Object) this);
+        if (redirected != null) {
+            cir.setReturnValue(FluidRegistry.getFluid(redirected));
+        }
+    }
+
+    @Inject(method = "getFluid(I)Lnet/minecraftforge/fluids/FluidStack;", at = @At("HEAD"), cancellable = true)
+    private void gtbm$redirectGetFluidStack(int mb, CallbackInfoReturnable<FluidStack> cir) {
+        String redirected = gtbm$getRedirectedName((Fluids) (Object) this);
+        if (redirected != null) {
+            cir.setReturnValue(FluidRegistry.getFluidStack(redirected, mb));
+        }
+    }
+
+    @Inject(method = "<clinit>", at = @At("TAIL"))
+    private static void gtbm$extendTagToFluid(CallbackInfo ci) {
+        tagToFluid.put("seed_oil", Fluids.SEED_OIL);
+        tagToFluid.put("ethanol", Fluids.BIO_ETHANOL);
+    }
+}

src/main/java/com/github/gtexpert/gtbm/mixins/forestry/ModuleFluidsMixin.java

@@ -0,0 +1,35 @@
+package com.github.gtexpert.gtbm.mixins.forestry;
+
+import java.util.EnumSet;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import forestry.core.ModuleFluids;
+import forestry.core.fluids.Fluids;
+
+/**
+ * Prevents Forestry from registering fluids that GregTech will register,
+ * so that GregTech's Fluid objects are used instead of Forestry's.
+ * This avoids NPE crashes caused by Forestry fluid item model issues in JEI.
+ */
+@Mixin(value = ModuleFluids.class, remap = false)
+public class ModuleFluidsMixin {
+
+    private static final EnumSet<Fluids> SKIPPED_FLUIDS = EnumSet.of(
+            Fluids.BIO_ETHANOL,
+            Fluids.BIOMASS,
+            Fluids.GLASS,
+            Fluids.ICE,
+            Fluids.MILK,
+            Fluids.SEED_OIL);
+
+    @Inject(method = "createFluid", at = @At("HEAD"), cancellable = true)
+    private static void gtbm$skipGregTechFluids(Fluids fluidDefinition, CallbackInfo ci) {
+        if (SKIPPED_FLUIDS.contains(fluidDefinition)) {
+            ci.cancel();
+        }
+    }
+}

src/main/resources/assets/gtbm/lang/ja_jp.lang

@@ -37,8 +37,8 @@ gtbm.farm.ceu=ゴムの木農園
 gtbm.farm.gtfo=果樹農園
 
 # GUI
-gtbm.gui.auto_breeding.tooltip.enabled=自動交配: ON/nクイーン死亡後にプリンセスを自動的に入力スロットに戻します
-gtbm.gui.auto_breeding.tooltip.disabled=自動交配: OFF/nプリンセスはアウトプットに残ります
+gtbm.gui.auto_breeding.tooltip.enabled=自動交配を有効化 (現在は無効)/nクイーン死亡後にプリンセスを自動的に入力スロットに戻します
+gtbm.gui.auto_breeding.tooltip.disabled=自動交配を無効化 (現在は有効)/nプリンセスはアウトプットに残ります
 
 # Multiblock Display
 gtbm.multiblock.progress=進捗: %s / %s (%s%%)

src/main/resources/mixins.gtbm.forestry.json

@@ -5,7 +5,9 @@
   "minVersion": "0.8",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
-    "FlowerRegistryAccessor"
+    "FlowerRegistryAccessor",
+    "FluidsMixin",
+    "ModuleFluidsMixin"
   ],
   "client": [
     "ItemBeeGEMixin",