Merge branch 'master' into TG-Removal

GTNewHorizons · Jan 11, 2025 · da7fe97 · da7fe97
2 parents 960f06c + f591de5
commit da7fe97
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 50 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,16 +1,16 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.61:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.63:dev")
     api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
     api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
 
-    implementation("com.github.GTNewHorizons:GTNHLib:0.6.0:dev")
+    implementation("com.github.GTNewHorizons:GTNHLib:0.6.1:dev")
 
     compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.0:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Avaritia:1.59:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:twilightforest:2.7.2:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.16:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.18:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.3-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.3:dev") { transitive = false }

diff --git a/src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java b/src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java
@@ -19,6 +19,7 @@
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
@@ -29,33 +30,38 @@
 import bartworks.common.items.SimpleSubItemClass;
 import bartworks.common.loaders.BioItemList;
 import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.enums.FluidState;
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TierEU;
-import gregtech.api.objects.GTFluid;
+import gregtech.api.fluid.GTFluidFactory;
 import gregtech.api.util.GTModHandler;
 import gregtech.api.util.GTUtility;
 
 public class BioItemLoader {
 
     private static Item BIOTEMS;
-    private static GTFluid[] BIOFLUIDS;
+    private static Fluid[] BIOFLUIDS;
 
     public static boolean preInit() {
         try {
-            BIOTEMS = new SimpleSubItemClass(new String[] { "itemCollagen", "itemGelatin", "itemAgar" })
-                    .setCreativeTab(MainMod.BIO_TAB);
+            BIOTEMS = new SimpleSubItemClass("itemCollagen", "itemGelatin", "itemAgar").setCreativeTab(MainMod.BIO_TAB);
             GameRegistry.registerItem(BIOTEMS, "GTNHBioItems", BartWorks.ID);
-            BIOFLUIDS = new GTFluid[] {
-                    new GTFluid("GelatinMixture", "molten.autogenerated", new short[] { 255, 255, 125 }),
-                    new GTFluid("MeatExtract", "molten.autogenerated", new short[] { 160, 70, 50 }),
-                    new GTFluid("UnknownNutrientAgar", "molten.autogenerated", new short[] { 175, 133, 0 }),
-                    new GTFluid("SeaweedBroth", "molten.autogenerated", new short[] { 60, 200, 0 }) };
-
-            for (GTFluid gtFluid : BIOFLUIDS) {
-                FluidRegistry.registerFluid(gtFluid);
-            }
+
+            BIOFLUIDS = new Fluid[] {
+                    GTFluidFactory.builder("GelatinMixture").withLocalizedName("Gelatin Mixture")
+                            .withTextureName("molten.autogenerated").withColorRGBA(new short[] { 255, 255, 125 })
+                            .withStateAndTemperature(FluidState.LIQUID, 300).buildAndRegister().asFluid(),
+                    GTFluidFactory.builder("MeatExtract").withLocalizedName("Meat Extract")
+                            .withTextureName("molten.autogenerated").withColorRGBA(new short[] { 160, 70, 50 })
+                            .withStateAndTemperature(FluidState.LIQUID, 300).buildAndRegister().asFluid(),
+                    GTFluidFactory.builder("UnknownNutrientAgar").withLocalizedName("Unknown Nutrient Agar")
+                            .withTextureName("molten.autogenerated").withColorRGBA(new short[] { 175, 133, 0 })
+                            .withStateAndTemperature(FluidState.LIQUID, 300).buildAndRegister().asFluid(),
+                    GTFluidFactory.builder("SeaweedBroth").withLocalizedName("Seaweed Broth")
+                            .withTextureName("molten.autogenerated").withColorRGBA(new short[] { 60, 200, 0 })
+                            .withStateAndTemperature(FluidState.LIQUID, 300).buildAndRegister().asFluid() };
             return true;
         } catch (Exception e) {
             MainRegistry.Logger.error(e);

diff --git a/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java b/src/main/java/com/dreammaster/scripts/ScriptExtraUtilities.java
@@ -925,7 +925,7 @@ public void loadRecipes() {
                         'g',
                         getModItem(ExtraUtilities.ID, "decorativeBlock1", 1, 11, missing),
                         'h',
-                        getModItem(IndustrialCraft2.ID, "blockMachine2", 1, 11, missing),
+                        ItemList.OreDrill2.get(1L),
                         'i',
                         getModItem(ExtraUtilities.ID, "decorativeBlock1", 1, 11, missing)));
         EnderConstructorRecipesHandler.registerRecipe(

diff --git a/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java b/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java
@@ -708,28 +708,6 @@ public void loadRecipes() {
                 "itemCasingAnyIron",
                 "batteryAdvanced",
                 "itemCasingAnyIron");
-        addShapedRecipe(
-                getModItem(IndustrialCraft2.ID, "itemScanner", 1, 0, missing),
-                "itemCasingGold",
-                "plateStainlessSteel",
-                "itemCasingGold",
-                "circuitAdvanced",
-                CustomItemList.Display.get(1L),
-                "circuitAdvanced",
-                "cableGt01Gold",
-                "batteryAdvanced",
-                "cableGt01Gold");
-        addShapedRecipe(
-                getModItem(IndustrialCraft2.ID, "itemScannerAdv", 1, 0, missing),
-                "itemCasingTitanium",
-                getModItem(IndustrialCraft2.ID, "itemScanner", 1, wildcard, missing),
-                "itemCasingTitanium",
-                "circuitData",
-                CustomItemList.Display.get(1L),
-                "circuitData",
-                "cableGt01Nichrome",
-                "batteryData",
-                "cableGt01Nichrome");
         addShapedRecipe(
                 getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 3, missing),
                 "cableGt01AnyCopper",
@@ -873,17 +851,6 @@ public void loadRecipes() {
                 "itemCasingSteel",
                 "circuitBasic",
                 "itemCasingSteel");
-        addShapedRecipe(
-                getModItem(IndustrialCraft2.ID, "blockMachine2", 1, 11, missing),
-                "circuitElite",
-                getModItem(IndustrialCraft2.ID, "blockElectric", 1, 2, missing),
-                "circuitElite",
-                ItemList.Electric_Motor_IV.get(1L),
-                getModItem(IndustrialCraft2.ID, "blockMachine", 1, 12, missing),
-                ItemList.Electric_Motor_IV.get(1L),
-                ItemList.Robot_Arm_IV.get(1L),
-                getModItem(IndustrialCraft2.ID, "blockMachine2", 1, 0, missing),
-                ItemList.Robot_Arm_IV.get(1L));
         addShapedRecipe(
                 getModItem(IndustrialCraft2.ID, "blockMachine2", 1, 1, missing),
                 getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 0, missing),