Merge branch 'master' into biovat

GTNewHorizons · Jan 9, 2025 · ded78f4 · ded78f4
2 parents 53af461 + 888d0ed
commit ded78f4
Show file tree

Hide file tree

Showing 22 changed files with 86 additions and 1,801 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,7 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.58:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.61:dev")
     api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
     api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
 

diff --git a/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java b/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java
@@ -3,6 +3,7 @@
 import static bartworks.API.BioObjectAdder.*;
 import static bartworks.API.recipe.BartWorksRecipeMaps.bacterialVatRecipes;
 import static bartworks.API.recipe.BartWorksRecipeMaps.bioLabRecipes;
+import static bartworks.util.BWRecipes.computeSieverts;
 import static gregtech.api.enums.Materials.*;
 import static gregtech.api.enums.Mods.GalaxySpace;
 import static gregtech.api.enums.Mods.Genetics;

diff --git a/src/main/java/com/dreammaster/gthandler/CoreMod_PCBFactory_MaterialLoader.java b/src/main/java/com/dreammaster/gthandler/CoreMod_PCBFactory_MaterialLoader.java
diff --git a/src/main/java/com/dreammaster/gthandler/CustomItemList.java b/src/main/java/com/dreammaster/gthandler/CustomItemList.java
@@ -13,10 +13,6 @@
 
 public enum CustomItemList implements IItemContainer {
 
-    Machine_Multi_AirFilterT1,
-    Machine_Multi_AirFilterT2,
-    Machine_Multi_AirFilterT3,
-
     // CoreModItems
     EtchedLowVoltageWiring,
     EtchedInsaneVoltageWiring,
@@ -310,7 +306,6 @@ public enum CustomItemList implements IItemContainer {
     MedalWarp,
     MaceratedPlantmass,
     EngineCore,
-    nameRemover,
     TwilightCrystal,
     UnfiredClayBrick,
     UnfiredSearedBrick,

diff --git a/src/main/java/com/dreammaster/gthandler/GT_CoreModSupport.java b/src/main/java/com/dreammaster/gthandler/GT_CoreModSupport.java
diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
@@ -611,7 +611,7 @@ public void run() {
                         OrePrefixes.stickLong.get(Materials.Steel), 'R', OrePrefixes.rotor.get(Materials.Steel), 'M',
                         ItemList.Electric_Motor_LV, 'R', OrePrefixes.screw.get(Materials.Steel) });
         GTModHandler.addCraftingRecipe(
-                CustomItemList.Machine_Multi_AirFilterT1.get(1L),
+                ItemList.Machine_Multi_AirFilterT1.get(1L),
                 bits,
                 new Object[] { "RPR", "MBM", "CGC", 'B', ItemList.Hull_LV, 'R', OrePrefixes.rotor.get(Materials.Steel),
                         'P', ItemList.Electric_Pump_LV, 'M', ItemList.Electric_Motor_LV, 'C',
@@ -628,7 +628,7 @@ public void run() {
                         OrePrefixes.stickLong.get(Materials.Titanium), 'R', OrePrefixes.rotor.get(Materials.Titanium),
                         'M', ItemList.Electric_Motor_HV, 'R', OrePrefixes.screw.get(Materials.Titanium) });
         GTModHandler.addCraftingRecipe(
-                CustomItemList.Machine_Multi_AirFilterT2.get(1L),
+                ItemList.Machine_Multi_AirFilterT2.get(1L),
                 bits,
                 new Object[] { "RPR", "MBM", "CGC", 'B', ItemList.Hull_HV, 'R',
                         OrePrefixes.rotor.get(Materials.Titanium), 'P', ItemList.Electric_Pump_HV, 'M',
@@ -647,7 +647,7 @@ public void run() {
                         OrePrefixes.rotor.get(Materials.TungstenSteel), 'M', ItemList.Electric_Motor_IV, 'R',
                         OrePrefixes.screw.get(Materials.TungstenSteel) });
         GTModHandler.addCraftingRecipe(
-                CustomItemList.Machine_Multi_AirFilterT3.get(1L),
+                ItemList.Machine_Multi_AirFilterT3.get(1L),
                 bits,
                 new Object[] { "RPR", "MBM", "CGC", 'B', ItemList.Hull_IV, 'R',
                         OrePrefixes.rotor.get(Materials.TungstenSteel), 'P', ItemList.Electric_Pump_IV, 'M',

diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_Machines.java
@@ -1,6 +1,5 @@
 package com.dreammaster.gthandler;
 
-import static com.dreammaster.gthandler.enums.MetaTileEntityIDs.*;
 import static gregtech.api.enums.GTValues.VP;
 import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
 import static gregtech.api.recipe.RecipeMaps.slicerRecipes;
@@ -10,10 +9,6 @@
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-import com.dreammaster.gthandler.multiAirFilter.GT_MetaTileEntity_AirFilterT1;
-import com.dreammaster.gthandler.multiAirFilter.GT_MetaTileEntity_AirFilterT2;
-import com.dreammaster.gthandler.multiAirFilter.GT_MetaTileEntity_AirFilterT3;
-import com.dreammaster.gthandler.nameRemover.NameRemover;
 import com.dreammaster.item.food.QuantumBread;
 
 import gregtech.api.enums.GTValues;
@@ -70,8 +65,6 @@ public void run() {
         registerPlasmaArcFurnace();
         registerCanningMachine();
         registerChemicalBath();
-        registerAirFilter();
-        registerNameRemover();
         registerCircuitAssembler();
         registerMachines2();
         recipes();
@@ -939,7 +932,7 @@ public void recipes() {
                         OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.UMV) });
 
         GTModHandler.addCraftingRecipe(
-                CustomItemList.nameRemover.get(1L),
+                ItemList.NameRemover.get(1L),
                 bitsd,
                 new Object[] { "SsS", "VMV", "SXS", 'M', ItemList.Hull_ULV, 'V',
                         OrePrefixes.gearGtSmall.get(Materials.AnyBronze), 'S', OrePrefixes.screw.get(Materials.AnyIron),
@@ -3318,29 +3311,6 @@ private void registerChemicalBath() {
                 12);
     }
 
-    private void registerAirFilter() {
-        CustomItemList.Machine_Multi_AirFilterT1.set(
-                new GT_MetaTileEntity_AirFilterT1(
-                        AIR_FILTER_CONTROLLER_T1.ID,
-                        "multimachine.airfilter.01",
-                        "Electric Air Filter T1").getStackForm(1L));
-        CustomItemList.Machine_Multi_AirFilterT2.set(
-                new GT_MetaTileEntity_AirFilterT2(
-                        AIR_FILTER_CONTROLLER_T2.ID,
-                        "multimachine.airfilter.02",
-                        "Electric Air Filter T2").getStackForm(1L));
-        CustomItemList.Machine_Multi_AirFilterT3.set(
-                new GT_MetaTileEntity_AirFilterT3(
-                        AIR_FILTER_CONTROLLER_T3.ID,
-                        "multimachine.airfilter.03",
-                        "Electric Air Filter T3").getStackForm(1L));
-    }
-
-    private void registerNameRemover() {
-        CustomItemList.nameRemover
-                .set(new NameRemover(NAME_REMOVER.ID, "fix.name.remover", "Name Remover", 0).getStackForm(1L));
-    }
-
     private void registerCircuitAssembler() {
         GTModHandler.addCraftingRecipe(
                 ItemList.CircuitAssemblerUHV.get(1L),