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/ProcessingOre.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/ProcessingOre.java')
-rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java | 130 |
1 files changed, 65 insertions, 65 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java index 79342a460d..4d0b405fea 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java @@ -4,22 +4,22 @@ import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; import java.util.ArrayList; 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_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistrator { @@ -41,21 +41,21 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra // For Sake of god of balance! // Dense ore - if (GT_Mod.gregtechproxy.mRichOreYieldMultiplier) { + if (GTMod.gregtechproxy.mRichOreYieldMultiplier) { tIsRich = (aPrefix == OrePrefixes.oreRich) || (aPrefix == OrePrefixes.oreDense); } // NetherOre - if (GT_Mod.gregtechproxy.mNetherOreYieldMultiplier && !tIsRich) { + if (GTMod.gregtechproxy.mNetherOreYieldMultiplier && !tIsRich) { tIsRich = (aPrefix == OrePrefixes.oreNetherrack) || (aPrefix == OrePrefixes.oreNether); } // EndOre - if (GT_Mod.gregtechproxy.mEndOreYieldMultiplier && !tIsRich) { + if (GTMod.gregtechproxy.mEndOreYieldMultiplier && !tIsRich) { tIsRich = (aPrefix == OrePrefixes.oreEndstone) || (aPrefix == OrePrefixes.oreEnd); } if (aMaterial == Materials.Oilsands) { - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1, aStack)) .itemOutputs(new ItemStack(net.minecraft.init.Blocks.sand, 1, 0)) .outputChances(tIsRich ? 2000 : 4000) .fluidOutputs(Materials.OilHeavy.getFluid(tIsRich ? 4000L : 2000L)) @@ -63,67 +63,67 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra .eut(TierEU.RECIPE_LV) .addTo(centrifugeRecipes); } else { - registerStandardOreRecipes(aPrefix, aMaterial, GT_Utility.copyAmount(1, aStack), tIsRich ? 2 : 1); + registerStandardOreRecipes(aPrefix, aMaterial, GTUtility.copyAmount(1, aStack), tIsRich ? 2 : 1); } } private boolean registerStandardOreRecipes(OrePrefixes aPrefix, Materials aMaterial, ItemStack aOreStack, int aMultiplier) { if ((aOreStack == null) || (aMaterial == null)) return false; - GT_ModHandler - .addValuableOre(GT_Utility.getBlockFromStack(aOreStack), aOreStack.getItemDamage(), aMaterial.mOreValue); + GTModHandler + .addValuableOre(GTUtility.getBlockFromStack(aOreStack), aOreStack.getItemDamage(), aMaterial.mOreValue); Materials tMaterial = aMaterial.mOreReplacement; Materials tPrimaryByMaterial = null; aMultiplier = Math.max(1, aMultiplier); - aOreStack = GT_Utility.copyAmount(1, aOreStack); + aOreStack = GTUtility.copyAmount(1, aOreStack); aOreStack.stackSize = 1; - ItemStack tIngot = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L); - ItemStack tGem = GT_OreDictUnificator.get(OrePrefixes.gem, tMaterial, 1L); + ItemStack tIngot = GTOreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L); + ItemStack tGem = GTOreDictUnificator.get(OrePrefixes.gem, tMaterial, 1L); ItemStack tSmeltInto = tIngot == null ? null : aMaterial.contains(SubTag.SMELTING_TO_GEM) - ? GT_OreDictUnificator.get( + ? GTOreDictUnificator.get( OrePrefixes.gem, tMaterial.mDirectSmelting, - GT_OreDictUnificator.get( + GTOreDictUnificator.get( OrePrefixes.crystal, tMaterial.mDirectSmelting, - GT_OreDictUnificator.get( + GTOreDictUnificator.get( OrePrefixes.gem, tMaterial, - GT_OreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L), + GTOreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L), 1L), 1L), 1L) : tIngot; - ItemStack tDust = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, tGem, 1L); - ItemStack tCleaned = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, tMaterial, tDust, 1L); - ItemStack tCrushed = GT_OreDictUnificator + ItemStack tDust = GTOreDictUnificator.get(OrePrefixes.dust, tMaterial, tGem, 1L); + ItemStack tCleaned = GTOreDictUnificator.get(OrePrefixes.crushedPurified, tMaterial, tDust, 1L); + ItemStack tCrushed = GTOreDictUnificator .get(OrePrefixes.crushed, tMaterial, (long) aMaterial.mOreMultiplier * aMultiplier); ItemStack tPrimaryByProduct = null; if (tCrushed == null) { - tCrushed = GT_OreDictUnificator.get( + tCrushed = GTOreDictUnificator.get( OrePrefixes.dustImpure, tMaterial, - GT_Utility.copyAmount(aMaterial.mOreMultiplier * aMultiplier, tCleaned, tDust, tGem), + GTUtility.copyAmount(aMaterial.mOreMultiplier * aMultiplier, tCleaned, tDust, tGem), (long) aMaterial.mOreMultiplier * aMultiplier); } for (Materials tMat : aMaterial.mOreByProducts) { - GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); + GTOreDictUnificator.get(OrePrefixes.dust, tMat, 1L); if (tPrimaryByProduct == null) { tPrimaryByMaterial = tMat; - tPrimaryByProduct = GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); - if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator - .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); + tPrimaryByProduct = GTOreDictUnificator.get(OrePrefixes.dust, tMat, 1L); + if (GTOreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GTOreDictUnificator + .get(OrePrefixes.dustTiny, tMat, GTOreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); } - GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); - if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GT_OreDictUnificator - .get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); + GTOreDictUnificator.get(OrePrefixes.dust, tMat, 1L); + if (GTOreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) GTOreDictUnificator + .get(OrePrefixes.dustTiny, tMat, GTOreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L); } if (tPrimaryByMaterial == null) tPrimaryByMaterial = tMaterial; @@ -132,33 +132,33 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra if (tSmeltInto != null) { if ((aMaterial.mBlastFurnaceRequired) || (aMaterial.mDirectSmelting.mBlastFurnaceRequired)) { - GT_ModHandler.removeFurnaceSmelting(aOreStack); + GTModHandler.removeFurnaceSmelting(aOreStack); } else { - tHasSmelting = GT_ModHandler.addSmeltingRecipe( + tHasSmelting = GTModHandler.addSmeltingRecipe( aOreStack, - GT_Utility.copyAmount(aMultiplier * aMaterial.mSmeltingMultiplier, tSmeltInto)); + GTUtility.copyAmount(aMultiplier * aMaterial.mSmeltingMultiplier, tSmeltInto)); } if (aMaterial.contains(SubTag.BLASTFURNACE_CALCITE_TRIPLE)) { if (aMaterial.mAutoGenerateBlastFurnaceRecipes) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( aOreStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier)) .itemOutputs( - GT_Utility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) + GTUtility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) .duration(tSmeltInto.stackSize * 25 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1500) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( aOreStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier)) .itemOutputs( - GT_Utility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) + GTUtility.mul(aMultiplier * 3 * aMaterial.mSmeltingMultiplier, tSmeltInto), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) .duration(tSmeltInto.stackSize * 25 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1500) @@ -166,24 +166,24 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra } } else if (aMaterial.contains(SubTag.BLASTFURNACE_CALCITE_DOUBLE)) { if (aMaterial.mAutoGenerateBlastFurnaceRecipes) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( aOreStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, aMultiplier)) .itemOutputs( - GT_Utility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) + GTUtility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) .duration(tSmeltInto.stackSize * 25 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1500) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( aOreStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, aMultiplier)) .itemOutputs( - GT_Utility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) + GTUtility.mul(aMultiplier * 2 * aMaterial.mSmeltingMultiplier, tSmeltInto), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.DarkAsh, 1L)) .duration(tSmeltInto.stackSize * 25 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 1500) @@ -193,18 +193,18 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra } if (!tHasSmelting) { - GT_ModHandler.addSmeltingRecipe( + GTModHandler.addSmeltingRecipe( aOreStack, - GT_OreDictUnificator.get( + GTOreDictUnificator.get( OrePrefixes.gem, tMaterial.mDirectSmelting, Math.max(1, aMultiplier * aMaterial.mSmeltingMultiplier / 2))); } if (tCrushed != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aOreStack) - .itemOutputs(GT_Utility.copy(GT_Utility.copyAmount(tCrushed.stackSize, tGem), tCrushed)) + .itemOutputs(GTUtility.copy(GTUtility.copyAmount(tCrushed.stackSize, tGem), tCrushed)) .duration(10) .eut(16) .addTo(hammerRecipes); @@ -212,19 +212,19 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra int chanceOre2 = tPrimaryByProduct == null ? 0 : tPrimaryByProduct.stackSize * 10 * aMultiplier * aMaterial.mByProductMultiplier; chanceOre2 = 100 * chanceOre2; // converting to the GT format, 100% is 10000 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aOreStack) .itemOutputs( - GT_Utility.mul(2, tCrushed), - tMaterial.contains(SubTag.PULVERIZING_CINNABAR) ? GT_OreDictUnificator.get( + GTUtility.mul(2, tCrushed), + tMaterial.contains(SubTag.PULVERIZING_CINNABAR) ? GTOreDictUnificator.get( OrePrefixes.crystal, Materials.Cinnabar, - GT_OreDictUnificator - .get(OrePrefixes.gem, tPrimaryByMaterial, GT_Utility.copyAmount(1, tPrimaryByProduct), 1L), + GTOreDictUnificator + .get(OrePrefixes.gem, tPrimaryByMaterial, GTUtility.copyAmount(1, tPrimaryByProduct), 1L), 1L) - : GT_OreDictUnificator - .get(OrePrefixes.gem, tPrimaryByMaterial, GT_Utility.copyAmount(1, tPrimaryByProduct), 1L), - GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial)) + : GTOreDictUnificator + .get(OrePrefixes.gem, tPrimaryByMaterial, GTUtility.copyAmount(1, tPrimaryByProduct), 1L), + GTOreDictUnificator.getDust(aPrefix.mSecondaryMaterial)) .outputChances(10000, chanceOre2, 5000) .duration(20 * SECONDS) .eut(2) |