diff options
author | NotAPenguin <michiel.vandeginste@gmail.com> | 2024-09-02 23:17:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-02 23:17:17 +0200 |
commit | 1b820de08a05070909a267e17f033fcf58ac8710 (patch) | |
tree | 02831a025986a06b20f87e5bcc69d1e0c639a342 /src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java | |
parent | afd3fd92b6a6ab9ab0d0dc3214e6bc8ff7a86c9b (diff) | |
download | GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.gz GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.bz2 GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.zip |
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
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java')
-rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java index 93458ee467..315bdcd6dd 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java @@ -2,24 +2,24 @@ package gregtech.loaders.oreprocessing; import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; import static gregtech.api.recipe.RecipeMaps.primitiveBlastRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.ADDITIVE_AMOUNT; -import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.ADDITIVE_AMOUNT; +import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import gregtech.GT_Mod; -import gregtech.api.enums.GT_Values; +import gregtech.GTMod; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_RecipeBuilder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipeBuilder; +import gregtech.api.util.GTUtility; public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -34,24 +34,24 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { - GT_ModHandler.removeFurnaceSmelting(aStack); + GTModHandler.removeFurnaceSmelting(aStack); if (!aMaterial.contains(SubTag.NO_SMELTING)) { if ((aMaterial.mBlastFurnaceRequired) || (aMaterial.mDirectSmelting.mBlastFurnaceRequired)) { if (aMaterial.mBlastFurnaceTemp < 1000 && aMaterial.mDirectSmelting.mBlastFurnaceTemp < 1000) if (aMaterial.mAutoGenerateBlastFurnaceRecipes - && GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) { - GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder(); + && GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) { + GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder(); recipeBuilder - .itemInputs(GT_Utility.copyAmount(1, aStack), GT_Utility.getIntegratedCircuit(1)); + .itemInputs(GTUtility.copyAmount(1, aStack), GTUtility.getIntegratedCircuit(1)); if (aMaterial.mBlastFurnaceTemp > 1750) { recipeBuilder.itemOutputs( - GT_OreDictUnificator.get( + GTOreDictUnificator.get( OrePrefixes.ingotHot, aMaterial, - GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), 1L)); } else { - recipeBuilder.itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L)); + recipeBuilder.itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L)); } recipeBuilder .duration(Math.max(aMaterial.getMass() / 4L, 1L) * aMaterial.mBlastFurnaceTemp * TICKS) @@ -70,7 +70,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe outputSize = 10; outputPrefix = OrePrefixes.nugget; } else { - if (GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre) { + if (GTMod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre) { outputSize = 6; outputPrefix = OrePrefixes.nugget; } else { @@ -80,18 +80,18 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe } break; case dust: - int outputAmount = GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre ? 2 : 3; + int outputAmount = GTMod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre ? 2 : 3; if (aMaterial.mDirectSmelting != aMaterial) { if (!aMaterial.contains(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE) && aMaterial.mDirectSmelting.getIngots(1) != null) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(2, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(2, aStack)) .itemOutputs(aMaterial.mDirectSmelting.getIngots(outputAmount)) .duration(2 * MINUTES) .metadata(ADDITIVE_AMOUNT, 2) .addTo(primitiveBlastRecipes); } else if (aMaterial == Materials.Chalcopyrite) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aMaterial.getDust(2), new ItemStack(Blocks.sand, 2)) .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), @@ -99,7 +99,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .duration(2 * MINUTES) .metadata(ADDITIVE_AMOUNT, 2) .addTo(primitiveBlastRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aMaterial.getDust(2), Materials.Glass.getDust(2)) .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), @@ -107,7 +107,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .duration(2 * MINUTES) .metadata(ADDITIVE_AMOUNT, 2) .addTo(primitiveBlastRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aMaterial.getDust(2), Materials.SiliconDioxide.getDust(2)) .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), @@ -115,7 +115,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .duration(2 * MINUTES) .metadata(ADDITIVE_AMOUNT, 2) .addTo(primitiveBlastRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aMaterial.getDust(2), Materials.Quartzite.getDust(4)) .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), @@ -123,7 +123,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .duration(2 * MINUTES) .metadata(ADDITIVE_AMOUNT, 2) .addTo(primitiveBlastRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aMaterial.getDust(2), Materials.NetherQuartz.getDust(2)) .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), @@ -131,7 +131,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .duration(2 * MINUTES) .metadata(ADDITIVE_AMOUNT, 2) .addTo(primitiveBlastRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aMaterial.getDust(2), Materials.CertusQuartz.getDust(2)) .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), @@ -140,7 +140,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .metadata(ADDITIVE_AMOUNT, 2) .addTo(primitiveBlastRecipes); } else if (aMaterial == Materials.Tetrahedrite) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aMaterial.getDust(2)) .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), @@ -149,7 +149,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .metadata(ADDITIVE_AMOUNT, 2) .addTo(primitiveBlastRecipes); } else if (aMaterial == Materials.Galena) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aMaterial.getDust(2)) .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), @@ -166,7 +166,7 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe outputPrefix = OrePrefixes.ingot; outputSize = 1; } else { - if (GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre) { + if (GTMod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre) { outputSize = 6; outputPrefix = OrePrefixes.nugget; } else { @@ -180,14 +180,14 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe outputSize = 1; break; } - ItemStack tStack = GT_OreDictUnificator.get(outputPrefix, aMaterial.mDirectSmelting, outputSize); - if (tStack == null) tStack = GT_OreDictUnificator.get( + ItemStack tStack = GTOreDictUnificator.get(outputPrefix, aMaterial.mDirectSmelting, outputSize); + if (tStack == null) tStack = GTOreDictUnificator.get( aMaterial.contains(SubTag.SMELTING_TO_GEM) ? OrePrefixes.gem : OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L); if ((tStack == null) && (!aMaterial.contains(SubTag.SMELTING_TO_GEM))) - tStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L); - GT_ModHandler.addSmeltingRecipe(aStack, tStack); + tStack = GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L); + GTModHandler.addSmeltingRecipe(aStack, tStack); } } } |