From b530fdac89f5d764613a6a69339e4324083c9895 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Mon, 16 Sep 2024 00:53:18 +0200 Subject: Remove GT++ AutoMap (#3199) --- .../core/block/base/BasicTileBlockWithTooltip.java | 26 +- .../core/block/general/BlockSuperLight.java | 9 +- .../core/block/machine/BlockSuperJukebox.java | 6 +- .../core/client/renderer/RenderDecayChest.java | 59 ++-- .../commands/CommandEnableDebugWhileRunning.java | 279 ++++++++-------- .../java/gtPlusPlus/core/common/CommonProxy.java | 6 - .../gtPlusPlus/core/handler/CompatHandler.java | 10 +- .../core/handler/Recipes/DecayableRecipe.java | 7 +- .../core/handler/events/EntityDeathHandler.java | 13 +- src/main/java/gtPlusPlus/core/item/ModItems.java | 28 +- .../core/item/base/itemblock/ItemBlockMeta.java | 10 +- .../core/item/base/itemblock/ItemBlockOre.java | 19 +- .../core/item/chemistry/AgriculturalChem.java | 71 ++-- .../core/item/chemistry/MilledOreProcessing.java | 33 +- .../core/item/chemistry/StandardBaseParticles.java | 4 +- .../core/item/food/BaseItemMetaFood.java | 42 +-- .../core/item/tool/misc/ItemGregtechPump.java | 5 +- .../java/gtPlusPlus/core/material/Material.java | 153 ++++----- .../core/material/MaterialGenerator.java | 4 +- .../java/gtPlusPlus/core/material/Particle.java | 7 +- .../java/gtPlusPlus/core/proxy/ClientProxy.java | 12 - .../gtPlusPlus/core/recipe/RecipesMachines.java | 360 ++++++++++----------- .../general/TileEntityCircuitProgrammer.java | 7 +- .../general/TileEntityVolumetricFlaskSetter.java | 7 +- .../machines/TileEntityAdvPooCollector.java | 7 +- .../machines/TileEntityBaseFluidCollector.java | 6 +- .../machines/TileEntityPestKiller.java | 13 +- .../machines/TileEntityPooCollector.java | 7 +- .../gtPlusPlus/core/util/data/StringUtils.java | 13 +- .../java/gtPlusPlus/core/util/math/MathUtils.java | 10 +- .../gtPlusPlus/core/util/minecraft/ItemUtils.java | 5 +- .../core/util/minecraft/MaterialUtils.java | 12 +- .../core/util/minecraft/MiningUtils.java | 30 +- .../core/util/minecraft/RecipeUtils.java | 6 +- .../util/minecraft/gregtech/PollutionUtils.java | 13 +- 35 files changed, 595 insertions(+), 704 deletions(-) (limited to 'src/main/java/gtPlusPlus/core') diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java index bace2937fd..c546d2114e 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java @@ -27,7 +27,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.CubicObject; import gtPlusPlus.api.objects.minecraft.SafeTexture; import gtPlusPlus.core.lib.GTPPCore; @@ -41,13 +40,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement * Each mapped object holds the data for the six sides. */ @SideOnly(Side.CLIENT) - private AutoMap> mSidedTextureArray; - - /** - * Holds the data for the six sides, each side holds an array of data for each respective meta. - */ - @SideOnly(Side.CLIENT) - private AutoMap> mSidedTexturePathArray; + private ArrayList> mSidedTextureArray; /** * Does this block have any meta at all? @@ -163,8 +156,11 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement Logger.INFO("[TeTexture] Building Texture Maps for " + getTileEntityName() + "."); // Init on the Client side only, to prevent Field initialisers existing in the Server side bytecode. - mSidedTextureArray = new AutoMap<>(); - mSidedTexturePathArray = new AutoMap<>(); + mSidedTextureArray = new ArrayList<>(); + /** + * Holds the data for the six sides, each side holds an array of data for each respective meta. + */ + ArrayList> sidedTexturePathArray = new ArrayList<>(); // Store them in forge order // DOWN, UP, NORTH, SOUTH, WEST, EAST @@ -191,7 +187,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement Logger.INFO("[TeTexture] Found custom texture data, using this instead. Size: " + aDataMap.length); // Map each meta string data to the main map. for (int i = 0; i < aDataMap.length; i++) { - mSidedTexturePathArray.put(aDataMap[i]); + sidedTexturePathArray.add(aDataMap[i]); Logger.INFO("Mapped value for meta " + i + "."); } } else { @@ -231,17 +227,17 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement aStringFront, aStringLeft, aStringRight); - mSidedTexturePathArray.put(aMetaBlob); + sidedTexturePathArray.add(aMetaBlob); Logger.INFO("[TeTexture] Added Texture Path data to map for meta " + i); } } - Logger.INFO("[TeTexture] Map size for pathing: " + mSidedTexturePathArray.size()); + Logger.INFO("[TeTexture] Map size for pathing: " + sidedTexturePathArray.size()); // Iteration Index int aIndex = 0; // Iterate each CubicObject, holding the six texture paths for each meta. - for (CubicObject aMetaBlob : mSidedTexturePathArray) { + for (CubicObject aMetaBlob : sidedTexturePathArray) { // Make a Safe Texture for each side SafeTexture aBottom = SafeTexture.register(aMetaBlob.DOWN); SafeTexture aTop = SafeTexture.register(aMetaBlob.UP); @@ -254,7 +250,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement // Convenience Blob CubicObject aMetaBlob2 = new CubicObject<>(aInjectBlob); // Store this Blob into - mSidedTextureArray.put(aMetaBlob2); + mSidedTextureArray.add(aMetaBlob2); Logger.INFO("[TeTexture] Added SafeTexture data to map for meta " + (aIndex++)); } Logger.INFO("[TeTexture] Map size for registration: " + mSidedTextureArray.size()); diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java index 4110c02fe3..e12e829260 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java @@ -2,6 +2,8 @@ package gtPlusPlus.core.block.general; import static gregtech.api.enums.Mods.GTPlusPlus; +import java.util.ArrayList; + import net.minecraft.block.Block; import net.minecraft.block.BlockAir; import net.minecraft.block.BlockContainer; @@ -18,7 +20,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.block.ModBlocks; @@ -143,7 +144,7 @@ public class BlockSuperLight extends BlockContainer { aLitBlocks = new int[50][10][50][1]; int aLitCounter = 0; - AutoMap aBlocksToUpdate = new AutoMap<>(); + ArrayList aBlocksToUpdate = new ArrayList<>(); Logger.INFO("Trying to relight area."); BlockPos aStartIterationPoint = new BlockPos( @@ -169,14 +170,14 @@ public class BlockSuperLight extends BlockContainer { } // Turning Lights on else if (enable && aLight == 0) { - aBlocksToUpdate.put(new BlockPos(xOff, yOff, zOff, this.worldObj)); + aBlocksToUpdate.add(new BlockPos(xOff, yOff, zOff, this.worldObj)); this.worldObj .setBlock(xOff, yOff, zOff, ModBlocks.MatterFabricatorEffectBlock, 0, 3); aLitCounter++; } // Turning Lights off else if (!enable && aLight > 0) { - aBlocksToUpdate.put(new BlockPos(xOff, yOff, zOff, this.worldObj)); + aBlocksToUpdate.add(new BlockPos(xOff, yOff, zOff, this.worldObj)); if (aBlockGet instanceof BlockLightGlass) { Logger.INFO("Dimmed air."); this.worldObj.setBlock(xOff, yOff, zOff, Blocks.air, 0, 3); diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java b/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java index 4440d2920a..be55db80a0 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.block.machine; +import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; @@ -25,7 +26,6 @@ import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.util.GTUtility; import gtPlusPlus.GTplusplus; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.handler.GuiHandler; import gtPlusPlus.core.inventories.InventorySuperJukebox; import gtPlusPlus.core.util.math.MathUtils; @@ -315,12 +315,12 @@ public class BlockSuperJukebox extends BlockJukebox { // Determine which record to play public boolean selectRecordToPlayFromInventoryAndSetViaVanillaHandler() { - AutoMap mValidRecords = new AutoMap<>(); + ArrayList mValidRecords = new ArrayList<>(); for (ItemStack g : this.getInventory() .getInventory()) { if (g != null) { if (g.getItem() instanceof ItemRecord) { - mValidRecords.put(g); + mValidRecords.add(g); } } } diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java index aa6bfa9288..78d4f367eb 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java @@ -36,47 +36,24 @@ public class RenderDecayChest extends TileEntitySpecialRenderer { public void renderTileEntityAt(TileEntityDecayablesChest p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_) { - - int i = 0; - - if (true) { - this.bindTexture(mChestTexture); - GL11.glPushMatrix(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glTranslatef((float) p_147500_2_, (float) p_147500_4_ + 1.0F, (float) p_147500_6_ + 1.0F); - GL11.glScalef(1.0F, -1.0F, -1.0F); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - short short1 = 0; - - if (i == 2) { - short1 = 180; - } - - if (i == 3) { - short1 = 0; - } - - if (i == 4) { - short1 = 90; - } - - if (i == 5) { - short1 = -90; - } - - GL11.glRotatef((float) short1, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - float f1 = p_147500_1_.prevLidAngle + (p_147500_1_.lidAngle - p_147500_1_.prevLidAngle) * p_147500_8_; - - f1 = 1.0F - f1; - f1 = 1.0F - f1 * f1 * f1; - mChestModel.chestLid.rotateAngleX = -(f1 * GTPPCore.PI / 2.0F); - mChestModel.renderAll(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - } + this.bindTexture(mChestTexture); + GL11.glPushMatrix(); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glTranslatef((float) p_147500_2_, (float) p_147500_4_ + 1.0F, (float) p_147500_6_ + 1.0F); + GL11.glScalef(1.0F, -1.0F, -1.0F); + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + GL11.glRotatef(0.0f, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + float f1 = p_147500_1_.prevLidAngle + (p_147500_1_.lidAngle - p_147500_1_.prevLidAngle) * p_147500_8_; + + f1 = 1.0F - f1; + f1 = 1.0F - f1 * f1 * f1; + mChestModel.chestLid.rotateAngleX = -(f1 * GTPPCore.PI / 2.0F); + mChestModel.renderAll(); + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + GL11.glPopMatrix(); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); } @Override diff --git a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java index 56ba05f21f..0001f825d8 100644 --- a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java +++ b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java @@ -17,7 +17,6 @@ import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.NBTUtils; @@ -66,8 +65,7 @@ public class CommandEnableDebugWhileRunning implements ICommand { int aMaxArgumentsAllowed = 2; if ((argString == null || argString.length == 0 || argString.length > aMaxArgumentsAllowed) - || argString[0].toLowerCase() - .equals("?")) { + || argString[0].equalsIgnoreCase("?")) { Logger.INFO("Listing commands and their uses."); final EntityPlayer P = CommandUtils.getPlayer(S); AsmConfig.disableAllLogging = !AsmConfig.disableAllLogging; @@ -79,143 +77,132 @@ public class CommandEnableDebugWhileRunning implements ICommand { PlayerUtils.messagePlayer( P, "debug - Toggles GT++ Debug Mode. Only use when advised, may break everything. (OP)"); - } else if (argString[0].toLowerCase() - .equals("debug")) { - Logger.INFO("Toggling Debug Mode."); - final EntityPlayer P = CommandUtils.getPlayer(S); - if (PlayerUtils.isPlayerOP(P)) { - PreloaderCore.DEBUG_MODE = !PreloaderCore.DEBUG_MODE; - PlayerUtils.messagePlayer(P, "Toggled GT++ Debug Mode - Enabled: " + PreloaderCore.DEBUG_MODE); - } - } else if (argString[0].toLowerCase() - .equals("logging")) { - Logger.INFO("Toggling Logging."); - final EntityPlayer P = CommandUtils.getPlayer(S); - AsmConfig.disableAllLogging = !AsmConfig.disableAllLogging; - PlayerUtils.messagePlayer(P, "Toggled GT++ Logging - Enabled: " + (!AsmConfig.disableAllLogging)); - } + } else if (argString[0].equalsIgnoreCase("debug")) { + Logger.INFO("Toggling Debug Mode."); + final EntityPlayer P = CommandUtils.getPlayer(S); + if (PlayerUtils.isPlayerOP(P)) { + PreloaderCore.DEBUG_MODE = !PreloaderCore.DEBUG_MODE; + PlayerUtils.messagePlayer(P, "Toggled GT++ Debug Mode - Enabled: " + PreloaderCore.DEBUG_MODE); + } + } else if (argString[0].equalsIgnoreCase("logging")) { + Logger.INFO("Toggling Logging."); + final EntityPlayer P = CommandUtils.getPlayer(S); + AsmConfig.disableAllLogging = !AsmConfig.disableAllLogging; + PlayerUtils.messagePlayer(P, "Toggled GT++ Logging - Enabled: " + (!AsmConfig.disableAllLogging)); + } /* * else if (argString[0].toLowerCase().equals("test")) { ItemStack mSemiFluidgen = * ItemUtils.simpleMetaStack("IC2:blockGenerator", 7, 1); final EntityPlayer P = CommandUtils.getPlayer(S); * if(mSemiFluidgen != null) { PlayerUtils.messagePlayer(P, ItemUtils.getItemName(mSemiFluidgen)); } } */ - else if (argString[0].toLowerCase() - .equals("inv")) { - final EntityPlayer P = CommandUtils.getPlayer(S); - if (P != null && !P.worldObj.isRemote) { - ItemStack[] aInv = P.inventory.mainInventory; - for (ItemStack aItem : aInv) { - if (aItem != null) { - String aModID = GameRegistry.findUniqueIdentifierFor(aItem.getItem()).modId; - String aRegistryName = GameRegistry.findUniqueIdentifierFor(aItem.getItem()).name; - Logger.INFO( - aModID + ":" - + aRegistryName - + ":" - + aItem.getItemDamage() - + " | " - + aItem.getDisplayName()); - } + else if (argString[0].equalsIgnoreCase("inv")) { + final EntityPlayer P = CommandUtils.getPlayer(S); + if (P != null && !P.worldObj.isRemote) { + ItemStack[] aInv = P.inventory.mainInventory; + for (ItemStack aItem : aInv) { + if (aItem != null) { + String aModID = GameRegistry.findUniqueIdentifierFor(aItem.getItem()).modId; + String aRegistryName = GameRegistry.findUniqueIdentifierFor(aItem.getItem()).name; + Logger.INFO( + aModID + ":" + + aRegistryName + + ":" + + aItem.getItemDamage() + + " | " + + aItem.getDisplayName()); } - PlayerUtils.messagePlayer(P, "Dumped Inventory."); } - } else if (argString[0].toLowerCase() - .equals("hand")) { - final EntityPlayer P = CommandUtils.getPlayer(S); - if (P != null) { - ItemStack aHeldItem = PlayerUtils.getItemStackInPlayersHand(P); - if (aHeldItem != null) { - String aItemDisplayName = ItemUtils.getItemName(aHeldItem); - String aItemUnlocalName = ItemUtils.getUnlocalizedItemName(aHeldItem); - String aNbtString = tryIterateNBTData(aHeldItem); - AutoMap aOreDictNames = new AutoMap<>(); + PlayerUtils.messagePlayer(P, "Dumped Inventory."); + } + } else if (argString[0].equalsIgnoreCase("hand")) { + final EntityPlayer P = CommandUtils.getPlayer(S); + if (P != null) { + ItemStack aHeldItem = PlayerUtils.getItemStackInPlayersHand(P); + if (aHeldItem != null) { + String aItemDisplayName = ItemUtils.getItemName(aHeldItem); + String aItemUnlocalName = ItemUtils.getUnlocalizedItemName(aHeldItem); + String aNbtString = tryIterateNBTData(aHeldItem); + ArrayList aOreDictNames = new ArrayList<>(); - int[] aOreIDs = OreDictionary.getOreIDs(aHeldItem); - for (int id : aOreIDs) { - String aOreNameFromID = OreDictionary.getOreName(id); - if (aOreNameFromID != null && aOreNameFromID.length() > 0 - && !aOreNameFromID.equals("Unknown")) { - aOreDictNames.add(aOreNameFromID); - } - } + int[] aOreIDs = OreDictionary.getOreIDs(aHeldItem); + for (int id : aOreIDs) { + String aOreNameFromID = OreDictionary.getOreName(id); + if (aOreNameFromID != null && aOreNameFromID.length() > 0 + && !aOreNameFromID.equals("Unknown")) { + aOreDictNames.add(aOreNameFromID); + } + } - String aOreDictData = ""; - if (!aOreDictNames.isEmpty()) { - for (String tag : aOreDictNames) { - aOreDictData += (tag + ", "); - } - if (aOreDictData.endsWith(", ")) { - aOreDictData = aOreDictData.substring(0, aOreDictData.length() - 2); - } - } + String aOreDictData = ""; + if (!aOreDictNames.isEmpty()) { + for (String tag : aOreDictNames) { + aOreDictData += (tag + ", "); + } + if (aOreDictData.endsWith(", ")) { + aOreDictData = aOreDictData.substring(0, aOreDictData.length() - 2); + } + } - AutoMap aFluidContainerData = new AutoMap<>(); - FluidStack aHeldItemFluid = FluidContainerRegistry.getFluidForFilledItem(aHeldItem); - if (aHeldItemFluid != null) { - aFluidContainerData - .put("FluidStack Unlocal Name: " + aHeldItemFluid.getUnlocalizedName()); - aFluidContainerData.put("FluidStack Local Name: " + aHeldItemFluid.getLocalizedName()); - aFluidContainerData.put( - "Fluid Unlocal Name: " + aHeldItemFluid.getFluid() - .getUnlocalizedName()); - aFluidContainerData.put("Fluid Local Name: " + aHeldItemFluid.getLocalizedName()); - aFluidContainerData.put( - "Fluid Name: " + aHeldItemFluid.getFluid() - .getName()); - } + ArrayList aFluidContainerData = new ArrayList<>(); + FluidStack aHeldItemFluid = FluidContainerRegistry.getFluidForFilledItem(aHeldItem); + if (aHeldItemFluid != null) { + aFluidContainerData.add("FluidStack Unlocal Name: " + aHeldItemFluid.getUnlocalizedName()); + aFluidContainerData.add("FluidStack Local Name: " + aHeldItemFluid.getLocalizedName()); + aFluidContainerData.add( + "Fluid Unlocal Name: " + aHeldItemFluid.getFluid() + .getUnlocalizedName()); + aFluidContainerData.add("Fluid Local Name: " + aHeldItemFluid.getLocalizedName()); + aFluidContainerData.add( + "Fluid Name: " + aHeldItemFluid.getFluid() + .getName()); + } - PlayerUtils.messagePlayer(P, "[" + aItemUnlocalName + "]" + "[" + aItemDisplayName + "] "); - if (aFluidContainerData.size() > 0) { - for (String s : aFluidContainerData) { - PlayerUtils.messagePlayer(P, "" + s); - } - } - if (!aOreDictNames.isEmpty()) { - PlayerUtils.messagePlayer(P, "" + aOreDictData); - } - if (aNbtString.length() > 0) { - PlayerUtils.messagePlayer(P, "" + aNbtString); - } - } else { - PlayerUtils.messagePlayer(P, "No item held."); + PlayerUtils.messagePlayer(P, "[" + aItemUnlocalName + "]" + "[" + aItemDisplayName + "] "); + if (!aFluidContainerData.isEmpty()) { + for (String s : aFluidContainerData) { + PlayerUtils.messagePlayer(P, s); } } - } else if (argString[0].toLowerCase() - .equals("fluid")) { - if (argString.length > 1 && argString[1] != null && argString[1].length() > 0) { - final EntityPlayer P = CommandUtils.getPlayer(S); - FluidStack aFluid = FluidUtils.getWildcardFluidStack(argString[1], 1); - if (P != null && aFluid != null) { - PlayerUtils - .messagePlayer(P, "Found fluid stack: " + FluidRegistry.getFluidName(aFluid)); - } else if (P != null && aFluid == null) { - PlayerUtils.messagePlayer(P, "Could not find any fluids."); - } - } - } else if (argString[0].toLowerCase() - .equals("item")) { - if (argString.length > 1 && argString[1] != null && argString[1].length() > 0) { - final EntityPlayer P = CommandUtils.getPlayer(S); - ItemStack aTest = ItemUtils.getItemStackFromFQRN(argString[1], 1); - if (P != null && aTest != null) { - PlayerUtils.messagePlayer(P, "Found fluid stack: " + ItemUtils.getItemName(aTest)); - } else if (P != null && aTest == null) { - PlayerUtils.messagePlayer(P, "Could not find valid item."); - } - } - } else { - final EntityPlayer P = CommandUtils.getPlayer(S); - PlayerUtils.messagePlayer(P, "Invalid command, use '?' as an argument for help.'"); - } + if (!aOreDictNames.isEmpty()) { + PlayerUtils.messagePlayer(P, aOreDictData); + } + if (!aNbtString.isEmpty()) { + PlayerUtils.messagePlayer(P, aNbtString); + } + } else { + PlayerUtils.messagePlayer(P, "No item held."); + } + } + } else if (argString[0].equalsIgnoreCase("fluid")) { + if (argString.length > 1 && argString[1] != null && !argString[1].isEmpty()) { + final EntityPlayer P = CommandUtils.getPlayer(S); + FluidStack aFluid = FluidUtils.getWildcardFluidStack(argString[1], 1); + if (P != null && aFluid != null) { + PlayerUtils.messagePlayer(P, "Found fluid stack: " + FluidRegistry.getFluidName(aFluid)); + } else if (P != null) { + PlayerUtils.messagePlayer(P, "Could not find any fluids."); + } + } + } else if (argString[0].equalsIgnoreCase("item")) { + if (argString.length > 1 && argString[1] != null && !argString[1].isEmpty()) { + final EntityPlayer P = CommandUtils.getPlayer(S); + ItemStack aTest = ItemUtils.getItemStackFromFQRN(argString[1], 1); + if (P != null && aTest != null) { + PlayerUtils.messagePlayer(P, "Found fluid stack: " + ItemUtils.getItemName(aTest)); + } else if (P != null) { + PlayerUtils.messagePlayer(P, "Could not find valid item."); + } + } + } else { + final EntityPlayer P = CommandUtils.getPlayer(S); + PlayerUtils.messagePlayer(P, "Invalid command, use '?' as an argument for help.'"); + } } @Override public boolean canCommandSenderUseCommand(final ICommandSender var1) { - if (var1 == null || CommandUtils.getPlayer(var1) == null) { - return false; - } - return true; + return var1 != null && CommandUtils.getPlayer(var1) != null; } @Override @@ -241,34 +228,34 @@ public class CommandEnableDebugWhileRunning implements ICommand { public static String tryIterateNBTData(ItemStack aStack) { try { - AutoMap aItemDataTags = new AutoMap<>(); + ArrayList aItemDataTags = new ArrayList<>(); NBTTagCompound aNBT = NBTUtils.getNBT(aStack); - if (aNBT != null) { - if (!aNBT.hasNoTags()) { - Map mInternalMap = ReflectionUtils.getField(aNBT, "tagMap"); - if (mInternalMap != null) { - for (Map.Entry e : mInternalMap.entrySet()) { - aItemDataTags.add( - e.getKey() - .toString() + ":" - + e.getValue()); - } - int a = 0; - String data = ""; - for (String tag : aItemDataTags) { - data += (tag + ", "); - } - if (data.endsWith(", ")) { - data = data.substring(0, data.length() - 2); - } - return data; - } else { - Logger.INFO("Data map reflected from NBTTagCompound was not valid."); - return "Bad NBT"; + if (!aNBT.hasNoTags()) { + Map mInternalMap = ReflectionUtils.getField(aNBT, "tagMap"); + if (mInternalMap != null) { + for (Map.Entry e : mInternalMap.entrySet()) { + aItemDataTags.add( + e.getKey() + .toString() + ":" + + e.getValue()); + } + int a = 0; + StringBuilder data = new StringBuilder(); + for (String tag : aItemDataTags) { + data.append(tag) + .append(", "); + } + if (data.toString() + .endsWith(", ")) { + data = new StringBuilder(data.substring(0, data.length() - 2)); } + return data.toString(); + } else { + Logger.INFO("Data map reflected from NBTTagCompound was not valid."); + return "Bad NBT"; } } - } catch (Throwable t) {} + } catch (Throwable ignored) {} return ""; } } diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java index 066dacdd9c..162b8ac1ab 100644 --- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java @@ -2,10 +2,8 @@ package gtPlusPlus.core.common; import net.minecraft.entity.monster.EntityBlaze; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.event.entity.living.LivingAttackEvent; import baubles.common.container.InventoryBaubles; @@ -21,8 +19,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import galaxyspace.core.entity.mob.EntityEvolvedColdBlaze; import gregtech.api.enums.Mods; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.entity.InternalEntityRegistry; @@ -197,8 +193,6 @@ public class CommonProxy { } } - protected final AutoMap> mItemRenderMappings = new AutoMap<>(); - public World getClientWorld() { return null; } diff --git a/src/main/java/gtPlusPlus/core/handler/CompatHandler.java b/src/main/java/gtPlusPlus/core/handler/CompatHandler.java index 83426c18c4..1c44216344 100644 --- a/src/main/java/gtPlusPlus/core/handler/CompatHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/CompatHandler.java @@ -5,6 +5,7 @@ import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Mods.Witchery; +import java.util.ArrayList; import java.util.LinkedList; import java.util.Queue; import java.util.Set; @@ -16,7 +17,6 @@ import gregtech.api.enums.GTValues; import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.common.compat.CompatExtraUtils; import gtPlusPlus.core.common.compat.CompatHarvestCraft; @@ -258,11 +258,11 @@ public class CompatHandler { runQueuedOnLoadComplete(event); } - public static final AutoMap> mRecipesToGenerate = new AutoMap<>(); - public static final AutoMap> mGtRecipesToGenerate = new AutoMap<>(); + public static final ArrayList> mRecipesToGenerate = new ArrayList<>(); + public static final ArrayList> mGtRecipesToGenerate = new ArrayList<>(); - public static final AutoMap> mObjectsToRunInPostInit = new AutoMap<>(); - public static final AutoMap mObjectsToRunInOnLoadComplete = new AutoMap<>(); + public static final ArrayList> mObjectsToRunInPostInit = new ArrayList<>(); + public static final ArrayList mObjectsToRunInOnLoadComplete = new ArrayList<>(); public static void runQueuedRecipes() { // Add autogenerated Recipes from Item Components diff --git a/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java b/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java index 769973f617..36e3b6edd8 100644 --- a/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java +++ b/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java @@ -1,14 +1,15 @@ package gtPlusPlus.core.handler.Recipes; +import java.util.ArrayList; + import net.minecraft.item.ItemStack; import gregtech.api.util.GTUtility; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.util.minecraft.ItemUtils; public class DecayableRecipe { - public static final AutoMap mRecipes = new AutoMap<>(); + public static final ArrayList mRecipes = new ArrayList<>(); public final int mTime; public final ItemStack mInput; @@ -18,7 +19,7 @@ public class DecayableRecipe { mTime = time; mInput = input; mOutput = output; - mRecipes.put(this); + mRecipes.add(this); } @Override diff --git a/src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java b/src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java index 4baa7a80dd..35970d9165 100644 --- a/src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java @@ -18,7 +18,6 @@ import com.kuba6000.mobsinfo.api.MobRecipe; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Triplet; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.util.math.MathUtils; @@ -28,7 +27,7 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils; @Optional.Interface(iface = "com.kuba6000.mobsinfo.api.IMobExtraInfoProvider", modid = "mobsinfo") public class EntityDeathHandler implements IMobExtraInfoProvider { - private static final HashMap>> mMobDropMap = new HashMap<>(); + private static final HashMap>> mMobDropMap = new HashMap<>(); private static final HashSet mInternalClassKeyCache = new HashSet<>(); /** @@ -41,11 +40,11 @@ public class EntityDeathHandler implements IMobExtraInfoProvider { */ public static void registerDropsForMob(Class aMobClass, ItemStack aStack, int aMaxAmount, int aChance) { Triplet aData = new Triplet<>(aStack, aMaxAmount, aChance); - AutoMap> aDataMap = mMobDropMap.get(aMobClass); + ArrayList> aDataMap = mMobDropMap.get(aMobClass); if (aDataMap == null) { - aDataMap = new AutoMap<>(); + aDataMap = new ArrayList<>(); } - aDataMap.put(aData); + aDataMap.add(aData); mMobDropMap.put(aMobClass, aDataMap); Logger.INFO( @@ -69,7 +68,7 @@ public class EntityDeathHandler implements IMobExtraInfoProvider { } private static boolean processDropsForMob(EntityLivingBase entityLiving) { - AutoMap> aMobData = mMobDropMap.get(entityLiving.getClass()); + ArrayList> aMobData = mMobDropMap.get(entityLiving.getClass()); boolean aDidDrop = false; if (aMobData != null) { if (!aMobData.isEmpty()) { @@ -137,7 +136,7 @@ public class EntityDeathHandler implements IMobExtraInfoProvider { @Override public void provideExtraDropsInformation(@NotNull String entityString, @NotNull ArrayList drops, @NotNull MobRecipe recipe) { - AutoMap> dropEntry = mMobDropMap.get(recipe.entity.getClass()); + ArrayList> dropEntry = mMobDropMap.get(recipe.entity.getClass()); if (dropEntry != null && !dropEntry.isEmpty()) { for (Triplet data : dropEntry) { diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index cdb61a5e46..12e127c3b7 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -958,23 +958,21 @@ public final class ModItems { MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.GEAR, MaterialsElements.STANDALONE.RHUGNOR); // Special Sillyness - if (true) { - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateSodium", 1) == null) { - new BaseItemPlate(MaterialsElements.getInstance().SODIUM); - } + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateSodium", 1) == null) { + new BaseItemPlate(MaterialsElements.getInstance().SODIUM); + } - Material meatRaw = MaterialsOther.MEAT; - // A plate of Meat. - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateMeatRaw", 1) == null) { - itemPlateRawMeat = new BaseItemPlate(meatRaw); - ItemUtils.registerFuel(ItemUtils.getSimpleStack(itemPlateRawMeat), 100); - } - // A Block of Meat. - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("blockMeatRaw", 1) == null) { - blockRawMeat = new BlockBaseModular(meatRaw, BlockTypes.STANDARD); - ItemUtils.registerFuel(ItemUtils.getSimpleStack(blockRawMeat), 900); - } + Material meatRaw = MaterialsOther.MEAT; + // A plate of Meat. + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateMeatRaw", 1) == null) { + itemPlateRawMeat = new BaseItemPlate(meatRaw); + ItemUtils.registerFuel(ItemUtils.getSimpleStack(itemPlateRawMeat), 100); + } + // A Block of Meat. + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("blockMeatRaw", 1) == null) { + blockRawMeat = new BlockBaseModular(meatRaw, BlockTypes.STANDARD); + ItemUtils.registerFuel(ItemUtils.getSimpleStack(blockRawMeat), 900); } // A plate of Vanadium. diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java index 54cfefbac2..240c0851e1 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.item.base.itemblock; +import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; @@ -13,12 +14,11 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.interfaces.ITileTooltip; -import gtPlusPlus.api.objects.data.AutoMap; public class ItemBlockMeta extends ItemBlockWithMetadata { private final Block mBlock; - private HashMap> aTooltips = new LinkedHashMap<>(); + private HashMap> aTooltips = new LinkedHashMap<>(); public ItemBlockMeta(final Block aBlock) { super(aBlock, aBlock); @@ -36,11 +36,9 @@ public class ItemBlockMeta extends ItemBlockWithMetadata { Block aThis = Block.getBlockFromItem(stack.getItem()); if (aThis != null) { if (!aTooltips.isEmpty()) { - AutoMap h = aTooltips.get(stack.getItemDamage()); + ArrayList h = aTooltips.get(stack.getItemDamage()); if (h != null && !h.isEmpty()) { - for (String s : h) { - list.add(s); - } + list.addAll(h); } } } diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java index 45d0e4f60e..538436d610 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.item.base.itemblock; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -12,7 +13,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.block.base.BlockBaseOre; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; @@ -40,27 +40,26 @@ public class ItemBlockOre extends ItemBlock { } } - private static Map> mMapOreBlockItemToDimName = new LinkedHashMap<>(); + private static final Map> mMapOreBlockItemToDimName = new LinkedHashMap<>(); private static boolean mInitOres_Everglades = false; - private AutoMap mDimsForThisOre = new AutoMap<>(); + private HashSet mDimsForThisOre = new HashSet<>(); @Override - public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, + final boolean bool) { if (!mInitOres_Everglades) { for (WorldGen_GT_Ore_Layer f : gtPlusPlus.everglades.gen.gt.WorldGen_Ores.validOreveins.values()) { Material[] m2 = new Material[] { f.mPrimary, f.mSecondary, f.mBetween, f.mSporadic }; for (Material m1 : m2) { - AutoMap aMap = mMapOreBlockItemToDimName.get( + HashSet aMap = mMapOreBlockItemToDimName.get( m1.getUnlocalizedName() .toLowerCase()); if (aMap == null) { - aMap = new AutoMap<>(); + aMap = new HashSet<>(); } String aDimName = "Everglades"; - if (!aMap.containsValue(aDimName)) { - aMap.put(aDimName); - } + aMap.add(aDimName); mMapOreBlockItemToDimName.put( m1.getUnlocalizedName() .toLowerCase(), @@ -104,7 +103,7 @@ public class ItemBlockOre extends ItemBlock { } if (mDimsForThisOre.isEmpty()) { - AutoMap A = mMapOreBlockItemToDimName.get( + HashSet A = mMapOreBlockItemToDimName.get( this.mThisMaterial.getUnlocalizedName() .toLowerCase()); if (A != null) { diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java index 1e05e123cb..c1a4ae845a 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java @@ -33,7 +33,6 @@ import gregtech.api.enums.TierEU; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.item.circuit.GTPPIntegratedCircuitItem; import gtPlusPlus.core.recipe.common.CI; @@ -50,7 +49,7 @@ public class AgriculturalChem extends ItemPackage { private static boolean aBOP; private static boolean aTiCon; - private static AutoMap mBloodFluids = new AutoMap<>(); + private static ArrayList mBloodFluids = new ArrayList<>(); /** * Fluids @@ -306,7 +305,7 @@ public class AgriculturalChem extends ItemPackage { if (aBlood != null) { Logger.INFO("Found Biome's o Plenty, enabled Blood support."); CustomBlood = aBlood.getFluid(); - mBloodFluids.put(aBlood); + mBloodFluids.add(aBlood); } } @@ -315,7 +314,7 @@ public class AgriculturalChem extends ItemPackage { if (aBlood != null) { Logger.INFO("Found Tinker's Construct, enabled Blood support."); CustomBlood = aBlood.getFluid(); - mBloodFluids.put(FluidUtils.getFluidStack("blood", 100)); + mBloodFluids.add(FluidUtils.getFluidStack("blood", 100)); } } @@ -336,24 +335,24 @@ public class AgriculturalChem extends ItemPackage { } } Logger.INFO("Using " + CustomBlood.getName()); - mBloodFluids.put(FluidUtils.getFluidStack(CustomBlood, 100)); + mBloodFluids.add(FluidUtils.getFluidStack(CustomBlood, 100)); } } - private static final AutoMap mMeats = new AutoMap<>(); - private static final AutoMap mFish = new AutoMap<>(); - private static final AutoMap mFruits = new AutoMap<>(); - private static final AutoMap mVege = new AutoMap<>(); - private static final AutoMap mNuts = new AutoMap<>(); - private static final AutoMap mSeeds = new AutoMap<>(); - private static final AutoMap mPeat = new AutoMap<>(); - private static final AutoMap mBones = new AutoMap<>(); - private static final AutoMap mBoneMeal = new AutoMap<>(); - - private static final AutoMap mList_Master_Meats = new AutoMap<>(); - private static final AutoMap mList_Master_FruitVege = new AutoMap<>(); - private static final AutoMap mList_Master_Seeds = new AutoMap<>(); - private static final AutoMap mList_Master_Bones = new AutoMap<>(); + private static final ArrayList mMeats = new ArrayList<>(); + private static final ArrayList mFish = new ArrayList<>(); + private static final ArrayList mFruits = new ArrayList<>(); + private static final ArrayList mVege = new ArrayList<>(); + private static final ArrayList mNuts = new ArrayList<>(); + private static final ArrayList mSeeds = new ArrayList<>(); + private static final ArrayList mPeat = new ArrayList<>(); + private static final ArrayList mBones = new ArrayList<>(); + private static final ArrayList mBoneMeal = new ArrayList<>(); + + private static final ArrayList mList_Master_Meats = new ArrayList<>(); + private static final ArrayList mList_Master_FruitVege = new ArrayList<>(); + private static final ArrayList mList_Master_Seeds = new ArrayList<>(); + private static final ArrayList mList_Master_Bones = new ArrayList<>(); private static void processAllOreDict() { processOreDict("listAllmeatraw", mMeats); @@ -367,9 +366,7 @@ public class AgriculturalChem extends ItemPackage { processOreDict("dustBone", mBoneMeal); // Just make a mega list, makes life easier. if (!mMeats.isEmpty()) { - for (ItemStack g : mMeats) { - mList_Master_Meats.put(g); - } + mList_Master_Meats.addAll(mMeats); } if (!mFish.isEmpty()) { for (ItemStack g : mFish) { @@ -381,33 +378,23 @@ public class AgriculturalChem extends ItemPackage { } } if (foundDupe) continue; - mList_Master_Meats.put(g); + mList_Master_Meats.add(g); } } if (!mFruits.isEmpty()) { - for (ItemStack g : mFruits) { - mList_Master_FruitVege.put(g); - } + mList_Master_FruitVege.addAll(mFruits); } if (!mVege.isEmpty()) { - for (ItemStack g : mVege) { - mList_Master_FruitVege.put(g); - } + mList_Master_FruitVege.addAll(mVege); } if (!mNuts.isEmpty()) { - for (ItemStack g : mNuts) { - mList_Master_FruitVege.put(g); - } + mList_Master_FruitVege.addAll(mNuts); } if (!mSeeds.isEmpty()) { - for (ItemStack g : mSeeds) { - mList_Master_Seeds.put(g); - } + mList_Master_Seeds.addAll(mSeeds); } if (!mBoneMeal.isEmpty()) { - for (ItemStack g : mBoneMeal) { - mList_Master_Bones.put(g); - } + mList_Master_Bones.addAll(mBoneMeal); } if (!mBones.isEmpty()) { for (ItemStack g : mBones) { @@ -419,17 +406,15 @@ public class AgriculturalChem extends ItemPackage { } } if (foundDupe) continue; - mList_Master_Bones.put(g); + mList_Master_Bones.add(g); } } } - private static void processOreDict(String aOreName, AutoMap aMap) { + private static void processOreDict(String aOreName, ArrayList aMap) { ArrayList aTemp = OreDictionary.getOres(aOreName); if (!aTemp.isEmpty()) { - for (ItemStack stack : aTemp) { - aMap.put(stack); - } + aMap.addAll(aTemp); } } diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java index 4909d269cc..e945729cf8 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java @@ -8,6 +8,7 @@ import static gregtech.api.util.GTRecipeConstants.CHEMPLANT_CASING_TIER; import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.*; +import java.util.ArrayList; import java.util.HashMap; import net.minecraft.item.Item; @@ -22,7 +23,6 @@ import gregtech.api.enums.TierEU; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.api.objects.data.Quad; import gtPlusPlus.api.objects.minecraft.ItemPackage; @@ -642,10 +642,10 @@ public class MilledOreProcessing extends ItemPackage { } private void addPineOilExtraction() { - AutoMap aLogs = new AutoMap<>(); - AutoMap aLeaves = new AutoMap<>(); - AutoMap aSaplings = new AutoMap<>(); - AutoMap aPinecones = new AutoMap<>(); + ArrayList aLogs = new ArrayList<>(); + ArrayList aLeaves = new ArrayList<>(); + ArrayList aSaplings = new ArrayList<>(); + ArrayList aPinecones = new ArrayList<>(); ItemStack aCrushedPine = ItemUtils.getSimpleStack(AgriculturalChem.mCrushedPine, 1); @@ -745,10 +745,10 @@ public class MilledOreProcessing extends ItemPackage { public static ItemStack[] cleanArray(ItemStack[] input) { int aArraySize = input.length; - AutoMap aCleanedItems = new AutoMap<>(); + ArrayList aCleanedItems = new ArrayList<>(); for (ItemStack checkStack : input) { if (ItemUtils.checkForInvalidItems(checkStack)) { - aCleanedItems.put(checkStack); + aCleanedItems.add(checkStack); } } ItemStack[] aOutput = new ItemStack[aCleanedItems.size()]; @@ -799,10 +799,9 @@ public class MilledOreProcessing extends ItemPackage { private static ItemStack[] getArrayFromQuad( Quad, Pair, Pair, Pair> aData) { - AutoMap aOutputs = new AutoMap<>(); + ArrayList aOutputs = new ArrayList<>(); for (Object aPair : aData.values()) { - if (aPair != null && Pair.class.isInstance(aPair)) { - Pair aObj = (Pair) aPair; + if (aPair instanceof Pair aObj) { Material aMat = (Material) aObj.getKey(); int aCount = (int) aObj.getValue(); aOutputs.addAll(getItemStackFromPair(aMat, aCount)); @@ -816,23 +815,23 @@ public class MilledOreProcessing extends ItemPackage { return aRealOutputArray; } - private static AutoMap getItemStackFromPair(Material aMat, Integer aCount) { - AutoMap aOutputs = new AutoMap<>(); + private static ArrayList getItemStackFromPair(Material aMat, Integer aCount) { + ArrayList aOutputs = new ArrayList<>(); if (aCount > 64) { - AutoMap sizes = getStackSizes(aCount); + ArrayList sizes = getStackSizes(aCount); for (int aSplitSize : sizes) { ItemStack aDustStack = aMat.getDust(aSplitSize); - aOutputs.put(aDustStack); + aOutputs.add(aDustStack); } } else { ItemStack aDustStack = aMat.getDust(aCount); - aOutputs.put(aDustStack); + aOutputs.add(aDustStack); } return aOutputs; } - private static AutoMap getStackSizes(int aBigSize) { - AutoMap aSizes = new AutoMap<>(); + private static ArrayList getStackSizes(int aBigSize) { + ArrayList aSizes = new ArrayList<>(); if (aBigSize <= 64) { aSizes.add(aBigSize); } else { diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java index 1604bcb571..0c3d481fd7 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java @@ -2,6 +2,7 @@ package gtPlusPlus.core.item.chemistry; import static gregtech.api.enums.Mods.GTPlusPlus; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -12,7 +13,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.item.base.misc.BaseItemParticle; import gtPlusPlus.core.material.Particle; import gtPlusPlus.core.material.Particle.ElementaryGroup; @@ -87,7 +87,7 @@ public class StandardBaseParticles extends BaseItemParticle { } public static Particle getParticle(ItemStack aStack) { - AutoMap g = Particle.aMap; + ArrayList g = Particle.aMap; for (Particle p : g) { String aPartName = Utils.sanitizeString(p.mParticleName.toLowerCase()); String expectedPart = Utils.sanitizeString(aTypes[aStack.getItemDamage()].toLowerCase()); diff --git a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java index 01f2b1b263..5c38dde63b 100644 --- a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java +++ b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java @@ -3,6 +3,7 @@ package gtPlusPlus.core.item.food; import static gregtech.api.enums.Mods.GTPlusPlus; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -24,7 +25,6 @@ import gregtech.api.enums.Materials; import gregtech.api.objects.ItemData; import gregtech.api.objects.MaterialStack; import gregtech.api.util.GTOreDictUnificator; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.util.math.MathUtils; @@ -95,7 +95,7 @@ public class BaseItemMetaFood extends ItemFood { 4, 1, 64, - new AutoMap<>(), + new ArrayList<>(), new setOnFire(), getOreDictNamesAsArrayList("listAllmeatcooked")); } @@ -105,7 +105,7 @@ public class BaseItemMetaFood extends ItemFood { private static final HashMap mRarityMap = new HashMap<>(); private static final HashMap mHealAmountMap = new HashMap<>(); private static final HashMap mSaturationAmountMap = new HashMap<>(); - private static final HashMap> mPotionEffectsMap = new HashMap<>(); + private static final HashMap> mPotionEffectsMap = new HashMap<>(); private static final HashMap mHasSpecialBehaviourMap = new HashMap<>(); private static final HashMap mSpecialBehaviourMap = new HashMap<>(); private static final HashMap> mOreDictNames = new HashMap<>(); @@ -119,7 +119,7 @@ public class BaseItemMetaFood extends ItemFood { aHealAmount, aSaturationModifier, aMaxStacksize, - new AutoMap<>(), + new ArrayList<>(), null, new ArrayList<>()); } @@ -133,27 +133,13 @@ public class BaseItemMetaFood extends ItemFood { aHealAmount, aSaturationModifier, aMaxStacksize, - new AutoMap<>(), + new ArrayList<>(), null, aOreDictNames); } public static void registerNewMetaFood(final int aMetaID, String aTooltip, final int aHealAmount, - final float aSaturationModifier, final int aMaxStacksize, final AutoMap aPotionEffects) { - registerNewMetaFood( - aMetaID, - aTooltip, - EnumRarity.common, - aHealAmount, - aSaturationModifier, - aMaxStacksize, - new AutoMap<>(), - null, - new ArrayList<>()); - } - - public static void registerNewMetaFood(final int aMetaID, String aTooltip, final int aHealAmount, - final float aSaturationModifier, final int aMaxStacksize, final AutoMap aPotionEffects, + final float aSaturationModifier, final int aMaxStacksize, final ArrayList aPotionEffects, final ArrayList aOreDictNames) { registerNewMetaFood( aMetaID, @@ -169,7 +155,7 @@ public class BaseItemMetaFood extends ItemFood { public static void registerNewMetaFood(final int aMetaID, String aTooltip, EnumRarity aRarity, final int aHealAmount, final float aSaturationModifier, final int aMaxStacksize, - final AutoMap aPotionEffects, final SpecialFoodBehaviour aSpecialBehaviour) { + final ArrayList aPotionEffects, final SpecialFoodBehaviour aSpecialBehaviour) { registerNewMetaFood( aMetaID, aTooltip, @@ -184,7 +170,7 @@ public class BaseItemMetaFood extends ItemFood { public static void registerNewMetaFood(final int aMetaID, String aTooltip, EnumRarity aRarity, final int aHealAmount, final float aSaturationModifier, final int aMaxStacksize, - final AutoMap aPotionEffects, final SpecialFoodBehaviour aSpecialBehaviour, + final ArrayList aPotionEffects, final SpecialFoodBehaviour aSpecialBehaviour, final ArrayList aOreDictNames) { mTotalMetaItems++; mMaxStackSizeMap.put(aMetaID, aMaxStacksize); @@ -257,8 +243,8 @@ public class BaseItemMetaFood extends ItemFood { @Override protected void onFoodEaten(final ItemStack aStack, final World aWorld, final EntityPlayer aPlayer) { // super.onFoodEaten(stack, world, player); - AutoMap aPotionEffects = mPotionEffectsMap.get(getMetaKey(aStack)); - if (!aWorld.isRemote && aPotionEffects != null && aPotionEffects.size() > 0) { + ArrayList aPotionEffects = mPotionEffectsMap.get(getMetaKey(aStack)); + if (!aWorld.isRemote && aPotionEffects != null && !aPotionEffects.isEmpty()) { for (PotionEffectPackage aFoodEffect : aPotionEffects) { if (MathUtils.randInt(0, 100) <= aFoodEffect.getChance() || aFoodEffect.getChance() == 100) { PotionEffect aEffect = aFoodEffect.getEffect(); @@ -426,12 +412,10 @@ public class BaseItemMetaFood extends ItemFood { } } - private static AutoMap getPotionEffectPackage(PotionEf