GTNewHorizons · serenibyss · Jan 26, 2025 · Jan 13, 2025 · Jan 14, 2025 · Jan 14, 2025
diff --git a/src/main/java/com/dreammaster/gthandler/GT_Loader_Materials.java b/src/main/java/com/dreammaster/gthandler/GT_Loader_Materials.java
@@ -15,9 +15,9 @@ private void registerMaterialRecipes() {
         GTModHandler.addShapelessCraftingRecipe(
                 GTOreDictUnificator.get(OrePrefixes.dust, Materials.Alumite, 8),
                 GTModHandler.RecipeBits.NOT_REMOVABLE,
-                new Object[] { OrePrefixes.dust.get(Materials.Aluminium), OrePrefixes.dust.get(Materials.Aluminium),
-                        OrePrefixes.dust.get(Materials.Aluminium), OrePrefixes.dust.get(Materials.Aluminium),
-                        OrePrefixes.dust.get(Materials.Aluminium), OrePrefixes.dust.get(Materials.Steel),
+                new Object[] { OrePrefixes.dust.get(Materials.Zinc), OrePrefixes.dust.get(Materials.Zinc),
+                        OrePrefixes.dust.get(Materials.Zinc), OrePrefixes.dust.get(Materials.Zinc),
+                        OrePrefixes.dust.get(Materials.Zinc), OrePrefixes.dust.get(Materials.Steel),
                         OrePrefixes.dust.get(Materials.Steel), OrePrefixes.dust.get(Materials.Obsidian),
                         OrePrefixes.dust.get(Materials.Obsidian) });
 

diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AlloySmelterRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AlloySmelterRecipes.java
@@ -3,7 +3,6 @@
 import static com.dreammaster.scripts.IScriptLoader.wildcard;
 import static gregtech.api.enums.Mods.EnderIO;
 import static gregtech.api.enums.Mods.IndustrialCraft2;
-import static gregtech.api.enums.Mods.TinkerConstruct;
 import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes;
 import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 
@@ -226,17 +225,6 @@ public void run() {
 
             }
         }
-
-        if (TinkerConstruct.isModLoaded()) {
-            GTValues.RA.stdBuilder()
-                    .itemInputs(
-                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 3L),
-                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1L))
-                    .itemOutputs(GTModHandler.getModItem(TinkerConstruct.ID, "materials", 4L, 14)).duration(5 * SECONDS)
-                    .eut(TierEU.RECIPE_MV).addTo(alloySmelterRecipes);
-
-        }
-
     }
 
 }
diff --git a/src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java
@@ -41,10 +41,6 @@ public void run() {
 
         if (TinkerConstruct.isModLoaded()) {
 
-            GTValues.RA.stdBuilder().itemInputs(GTModHandler.getModItem(TinkerConstruct.ID, "materials", 1L, 14))
-                    .fluidOutputs(FluidRegistry.getFluidStack("aluminumbrass.molten", 144))
-                    .duration(1 * SECONDS + 4 * TICKS).eut(48).addTo(fluidExtractionRecipes);
-
             GTValues.RA.stdBuilder().itemInputs(new ItemStack(Items.ender_pearl, 1, 0))
                     .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ender"), 250)).duration(5 * SECONDS)
                     .eut(TierEU.RECIPE_LV).addTo(fluidExtractionRecipes);

diff --git a/src/main/java/com/dreammaster/gthandler/recipes/FluidSolidifierRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/FluidSolidifierRecipes.java
@@ -15,6 +15,7 @@
 import com.dreammaster.gthandler.CustomItemList;
 import com.dreammaster.gthandler.GT_CustomLoader;
 import com.dreammaster.item.NHItemList;
+import com.dreammaster.tinkersConstruct.SmelteryFluidTypes;
 
 import bartworks.common.loaders.ItemRegistry;
 import gregtech.api.enums.GTValues;
@@ -131,8 +132,8 @@ public void run() {
 
             GTValues.RA.stdBuilder().itemInputs(GTUtility.getIntegratedCircuit(1))
                     .itemOutputs(GTModHandler.getModItem(TinkerConstruct.ID, "blankPattern", 1L, 1))
-                    .fluidInputs(FluidRegistry.getFluidStack("aluminumbrass.molten", 144)).duration(20 * TICKS).eut(48)
-                    .addTo(fluidSolidifierRecipes);
+                    .fluidInputs(FluidRegistry.getFluidStack(SmelteryFluidTypes.getMoltenPatternFluidName(), 144))
+                    .duration(20 * TICKS).eut(48).addTo(fluidSolidifierRecipes);
 
             GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.gravel, 1, 0))
                     .itemOutputs(GTModHandler.getModItem(TinkerConstruct.ID, "SpeedBlock", 1, 0))

diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java
@@ -671,7 +671,7 @@ public void run() {
         GTValues.RA.stdBuilder()
                 .itemInputs(
                         GTOreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 2L),
-                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 5L),
+                        GTOreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 5L),
                         GTOreDictUnificator.get(OrePrefixes.dust, Materials.Obsidian, 2L),
                         GTUtility.getIntegratedCircuit(2))
                 .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Alumite, 9)).duration(10 * SECONDS)
@@ -1059,14 +1059,6 @@ public void run() {
 
         if (TinkerConstruct.isModLoaded() && Natura.isModLoaded()) {
 
-            GTValues.RA.stdBuilder()
-                    .itemInputs(
-                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 3L),
-                            GTOreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 1L),
-                            GTUtility.getIntegratedCircuit(2))
-                    .itemOutputs(GTModHandler.getModItem(TinkerConstruct.ID, "materials", 4L, 42))
-                    .duration(10 * SECONDS).eut(8).addTo(mixerRecipes);
-
             GTValues.RA.stdBuilder()
                     .itemInputs(
                             GTModHandler.getModItem(TinkerConstruct.ID, "slime.gel", 1L, 2),

diff --git a/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/NeutroniumCompressorRecipes.java
@@ -241,6 +241,10 @@ public void run() {
                     GTUtility.copyAmountUnsafe(62, GTOreDictUnificator.get(OrePrefixes.block, Materials.Europium, 1)))
                     .itemOutputs(getModItem(UniversalSingularities.ID, "universal.general.singularity", 1, 30))
                     .duration(3 * SECONDS).eut(TierEU.RECIPE_HV).addTo(neutroniumCompressorRecipes);
+            GTValues.RA.stdBuilder().itemInputsUnsafe(
+                    GTUtility.copyAmountUnsafe(1824, GTOreDictUnificator.get(OrePrefixes.block, Materials.RoseGold, 1)))
+                    .itemOutputs(getModItem(UniversalSingularities.ID, "universal.general.singularity", 1, 32))
+                    .duration(3 * SECONDS).eut(TierEU.RECIPE_HV).addTo(neutroniumCompressorRecipes);
             if (DraconicEvolution.isModLoaded()) {
                 GTValues.RA.stdBuilder()
                         .itemInputsUnsafe(
@@ -335,14 +339,6 @@ public void run() {
                         .duration(3 * SECONDS).eut(TierEU.RECIPE_HV).addTo(neutroniumCompressorRecipes);
             }
             if (TinkerConstruct.isModLoaded()) {
-                GTValues.RA.stdBuilder()
-                        .itemInputsUnsafe(
-                                GTUtility.copyAmountUnsafe(
-                                        1824,
-                                        GTOreDictUnificator.get(OrePrefixes.block, Materials.AluminiumBrass, 1)))
-                        .itemOutputs(
-                                getModItem(UniversalSingularities.ID, "universal.tinkersConstruct.singularity", 1, 0))
-                        .duration(3 * SECONDS).eut(TierEU.RECIPE_HV).addTo(neutroniumCompressorRecipes);
                 GTValues.RA.stdBuilder()
                         .itemInputsUnsafe(
                                 GTUtility.copyAmountUnsafe(

diff --git a/src/main/java/com/dreammaster/main/MainRegistry.java b/src/main/java/com/dreammaster/main/MainRegistry.java
@@ -75,6 +75,7 @@
 import com.dreammaster.recipes.RecipeRemover;
 import com.dreammaster.scripts.ScriptLoader;
 import com.dreammaster.thaumcraft.TCLoader;
+import com.dreammaster.tinkersConstruct.SmelteryFluidTypes;
 import com.dreammaster.tinkersConstruct.TiCoLoader;
 import com.dreammaster.witchery.WitcheryPlugin;
 
@@ -150,6 +151,7 @@ public static void AddLoginError(String pMessage) {
 
     public MainRegistry() {
         if (DetravScannerMod.isModLoaded()) GregTechAPI.sAfterGTPreload.add(ScannerTools::new);
+        GregTechAPI.sBeforeGTPreload.add(TiCoLoader::overrideAlumiteMaterial);
     }
 
     @Mod.EventHandler
@@ -311,6 +313,11 @@ public void PreLoad(FMLPreInitializationEvent PreEvent) {
         Logger.warn("==================================================");
 
         MinecraftForge.EVENT_BUS.register(new OvenGlove.EventHandler());
+
+        if (TinkerConstruct.isModLoaded()) {
+            TiCoLoader.doPreInitialization();
+            GregTechAPI.sAfterGTPreload.add(SmelteryFluidTypes::registerGregtechFluidTypes);
+        }
     }
 
     private static boolean RegisterNonEnumItems() {
@@ -366,6 +373,10 @@ public void load(FMLInitializationEvent event) {
         }
 
         VillagerRegistry.instance().registerVillageTradeHandler(2, new NHTradeHandler());
+
+        if (TinkerConstruct.isModLoaded()) {
+            TiCoLoader.doInitialization();
+        }
     }
 
     public static Block _mBlockBabyChest = new BlockBabyChest();

diff --git a/src/main/java/com/dreammaster/main/NHItems.java b/src/main/java/com/dreammaster/main/NHItems.java
@@ -1,5 +1,7 @@
 package com.dreammaster.main;
 
+import net.minecraft.block.Block;
+
 import com.dreammaster.baubles.OvenGlove;
 import com.dreammaster.baubles.WitherProtectionRing;
 import com.dreammaster.item.WoodenBrickForm;
@@ -11,4 +13,5 @@ public class NHItems {
     public static final Placeable<OvenGlove> OVEN_GLOVE = Placeable.make();
     public static final Placeable<WitherProtectionRing> WITHER_PROTECTION_RING = Placeable.make();
     public static final Placeable<WoodenBrickForm> WOODEN_BRICK_FORM = Placeable.make();
+    public static Block ZINC_GRAVEL_ORE;
 }
diff --git a/src/main/java/com/dreammaster/scripts/ScriptAvaritia.java b/src/main/java/com/dreammaster/scripts/ScriptAvaritia.java
@@ -366,7 +366,7 @@ public void loadRecipes() {
                 'e',
                 getModItem(UniversalSingularities.ID, "universal.projectRed.singularity", 1, 0, missing),
                 'f',
-                getModItem(UniversalSingularities.ID, "universal.tinkersConstruct.singularity", 1, 0, missing),
+                getModItem(UniversalSingularities.ID, "universal.general.singularity", 1, 32, missing),
                 'g',
                 getModItem(UniversalSingularities.ID, "universal.tinkersConstruct.singularity", 1, 1, missing),
                 'h',

diff --git a/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java b/src/main/java/com/dreammaster/scripts/ScriptCoreMod.java
@@ -1,5 +1,6 @@
 package com.dreammaster.scripts;
 
+import static com.dreammaster.tinkersConstruct.SmelteryFluidTypes.getMoltenPatternFluidTypeName;
 import static gregtech.api.enums.Mods.AdvancedSolarPanel;
 import static gregtech.api.enums.Mods.AppliedEnergistics2;
 import static gregtech.api.enums.Mods.BartWorks;
@@ -51,9 +52,9 @@
 import com.dreammaster.item.CustomPatterns;
 import com.dreammaster.item.NHItemList;
 import com.dreammaster.main.NHItems;
+import com.dreammaster.tinkersConstruct.SmelteryFluidTypes;
 import com.dreammaster.tinkersConstruct.TConstructHelper;
 
-import cpw.mods.fml.common.registry.GameRegistry;
 import forestry.api.recipes.RecipeManagers;
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
@@ -65,6 +66,7 @@
 import gregtech.api.util.GTOreDictUnificator;
 import gregtech.api.util.GTUtility;
 import tconstruct.library.TConstructRegistry;
+import tconstruct.library.crafting.FluidType;
 
 public class ScriptCoreMod implements IScriptLoader {
 
@@ -450,7 +452,7 @@ public void loadRecipes() {
                 null,
                 getModItem(OpenBlocks.ID, "filledbucket", 1, 0, missing));
         addShapedRecipe(
-                getModItem(TinkerConstruct.ID, "materials", 1, 40, missing),
+                GTOreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1L),
                 getModItem(OpenBlocks.ID, "filledbucket", 1, 0, missing),
                 getModItem(OpenBlocks.ID, "filledbucket", 1, 0, missing),
                 getModItem(OpenBlocks.ID, "filledbucket", 1, 0, missing),
@@ -585,8 +587,7 @@ public void loadRecipes() {
 
         GTModHandler
                 .addSmeltingRecipe(CustomItemList.UnfiredCokeOvenBrick.get(1L), CustomItemList.CokeOvenBrick.get(1L));
-        TConstructHelper
-                .getMeltingAdder(GameRegistry.findBlock("TConstruct", "MetalBlock"), 7, 500, "aluminumbrass.molten", 72)
+        TConstructHelper.getMeltingAdder(FluidType.getFluidType(getMoltenPatternFluidTypeName()), 150, 72)
                 .add(
                         Stream.of(
                                 NHItemList.ShapeBolt,
@@ -709,13 +710,13 @@ public void loadRecipes() {
                 100);
         TConstructRegistry.getTableCasting().addCastingRecipe(
                 new ItemStack(CustomPatterns.BowFletchingCast, 1),
-                FluidRegistry.getFluidStack("aluminumbrass.molten", 144),
+                FluidRegistry.getFluidStack(SmelteryFluidTypes.getMoltenPatternFluidName(), 144),
                 getModItem(TinkerConstruct.ID, "fletching", 1, wildcard, missing),
                 true,
                 100);
         TConstructRegistry.getTableCasting().addCastingRecipe(
                 new ItemStack(CustomPatterns.BowStringCast, 1),
-                FluidRegistry.getFluidStack("aluminumbrass.molten", 144),
+                FluidRegistry.getFluidStack(SmelteryFluidTypes.getMoltenPatternFluidName(), 144),
                 getModItem(TinkerConstruct.ID, "bowstring", 1, wildcard, missing),
                 true,
                 100);

diff --git a/src/main/java/com/dreammaster/scripts/ScriptMechworks.java b/src/main/java/com/dreammaster/scripts/ScriptMechworks.java
@@ -128,7 +128,7 @@ public void loadRecipes() {
                 .itemOutputs(getModItem(TinkersMechworks.ID, "SignalTerminal", 1, 0, missing))
                 .fluidInputs(FluidRegistry.getFluidStack("molten.glass", 288)).duration(15 * SECONDS).eut(30)
                 .addTo(assemblerRecipes);
-        GTValues.RA.stdBuilder().itemInputs(getModItem(TinkerConstruct.ID, "materials", 1, 14, missing))
+        GTValues.RA.stdBuilder().itemInputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Brass, 1))
                 .itemOutputs(getModItem(TinkersMechworks.ID, "LengthWire", 2, 0, missing))
                 .duration(2 * SECONDS + 10 * TICKS).eut(16).addTo(wiremillRecipes);