From 26caa265b7eae49767947e1ff4e6cfc8166b07f5 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Sun, 9 Apr 2023 01:08:26 +0200 Subject: clean up GT++ code (#589) * yeet big reactor support * yeet IC2 classic support * yeet pneumaticraft support * yeet More Planets support * yeet Immersive Engineering support * yeet Psychedilicraft support * yeet Beyond Reality Core support * sort mods to see what must be purged * yeet simply jetpacks * yeet RFTools * yeet xReliquary * yeet RedTech * yeet Mekanism * yeet GrowthCraft * yeet ihl * leftover cleaning * yeet thermal fondation support * yeet compact windmills support * spotless * remove constants from LoadedMods (part 1 / 2) * spotless * remove constants from LoadedMods (part 2 / 2) * use mod id enum instead of strings + optimize imports * Loaded.isModLoaded -> enum * restore RA init * missing ! * start organizing recipes stuff * fix crash on world load in dev * remove unused class * remove HazmatUtils.java * move all the removals * remove enableHarderRecipesForHighTierCasings and usages(disabled in the pack) * move some pyrolyse oven recipes to its own file * sa * bump GT version * bump GT5U version * spotless apply * use Everglades entry from the mod enum --------- Co-authored-by: miozune Co-authored-by: Martin Robertz --- .../java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java | 333 +-------------------- .../gregtech/api/enums/GregtechOrePrefixes.java | 32 +- .../xmod/gregtech/api/enums/GregtechTextures.java | 17 +- .../xmod/gregtech/api/gui/GTPP_UITextures.java | 192 ++++++------ .../gregtech/api/items/Gregtech_Generic_Item.java | 12 +- .../xmod/gregtech/api/items/Gregtech_MetaItem.java | 12 +- .../gregtech/api/items/Gregtech_MetaItem_Base.java | 13 +- .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 8 +- .../gregtech/api/items/tools/GT_MetaGenTool.java | 5 +- .../api/items/types/ToolType_HardHammer.java | 5 +- .../GT_MetaTileEntity_Hatch_ControlCore.java | 1 - .../GregtechMetaPipeEntity_Cable.java | 5 +- .../base/GregtechMeta_MultiBlockBase.java | 34 ++- .../base/GregtechMeta_SteamMultiBase.java | 11 +- .../xmod/gregtech/api/objects/GregtechFluid.java | 5 +- .../gregtech/api/objects/GregtechItemData.java | 6 +- .../xmod/gregtech/common/Meta_GT_Proxy.java | 21 +- .../common/blocks/fluid/GregtechFluidHandler.java | 114 +++---- .../common/blocks/textures/TexturesGtBlock.java | 7 +- .../blocks/textures/TexturesGtCutomCovers.java | 4 +- .../common/blocks/textures/TexturesGtTools.java | 7 +- .../turbine/LargeTurbineTextureHandler.java | 19 +- .../common/computer/GT_ComputerCube_Setup.java | 7 +- .../xmod/gregtech/common/covers/CoverManager.java | 6 +- .../gregtech/common/helpers/ChargingHelper.java | 4 +- .../gregtech/common/helpers/TreeFarmHelper.java | 7 +- .../helpers/autocrafter/AC_Helper_Container.java | 7 +- .../helpers/autocrafter/AC_Helper_Utils.java | 5 +- .../common/helpers/tesseract/TesseractHelper.java | 9 +- .../gregtech/common/items/MetaCustomCoverItem.java | 5 +- .../common/items/covers/MetaItemCoverCasings.java | 7 +- .../gregtech/common/render/GTPP_CapeRenderer.java | 5 +- .../GT_MetaTileEntity_TesseractGenerator.java | 8 +- .../basic/GT_MetaTileEntity_CropHarvestor.java | 19 +- .../basic/GT_MetaTileEntity_WorldAccelerator.java | 3 +- .../basic/GregtechMetaTileEntityChunkLoader.java | 13 +- .../basic/GregtechMetaWirelessCharger.java | 4 +- .../machines/multi/misc/GMTE_AmazonPackager.java | 6 +- ...gtechMetaTileEntity_IndustrialAlloySmelter.java | 6 +- ...regtechMetaTileEntity_IndustrialArcFurnace.java | 8 +- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 8 +- .../GregtechMetaTileEntity_IndustrialChisel.java | 6 +- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 8 +- ...echMetaTileEntity_IndustrialCuttingMachine.java | 7 +- ...regtechMetaTileEntity_IndustrialDehydrator.java | 8 +- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 8 +- .../GregtechMetaTileEntity_IndustrialExtruder.java | 6 +- ...egtechMetaTileEntity_IndustrialFluidHeater.java | 8 +- ...egtechMetaTileEntity_IndustrialForgeHammer.java | 37 ++- ...GregtechMetaTileEntity_IndustrialMacerator.java | 6 +- .../GregtechMetaTileEntity_IndustrialMixer.java | 8 +- ...aTileEntity_IndustrialMolecularTransformer.java | 6 +- ...gtechMetaTileEntity_IndustrialMultiMachine.java | 15 +- ...regtechMetaTileEntity_IndustrialPlatePress.java | 6 +- .../GregtechMetaTileEntity_IndustrialSifter.java | 8 +- ...MetaTileEntity_IndustrialThermalCentrifuge.java | 6 +- ...techMetaTileEntity_IndustrialVacuumFreezer.java | 8 +- ...GregtechMetaTileEntity_IndustrialWashPlant.java | 15 +- .../GregtechMetaTileEntity_IndustrialWireMill.java | 6 +- .../processing/GregtechMetaTileEntity_IsaMill.java | 8 +- .../GregtechMetaTileEntity_SpargeTower.java | 19 +- ...egtechMetaTileEntity_Adv_DistillationTower.java | 14 +- .../advanced/GregtechMetaTileEntity_Adv_EBF.java | 8 +- .../GregtechMetaTileEntity_Adv_HeatExchanger.java | 14 +- .../GregtechMetaTileEntity_Adv_Implosion.java | 15 +- .../GregtechMetaTileEntity_SteamMacerator.java | 5 +- .../multi/production/GT4Entity_AutoCrafter.java | 7 +- .../multi/production/GT4Entity_ThermalBoiler.java | 14 +- .../GregtechMTE_ElementalDuplicator.java | 7 +- .../production/GregtechMTE_FrothFlotationCell.java | 6 +- .../production/GregtechMTE_NuclearReactor.java | 12 +- .../GregtechMetaTileEntityGeneratorArray.java | 15 +- .../production/GregtechMetaTileEntityTreeFarm.java | 166 +++++----- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 8 +- .../GregtechMetaTileEntity_Cyclotron.java | 14 +- ...egtechMetaTileEntity_IndustrialFishingPond.java | 15 +- ...egtechMetaTileEntity_IndustrialRockBreaker.java | 15 +- .../GregtechMetaTileEntity_LargeRocketEngine.java | 6 +- .../GregtechMetaTileEntity_MassFabricator.java | 17 +- ...techMetaTileEntity_QuantumForceTransformer.java | 25 +- .../GregtechMetaTileEntity_Refinery.java | 7 +- ...chMetaTileEntity_BedrockMiningPlatformBase.java | 8 +- .../chemplant/GregtechMTE_ChemicalPlant.java | 22 +- ...egTechMetaTileEntity_MegaAlloyBlastSmelter.java | 27 +- .../GregtechMetaTileEntity_LargerTurbineBase.java | 7 +- ...chMetaTileEntity_PowerSubStationController.java | 18 +- .../misc/GT_TileEntity_ComputerCube.java | 15 +- .../GT_MetaTileEntity_RedstoneCircuitBlock.java | 11 +- .../storage/shelving/GT4Entity_Shelf.java | 1 - .../xmod/gregtech/loaders/Gregtech_Blocks.java | 11 +- .../loaders/ProcessingToolHeadChoocher.java | 5 +- .../loaders/RecipeGen_BlastSmelterGT_Ex.java | 207 ------------- .../loaders/RecipeGen_BlastSmelterGT_GTNH.java | 2 +- .../loaders/recipe/RecipeLoader_ChemicalSkips.java | 26 +- .../loaders/recipe/RecipeLoader_GlueLine.java | 32 +- .../recipe/RecipeLoader_MolecularTransformer.java | 30 +- .../loaders/recipe/RecipeLoader_Nuclear.java | 6 +- .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 7 +- .../xmod/gregtech/recipes/RecipesToRemove.java | 49 --- .../registration/gregtech/Gregtech4Content.java | 18 +- .../gregtech/GregtechComponentAssembler.java | 5 +- .../registration/gregtech/GregtechConduits.java | 18 +- .../gregtech/GregtechCustomHatches.java | 11 +- .../gregtech/GregtechEnergyBuffer.java | 7 +- .../GregtechLargeTurbinesAndHeatExchanger.java | 11 +- .../registration/gregtech/GregtechSafeBlock.java | 5 +- .../gregtech/GregtechThaumcraftDevices.java | 5 +- 107 files changed, 1054 insertions(+), 1099 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/recipes/RecipesToRemove.java (limited to 'src/main/java/gtPlusPlus/xmod/gregtech') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java index 0d83b88b8c..3828a66353 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java @@ -1,53 +1,38 @@ package gtPlusPlus.xmod.gregtech; -import static gtPlusPlus.core.recipe.common.CI.bits; -import static gtPlusPlus.core.util.minecraft.MaterialUtils.getMaterialName; +import static gregtech.api.enums.Mods.AdvancedSolarPanel; import java.util.ArrayList; -import java.util.Collection; import java.util.List; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import cpw.mods.fml.common.event.FMLLoadCompleteEvent; -import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.Element; -import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; import gregtech.api.util.GT_Config; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_ModHandler.RecipeBits; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; -import gregtech.common.items.GT_MetaGenerated_Tool_01; import gregtech.common.items.behaviors.Behaviour_DataOrb; import gtPlusPlus.api.helpers.GregtechPlusPlus_API.Multiblock_API; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.api.objects.minecraft.multi.NoEUBonusMultiBehaviour; import gtPlusPlus.api.objects.minecraft.multi.NoOutputBonusMultiBehaviour; import gtPlusPlus.api.objects.minecraft.multi.NoSpeedBonusMultiBehaviour; import gtPlusPlus.core.handler.COMPAT_HANDLER; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.CORE.ConfigSwitches; -import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; -import gtPlusPlus.core.util.reflect.AddGregtechRecipe; import gtPlusPlus.everglades.gen.gt.WorldGen_GT; +import gtPlusPlus.recipes.CokeAndPyrolyseOven; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config; @@ -67,7 +52,6 @@ import gtPlusPlus.xmod.gregtech.loaders.ProcessingToolHeadChoocher; import gtPlusPlus.xmod.gregtech.loaders.misc.AddCustomMachineToPA; import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_AlgaeFarm; import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_MolecularTransformer; -import gtPlusPlus.xmod.gregtech.recipes.RecipesToRemove; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits; public class HANDLER_GT { @@ -102,11 +86,6 @@ public class HANDLER_GT { if (CORE.ConfigSwitches.enableSkookumChoochers) { sMetaGeneratedToolInstance = MetaGeneratedGregtechTools.getInstance(); } - - // Generates recipes for all gregtech smelting and alloy smelting combinations. - // RecipeGen_BlastSmelterGT.generateRecipes(); - // new RecipeGen_BlastSmelterGT_Ex(); - } public static void postInit() { @@ -145,18 +124,13 @@ public class HANDLER_GT { } public static void onLoadComplete(FMLLoadCompleteEvent event) { - removeCrudeTurbineRotors(); - if (ConfigSwitches.enableHarderRecipesForHighTierCasings) { - removeOldHighTierCasingRecipes(); - } - RecipesToRemove.go(); - convertPyroToCokeOven(); + CokeAndPyrolyseOven.onLoadComplete(); generateElementalDuplicatorRecipes(); Meta_GT_Proxy.fixIC2FluidNames(); GT_Computercube_Description.addStandardDescriptions(); GT_ComputerCube_Setup.init(); RecipeLoader_AlgaeFarm.generateRecipes(); - if (LoadedMods.AdvancedSolarPanel) { + if (AdvancedSolarPanel.isModLoaded()) { RecipeLoader_MolecularTransformer.run(); } } @@ -217,303 +191,4 @@ public class HANDLER_GT { + GT_Recipe_Map.sReplicatorFakeRecipes.mRecipeList.size() + " Replicator recipes."); } - - private static void convertPyroToCokeOven() { - int aCount = 0; - for (GT_Recipe g : GT_Recipe_Map.sPyrolyseRecipes.mRecipeList) { - if (AddGregtechRecipe.importPyroRecipe(g)) { - aCount++; - } - } - Logger.INFO("Converted " + aCount + " Pyrolyse recipes into Industrial Coke Oven recipes."); - } - - private static GT_Recipe replaceItemInRecipeWithAnother(GT_Recipe aRecipe, ItemStack aExisting, - ItemStack aNewItem) { - ItemStack[] aInputItemsCopy = aRecipe.mInputs; - String aOutputName = ItemUtils.getItemName(aRecipe.mOutputs[0]); - boolean aDidChange = false; - Logger.INFO("Attempting to Modify Recipe for " + aOutputName); - for (int i = 0; i < aRecipe.mInputs.length; i++) { - ItemStack aCurrentInputSlot = aRecipe.mInputs[i]; - if (aCurrentInputSlot != null) { - if (GT_Utility.areStacksEqual(aCurrentInputSlot, aExisting, true)) { - aInputItemsCopy[i] = ItemUtils.getSimpleStack(aNewItem, aCurrentInputSlot.stackSize); - aDidChange = true; - } - } - } - if (aDidChange) { - aRecipe.mInputs = aInputItemsCopy; - Logger.INFO("Modifed Recipe for " + aOutputName); - return aRecipe; - } else { - Logger.INFO("Failed to Modify Recipe for " + aOutputName); - return aRecipe; - } - } - - private static void updateRecipeMap(GT_Recipe aOld, GT_Recipe aNew, GT_Recipe_Map aMap) { - RecipeUtils.removeGtRecipe(aOld, aMap); - RecipeUtils.addGtRecipe(aNew, aMap); - Logger.INFO("Updating recipe map: " + aMap.mNEIName); - Logger.INFO("Removed Recipe with hash: " + aOld.hashCode()); - Logger.INFO("Added Recipe with hash: " + aNew.hashCode()); - } - - private static void removeOldHighTierCasingRecipes() { - // Static objects to save memory - ItemStack aCasing_LUV = CI.machineCasing_LuV; - ItemStack aCasing_ZPM = CI.machineCasing_ZPM; - ItemStack aCasing_UV = CI.machineCasing_UV; - ItemStack aCasing_MAX = CI.machineCasing_MAX; - - ItemStack aHull_LUV = CI.machineHull_LuV; - ItemStack aHull_ZPM = CI.machineHull_ZPM; - ItemStack aHull_UV = CI.machineHull_UV; - ItemStack aHull_MAX = CI.machineHull_MAX; - - int aTier_LUV = 5; - int aTier_ZPM = 6; - int aTier_UV = 7; - // int aTier_MAX = 8; - - ItemStack[] aCasings = new ItemStack[] { aCasing_LUV, aCasing_ZPM, aCasing_UV, aCasing_MAX }; - ItemStack[] aHulls = new ItemStack[] { aHull_LUV, aHull_ZPM, aHull_UV, aHull_MAX }; - - // Remove Hand Crafting Recipes - - // Casings - Logger.INFO("Removing shaped crafting for Casings."); - RecipeUtils.removeRecipeByOutput(aCasing_LUV); - RecipeUtils.removeRecipeByOutput(aCasing_ZPM); - RecipeUtils.removeRecipeByOutput(aCasing_UV); - // RecipeUtils.removeRecipeByOutput(aCasing_MAX); - - // Hulls - Logger.INFO("Removing shaped crafting for Hulls."); - RecipeUtils.removeRecipeByOutput(aHull_LUV); - RecipeUtils.removeRecipeByOutput(aHull_ZPM); - RecipeUtils.removeRecipeByOutput(aHull_UV); - // RecipeUtils.removeRecipeByOutput(aHull_MAX); - - // Modify Assembler Recipes - Logger.INFO( - "Attempting to modify existing Assembly recipes for Casings & Hulls, this should provide best compatibility."); - int aUpdateCount = 0; - - AutoMap> aDataToModify = new AutoMap>(); - - Outer: for (final GT_Recipe r : GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.mRecipeList) { - - if (r != null && r.mOutputs != null && r.mOutputs.length > 0) { - - GT_Recipe aOldRecipeCopy = r; - GT_Recipe aNewRecipe = r.copy(); - - // Casings - Inner: for (ItemStack aCasingObject : aCasings) { - if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aCasingObject)) { - String aOutputName = ItemUtils.getItemName(aOldRecipeCopy.mOutputs[0]); - Logger.INFO("Attempting to Modify Assembly Recipe for " + aOutputName); - // Replace Chrome - if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aCasing_LUV)) { - aNewRecipe = replaceItemInRecipeWithAnother( - aOldRecipeCopy, - ItemUtils.getItemStackOfAmountFromOreDict("plateChrome", 1), - ELEMENT.getInstance().SELENIUM.getPlate(1)); - aDataToModify.put(new Pair<>(r, aNewRecipe)); - aUpdateCount++; - continue Outer; - } - // Replace Iridium - else if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aCasing_ZPM)) { - aNewRecipe = replaceItemInRecipeWithAnother( - aOldRecipeCopy, - ItemUtils.getItemStackOfAmountFromOreDict("plateIridium", 1), - CI.getPlate(aTier_ZPM, 1)); - aDataToModify.put(new Pair<>(r, aNewRecipe)); - aUpdateCount++; - continue Outer; - } - // Replace Osmium - else if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aCasing_UV)) { - aNewRecipe = replaceItemInRecipeWithAnother( - aOldRecipeCopy, - ItemUtils.getItemStackOfAmountFromOreDict("plateOsmium", 1), - CI.getPlate(aTier_UV, 1)); - aDataToModify.put(new Pair<>(r, aNewRecipe)); - aUpdateCount++; - continue Outer; - } else { - continue Inner; - } - } - } - - // Hulls - Inner: for (ItemStack aHullObject : aHulls) { - if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aHullObject)) { - String aOutputName = ItemUtils.getItemName(aOldRecipeCopy.mOutputs[0]); - Logger.INFO("Attempting to Modify Assembly Recipe for " + aOutputName); - // Replace Chrome - if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aHull_LUV)) { - aNewRecipe = replaceItemInRecipeWithAnother( - aOldRecipeCopy, - ItemUtils.getItemStackOfAmountFromOreDict("plateChrome", 1), - ELEMENT.getInstance().SELENIUM.getPlate(1)); - aDataToModify.put(new Pair<>(r, aNewRecipe)); - aUpdateCount++; - continue Outer; - } - // Replace Iridium - else if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aHull_ZPM)) { - aNewRecipe = replaceItemInRecipeWithAnother( - aOldRecipeCopy, - ItemUtils.getItemStackOfAmountFromOreDict("plateIridium", 1), - CI.getPlate(aTier_ZPM, 1)); - aDataToModify.put(new Pair<>(r, aNewRecipe)); - aUpdateCount++; - continue Outer; - } - // Replace Osmium - else if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aHull_UV)) { - aNewRecipe = replaceItemInRecipeWithAnother( - aOldRecipeCopy, - ItemUtils.getItemStackOfAmountFromOreDict("plateOsmium", 1), - CI.getPlate(aTier_UV, 1)); - aDataToModify.put(new Pair<>(r, aNewRecipe)); - aUpdateCount++; - continue Outer; - } else { - continue Inner; - } - } - } - } - } - - Logger.INFO("There is " + aUpdateCount + " recipes flagged for update."); - - if (aUpdateCount > 0) { - for (Pair g : aDataToModify) { - updateRecipeMap(g.getKey(), g.getValue(), GT_Recipe.GT_Recipe_Map.sAssemblerRecipes); - } - Logger.INFO("Modified " + aUpdateCount + " recipes."); - } - - Logger.INFO("Adding new Shaped recipes for Casings."); - GT_ModHandler.addCraftingRecipe( - ItemList.Casing_LuV.get(1), - bits, - new Object[] { "PPP", "PwP", "PPP", 'P', ELEMENT.getInstance().SELENIUM.getPlate(1) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Casing_ZPM.get(1), - bits, - new Object[] { "PPP", "PwP", "PPP", 'P', CI.getPlate(aTier_ZPM, 1) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Casing_UV.get(1), - bits, - new Object[] { "PPP", "PwP", "PPP", 'P', CI.getPlate(aTier_UV, 1) }); - - if (!GT_Mod.gregtechproxy.mHardMachineCasings) { - Logger.INFO("Adding new easy Shaped recipes for Hulls."); - GT_ModHandler.addCraftingRecipe( - ItemList.Hull_LuV.get(1), - RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, - new Object[] { "CMC", 'M', ItemList.Casing_LuV, 'C', - OrePrefixes.cableGt01.get(Materials.VanadiumGallium) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Hull_ZPM.get(1), - RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, - new Object[] { "CMC", 'M', ItemList.Casing_ZPM, 'C', - OrePrefixes.cableGt01.get(Materials.Naquadah) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Hull_UV.get(1), - RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, - new Object[] { "CMC", 'M', ItemList.Casing_UV, 'C', - OrePrefixes.wireGt04.get(Materials.NaquadahAlloy) }); - } else { - - Materials aPolytetrafluoroethylene = MaterialUtils.getMaterial("Polytetrafluoroethylene", "Plastic"); - - Logger.INFO("Adding new hard Shaped recipes for Hulls."); - GT_ModHandler.addCraftingRecipe( - ItemList.Hull_LuV.get(1), - RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, - new Object[] { "PHP", "CMC", 'M', ItemList.Casing_LuV, 'C', - OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'H', - ELEMENT.getInstance().SELENIUM.getPlate(1), 'P', - OrePrefixes.plate.get(Materials.Plastic) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Hull_ZPM.get(1), - RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, - new Object[] { "PHP", "CMC", 'M', ItemList.Casing_ZPM, 'C', - OrePrefixes.cableGt01.get(Materials.Naquadah), 'H', CI.getPlate(aTier_ZPM, 1), 'P', - OrePrefixes.plate.get(aPolytetrafluoroethylene) }); - GT_ModHandler.addCraftingRecipe( - ItemList.Hull_UV.get(1), - RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, - new Object[] { "PHP", "CMC", 'M', ItemList.Casing_UV, 'C', - OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), 'H', CI.getPlate(aTier_UV, 1), 'P', - OrePrefixes.plate.get(aPolytetrafluoroethylene) }); - } - } - - private static int removeCrudeTurbineRotors() { - int aRemoved = 0; - int CUT = CORE.turbineCutoffBase; - Item aU; - Collection aAssRecipes = GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.mRecipeList; - // 170, 172, 174, 176 - if (aAssRecipes.size() > 0) { - recipe: for (GT_Recipe aG : aAssRecipes) { - if (aG.mOutputs != null && aG.mOutputs.length > 0) { - outputs: for (ItemStack aI : aG.mOutputs) { - if (aI == null) { - continue; - } - aU = aI.getItem(); - if (aU == null) { - continue; - } - if (aU instanceof GT_MetaGenerated_Tool_01) { - int aMeta = aI.getItemDamage(); - if (aMeta >= 170 && aMeta <= 176) { - // Found a Turbine - int aCutoff = aMeta == 170 ? CUT - : (aMeta == 172 ? CUT * 2 : (aMeta == 174 ? CUT * 3 : CUT * 4)); - String aType = aMeta == 170 ? "Small " - : (aMeta == 172 ? "" : (aMeta == 174 ? "Large " : "Huge ")); - Materials aMainMaterial = GT_MetaGenerated_Tool.getPrimaryMaterial(aI); - Materials aSecondaryMaterial = GT_MetaGenerated_Tool.getSecondaryMaterial(aI); - long rotorDurabilityMax = GT_MetaGenerated_Tool.getToolMaxDamage(aI); - if (rotorDurabilityMax < aCutoff) { - Logger.WARNING( - "[Turbine Cleanup] " + getMaterialName(aMainMaterial) - + " " - + aType - + "Turbines have " - + rotorDurabilityMax - + ", which is below the cutoff durability of " - + aCutoff - + ", disabling."); - aG.mEnabled = false; - aG.mHidden = true; - aG.mCanBeBuffered = false; - aRemoved++; - } else { - break; - } - } - } - } - } - } - } - - Logger.INFO("Removed " + aRemoved + " useless Turbines."); - - return aRemoved; - } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java index f71e07f0a3..0b7e44ce14 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java @@ -1,21 +1,37 @@ package gtPlusPlus.xmod.gregtech.api.enums; -import static gregtech.api.enums.GT_Values.*; +import static gregtech.api.enums.GT_Values.B; +import static gregtech.api.enums.GT_Values.D2; +import static gregtech.api.enums.GT_Values.M; import static gtPlusPlus.core.util.Utils.getTcAspectStack; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; import net.minecraft.enchantment.Enchantment; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.enums.*; +import gregtech.api.enums.ConfigCategories; +import gregtech.api.enums.Dyes; +import gregtech.api.enums.Element; +import gregtech.api.enums.Materials; +import gregtech.api.enums.SubTag; +import gregtech.api.enums.TC_Aspects; import gregtech.api.enums.TC_Aspects.TC_AspectStack; -import gregtech.api.interfaces.*; +import gregtech.api.enums.TextureSet; +import gregtech.api.interfaces.IColorModulationContainer; +import gregtech.api.interfaces.ICondition; +import gregtech.api.interfaces.ISubTagContainer; import gregtech.api.objects.GT_FluidStack; import gregtech.api.objects.MaterialStack; -import gregtech.api.util.*; +import gregtech.api.util.GT_Config; +import gregtech.api.util.GT_Log; +import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; import gtPlusPlus.xmod.gregtech.api.objects.GregtechItemData; @@ -948,12 +964,6 @@ public enum GregtechOrePrefixes { ConfigCategories.Materials.blastinductionsmelter, tString, tMaterial.mBlastFurnaceTemp < 1500)) {} - // GT_ModHandler.ThermalExpansion.addSmelterBlastOre(tMaterial); - // tMaterial.mHandleMaterial = (tMaterial == Desh ? tMaterial.mHandleMaterial : tMaterial == Diamond || - // tMaterial == Thaumium ? Wood : tMaterial.contains(SubTag.BURNING) ? Blaze : - // tMaterial.contains(SubTag.MAGICAL) && tMaterial.contains(SubTag.CRYSTAL) && - // Loader.isModLoaded(MOD_ID_TC) ? Thaumium : tMaterial.getMass() > Element.Tc.getMass() * 2 ? - // TungstenSteel : tMaterial.getMass() > Element.Tc.getMass() ? Steel : Wood); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java index dee662ac20..1b9a88e230 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java @@ -1,10 +1,11 @@ package gtPlusPlus.xmod.gregtech.api.enums; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_IconContainer; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_Texture; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; @@ -62,7 +63,7 @@ public class GregtechTextures { @Override public void run() { - this.mIcon = Meta_GT_Proxy.sBlockIcons.registerIcon(CORE.MODID + ":" + "iconsets/" + this); + this.mIcon = Meta_GT_Proxy.sBlockIcons.registerIcon(GTPlusPlus.ID + ":" + "iconsets/" + this); } @Override @@ -92,7 +93,7 @@ public class GregtechTextures { @Override public void run() { - this.mIcon = Meta_GT_Proxy.sBlockIcons.registerIcon(CORE.MODID + ":" + this.mIconName); + this.mIcon = Meta_GT_Proxy.sBlockIcons.registerIcon(GTPlusPlus.ID + ":" + this.mIconName); } @Override @@ -146,8 +147,9 @@ public class GregtechTextures { @Override public void run() { - this.mIcon = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID + ":" + "iconsets/" + this); - this.mOverlay = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID + ":" + "iconsets/" + this + "_OVERLAY"); + this.mIcon = Meta_GT_Proxy.sItemIcons.registerIcon(GTPlusPlus.ID + ":" + "iconsets/" + this); + this.mOverlay = Meta_GT_Proxy.sItemIcons + .registerIcon(GTPlusPlus.ID + ":" + "iconsets/" + this + "_OVERLAY"); } public static class CustomIcon implements Interface_IconContainer, Runnable { @@ -172,8 +174,9 @@ public class GregtechTextures { @Override public void run() { - this.mIcon = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID + ":" + this.mIconName); - this.mOverlay = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID + ":" + this.mIconName + "_OVERLAY"); + this.mIcon = Meta_GT_Proxy.sItemIcons.registerIcon(GTPlusPlus.ID + ":" + this.mIconName); + this.mOverlay = Meta_GT_Proxy.sItemIcons + .registerIcon(GTPlusPlus.ID + ":" + this.mIconName + "_OVERLAY"); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java index 26de142e22..8cf0e88473 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GTPP_UITextures.java @@ -1,6 +1,6 @@ package gtPlusPlus.xmod.gregtech.api.gui; -import static gtPlusPlus.core.lib.CORE.MODID; +import static gregtech.api.enums.Mods.GTPlusPlus; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -10,132 +10,148 @@ import com.gtnewhorizons.modularui.api.drawable.UITexture; public class GTPP_UITextures { - public static final UITexture OVERLAY_SLOT_COAL = UITexture.fullImage(MODID, "gui/overlay_slot/coal"); + public static final UITexture OVERLAY_SLOT_COAL = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/coal"); public static final UITexture OVERLAY_SLOT_CANISTER_DARK = UITexture - .fullImage(MODID, "gui/overlay_slot/canister_dark"); + .fullImage(GTPlusPlus.ID, "gui/overlay_slot/canister_dark"); public static final AdaptableUITexture BACKGROUND_YELLOW = AdaptableUITexture - .of(MODID, "gui/background/yellow", 176, 166, 4); + .of(GTPlusPlus.ID, "gui/background/yellow", 176, 166, 4); public static final AdaptableUITexture SLOT_ITEM_YELLOW = AdaptableUITexture - .of(MODID, "gui/slot/item_yellow", 18, 18, 1); + .of(GTPlusPlus.ID, "gui/slot/item_yellow", 18, 18, 1); public static final AdaptableUITexture[] SLOT_INVENTORY_MANAGER = new AdaptableUITexture[] { - AdaptableUITexture.of(MODID, "gui/slot/red", 18, 18, 1), - AdaptableUITexture.of(MODID, "gui/slot/green", 18, 18, 1), - AdaptableUITexture.of(MODID, "gui/slot/blue", 18, 18, 1), - AdaptableUITexture.of(MODID, "gui/slot/cyan", 18, 18, 1), - AdaptableUITexture.of(MODID, "gui/slot/magenta", 18, 18, 1), - AdaptableUITexture.of(MODID, "gui/slot/yellow", 18, 18, 1), }; + AdaptableUITexture.of(GTPlusPlus.ID, "gui/slot/red", 18, 18, 1), + AdaptableUITexture.of(GTPlusPlus.ID, "gui/slot/green", 18, 18, 1), + AdaptableUITexture.of(GTPlusPlus.ID, "gui/slot/blue", 18, 18, 1), + AdaptableUITexture.of(GTPlusPlus.ID, "gui/slot/cyan", 18, 18, 1), + AdaptableUITexture.of(GTPlusPlus.ID, "gui/slot/magenta", 18, 18, 1), + AdaptableUITexture.of(GTPlusPlus.ID, "gui/slot/yellow", 18, 18, 1), }; - public static final UITexture BUTTON_STANDARD_BRONZE = UITexture.fullImage(MODID, "gui/button/standard_bronze"); - public static final UITexture BUTTON_STANDARD_16x16 = UITexture.fullImage(MODID, "gui/button/standard_16x16"); + public static final UITexture BUTTON_STANDARD_BRONZE = UITexture + .fullImage(GTPlusPlus.ID, "gui/button/standard_bronze"); + public static final UITexture BUTTON_STANDARD_16x16 = UITexture + .fullImage(GTPlusPlus.ID, "gui/button/standard_16x16"); - public static final UITexture OVERLAY_SLOT_WEED_EX = UITexture.fullImage(MODID, "gui/overlay_slot/weed_ex"); - public static final UITexture OVERLAY_SLOT_FERTILIZER = UITexture.fullImage(MODID, "gui/overlay_slot/fertilizer"); + public static final UITexture OVERLAY_SLOT_WEED_EX = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/weed_ex"); + public static final UITexture OVERLAY_SLOT_FERTILIZER = UITexture + .fullImage(GTPlusPlus.ID, "gui/overlay_slot/fertilizer"); public static final UITexture OVERLAY_SLOT_ELECTRIC_TOOL = UITexture - .fullImage(MODID, "gui/overlay_slot/electric_tool"); + .fullImage(GTPlusPlus.ID, "gui/overlay_slot/electric_tool"); public static final UITexture OVERLAY_SLOT_PAGE_PRINTED_BRONZE = UITexture - .fullImage(MODID, "gui/overlay_slot/page_printed_bronze"); - public static final UITexture OVERLAY_SLOT_ARROW = UITexture.fullImage(MODID, "gui/overlay_slot/arrow"); + .fullImage(GTPlusPlus.ID, "gui/overlay_slot/page_printed_bronze"); + public static final UITexture OVERLAY_SLOT_ARROW = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/arrow"); public static final UITexture OVERLAY_SLOT_ARROW_BRONZE = UITexture - .fullImage(MODID, "gui/overlay_slot/arrow_bronze"); + .fullImage(GTPlusPlus.ID, "gui/overlay_slot/arrow_bronze"); public static final UITexture OVERLAY_SLOT_CRAFT_OUTPUT = UITexture - .fullImage(MODID, "gui/overlay_slot/craft_output"); + .fullImage(GTPlusPlus.ID, "gui/overlay_slot/craft_output"); public static final UITexture OVERLAY_SLOT_CRAFT_OUTPUT_BRONZE = UITexture - .fullImage(MODID, "gui/overlay_slot/craft_output_bronze"); - public static final UITexture OVERLAY_SLOT_PARK = UITexture.fullImage(MODID, "gui/overlay_slot/park"); - public static final UITexture OVERLAY_SLOT_PARK_BRONZE = UITexture.fullImage(MODID, "gui/overlay_slot/park_bronze"); - public static final UITexture OVERLAY_SLOT_INGOT = UITexture.fullImage(MODID, "gui/overlay_slot/ingot"); - public static final UITexture OVERLAY_SLOT_ARROW_4 = UITexture.fullImage(MODID, "gui/overlay_slot/arrow_4"); - public static final UITexture OVERLAY_SLOT_TURBINE = UITexture.fullImage(MODID, "gui/overlay_slot/turbine"); - public static final UITexture OVERLAY_SLOT_CHEST = UITexture.fullImage(MODID, "gui/overlay_slot/chest"); + .fullImage(GTPlusPlus.ID, "gui/overlay_slot/craft_output_bronze"); + public static final UITexture OVERLAY_SLOT_PARK = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/park"); + public static final UITexture OVERLAY_SLOT_PARK_BRONZE = UITexture + .fullImage(GTPlusPlus.ID, "gui/overlay_slot/park_bronze"); + public static final UITexture OVERLAY_SLOT_INGOT = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/ingot"); + public static final UITexture OVERLAY_SLOT_ARROW_4 = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/arrow_4"); + public static final UITexture OVERLAY_SLOT_TURBINE = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/turbine"); + public static final UITexture OVERLAY_SLOT_CHEST = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/chest"); public static final UITexture[] OVERLAY_SLOT_INVENTORY_MANAGER_COLOR = new UITexture[] { - UITexture.fullImage(MODID, "gui/overlay_slot/red"), UITexture.fullImage(MODID, "gui/overlay_slot/green"), - UITexture.fullImage(MODID, "gui/overlay_slot/blue"), UITexture.fullImage(MODID, "gui/overlay_slot/cyan"), - UITexture.fullImage(MODID, "gui/overlay_slot/magenta"), - UITexture.fullImage(MODID, "gui/overlay_slot/yellow"), }; + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/red"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/green"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/blue"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/cyan"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/magenta"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/yellow"), }; public static final UITexture[] OVERLAY_SLOT_INVENTORY_MANAGER_ARROW = new UITexture[] { - UITexture.fullImage(MODID, "gui/overlay_slot/arrow_red"), - UITexture.fullImage(MODID, "gui/overlay_slot/arrow_green"), - UITexture.fullImage(MODID, "gui/overlay_slot/arrow_blue"), - UITexture.fullImage(MODID, "gui/overlay_slot/arrow_cyan"), - UITexture.fullImage(MODID, "gui/overlay_slot/arrow_magenta"), - UITexture.fullImage(MODID, "gui/overlay_slot/arrow_yellow"), }; + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/arrow_red"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/arrow_green"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/arrow_blue"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/arrow_cyan"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/arrow_magenta"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_slot/arrow_yellow"), }; public static final UITexture PROGRESSBAR_FLUID_REACTOR = UITexture - .fullImage(MODID, "gui/progressbar/fluid_reactor"); - public static final UITexture PROGRESSBAR_BOILER_EMPTY = UITexture.fullImage(MODID, "gui/progressbar/boiler_empty"); - public static final UITexture PROGRESSBAR_FUEL = UITexture.fullImage(MODID, "gui/progressbar/fuel"); - public static final UITexture PROGRESSBAR_ARROW_2 = UITexture.fullImage(MODID, "gui/progressbar/arrow_2"); + .fullImage(GTPlusPlus.ID, "gui/progressbar/fluid_reactor"); + public static final UITexture PROGRESSBAR_BOILER_EMPTY = UITexture + .fullImage(GTPlusPlus.ID, "gui/progressbar/boiler_empty"); + public static final UITexture PROGRESSBAR_FUEL = UITexture.fullImage(GTPlusPlus.ID, "gui/progressbar/fuel"); + public static final UITexture PROGRESSBAR_ARROW_2 = UITexture.fullImage(GTPlusPlus.ID, "gui/progressbar/arrow_2"); public static final UITexture PROGRESSBAR_COMPUTER_ENERGY = UITexture - .fullImage(MODID, "gui/progressbar/computer_energy"); - public static final UITexture PROGRESSBAR_PSS_ENERGY = UITexture.fullImage(MODID, "gui/progressbar/pss_energy"); + .fullImage(GTPlusPlus.ID, "gui/progressbar/computer_energy"); + public static final UITexture PROGRESSBAR_PSS_ENERGY = UITexture + .fullImage(GTPlusPlus.ID, "gui/progressbar/pss_energy"); public static final AdaptableUITexture TAB_TITLE_YELLOW = AdaptableUITexture - .of(MODID, "gui/tab/title_yellow", 28, 28, 4); + .of(GTPlusPlus.ID, "gui/tab/title_yellow", 28, 28, 4); public static final AdaptableUITexture TAB_TITLE_ANGULAR_YELLOW = AdaptableUITexture - .of(MODID, "gui/tab/title_angular_yellow", 28, 28, 4); + .of(GTPlusPlus.ID, "gui/tab/title_angular_yellow", 28, 28, 4); public static final AdaptableUITexture TAB_TITLE_DARK_YELLOW = AdaptableUITexture - .of(MODID, "gui/tab/title_dark_yellow", 28, 28, 4); + .of(GTPlusPlus.ID, "gui/tab/title_dark_yellow", 28, 28, 4); public static final UITexture OVERLAY_BUTTON_HARVESTER_MODE = UITexture - .fullImage(MODID, "gui/overlay_button/harvester_mode"); - public static final UITexture OVERLAY_BUTTON_FLUSH = UITexture.fullImage(MODID, "gui/overlay_button/flush"); + .fullImage(GTPlusPlus.ID, "gui/overlay_button/harvester_mode"); + public static final UITexture OVERLAY_BUTTON_FLUSH = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/flush"); public static final UITexture OVERLAY_BUTTON_FLUSH_BRONZE = UITexture - .fullImage(MODID, "gui/overlay_button/flush_bronze"); + .fullImage(GTPlusPlus.ID, "gui/overlay_button/flush_bronze"); public static final UITexture OVERLAY_BUTTON_AUTOMATION = UITexture - .fullImage(MODID, "gui/overlay_button/automation"); - public static final UITexture OVERLAY_BUTTON_LOCK = UITexture.fullImage(MODID, "gui/overlay_button/lock"); + .fullImage(GTPlusPlus.ID, "gui/overlay_button/automation"); + public static final UITexture OVERLAY_BUTTON_LOCK = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/lock"); public static final UITexture[] OVERLAY_BUTTON_THROUGHPUT = IntStream.range(0, 4) // GT_MetaTileEntity_ElectricAutoWorkbench#MAX_THROUGHPUT - .mapToObj(i -> UITexture.fullImage(MODID, "gui/overlay_button/throughput_" + i)) + .mapToObj(i -> UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/throughput_" + i)) .collect(Collectors.toList()).toArray(new UITexture[0]); public static final UITexture[] OVERLAY_BUTTON_MODE = IntStream.range(0, 10) // GT_MetaTileEntity_ElectricAutoWorkbench#MAX_MODES - .mapToObj(i -> UITexture.fullImage(MODID, "gui/overlay_button/mode_" + i)).collect(Collectors.toList()) - .toArray(new UITexture[0]); + .mapToObj(i -> UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/mode_" + i)) + .collect(Collectors.toList()).toArray(new UITexture[0]); public static final UITexture OVERLAY_BUTTON_COMPUTER_MODE = UITexture - .fullImage(MODID, "gui/overlay_button/computer_mode"); - public static final UITexture OVERLAY_BUTTON_SAVE = UITexture.fullImage(MODID, "gui/overlay_button/save"); - public static final UITexture OVERLAY_BUTTON_LOAD = UITexture.fullImage(MODID, "gui/overlay_button/load"); + .fullImage(GTPlusPlus.ID, "gui/overlay_button/computer_mode"); + public static final UITexture OVERLAY_BUTTON_SAVE = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/save"); + public static final UITexture OVERLAY_BUTTON_LOAD = UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/load"); public static final UITexture OVERLAY_BUTTON_NUCLEAR_SWITCH = UITexture - .fullImage(MODID, "gui/overlay_button/nuclear_switch"); + .fullImage(GTPlusPlus.ID, "gui/overlay_button/nuclear_switch"); public static final UITexture OVERLAY_BUTTON_ARROW_LEFT = UITexture - .fullImage(MODID, "gui/overlay_button/arrow_left"); + .fullImage(GTPlusPlus.ID, "gui/overlay_button/arrow_left"); public static final UITexture OVERLAY_BUTTON_ARROW_RIGHT = UITexture - .fullImage(MODID, "gui/overlay_button/arrow_right"); + .fullImage(GTPlusPlus.ID, "gui/overlay_button/arrow_right"); public static final UITexture[] OVERLAY_BUTTON_DIRECTION = new UITexture[] { - UITexture.fullImage(MODID, "gui/overlay_button/bottom"), - UITexture.fullImage(MODID, "gui/overlay_button/top"), - UITexture.fullImage(MODID, "gui/overlay_button/north"), - UITexture.fullImage(MODID, "gui/overlay_button/south"), - UITexture.fullImage(MODID, "gui/overlay_button/west"), - UITexture.fullImage(MODID, "gui/overlay_button/east"), }; + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/bottom"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/top"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/north"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/south"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/west"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/east"), }; public static final UITexture[] OVERLAY_BUTTON_DIRECTION_GRAY = new UITexture[] { - UITexture.fullImage(MODID, "gui/overlay_button/bottom_gray"), - UITexture.fullImage(MODID, "gui/overlay_button/top_gray"), - UITexture.fullImage(MODID, "gui/overlay_button/north_gray"), - UITexture.fullImage(MODID, "gui/overlay_button/south_gray"), - UITexture.fullImage(MODID, "gui/overlay_button/west_gray"), - UITexture.fullImage(MODID, "gui/overlay_button/east_gray"), }; - public static final UITexture OVERLAY_BUTTON_TIP_GREEN = UITexture.fullImage(MODID, "gui/overlay_button/tip_green"); - public static final UITexture OVERLAY_BUTTON_TIP_RED = UITexture.fullImage(MODID, "gui/overlay_button/tip_red"); + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/bottom_gray"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/top_gray"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/north_gray"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/south_gray"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/west_gray"), + UITexture.fullImage(GTPlusPlus.ID, "gui/overlay_button/east_gray"), }; + public static final UITexture OVERLAY_BUTTON_TIP_GREEN = UITexture + .fullImage(GTPlusPlus.ID, "gui/overlay_button/tip_green"); + public static final UITexture OVERLAY_BUTTON_TIP_RED = UITexture + .fullImage(GTPlusPlus.ID, "gui/overlay_button/tip_red"); public static final UITexture OVERLAY_BUTTON_ACTIVE_STATE = UITexture - .fullImage(MODID, "gui/overlay_button/active_state"); + .fullImage(GTPlusPlus.ID, "gui/overlay_button/active_state"); public static final UITexture OVERLAY_BUTTON_CHANGE_MODE = UITexture - .fullImage(MODID, "gui/overlay_button/change_mode"); + .fullImage(GTPlusPlus.ID, "gui/overlay_button/change_mode"); public static final UITexture OVERLAY_BUTTON_PLUS_MINUS = UITexture - .fullImage(MODID, "gui/overlay_button/plus_minus"); + .fullImage(GTPlusPlus.ID, "gui/overlay_button/plus_minus"); - public static final UITexture PICTURE_WORKBENCH_CIRCLE = UITexture.fullImage(MODID, "gui/picture/workbench_circle"); - public static final UITexture PICTURE_ARROW_WHITE_DOWN = UITexture.fullImage(MODID, "gui/picture/arrow_white_down"); - public static final UITexture PICTURE_V202 = UITexture.fullImage(MODID, "gui/picture/v202"); - public static final UITexture PICTURE_COMPUTER_TOP = UITexture.fullImage(MODID, "gui/picture/computer_top"); - public static final UITexture PICTURE_COMPUTER_GRID = UITexture.fullImage(MODID, "gui/picture/computer_grid"); - public static final UITexture PICTURE_ARROWS_SEPARATE = UITexture.fullImage(MODID, "gui/picture/arrows_separate"); - public static final UITexture PICTURE_ARROWS_FUSION = UITexture.fullImage(MODID, "gui/picture/arrows_fusion"); + public static final UITexture PICTURE_WORKBENCH_CIRCLE = UITexture + .fullImage(GTPlusPlus.ID, "gui/picture/workbench_circle"); + public static final UITexture PICTURE_ARROW_WHITE_DOWN = UITexture + .fullImage(GTPlusPlus.ID, "gui/picture/arrow_white_down"); + public static final UITexture PICTURE_V202 = UITexture.fullImage(GTPlusPlus.ID, "gui/picture/v202"); + public static final UITexture PICTURE_COMPUTER_TOP = UITexture.fullImage(GTPlusPlus.ID, "gui/picture/computer_top"); + public static final UITexture PICTURE_COMPUTER_GRID = UITexture + .fullImage(GTPlusPlus.ID, "gui/picture/computer_grid"); + public static final UITexture PICTURE_ARROWS_SEPARATE = UITexture + .fullImage(GTPlusPlus.ID, "gui/picture/arrows_separate"); + public static final UITexture PICTURE_ARROWS_FUSION = UITexture + .fullImage(GTPlusPlus.ID, "gui/picture/arrows_fusion"); public static final UITexture PICTURE_REDSTONE_CIRCUIT_SCREEN = UITexture - .fullImage(MODID, "gui/picture/redstone_circuit_screen"); + .fullImage(GTPlusPlus.ID, "gui/picture/redstone_circuit_screen"); public static final UITexture PICTURE_ELECTRICITY_ERROR = UITexture - .fullImage(MODID, "gui/picture/electricity_error"); - public static final UITexture PICTURE_ELECTRICITY_FINE = UITexture.fullImage(MODID, "gui/picture/electricity_fine"); - public static final UITexture PICTURE_ENERGY_FRAME = UITexture.fullImage(MODID, "gui/picture/energy_frame"); + .fullImage(GTPlusPlus.ID, "gui/picture/electricity_error"); + public static final UITexture PICTURE_ELECTRICITY_FINE = UITexture + .fullImage(GTPlusPlus.ID, "gui/picture/electricity_fine"); + public static final UITexture PICTURE_ENERGY_FRAME = UITexture.fullImage(GTPlusPlus.ID, "gui/picture/energy_frame"); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java index 3eefd1c314..01628d60d0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_Generic_Item.java @@ -1,10 +1,15 @@ package gtPlusPlus.xmod.gregtech.api.items; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.block.BlockDispenser; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.dispenser.*; +import net.minecraft.dispenser.BehaviorDefaultDispenseItem; +import net.minecraft.dispenser.BehaviorProjectileDispense; +import net.minecraft.dispenser.IBlockSource; +import net.minecraft.dispenser.IPosition; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IProjectile; import net.minecraft.entity.player.EntityPlayer; @@ -24,7 +29,6 @@ import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; /** @@ -53,7 +57,7 @@ public class Gregtech_Generic_Item extends Item implements IProjectileItem { this.mTooltip = null; } this.setCreativeTab(AddToCreativeTab.tabMachines); - GameRegistry.registerItem(this, this.mName, CORE.MODID); + GameRegistry.registerItem(this, this.mName, GTPlusPlus.ID); BlockDispenser.dispenseBehaviorRegistry.putObject(this, new GT_Item_Dispense()); } @@ -75,7 +79,7 @@ public class Gregtech_Generic_Item extends Item implements IProjectileItem { @Override @SideOnly(Side.CLIENT) public void registerIcons(final IIconRegister aIconRegister) { - this.mIcon = aIconRegister.registerIcon(CORE.MODID + ":" + this.mName); + this.mIcon = aIconRegister.registerIcon(GTPlusPlus.ID + ":" + this.mName); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java index aa4f6fb45f..db41fd1e9f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem.java @@ -1,8 +1,13 @@ package gtPlusPlus.xmod.gregtech.api.items; import static gregtech.api.enums.GT_Values.D1; +import static gregtech.api.enums.Mods.GTPlusPlus; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.BitSet; +import java.util.HashMap; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -27,7 +32,6 @@ import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour; public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { @@ -298,10 +302,10 @@ public abstract class Gregtech_MetaItem extends Gregtech_MetaItem_Base { if (this.mEnabledItems.get(i)) { for (byte k = 1; k < this.mIconList[i].length; k++) { this.mIconList[i][k] = aIconRegister - .registerIcon(CORE.MODID + ":" + this.getUnlocalizedName() + "/" + i + "/" + k); + .registerIcon(GTPlusPlus.ID + ":" + this.getUnlocalizedName() + "/" + i + "/" + k); } this.mIconList[i][0] = aIconRegister - .registerIcon(CORE.MODID + ":" + this.getUnlocalizedName() + "/" + i); + .registerIcon(GTPlusPlus.ID + ":" + this.getUnlocalizedName() + "/" + i); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java index 6ed72a8803..631e004178 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java @@ -1,6 +1,7 @@ package gtPlusPlus.xmod.gregtech.api.items; -import static gregtech.api.enums.GT_Values.*; +import static gregtech.api.enums.GT_Values.D1; +import static gregtech.api.enums.GT_Values.V; import java.util.ArrayList; import java.util.HashMap; @@ -21,10 +22,16 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; import gregtech.api.enums.SubTag; -import gregtech.api.util.*; +import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GT_Log; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_Utility; import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ItemBehaviour; -import ic2.api.item.*; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import ic2.api.item.IElectricItemManager; +import ic2.api.item.ISpecialElectricItem; public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item implements ISpecialElectricItem, IElectricItemManager, IFluidContainerItem { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java index 11a4c02fbb..5c92944345 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java @@ -29,6 +29,7 @@ import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.common.Optional; import gregtech.api.enchants.Enchantment_Radioactivity; import gregtech.api.enums.Materials; +import gregtech.api.enums.Mods; import gregtech.api.interfaces.IDamagableItem; import gregtech.api.interfaces.IToolStats; import gregtech.api.items.GT_MetaGenerated_Tool; @@ -42,10 +43,11 @@ import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats; * GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01").getToolWithStats(16, 1, Materials.Bismuth, Materials.Bismuth, * null); */ -@Optional.InterfaceList({ @Optional.Interface(iface = "forestry.api.arboriculture.IToolGrafter", modid = "Forestry"), - @Optional.Interface(iface = "mods.railcraft.api.core.items.IToolCrowbar", modid = "Railcraft"), +@Optional.InterfaceList({ + @Optional.Interface(iface = "forestry.api.arboriculture.IToolGrafter", modid = Mods.Names.FORESTRY), + @Optional.Interface(iface = "mods.railcraft.api.core.items.IToolCrowbar", modid = Mods.Names.RAILCRAFT), @Optional.Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft"), - @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = "EnderIO") }) + @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = Mods.Names.ENDER_I_O) }) public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool implements IDamagableItem, IToolCrowbar, IToolWrench { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java index 77b407109e..a7bc99e85c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java @@ -28,7 +28,10 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.TC_Aspects.TC_AspectStack; import gregtech.api.interfaces.IToolStats; import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.util.*; +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 gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats; /** diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java index 6ed462d31f..c387c513a4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/types/ToolType_HardHammer.java @@ -17,7 +17,10 @@ import gregtech.api.enums.Materials; import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.objects.ItemData; -import gregtech.api.util.*; +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.blocks.GT_Block_Ores; import gregtech.common.blocks.GT_TileEntity_Ores; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java index b1d0731521..d9eeb9d84b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java @@ -7,7 +7,6 @@ import net.minecraft.tileentity.TileEntity; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; -import gregtech.api.gui.*; import gregtech.api.gui.modularui.GT_UIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java index edb9a357a7..61a8e62359 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java @@ -1,6 +1,9 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; -import gregtech.api.enums.*; +import gregtech.api.enums.Dyes; +import gregtech.api.enums.Materials; +import gregtech.api.enums.TextureSet; +import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.metatileentity.IMetaTileEntityCable; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index d3b50f48fc..bb9f1a0e56 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -1,9 +1,17 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity