Merge branch 'master' into EFR-recipe-integration

GTNewHorizons · Dec 26, 2024 · 3eea6d4 · 3eea6d4
2 parents 5caecd4 + 5caa161
commit 3eea6d4
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 18 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.27:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.29: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/detrav/ScannerTools.java b/src/main/java/com/dreammaster/detrav/ScannerTools.java
@@ -12,7 +12,9 @@
 
 public class ScannerTools implements IOreRecipeRegistrator {
 
-    public ScannerTools() {}
+    public ScannerTools() {
+        OrePrefixes.toolHeadDrill.add(this);
+    }
 
     public void registerOre(OrePrefixes o, Materials material, String s, String s2, ItemStack i) {
         GTModHandler.addCraftingRecipe(

diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java
@@ -1790,6 +1790,11 @@ public static void run() {
         removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "brewing_stand", 1, 0, missing));
         removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "clock", 1, 0, missing));
         removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "compass", 1, 0, missing));
+        removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "stone_sword", 1, 0, missing));
+        removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "stone_shovel", 1, 0, missing));
+        removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "stone_pickaxe", 1, 0, missing));
+        removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "stone_axe", 1, 0, missing));
+        removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "stone_hoe", 1, 0, missing));
         removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "diamond_sword", 1, 0, missing));
         removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "diamond_shovel", 1, 0, missing));
         removeRecipeByOutputDelayed(getModItem(Minecraft.ID, "diamond_pickaxe", 1, 0, missing));

diff --git a/src/main/java/com/dreammaster/scripts/ScriptGalaxySpace.java b/src/main/java/com/dreammaster/scripts/ScriptGalaxySpace.java
@@ -190,7 +190,7 @@ public void loadRecipes() {
                         CustomItemList.Display.get(1),
                         ItemList.Emitter_IV.get(1),
                         ItemList.Sensor_IV.get(1),
-                        getGSItem("item.HeavyDutyPlateTier4", 1, 0))
+                        CustomItemList.HeavyDutyPlateTier4.get(1))
                 .itemOutputs(getGSItem("item.RocketControlComputer", 1, 4))
                 .fluidInputs(Materials.SolderingAlloy.getMolten(1728)).requiresCleanRoom().duration(30 * SECONDS)
                 .eut(TierEU.RECIPE_IV).addTo(assemblerRecipes);
@@ -201,7 +201,7 @@ public void loadRecipes() {
                         CustomItemList.Display.get(1),
                         ItemList.Emitter_LuV.get(1),
                         ItemList.Sensor_LuV.get(1),
-                        getGSItem("item.HeavyDutyPlateTier5", 1, 0))
+                        CustomItemList.HeavyDutyPlateTier5.get(1))
                 .itemOutputs(getGSItem("item.RocketControlComputer", 1, 5))
                 .fluidInputs(Materials.SolderingAlloy.getMolten(2304)).requiresCleanRoom().duration(30 * SECONDS)
                 .eut(TierEU.RECIPE_LuV).addTo(assemblerRecipes);
@@ -212,7 +212,7 @@ public void loadRecipes() {
                         CustomItemList.Display.get(1),
                         ItemList.Emitter_ZPM.get(1),
                         ItemList.Sensor_ZPM.get(1),
-                        getGSItem("item.HeavyDutyPlateTier6", 1, 0))
+                        CustomItemList.HeavyDutyPlateTier6.get(1))
                 .itemOutputs(getGSItem("item.RocketControlComputer", 1, 6))
                 .fluidInputs(Materials.SolderingAlloy.getMolten(3456)).requiresCleanRoom().duration(30 * SECONDS)
                 .eut(TierEU.RECIPE_ZPM).addTo(assemblerRecipes);
@@ -223,7 +223,7 @@ public void loadRecipes() {
                         CustomItemList.Display.get(1),
                         ItemList.Emitter_UV.get(1),
                         ItemList.Sensor_UV.get(1),
-                        getGSItem("item.HeavyDutyPlateTier7", 1, 0))
+                        CustomItemList.HeavyDutyPlateTier7.get(1))
                 .itemOutputs(getGSItem("item.RocketControlComputer", 1, 7))
                 .fluidInputs(Materials.SolderingAlloy.getMolten(4608)).requiresCleanRoom().duration(30 * SECONDS)
                 .eut(TierEU.RECIPE_UV).addTo(assemblerRecipes);
@@ -234,7 +234,7 @@ public void loadRecipes() {
                         CustomItemList.Display.get(1),
                         ItemList.Emitter_UV.get(1),
                         ItemList.Sensor_UV.get(1),
-                        getGSItem("item.HeavyDutyPlateTier8", 1, 0))
+                        CustomItemList.HeavyDutyPlateTier8.get(1))
                 .itemOutputs(getGSItem("item.RocketControlComputer", 1, 8))
                 .fluidInputs(Materials.SolderingAlloy.getMolten(6912)).requiresCleanRoom().duration(30 * SECONDS)
                 .eut(TierEU.RECIPE_UV).addTo(assemblerRecipes);

diff --git a/src/main/java/com/dreammaster/scripts/ScriptNuclearControl.java b/src/main/java/com/dreammaster/scripts/ScriptNuclearControl.java
@@ -13,7 +13,6 @@
 import java.util.List;
 
 import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
 import com.dreammaster.gthandler.CustomItemList;
@@ -304,9 +303,9 @@ public void loadRecipes() {
 
         GTValues.RA.stdBuilder() // Color upgrade
                 .itemInputs(
-                        new ItemStack(Items.dye, 1, 1),
-                        new ItemStack(Items.dye, 1, 2),
-                        new ItemStack(Items.dye, 1, 4),
+                        ItemList.Color_01.get(1L),
+                        ItemList.Color_02.get(1L),
+                        ItemList.Color_04.get(1L),
                         GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L))
                 .itemOutputs(getModItem(IC2NuclearControl.ID, "ItemUpgrade", 1, 1, missing)).duration(20 * SECONDS)
                 .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);

diff --git a/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java b/src/main/java/com/dreammaster/scripts/ScriptProjectRed.java
@@ -52,7 +52,6 @@
 import net.minecraftforge.oredict.OreDictionary;
 
 import com.dreammaster.chisel.ChiselHelper;
-import com.dreammaster.tinkersConstruct.TConstructHelper;
 
 import fox.spiteful.avaritia.crafting.ExtremeCraftingManager;
 import gregtech.api.GregTechAPI;
@@ -65,7 +64,6 @@
 import gregtech.api.util.GTOreDictUnificator;
 import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.material.MaterialsAlloy;
-import tconstruct.library.crafting.Smeltery;
 
 public class ScriptProjectRed implements IScriptLoader {
 
@@ -160,11 +158,6 @@ public void loadRecipes() {
         ChiselHelper.addGroup("ruby");
         ChiselHelper.addGroup("sapphire");
         ChiselHelper.addGroup("peridot");
-        TConstructHelper.removeSmelterAlloyMix(FluidRegistry.getFluidStack("redmetal.molten", 144));
-        Smeltery.addAlloyMixing(
-                FluidRegistry.getFluidStack("redmetal.molten", 144),
-                FluidRegistry.getFluidStack("redstone.molten", 576),
-                FluidRegistry.getFluidStack("copper.molten", 144));
         ChiselHelper.addVariationFromStack("ruby", getModItem(BiomesOPlenty.ID, "gemOre", 1, 3, missing));
         ChiselHelper.addVariationFromStack("ruby", new ItemStack(GregTechAPI.sBlockGem2, 1, 11));
         ChiselHelper.addVariationFromStack(