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 --- src/main/java/gtPlusPlus/core/util/Utils.java | 64 +++++------ .../java/gtPlusPlus/core/util/math/MathUtils.java | 12 +- .../core/util/minecraft/EntityUtils.java | 10 +- .../gtPlusPlus/core/util/minecraft/FluidUtils.java | 14 +-- .../gtPlusPlus/core/util/minecraft/ItemUtils.java | 122 ++++++++++----------- .../core/util/minecraft/MaterialUtils.java | 8 +- .../core/util/minecraft/MiningUtils.java | 29 +++-- .../gtPlusPlus/core/util/minecraft/NBTUtils.java | 12 +- .../core/util/minecraft/PlayerUtils.java | 3 +- .../core/util/minecraft/RecipeUtils.java | 50 ++++----- .../util/minecraft/gregtech/PollutionUtils.java | 40 +++---- .../gtPlusPlus/core/util/recipe/GTRecipeUtils.java | 95 ++++++++++++++++ .../core/util/recipe/GT_RecipeUtils.java | 95 ---------------- .../core/util/recipe/RecipeHashStrat.java | 10 +- .../core/util/reflect/AddGregtechRecipe.java | 16 +-- 15 files changed, 290 insertions(+), 290 deletions(-) create mode 100644 src/main/java/gtPlusPlus/core/util/recipe/GTRecipeUtils.java delete mode 100644 src/main/java/gtPlusPlus/core/util/recipe/GT_RecipeUtils.java (limited to 'src/main/java/gtPlusPlus/core/util') diff --git a/src/main/java/gtPlusPlus/core/util/Utils.java b/src/main/java/gtPlusPlus/core/util/Utils.java index 610cc4f8fa..c3c877388b 100644 --- a/src/main/java/gtPlusPlus/core/util/Utils.java +++ b/src/main/java/gtPlusPlus/core/util/Utils.java @@ -26,15 +26,15 @@ import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.EnumUtils; import cpw.mods.fml.common.FMLCommonHandler; -import gregtech.api.GregTech_API; -import gregtech.api.enums.TC_Aspects; -import gregtech.api.enums.TC_Aspects.TC_AspectStack; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_Utility; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.TCAspects; +import gregtech.api.enums.TCAspects.TC_AspectStack; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.NBTUtils; @@ -56,7 +56,7 @@ public class Utils { .isClient(); } - public static TC_AspectStack getTcAspectStack(final TC_Aspects aspect, final long size) { + public static TC_AspectStack getTcAspectStack(final TCAspects aspect, final long size) { return getTcAspectStack(aspect.name(), (int) size); } @@ -64,7 +64,7 @@ public class Utils { return getTcAspectStack(aspect, (int) size); } - public static TC_AspectStack getTcAspectStack(final TC_Aspects aspect, final int size) { + public static TC_AspectStack getTcAspectStack(final TCAspects aspect, final int size) { return getTcAspectStack(aspect.name(), size); } @@ -75,14 +75,14 @@ public class Utils { if (aspect.equalsIgnoreCase("COGNITIO")) { // Adds in Compat for older GT Versions which Misspell aspects. try { - if (EnumUtils.isValidEnum(TC_Aspects.class, "COGNITIO")) { + if (EnumUtils.isValidEnum(TCAspects.class, "COGNITIO")) { Logger.WARNING("TC Aspect found - " + aspect); - returnValue = new TC_AspectStack(TC_Aspects.valueOf("COGNITIO"), size); + returnValue = new TC_AspectStack(TCAspects.valueOf("COGNITIO"), size); } else { Logger.INFO( "Fallback TC Aspect found - " + aspect + " - PLEASE UPDATE GREGTECH TO A NEWER VERSION TO REMOVE THIS MESSAGE - THIS IS NOT AN ERROR"); - returnValue = new TC_AspectStack(TC_Aspects.valueOf("COGNITO"), size); + returnValue = new TC_AspectStack(TCAspects.valueOf("COGNITO"), size); } } catch (final NoSuchFieldError r) { Logger.INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus"); @@ -90,14 +90,14 @@ public class Utils { } else if (aspect.equalsIgnoreCase("EXANIMUS")) { // Adds in Compat for older GT Versions which Misspell aspects. try { - if (EnumUtils.isValidEnum(TC_Aspects.class, "EXANIMUS")) { + if (EnumUtils.isValidEnum(TCAspects.class, "EXANIMUS")) { Logger.WARNING("TC Aspect found - " + aspect); - returnValue = new TC_AspectStack(TC_Aspects.valueOf("EXANIMUS"), size); + returnValue = new TC_AspectStack(TCAspects.valueOf("EXANIMUS"), size); } else { Logger.INFO( "Fallback TC Aspect found - " + aspect + " - PLEASE UPDATE GREGTECH TO A NEWER VERSION TO REMOVE THIS MESSAGE - THIS IS NOT AN ERROR"); - returnValue = new TC_AspectStack(TC_Aspects.valueOf("EXAMINIS"), size); + returnValue = new TC_AspectStack(TCAspects.valueOf("EXAMINIS"), size); } } catch (final NoSuchFieldError r) { Logger.INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus"); @@ -106,21 +106,21 @@ public class Utils { } else if (aspect.equalsIgnoreCase("PRAECANTATIO")) { // Adds in Compat for older GT Versions which Misspell aspects. try { - if (EnumUtils.isValidEnum(TC_Aspects.class, "PRAECANTATIO")) { + if (EnumUtils.isValidEnum(TCAspects.class, "PRAECANTATIO")) { Logger.WARNING("TC Aspect found - " + aspect); - returnValue = new TC_AspectStack(TC_Aspects.valueOf("PRAECANTATIO"), size); + returnValue = new TC_AspectStack(TCAspects.valueOf("PRAECANTATIO"), size); } else { Logger.INFO( "Fallback TC Aspect found - " + aspect + " - PLEASE UPDATE GREGTECH TO A NEWER VERSION TO REMOVE THIS MESSAGE - THIS IS NOT AN ERROR"); - returnValue = new TC_AspectStack(TC_Aspects.valueOf("PRAECANTIO"), size); + returnValue = new TC_AspectStack(TCAspects.valueOf("PRAECANTIO"), size); } } catch (final NoSuchFieldError r) { Logger.INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus"); } } else { Logger.WARNING("TC Aspect found - " + aspect); - returnValue = new TC_AspectStack(TC_Aspects.valueOf(aspect), size); + returnValue = new TC_AspectStack(TCAspects.valueOf(aspect), size); } return returnValue; @@ -352,17 +352,17 @@ public class Utils { } public static String addBookTitleLocalization(final String aTitle) { - return GT_LanguageManager - .addStringLocalization("Book." + aTitle + ".Name", aTitle, !GregTech_API.sPostloadFinished); + return GTLanguageManager + .addStringLocalization("Book." + aTitle + ".Name", aTitle, !GregTechAPI.sPostloadFinished); } public static String[] addBookPagesLocalization(final String aTitle, final String[] aPages) { String[] aLocalizationPages = new String[aPages.length]; for (byte i = 0; i < aPages.length; i = (byte) (i + 1)) { - aLocalizationPages[i] = GT_LanguageManager.addStringLocalization( + aLocalizationPages[i] = GTLanguageManager.addStringLocalization( "Book." + aTitle + ".Page" + ((i < 10) ? "0" + i : Byte.valueOf(i)), aPages[i], - !GregTech_API.sPostloadFinished); + !GregTechAPI.sPostloadFinished); } return aLocalizationPages; } @@ -370,16 +370,16 @@ public class Utils { public static ItemStack getWrittenBook(ItemStack book, int ID, String mapping, String title, String author, String[] pages) { - if (GT_Utility.isStringInvalid(mapping)) { + if (GTUtility.isStringInvalid(mapping)) { return null; } - ItemStack stack = CORE.sBookList.get(mapping); + ItemStack stack = GTPPCore.sBookList.get(mapping); if (stack != null) { - return GT_Utility.copyAmount(1L, stack); + return GTUtility.copyAmount(1L, stack); } - if (GT_Utility.isStringInvalid(title) || GT_Utility.isStringInvalid(author) || pages.length <= 0) { + if (GTUtility.isStringInvalid(title) || GTUtility.isStringInvalid(author) || pages.length <= 0) { return null; } @@ -400,11 +400,11 @@ public class Utils { NBTList.appendTag(new NBTTagString(pages[i])); } else { Logger.INFO("WARNING: String for written Book too long! -> " + pages[i]); - GT_Log.err.println("WARNING: String for written Book too long! -> " + pages[i]); + GTLog.err.println("WARNING: String for written Book too long! -> " + pages[i]); } } else { Logger.INFO("WARNING: Too much Pages for written Book! -> " + title); - GT_Log.err.println("WARNING: Too much Pages for written Book! -> " + title); + GTLog.err.println("WARNING: Too much Pages for written Book! -> " + title); break; } } @@ -423,14 +423,14 @@ public class Utils { mapping, title, author); - GT_Log.out.println(logMessage); + GTLog.out.println(logMessage); NBTUtils.createIntegerTagCompound(stack, "stats", "mMeta", ID); - CORE.sBookList.put(mapping, stack); + GTPPCore.sBookList.put(mapping, stack); Logger.INFO(String.format("Creating book: %s by %s. Using Meta %d.", title, author, ID)); - return GT_Utility.copy(stack); + return GTUtility.copy(stack); } } diff --git a/src/main/java/gtPlusPlus/core/util/math/MathUtils.java b/src/main/java/gtPlusPlus/core/util/math/MathUtils.java index ac3ef2e947..4fb34bd158 100644 --- a/src/main/java/gtPlusPlus/core/util/math/MathUtils.java +++ b/src/main/java/gtPlusPlus/core/util/math/MathUtils.java @@ -4,15 +4,15 @@ import java.text.NumberFormat; import java.util.Map; import java.util.Random; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.Utils; public class MathUtils { - static final Random rand = CORE.RANDOM; + static final Random rand = GTPPCore.RANDOM; /** Formats a number with group separator and at most 2 fraction digits. */ private static final NumberFormat sNumberFormat = NumberFormat.getInstance(); @@ -273,7 +273,7 @@ public class MathUtils { } public static int safeInt(long number) { - return number > GT_Values.V[GT_Values.V.length - 1] ? safeInt(GT_Values.V[GT_Values.V.length - 1], 1) + return number > GTValues.V[GTValues.V.length - 1] ? safeInt(GTValues.V[GTValues.V.length - 1], 1) : number < Integer.MIN_VALUE ? Integer.MIN_VALUE : (int) number; } @@ -391,7 +391,7 @@ public class MathUtils { /** * Inverts the value, making Positives into Negatives and vice versa. - * + * * @param aPositive - An int value, either positive or negative. * @return - Inverted int Value. */ @@ -484,7 +484,7 @@ public class MathUtils { /** * Balances a number within a range. - * + * * @param aInput - The number to balance * @param aMin - The minimum bounds * @param aMax - The maximum bounds diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java index 87bd0e60c6..f0fbd2f253 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java @@ -11,7 +11,7 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.handler.events.EntityDeathHandler; import ic2.core.IC2Potion; @@ -49,7 +49,7 @@ public class EntityUtils { if ((radiationLevel > 0) && (entityHolding instanceof final EntityLivingBase entityLiving)) { if (!((EntityPlayer) entityHolding).capabilities.isCreativeMode) { if (!ItemArmorHazmat.hasCompleteHazmat(entityLiving) - && !GT_Utility.isWearingFullRadioHazmat(entityLiving)) { + && !GTUtility.isWearingFullRadioHazmat(entityLiving)) { if (entityLiving.getActivePotionEffect(IC2Potion.radiation) != null) { entityLiving.getActivePotionEffect(IC2Potion.radiation); } @@ -120,8 +120,8 @@ public class EntityUtils { if (!world.isRemote) { if ((heatLevel > 0) && (entityHolding instanceof final EntityLivingBase entityLiving)) { if (!((EntityPlayer) entityHolding).capabilities.isCreativeMode) { - if (!GT_Utility.isWearingFullHeatHazmat(entityLiving)) { - GT_Utility.applyHeatDamage(entityLiving, heatLevel); + if (!GTUtility.isWearingFullHeatHazmat(entityLiving)) { + GTUtility.applyHeatDamage(entityLiving, heatLevel); } } } @@ -134,7 +134,7 @@ public class EntityUtils { /** * Provides the ability to provide custom drops upon the death of EntityLivingBase objects. - * + * * @param aMobClass - The Base Class you want to drop this item. * @param aStack - The ItemStack, stack size is not respected. * @param aMaxAmount - The maximum size of the ItemStack which drops. diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java index 2b6e96541d..95ba020887 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java @@ -2,7 +2,7 @@ package gtPlusPlus.core.util.minecraft; import static gregtech.api.recipe.RecipeMaps.fluidCannerRecipes; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import java.util.HashMap; @@ -16,10 +16,10 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; import gregtech.api.enums.Dyes; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.FluidGT6; import gtPlusPlus.core.item.base.BaseItemComponent; @@ -302,7 +302,7 @@ public class FluidUtils { } if (register) { - GT_LanguageManager.addStringLocalization(rFluid.getUnlocalizedName(), aLocalName); + GTLanguageManager.addStringLocalization(rFluid.getUnlocalizedName(), aLocalName); if (FluidRegistry.registerFluid(rFluid)) { switch (aState) { case 0 -> { @@ -375,7 +375,7 @@ public class FluidUtils { if ((aFullContainer != null) && (aEmptyContainer != null) && !FluidContainerRegistry .registerFluidContainer(new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Cell_Empty.get(1L)) .itemOutputs(aFullContainer) .fluidInputs(new FluidStack(rFluid, aFluidAmount)) @@ -529,7 +529,7 @@ public class FluidUtils { aGenerateCell); if (dustStack != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(dustStack) .fluidOutputs(FluidUtils.getFluidStack(gtFluid, amountPerItem)) .duration(1 * SECONDS) @@ -537,7 +537,7 @@ public class FluidUtils { .addTo(fluidExtractionRecipes); } if (dustStack2 != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(dustStack2) .fluidOutputs(FluidUtils.getFluidStack(gtFluid, amountPerItem)) .duration(1 * SECONDS) diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java index bedc0d2439..1e211290cd 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -5,7 +5,7 @@ import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.enums.Mods.Minecraft; import static gregtech.api.recipe.RecipeMaps.packagerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import java.util.ArrayList; import java.util.HashMap; @@ -25,15 +25,15 @@ import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gregtech.common.items.MetaGeneratedTool01; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; @@ -41,16 +41,16 @@ import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.base.dusts.BaseItemDustUnique; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.item.chemistry.GenericChem; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.CORE_Preloader; -import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool; +import gtPlusPlus.preloader.PreloaderCore; +import gtPlusPlus.xmod.gregtech.api.items.GTMetaTool; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; -import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_DustGeneration; +import gtPlusPlus.xmod.gregtech.loaders.RecipeGenDustGeneration; public class ItemUtils { @@ -94,7 +94,7 @@ public class ItemUtils { } public static ItemStack getIC2Cell(final int meta) { - return GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCellEmpty", 1L, meta); + return GTModHandler.getModItem(IndustrialCraft2.ID, "itemCellEmpty", 1L, meta); } public static ItemStack getEmptyCell() { @@ -105,7 +105,7 @@ public class ItemUtils { if (ItemList.Cell_Empty.hasBeenSet()) { return ItemList.Cell_Empty.get(i); } - final ItemStack temp = GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCellEmpty", i, 0); + final ItemStack temp = GTModHandler.getModItem(IndustrialCraft2.ID, "itemCellEmpty", i, 0); return temp != null ? temp : null; } @@ -122,7 +122,7 @@ public class ItemUtils { if (em != null) { final ItemStack metaStack = new ItemStack(em, 1, meta); - GT_OreDictUnificator.registerOre(oreDictName, metaStack); + GTOreDictUnificator.registerOre(oreDictName, metaStack); } } catch (final NullPointerException e) { @@ -308,7 +308,7 @@ public class ItemUtils { } public static ItemStack getItemStackOfAmountFromOreDictNoBroken(String oredictName, final int amount) { - if (CORE_Preloader.DEBUG_MODE) { + if (PreloaderCore.DEBUG_MODE) { Logger.WARNING("Looking up: " + oredictName + " - from method: " + ReflectionUtils.getMethodName(1)); Logger.WARNING("Looking up: " + oredictName + " - from method: " + ReflectionUtils.getMethodName(2)); Logger.WARNING("Looking up: " + oredictName + " - from method: " + ReflectionUtils.getMethodName(3)); @@ -353,7 +353,7 @@ public class ItemUtils { } public static ItemStack getGregtechDust(final Materials material, final int amount) { - final ItemStack returnValue = GT_OreDictUnificator.get(OrePrefixes.dust, material, 1L); + final ItemStack returnValue = GTOreDictUnificator.get(OrePrefixes.dust, material, 1L); if (returnValue != null) { if (ItemUtils.checkForInvalidItems(returnValue)) { return returnValue.copy(); @@ -371,7 +371,7 @@ public class ItemUtils { public static Item[] generateSpecialUseDusts(final String unlocalizedName, final String materialName, String mChemForm, final int Colour) { - GT_LanguageManager.addStringLocalization("gtplusplus.material." + materialName, materialName); + GTLanguageManager.addStringLocalization("gtplusplus.material." + materialName, materialName); final Item[] output = { new BaseItemDustUnique("itemDust" + unlocalizedName, materialName, mChemForm, Colour, "Dust"), new BaseItemDustUnique("itemDustSmall" + unlocalizedName, materialName, mChemForm, Colour, "Small"), @@ -383,15 +383,15 @@ public class ItemUtils { final ItemStack smallDust = ItemUtils.getSimpleStack(output[1]); final ItemStack tinyDust = ItemUtils.getSimpleStack(output[2]); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(4, smallDust), ItemList.Schematic_Dust.get(0)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(4, smallDust), ItemList.Schematic_Dust.get(0)) .itemOutputs(normalDust) .duration(5 * SECONDS) .eut(4) .addTo(packagerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(9, tinyDust), ItemList.Schematic_Dust.get(0)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(9, tinyDust), ItemList.Schematic_Dust.get(0)) .itemOutputs(normalDust) .duration(5 * SECONDS) .eut(4) @@ -503,7 +503,7 @@ public class ItemUtils { output = new Item[] { new BaseItemDustUnique("itemDust" + unlocalizedName, materialName, Colour, "Dust") }; } - new RecipeGen_DustGeneration(material, disableExtraRecipes); + new RecipeGenDustGeneration(material, disableExtraRecipes); return output; } @@ -657,7 +657,7 @@ public class ItemUtils { if (mPrefix == OrePrefixes.rod) { mPrefix = OrePrefixes.stick; } - ItemStack aGtStack = GT_OreDictUnificator.get(mPrefix, mMat, mAmount); + ItemStack aGtStack = GTOreDictUnificator.get(mPrefix, mMat, mAmount); if (aGtStack == null) { Logger .INFO("Failed to find `" + mPrefix + MaterialUtils.getMaterialName(mMat) + "` in OD. [Prefix Search]"); @@ -695,7 +695,7 @@ public class ItemUtils { } public static boolean registerFuel(ItemStack aBurnable, int burn) { - return CORE.burnables.add(new Pair<>(burn, aBurnable)); + return GTPPCore.burnables.add(new Pair<>(burn, aBurnable)); } public static boolean checkForInvalidItems(ItemStack mInput) { @@ -772,8 +772,8 @@ public class ItemUtils { IInventory aTemp = aInputInventory; for (int i = 0; i < p.length; ++i) { for (int j = i + 1; j < p.length; ++j) { - if (p[j] != null && (p[i] == null || GT_Utility.areStacksEqual(p[i], p[j]))) { - GT_Utility.moveStackFromSlotAToSlotB(aTemp, aTemp, j, i, (byte) 64, (byte) 1, (byte) 64, (byte) 1); + if (p[j] != null && (p[i] == null || GTUtility.areStacksEqual(p[i], p[j]))) { + GTUtility.moveStackFromSlotAToSlotB(aTemp, aTemp, j, i, (byte) 64, (byte) 1, (byte) 64, (byte) 1); } } } @@ -840,9 +840,9 @@ public class ItemUtils { final Item mItem = aStack.getItem(); final Item aSkookum = ItemUtils.getItemFromFQRN("miscutils:gt.plusplus.metatool.01"); final Class aSkookClass = aSkookum.getClass(); - if (aSkookClass.isInstance(mItem) || mItem instanceof GT_MetaGenerated_Tool_01 + if (aSkookClass.isInstance(mItem) || mItem instanceof MetaGeneratedTool01 || mItem instanceof MetaGeneratedGregtechTools - || mItem instanceof Gregtech_MetaTool + || mItem instanceof GTMetaTool || mItem == aSkookum) { return true; } @@ -884,7 +884,7 @@ public class ItemUtils { } public static ItemStack getNullStack() { - return GT_Values.NI; + return GTValues.NI; } public static ItemStack depleteStack(ItemStack aStack) { @@ -908,7 +908,7 @@ public class ItemUtils { Item aItem = aStack.getItem(); if (aItem == CI.getNumberedBioCircuit(0) .getItem() || aItem - == GT_Utility.getIntegratedCircuit(0) + == GTUtility.getIntegratedCircuit(0) .getItem() || aItem == CI.getNumberedAdvancedCircuit(0) .getItem()) { @@ -919,91 +919,91 @@ public class ItemUtils { } public static boolean isCatalyst(ItemStack aStack) { - if (GT_Utility.areStacksEqual(aStack, GenericChem.mBlueCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mBlueCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mBrownCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mBrownCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mOrangeCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mOrangeCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mPurpleCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mPurpleCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mRedCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mRedCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mYellowCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mYellowCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mPinkCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mPinkCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mFormaldehydeCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mFormaldehydeCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mSolidAcidCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mSolidAcidCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mInfiniteMutationCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mInfiniteMutationCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, AgriculturalChem.mGreenCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, AgriculturalChem.mGreenCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mPlatinumGroupCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mPlatinumGroupCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mPlasticPolymerCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mPlasticPolymerCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mRubberPolymerCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mRubberPolymerCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mAdhesionPromoterCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mAdhesionPromoterCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mTitaTungstenIndiumCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mTitaTungstenIndiumCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mRadioactivityCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mRadioactivityCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mRareEarthGroupCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mRareEarthGroupCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mSimpleNaquadahCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mSimpleNaquadahCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mAdvancedNaquadahCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mAdvancedNaquadahCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mRawIntelligenceCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mRawIntelligenceCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mUltimatePlasticCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mUltimatePlasticCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mBiologicalIntelligenceCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mBiologicalIntelligenceCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.TemporalHarmonyCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.TemporalHarmonyCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mLimpidWaterCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mLimpidWaterCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mFlawlessWaterCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mFlawlessWaterCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mParticleAccelerationCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mParticleAccelerationCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mSynchrotronCapableCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mSynchrotronCapableCatalyst, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mAlgagenicGrowthPromoterCatalyst, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mAlgagenicGrowthPromoterCatalyst, true)) { return true; } @@ -1011,10 +1011,10 @@ public class ItemUtils { } public static boolean isMillingBall(ItemStack aStack) { - if (GT_Utility.areStacksEqual(aStack, GenericChem.mMillingBallAlumina, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mMillingBallAlumina, true)) { return true; } - if (GT_Utility.areStacksEqual(aStack, GenericChem.mMillingBallSoapstone, true)) { + if (GTUtility.areStacksEqual(aStack, GenericChem.mMillingBallSoapstone, true)) { return true; } return false; diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java index 9aa8b3c0fa..6675e19891 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java @@ -13,7 +13,7 @@ import gregtech.api.enums.Element; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TextureSet; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.TypeCounter; @@ -22,7 +22,7 @@ import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes; import gtPlusPlus.core.item.base.foil.BaseItemFoil; import gtPlusPlus.core.item.base.wire.BaseItemFineWire; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialStack; import gtPlusPlus.core.material.state.MaterialState; @@ -73,7 +73,7 @@ public class MaterialUtils { int radioactivity = 0; if (material.isRadioactive()) { ItemStack aDustStack = ItemUtils.getOrePrefixStack(OrePrefixes.dust, material, 1); - radioactivity = aDustStack != null ? GT_Utility.getRadioactivityLevel(aDustStack) : 0; + radioactivity = aDustStack != null ? GTUtility.getRadioactivityLevel(aDustStack) : 0; if (radioactivity == 0) { long aProtons = material.getProtons(); radioactivity = (int) Math.min(Math.max((aProtons / 30), 1), 9); @@ -275,7 +275,7 @@ public class MaterialUtils { + "' & fallback '" + aFallbackMaterialName + "', returning _NULL."); - CORE.crash(); + GTPPCore.crash(); } return g; } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java index 3abc92b69e..16e5652e82 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java @@ -2,7 +2,7 @@ package gtPlusPlus.core.util.minecraft; import java.util.HashMap; -import gregtech.common.GT_Worldgen_GT_Ore_Layer; +import gregtech.common.WorldgenGTOreLayer; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -18,12 +18,11 @@ public class MiningUtils { String aTextWorldGen; if (MiningUtils.findAndMapOreTypesFromGT()) { int mapKey = 0; - for (AutoMap g : MiningUtils.mOreMaps) { - for (GT_Worldgen_GT_Ore_Layer h : g) { + for (AutoMap g : MiningUtils.mOreMaps) { + for (WorldgenGTOreLayer h : g) { try { - aTextWorldGen = (String) ReflectionUtils - .getField(GT_Worldgen_GT_Ore_Layer.class, "aTextWorldgen") + aTextWorldGen = (String) ReflectionUtils.getField(WorldgenGTOreLayer.class, "aTextWorldgen") .get(h); } catch (IllegalArgumentException | IllegalAccessException e) { aTextWorldGen = h.mWorldGenName; @@ -37,14 +36,14 @@ public class MiningUtils { } } - public static AutoMap[] mOreMaps = new AutoMap[7]; - private static final AutoMap Ores_Overworld = new AutoMap<>(); - private static final AutoMap Ores_Nether = new AutoMap<>(); - private static final AutoMap Ores_End = new AutoMap<>(); - private static final AutoMap Ores_Moon = new AutoMap<>(); - private static final AutoMap Ores_Mars = new AutoMap<>(); - private static final AutoMap Ores_Comets = new AutoMap<>(); - private static final AutoMap Ores_Misc = new AutoMap<>(); + public static AutoMap[] mOreMaps = new AutoMap[7]; + private static final AutoMap Ores_Overworld = new AutoMap<>(); + private static final AutoMap Ores_Nether = new AutoMap<>(); + private static final AutoMap Ores_End = new AutoMap<>(); + private static final AutoMap Ores_Moon = new AutoMap<>(); + private static final AutoMap Ores_Mars = new AutoMap<>(); + private static final AutoMap Ores_Comets = new AutoMap<>(); + private static final AutoMap Ores_Misc = new AutoMap<>(); public static boolean findAndMapOreTypesFromGT() { // Gets Moon ID @@ -92,11 +91,11 @@ public class MiningUtils { Ores_End.clear(); Ores_Misc.clear(); - for (GT_Worldgen_GT_Ore_Layer x : GT_Worldgen_GT_Ore_Layer.sList) { + for (WorldgenGTOreLayer x : WorldgenGTOreLayer.sList) { if (x.mEnabled) { try { - aEndAsteroids = ReflectionUtils.getField(GT_Worldgen_GT_Ore_Layer.class, "mEndAsteroid") + aEndAsteroids = ReflectionUtils.getField(WorldgenGTOreLayer.class, "mEndAsteroid") .getBoolean(x); } catch (IllegalArgumentException | IllegalAccessException e) { aEndAsteroids = false; diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java index 4b0f15b81e..bff2a25386 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; public class NBTUtils { @@ -18,7 +18,7 @@ public class NBTUtils { public static void setBookTitle(ItemStack aStack, String aTitle) { NBTTagCompound tNBT = getNBT(aStack); tNBT.setString("title", aTitle); - GT_Utility.ItemNBT.setNBT(aStack, tNBT); + GTUtility.ItemNBT.setNBT(aStack, tNBT); } public static ItemStack[] readItemsFromNBT(ItemStack itemstack) { @@ -82,7 +82,7 @@ public class NBTUtils { public static void setBoolean(ItemStack aStack, String aTag, boolean aBoolean) { NBTTagCompound tNBT = getNBT(aStack); tNBT.setBoolean(aTag, aBoolean); - GT_Utility.ItemNBT.setNBT(aStack, tNBT); + GTUtility.ItemNBT.setNBT(aStack, tNBT); } public static boolean getBoolean(ItemStack aStack, String aTag) { @@ -93,7 +93,7 @@ public class NBTUtils { public static void setInteger(ItemStack aStack, String aTag, int aInt) { NBTTagCompound tNBT = getNBT(aStack); tNBT.setInteger(aTag, aInt); - GT_Utility.ItemNBT.setNBT(aStack, tNBT); + GTUtility.ItemNBT.setNBT(aStack, tNBT); } public static int getInteger(ItemStack aStack, String aTag) { @@ -104,7 +104,7 @@ public class NBTUtils { public static void setLong(ItemStack aStack, String aTag, long aInt) { NBTTagCompound tNBT = getNBT(aStack); tNBT.setLong(aTag, aInt); - GT_Utility.ItemNBT.setNBT(aStack, tNBT); + GTUtility.ItemNBT.setNBT(aStack, tNBT); } public static long getLong(ItemStack aStack, String aTag) { @@ -115,7 +115,7 @@ public class NBTUtils { public static void setString(ItemStack aStack, String aTag, String aString) { NBTTagCompound tNBT = getNBT(aStack); tNBT.setString(aTag, aString); - GT_Utility.ItemNBT.setNBT(aStack, tNBT); + GTUtility.ItemNBT.setNBT(aStack, tNBT); } public static String getString(ItemStack aStack, String aTag) { diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java index ba7353cba6..5e29ddb53e 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java @@ -18,6 +18,7 @@ import net.minecraftforge.common.util.FakePlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -41,7 +42,7 @@ public class PlayerUtils { } public static void messagePlayer(final EntityPlayer P, final String S) { - gregtech.api.util.GT_Utility.sendChatToPlayer(P, S); + GTUtility.sendChatToPlayer(P, S); } public static void messagePlayer(final EntityPlayer P, final IChatComponent S) { diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java index ed2da4d7f7..6df6974030 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java @@ -16,17 +16,17 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.objects.ItemData; -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; import gtPlusPlus.GTplusplus; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.ShapedRecipe; -import gtPlusPlus.core.handler.COMPAT_HANDLER; +import gtPlusPlus.core.handler.CompatHandler; import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler; import gtPlusPlus.core.handler.Recipes.RegistrationHandler; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.data.ArrayUtils; @@ -64,11 +64,11 @@ public class RecipeUtils { Object[] o = new Object[] { slot_1, slot_2, slot_3, slot_4, slot_5, slot_6, slot_7, slot_8, slot_9 }; try { - int size = COMPAT_HANDLER.mRecipesToGenerate.size(); - COMPAT_HANDLER.mRecipesToGenerate.put(new InternalRecipeObject(o, resultItem, false)); + int size = CompatHandler.mRecipesToGenerate.size(); + CompatHandler.mRecipesToGenerate.put(new InternalRecipeObject(o, resultItem, false)); // Utils.LOG_WARNING("Success! Added a recipe for "+resultItem.getDisplayName()); - if (COMPAT_HANDLER.mRecipesToGenerate.size() > size) { - if (!COMPAT_HANDLER.areInitItemsLoaded) { + if (CompatHandler.mRecipesToGenerate.size() > size) { + if (!CompatHandler.areInitItemsLoaded) { RegistrationHandler.recipesSuccess++; } else { LateRegistrationHandler.recipesSuccess++; @@ -78,7 +78,7 @@ public class RecipeUtils { Logger.RECIPE( "[Fix] Invalid Recipe detected for: " + resultItem != null ? resultItem.getUnlocalizedName() : "INVALID OUTPUT ITEM"); - if (!COMPAT_HANDLER.areInitItemsLoaded) { + if (!CompatHandler.areInitItemsLoaded) { RegistrationHandler.recipesFailed++; } else { LateRegistrationHandler.recipesFailed++; @@ -163,18 +163,18 @@ public class RecipeUtils { InputItem9 }; if (gtPlusPlus.GTplusplus.CURRENT_LOAD_PHASE != GTplusplus.INIT_PHASE.POST_INIT) { - CORE.crash( + GTPPCore.crash( "Load Phase " + gtPlusPlus.GTplusplus.CURRENT_LOAD_PHASE + " should be " + GTplusplus.INIT_PHASE.POST_INIT + ". Unable to register recipe."); } - int size = COMPAT_HANDLER.mGtRecipesToGenerate.size(); - COMPAT_HANDLER.mGtRecipesToGenerate.put(new InternalRecipeObject(o, OutputItem, true)); + int size = CompatHandler.mGtRecipesToGenerate.size(); + CompatHandler.mGtRecipesToGenerate.put(new InternalRecipeObject(o, OutputItem, true)); - if (COMPAT_HANDLER.mGtRecipesToGenerate.size() > size) { - if (!COMPAT_HANDLER.areInitItemsLoaded) { + if (CompatHandler.mGtRecipesToGenerate.size() > size) { + if (!CompatHandler.areInitItemsLoaded) { RegistrationHandler.recipesSuccess++; } else { LateRegistrationHandler.recipesSuccess++; @@ -195,7 +195,7 @@ public class RecipeUtils { return false; } // let gregtech handle shapeless recipes. - if (GT_ModHandler.addShapelessCraftingRecipe(OutputItem, inputItems)) { + if (GTModHandler.addShapelessCraftingRecipe(OutputItem, inputItems)) { return true; } return false; @@ -294,7 +294,7 @@ public class RecipeUtils { boolean rReturn = false; ArrayList tList = (ArrayList) CraftingManager.getInstance() .getRecipeList(); - aOutput = GT_OreDictUnificator.get(aOutput); + aOutput = GTOreDictUnificator.get(aOutput); int tList_sS = tList.size(); for (int i = 0; i < tList_sS; ++i) { @@ -302,19 +302,19 @@ public class RecipeUtils { if (!aNotRemoveShapelessRecipes || !(tRecipe instanceof ShapelessRecipes) && !(tRecipe instanceof ShapelessOreRecipe)) { if (aOnlyRemoveNativeHandlers) { - if (!gregtech.api.util.GT_ModHandler.sNativeRecipeClasses.contains( + if (!GTModHandler.sNativeRecipeClasses.contains( tRecipe.getClass() .getName())) { continue; } - } else if (gregtech.api.util.GT_ModHandler.sSpecialRecipeClasses.contains( + } else if (GTModHandler.sSpecialRecipeClasses.contains( tRecipe.getClass() .getName())) { continue; } ItemStack tStack = tRecipe.getRecipeOutput(); - if (GT_Utility.areStacksEqual(GT_OreDictUnificator.get(tStack), aOutput, aIgnoreNBT)) { + if (GTUtility.areStacksEqual(GTOreDictUnificator.get(tStack), aOutput, aIgnoreNBT)) { tList.remove(i--); tList_sS = tList.size(); rReturn = true; @@ -372,7 +372,7 @@ public class RecipeUtils { "Cleaned a " + o.getClass() .getSimpleName() + " from recipe input."); Logger.INFO("ERROR"); - CORE.crash("Bad Shaped Recipe."); + GTPPCore.crash("Bad Shaped Recipe."); } } Logger.RECIPE("Using String: " + aFullString); @@ -414,10 +414,10 @@ public class RecipeUtils { ShapedOreRecipe aRecipe = new ShapedOreRecipe(aOutputStack, aDataObject); - int size = COMPAT_HANDLER.mRecipesToGenerate.size(); - COMPAT_HANDLER.mRecipesToGenerate.put(new InternalRecipeObject2(aRecipe)); - if (COMPAT_HANDLER.mRecipesToGenerate.size() > size) { - if (!COMPAT_HANDLER.areInitItemsLoaded) { + int size = CompatHandler.mRecipesToGenerate.size(); + CompatHandler.mRecipesToGenerate.put(new InternalRecipeObject2(aRecipe)); + if (CompatHandler.mRecipesToGenerate.size() > size) { + if (!CompatHandler.areInitItemsLoaded) { RegistrationHandler.recipesSuccess++; } else { LateRegistrationHandler.recipesSuccess++; diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java index 4e6e508c15..d9cf2e3769 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java @@ -6,16 +6,16 @@ import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.ArrayUtils; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; -import gregtech.common.GT_Pollution; +import gregtech.common.Pollution; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.item.base.cell.BaseItemCell; -import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.core.material.MaterialGenerator; +import gtPlusPlus.core.material.MaterialMisc; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -24,19 +24,19 @@ public class PollutionUtils { public static AutoMap mPollutionFluidStacks = new AutoMap<>(); public static boolean isPollutionEnabled() { - return GT_Mod.gregtechproxy.mPollution; + return GTMod.gregtechproxy.mPollution; } public static boolean addPollution(IGregTechTileEntity te, int pollutionValue) { - if (GT_Mod.gregtechproxy.mPollution) { - GT_Pollution.addPollution(te, pollutionValue); + if (GTMod.gregtechproxy.mPollution) { + Pollution.addPollution(te, pollutionValue); return true; } return false; } public static void addPollution(IHasWorldObjectAndCoords aTileOfSomeSort, int pollutionValue) { - if (GT_Mod.gregtechproxy.mPollution) { + if (GTMod.gregtechproxy.mPollution) { Chunk c = aTileOfSomeSort.getWorld() .getChunkFromBlockCoords(aTileOfSomeSort.getXCoord(), aTileOfSomeSort.getZCoord()); addPollution(c, pollutionValue); @@ -44,8 +44,8 @@ public class PollutionUtils { } public static void addPollution(Chunk aChunk, int pollutionValue) { - if (GT_Mod.gregtechproxy.mPollution) { - GT_Pollution.addPollution(aChunk, pollutionValue); + if (GTMod.gregtechproxy.mPollution) { + Pollution.addPollution(aChunk, pollutionValue); } } @@ -74,7 +74,7 @@ public class PollutionUtils { } public static void nullifyPollution(Chunk aChunk) { - if (GT_Mod.gregtechproxy.mPollution) { + if (GTMod.gregtechproxy.mPollution) { if (aChunk == null) { return; } @@ -86,11 +86,11 @@ public class PollutionUtils { } public static int getPollution(IGregTechTileEntity te) { - return GT_Pollution.getPollution(te); + return Pollution.getPollution(te); } public static int getPollution(Chunk te) { - return GT_Pollution.getPollution(te); + return Pollution.getPollution(te); } public static void setPollutionFluids() { @@ -103,33 +103,33 @@ public class PollutionUtils { if (CD != null) { Logger.INFO("[PollutionCompat] Found carbon dioxide fluid, registering it."); PollutionUtils.mPollutionFluidStacks.put(CD); - MISC_MATERIALS.CARBON_DIOXIDE.registerComponentForMaterial(CD); + MaterialMisc.CARBON_DIOXIDE.registerComponentForMaterial(CD); ItemStack cellCD = ItemUtils.getItemStackOfAmountFromOreDict("cellCarbonDioxide", 1); if (ItemUtils.checkForInvalidItems(cellCD)) { Logger.INFO("[PollutionCompat] Found carbon dioxide cell, registering component."); - MISC_MATERIALS.CARBON_DIOXIDE.registerComponentForMaterial(OrePrefixes.cell, cellCD); + MaterialMisc.CARBON_DIOXIDE.registerComponentForMaterial(OrePrefixes.cell, cellCD); } else { Logger.INFO("[PollutionCompat] Did not find carbon dioxide cell, registering new component."); - new BaseItemCell(MISC_MATERIALS.CARBON_DIOXIDE); + new BaseItemCell(MaterialMisc.CARBON_DIOXIDE); } } else { - MaterialGenerator.generate(MISC_MATERIALS.CARBON_DIOXIDE, false, false); + MaterialGenerator.generate(MaterialMisc.CARBON_DIOXIDE, false, false); } if (CM != null) { Logger.INFO("[PollutionCompat] Found carbon monoxide fluid, registering it."); PollutionUtils.mPollutionFluidStacks.put(CM); - MISC_MATERIALS.CARBON_MONOXIDE.registerComponentForMaterial(CM); + MaterialMisc.CARBON_MONOXIDE.registerComponentForMaterial(CM); ItemStack cellCD = ItemUtils.getItemStackOfAmountFromOreDict("cellCarbonMonoxide", 1); if (ItemUtils.checkForInvalidItems(cellCD)) { Logger.INFO("[PollutionCompat] Found carbon monoxide cell, registering component."); - MISC_MATERIALS.CARBON_MONOXIDE.registerComponentForMaterial(OrePrefixes.cell, cellCD); + MaterialMisc.CARBON_MONOXIDE.registerComponentForMaterial(OrePrefixes.cell, cellCD); } else { Logger.INFO("[PollutionCompat] Did not find carbon monoxide cell, registering new component."); - new BaseItemCell(MISC_MATERIALS.CARBON_MONOXIDE); + new BaseItemCell(MaterialMisc.CARBON_MONOXIDE); } } else { - MaterialGenerator.generate(MISC_MATERIALS.CARBON_MONOXIDE, false, false); + MaterialGenerator.generate(MaterialMisc.CARBON_MONOXIDE, false, false); } if (SD != null) { diff --git a/src/main/java/gtPlusPlus/core/util/recipe/GTRecipeUtils.java b/src/main/java/gtPlusPlus/core/util/recipe/GTRecipeUtils.java new file mode 100644 index 0000000000..980068ed97 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/util/recipe/GTRecipeUtils.java @@ -0,0 +1,95 @@ +package gtPlusPlus.core.util.recipe; + +import static gtPlusPlus.core.slots.SlotIntegratedCircuit.isRegularProgrammableCircuit; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; + +import org.apache.commons.lang3.ArrayUtils; + +import gnu.trove.map.hash.TCustomHashMap; +import gnu.trove.set.hash.TCustomHashSet; +import gregtech.api.util.GTRecipe; +import gtPlusPlus.api.objects.Logger; + +public class GTRecipeUtils { + + public static List removeDuplicates(List inputRecipes, String recipeMapName) { + TCustomHashSet recipesHashSet = new TCustomHashSet<>(RecipeHashStrat.RecipeHashingStrategy); + ArrayList recipeOutput = new ArrayList<>(); + TCustomHashMap circuitMap = new TCustomHashMap<>(RecipeHashStrat.RecipeHashingStrategy); + int removedRecipeCount = 0; + + for (GTRecipe recipeInput : inputRecipes) { + ItemStack savedCircuit = null; + // create a new input ItemStack array that does not contain programmable circuits if they were in the recipe + ArrayList itemInputsWithoutProgrammableCircuit = new ArrayList<>(); + // iterate over the recipe input items and add them all to a new array without any programmable circuits + for (ItemStack itemStack : recipeInput.mInputs) { + if (itemStack == null) { + continue; + } + if (isRegularProgrammableCircuit(itemStack) == -1) { + itemInputsWithoutProgrammableCircuit.add(itemStack); + } else { + savedCircuit = itemStack; + } + } + GTRecipe newRecipe = new GTRecipe( + false, + itemInputsWithoutProgrammableCircuit.toArray(new ItemStack[0]), + recipeInput.mOutputs, + recipeInput.mSpecialItems, + recipeInput.mChances, + recipeInput.mFluidInputs, + recipeInput.mFluidOutputs, + recipeInput.mDuration, + recipeInput.mEUt, + recipeInput.mSpecialValue); + if (!recipesHashSet.contains(newRecipe)) { + // if the recipes customHashSet does not contain the new recipe then add it + recipesHashSet.add(newRecipe); + } else { + removedRecipeCount++; + } + if (savedCircuit != null) { + // if the current recipe has a circuit and the recipe (without circuits) is already in the + // circuit map then check make sure the circuit map saves the recipe with the smallest circuit + // damage value. This is to prevent a case where recipe load order would affect which duplicate + // recipes with multiple circuit values gets removed. + if (circuitMap.containsKey(newRecipe)) { + if (circuitMap.get(newRecipe) + .getItemDamage() > savedCircuit.getItemDamage()) { + circuitMap.put(newRecipe, savedCircuit); + } + } else { + // If the circuit map does not have the recipe in it yet then add it + circuitMap.put(newRecipe, savedCircuit); + } + } + } + // iterate over all recipes without duplicates and add them to the output. If the recipe had a programmable + // circuit in it then add it back with its damage value coming from the circuit map. + for (GTRecipe filteredRecipe : recipesHashSet) { + // check to see if the recipe is in the circuit map + if (circuitMap.contains(filteredRecipe)) { + // add the circuit back + // update the item input array with the new input from + // ItemInputsWithoutProgrammableCircuit + circuit map circuit + filteredRecipe.mInputs = ArrayUtils.add(filteredRecipe.mInputs, circuitMap.get(filteredRecipe)); + } + // if the recipe was not in the circuit map then just add it the output as no updates to the item input + // needs to be made + recipeOutput.add(filteredRecipe); + } + // print results to log + Logger.INFO( + "Recipe Array duplication removal process completed for '" + recipeMapName + + "': '" + + removedRecipeCount + + "' removed."); + return recipeOutput; + } +} diff --git a/src/main/java/gtPlusPlus/core/util/recipe/GT_RecipeUtils.java b/src/main/java/gtPlusPlus/core/util/recipe/GT_RecipeUtils.java deleted file mode 100644 index c5498e4f59..0000000000 --- a/src/main/java/gtPlusPlus/core/util/recipe/GT_RecipeUtils.java +++ /dev/null @@ -1,95 +0,0 @@ -package gtPlusPlus.core.util.recipe; - -import static gtPlusPlus.core.slots.SlotIntegratedCircuit.isRegularProgrammableCircuit; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemStack; - -import org.apache.commons.lang3.ArrayUtils; - -import gnu.trove.map.hash.TCustomHashMap; -import gnu.trove.set.hash.TCustomHashSet; -import gregtech.api.util.GT_Recipe; -import gtPlusPlus.api.objects.Logger; - -public class GT_RecipeUtils { - - public static List removeDuplicates(List inputRecipes, String recipeMapName) { - TCustomHashSet recipesHashSet = new TCustomHashSet<>(RecipeHashStrat.RecipeHashingStrategy); - ArrayList recipeOutput = new ArrayList<>(); - TCustomHashMap circuitMap = new TCustomHashMap<>(RecipeHashStrat.RecipeHashingStrategy); - int removedRecipeCount = 0; - - for (GT_Recipe recipeInput : inputRecipes) { - ItemStack savedCircuit = null; - // create a new input ItemStack array that does not contain programmable circuits if they were in the recipe - ArrayList itemInputsWithoutProgrammableCircuit = new ArrayList<>(); - // iterate over the recipe input items and add them all to a new array without any programmable circuits - for (ItemStack itemStack : recipeInput.mInputs) { - if (itemStack == null) { - continue; - } - if (isRegularProgrammableCircuit(itemStack) == -1) { - itemInputsWithoutProgrammableCircuit.add(itemStack); - } else { - savedCircuit = itemStack; - } - } - GT_Recipe newRecipe = new GT_Recipe( - false, - itemInputsWithoutProgrammableCircuit.toArray(new ItemStack[0]), - recipeInput.mOutputs, -