From 1b820de08a05070909a267e17f033fcf58ac8710 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Mon, 2 Sep 2024 23:17:17 +0200 Subject: The Great Renaming (#3014) * move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names --- .../postload/recipes/AlloySmelterRecipes.java | 36 ++++++++++------------ 1 file changed, 17 insertions(+), 19 deletions(-) (limited to 'src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java') diff --git a/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java index a9e587a145..01d77704f7 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AlloySmelterRecipes.java @@ -1,15 +1,15 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.objects.MaterialStack; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GTOreDictUnificator; public class AlloySmelterRecipes implements Runnable { @@ -58,24 +58,22 @@ public class AlloySmelterRecipes implements Runnable { @Override public void run() { for (MaterialStack[] materials : mAlloySmelterList) { - ItemStack dust1 = GT_OreDictUnificator.get(OrePrefixes.dust, materials[0].mMaterial, materials[0].mAmount); - ItemStack dust2 = GT_OreDictUnificator.get(OrePrefixes.dust, materials[1].mMaterial, materials[1].mAmount); - ItemStack ingot1 = GT_OreDictUnificator - .get(OrePrefixes.ingot, materials[0].mMaterial, materials[0].mAmount); - ItemStack ingot2 = GT_OreDictUnificator - .get(OrePrefixes.ingot, materials[1].mMaterial, materials[1].mAmount); - ItemStack outputIngot = GT_OreDictUnificator + ItemStack dust1 = GTOreDictUnificator.get(OrePrefixes.dust, materials[0].mMaterial, materials[0].mAmount); + ItemStack dust2 = GTOreDictUnificator.get(OrePrefixes.dust, materials[1].mMaterial, materials[1].mAmount); + ItemStack ingot1 = GTOreDictUnificator.get(OrePrefixes.ingot, materials[0].mMaterial, materials[0].mAmount); + ItemStack ingot2 = GTOreDictUnificator.get(OrePrefixes.ingot, materials[1].mMaterial, materials[1].mAmount); + ItemStack outputIngot = GTOreDictUnificator .get(OrePrefixes.ingot, materials[2].mMaterial, materials[2].mAmount); - if (outputIngot != GT_Values.NI) { + if (outputIngot != GTValues.NI) { if (ingot1 != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ingot1, dust2) .itemOutputs(outputIngot) .duration((int) materials[2].mAmount * 50) .eut(16) .addTo(alloySmelterRecipes); if (ingot2 != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ingot1, ingot2) .itemOutputs(outputIngot) .duration((int) materials[2].mAmount * 50) @@ -85,7 +83,7 @@ public class AlloySmelterRecipes implements Runnable { } if (ingot2 != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(dust1, ingot2) .itemOutputs(outputIngot) .duration((int) materials[2].mAmount * 50) @@ -93,7 +91,7 @@ public class AlloySmelterRecipes implements Runnable { .addTo(alloySmelterRecipes); } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(dust1, dust2) .itemOutputs(outputIngot) .duration((int) materials[2].mAmount * 50) @@ -104,11 +102,11 @@ public class AlloySmelterRecipes implements Runnable { } // We use rubber - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 3L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 3L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 1L)) .duration(10 * SECONDS) .eut(8) .addTo(alloySmelterRecipes); -- cgit