GTEUtils#getModFluidを追加してGTFOの依存を除去 (#92)

Author: tier940

build.gradle

@@ -115,7 +115,6 @@ dependencies {
     implementation rfg.deobf("curse.maven:ae-additions-extra-cells-2-fork-${aea_pid}:${aea_fid}")
 
     // Soft Dependencies
-    compileOnlyApi rfg.deobf("curse.maven:gregtech-food-option-${gfo_pid}:${gfo_fid}")
     implementation "mezz.jei:jei_1.12.2:${jei_version}"
     implementation "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-${crt_version}"
     implementation rfg.deobf("curse.maven:top-${top_pid}:${top_fid}")
@@ -127,10 +126,10 @@ dependencies {
     //implementation rfg.deobf("curse.maven:groovyscript-${grs_pid}:${grs_fid}")
 
     // Debug Draconic Evolution/Additions
-    compileOnlyApi rfg.deobf("curse.maven:redstone-flux-${ref_pid}:${ref_fid}")
-    compileOnlyApi rfg.deobf("curse.maven:brandons-core-${brc_pid}:${brc_fid}")
-    compileOnlyApi rfg.deobf("curse.maven:draconic-evolution-${dre_pid}:${dre_fid}")
-    compileOnlyApi rfg.deobf("curse.maven:draconicadditions-${dra_pid}:${dra_fid}")
+    compileOnly rfg.deobf("curse.maven:redstone-flux-${ref_pid}:${ref_fid}")
+    compileOnly rfg.deobf("curse.maven:brandons-core-${brc_pid}:${brc_fid}")
+    compileOnly rfg.deobf("curse.maven:draconic-evolution-${dre_pid}:${dre_fid}")
+    compileOnly rfg.deobf("curse.maven:draconicadditions-${dra_pid}:${dra_fid}")
     if (project.debug_de.toBoolean()) {
         implementation rfg.deobf("curse.maven:redstone-flux-${ref_pid}:${ref_fid}")
         implementation rfg.deobf("curse.maven:brandons-core-${brc_pid}:${brc_fid}")
@@ -139,7 +138,7 @@ dependencies {
     }
 
     // Debug Chisel
-    compileOnlyApi rfg.deobf("curse.maven:chisel-${chi_pid}:${chi_fid}")
+    compileOnly rfg.deobf("curse.maven:chisel-${chi_pid}:${chi_fid}")
     if (project.debug_chisel.toBoolean()) {
         implementation rfg.deobf("curse.maven:chisel-${chi_pid}:${chi_fid}")
     }

gradle.properties

@@ -51,8 +51,6 @@ aea_pid = 493962
 aea_fid = 3814371
 
 ## Soft Dependencies
-gfo_pid = 477021
-gfo_fid = 4555292
 ref_pid = 270789
 ref_fid = 2920436
 brc_pid = 231382

src/main/java/gtexpert/GTEMixinPlugin.java

@@ -1,8 +1,8 @@
 package gtexpert;
 
 import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
+import org.jetbrains.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.Map;
 
 @IFMLLoadingPlugin.MCVersion("1.12.2")

src/main/java/gtexpert/api/util/GTEUtils.java

@@ -2,6 +2,8 @@
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import org.jetbrains.annotations.NotNull;
 
@@ -22,4 +24,12 @@ public class GTEUtils {
     public static @NotNull ItemStack getModItem(String modID, String itemName, int amount, int meta, NBTTagCompound nbt) {
         return GameRegistry.makeItemStack(String.format("%s:%s", modID, itemName), meta, amount, nbt != null ? nbt.toString() : null);
     }
+
+    public static @NotNull FluidStack getModFluid(String fluidName) {
+        return FluidRegistry.getFluidStack(fluidName, 1000);
+    }
+
+    public static @NotNull FluidStack getModFluid(String fluidName, int amount) {
+        return FluidRegistry.getFluidStack(fluidName, amount);
+    }
 }

src/main/java/gtexpert/loaders/recipe/ingredients/GTFORecipeLoader.java

@@ -3,11 +3,8 @@
 import gregtech.api.GTValues;
 import gregtech.api.recipes.GTRecipeHandler;
 import gregtech.api.recipes.RecipeMaps;
-import gregtech.loaders.WoodTypeEntry;
-import gregtechfoodoption.GTFOMaterialHandler;
-import gregtechfoodoption.block.GTFOMetaBlocks;
 import gtexpert.api.GTEValues;
-import gtexpert.common.GTEConfigHolder;
+import gtexpert.api.util.GTEUtils;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
@@ -20,7 +17,6 @@
 import static gregtech.api.GTValues.*;
 import static gregtech.api.unification.material.Materials.*;
 import static gregtech.api.unification.ore.OrePrefix.*;
-import static gregtech.loaders.recipe.WoodRecipeLoader.registerWoodTypeRecipe;
 
 public class GTFORecipeLoader {
     public static void init() {
@@ -63,14 +59,14 @@ private static void fluid() {
                 .circuitMeta(1)
                 .input("craftSludge", 1)
                 .fluidInputs(SulfuricAcid.getFluid(200))
-                .fluidOutputs(GTFOMaterialHandler.Sludge.getFluid(200))
+                .fluidOutputs(GTEUtils.getModFluid("gtfo_sludge", 200))
                 .duration(250).EUt(VA[LV])
                 .buildAndRegister();
         RecipeMaps.MIXER_RECIPES.recipeBuilder()
                 .circuitMeta(2)
                 .input("craftSludge", 1)
                 .fluidInputs(Water.getFluid(200))
-                .fluidOutputs(GTFOMaterialHandler.Sludge.getFluid(100))
+                .fluidOutputs(GTEUtils.getModFluid("gtfo_sludge", 100))
                 .duration(500).EUt(VA[LV])
                 .buildAndRegister();
     }