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) --- src/main/java/gregtech/api/enums/TAE.java | 19 +- .../java/gregtech/api/util/FishPondFakeRecipe.java | 11 +- .../java/gregtech/api/util/GasSpargingRecipe.java | 16 +- .../gregtech/api/util/GasSpargingRecipeMap.java | 11 +- src/main/java/gtPlusPlus/GTplusplus.java | 34 +- .../java/gtPlusPlus/api/objects/data/AutoMap.java | 356 -------------------- .../api/objects/data/weakref/WeakAutoMap.java | 14 - .../gtPlusPlus/api/objects/minecraft/BlockPos.java | 42 ++- .../api/objects/minecraft/CubicObject.java | 6 +- .../api/objects/minecraft/ItemPackage.java | 4 +- .../api/objects/minecraft/ShapedRecipe.java | 13 +- .../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 +- .../gtPlusPlus/plugin/agrichem/BioRecipes.java | 39 ++- .../plugin/agrichem/item/algae/ItemAlgaeBase.java | 4 +- .../plugin/agrichem/logic/AlgaeGeneticData.java | 14 +- .../gtPlusPlus/plugin/manager/CoreManager.java | 7 +- .../nbthandlers/MTEHatchCatalysts.java | 7 +- .../nbthandlers/MTEHatchMillingBalls.java | 7 +- .../nbthandlers/MTEHatchNbtConsumable.java | 9 +- .../common/blocks/textures/TexturesGtBlock.java | 7 +- .../xmod/gregtech/common/render/CapeRenderer.java | 28 +- .../basic/MTEAtmosphericReconditioner.java | 55 ++-- .../machines/multi/processing/MTEIsaMill.java | 17 +- .../multi/production/MTEIndustrialFishingPond.java | 34 +- .../production/chemplant/MTEChemicalPlant.java | 3 +- .../production/turbines/MTELargerTurbineBase.java | 5 +- .../gregtech/loaders/RecipeGenAlloySmelter.java | 2 +- .../xmod/gregtech/loaders/RecipeGenAssembler.java | 2 +- .../gregtech/loaders/RecipeGenBlastSmelter.java | 2 +- .../gregtech/loaders/RecipeGenDustGeneration.java | 2 +- .../xmod/gregtech/loaders/RecipeGenExtruder.java | 2 +- .../xmod/gregtech/loaders/RecipeGenFluids.java | 2 +- .../xmod/gregtech/loaders/RecipeGenFluorite.java | 2 +- .../loaders/RecipeGenMaterialProcessing.java | 7 +- .../gregtech/loaders/RecipeGenMetalRecipe.java | 2 +- .../RecipeGenMultisUsingFluidInsteadOfCells.java | 11 +- .../xmod/gregtech/loaders/RecipeGenOre.java | 11 +- .../xmod/gregtech/loaders/RecipeGenPlasma.java | 2 +- .../xmod/gregtech/loaders/RecipeGenPlates.java | 2 +- .../xmod/gregtech/loaders/RecipeGenRecycling.java | 7 +- .../gregtech/loaders/RecipeGenShapedCrafting.java | 2 +- .../loaders/recipe/RecipeLoaderAlgaeFarm.java | 68 ++-- .../gregtech/loaders/recipe/RecipeLoaderLFTR.java | 15 +- .../thaumcraft/objects/ThreadAspectScanner.java | 13 +- .../gtPlusPlus/xmod/tinkers/HandlerTinkers.java | 5 +- .../xmod/tinkers/material/BaseTinkersMaterial.java | 2 +- .../xmod/tinkers/util/TinkersDryingRecipe.java | 8 +- .../gtnhlanth/common/hatch/MTEBusInputFocus.java | 11 +- 82 files changed, 873 insertions(+), 1368 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/api/objects/data/AutoMap.java delete mode 100644 src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java (limited to 'src/main/java') diff --git a/src/main/java/gregtech/api/enums/TAE.java b/src/main/java/gregtech/api/enums/TAE.java index 79d3037a5a..48a39da036 100644 --- a/src/main/java/gregtech/api/enums/TAE.java +++ b/src/main/java/gregtech/api/enums/TAE.java @@ -6,7 +6,6 @@ import java.util.HashSet; import gregtech.api.interfaces.ITexture; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -53,22 +52,22 @@ public class TAE { } public static void finalizeTAE() { - String aFreeSpaces = ""; - String aPageAndSlotFree = ""; - AutoMap aTemp = new AutoMap<>(mFreeSlots); + StringBuilder aFreeSpaces = new StringBuilder(); + StringBuilder aPageAndSlotFree = new StringBuilder(); + Integer[] aTemp = mFreeSlots.toArray(new Integer[] {}); for (int i = 0; i < mFreeSlots.size(); i++) { - int j = aTemp.get(i); - aFreeSpaces += j; - aPageAndSlotFree += getPageFromIndex(j); + int j = aTemp[i]; + aFreeSpaces.append(j); + aPageAndSlotFree.append(getPageFromIndex(j)); if (i != (mFreeSlots.size() - 1)) { - aFreeSpaces += ", "; - aPageAndSlotFree += ", "; + aFreeSpaces.append(", "); + aPageAndSlotFree.append(", "); } } Logger.INFO("Free Indexes within TAE: " + aFreeSpaces); Logger.INFO("Free Page slots within TAE: " + aPageAndSlotFree); Logger.INFO("Filling them with ERROR textures."); - for (int aFreeSlot : aTemp.values()) { + for (int aFreeSlot : aTemp) { registerTexture(aFreeSlot, new GTPPCopiedBlockTexture(ModBlocks.blockCasingsTieredGTPP, 1, 15)); } Logger.INFO("Finalising TAE."); diff --git a/src/main/java/gregtech/api/util/FishPondFakeRecipe.java b/src/main/java/gregtech/api/util/FishPondFakeRecipe.java index 8f36600e2a..2deb38dccf 100644 --- a/src/main/java/gregtech/api/util/FishPondFakeRecipe.java +++ b/src/main/java/gregtech/api/util/FishPondFakeRecipe.java @@ -11,7 +11,6 @@ import net.minecraftforge.common.FishingHooks; import gregtech.api.enums.GTValues; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -36,13 +35,13 @@ public class FishPondFakeRecipe { e.printStackTrace(); } - AutoMap> mega = new AutoMap<>(); - mega.put(fish); - mega.put(junk); - mega.put(treasure); + ArrayList> mega = new ArrayList<>(); + mega.add(fish); + mega.add(junk); + mega.add(treasure); int mType = 14; - for (ArrayList f : mega.values()) { + for (ArrayList f : mega) { for (WeightedRandomFishable weightedRandomFishable : f) { if (weightedRandomFishable != null) { WeightedRandomFishable u = weightedRandomFishable; diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipe.java b/src/main/java/gregtech/api/util/GasSpargingRecipe.java index 527359e0e8..0e8deb285b 100644 --- a/src/main/java/gregtech/api/util/GasSpargingRecipe.java +++ b/src/main/java/gregtech/api/util/GasSpargingRecipe.java @@ -1,9 +1,10 @@ package gregtech.api.util; +import java.util.ArrayList; + import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.TierEU; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.util.data.ArrayUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -92,12 +93,11 @@ public class GasSpargingRecipe implements Comparable { } public String[] getRecipeInfo() { - AutoMap result = new AutoMap<>(); - result.put("Input " + ItemUtils.getArrayStackNames(mFluidInputs)); - result.put("Output " + ItemUtils.getArrayStackNames(mFluidOutputs)); - result.put("Duration: " + mDuration); - result.put("EU/t: " + mEUt); - String s[] = result.toArray(); - return s; + ArrayList result = new ArrayList<>(); + result.add("Input " + ItemUtils.getArrayStackNames(mFluidInputs)); + result.add("Output " + ItemUtils.getArrayStackNames(mFluidOutputs)); + result.add("Duration: " + mDuration); + result.add("EU/t: " + mEUt); + return result.toArray(new String[] {}); } } diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java index 6dcc7721e0..ece9c024e4 100644 --- a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java +++ b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java @@ -2,15 +2,14 @@ package gregtech.api.util; import static gregtech.api.enums.Mods.GregTech; -import net.minecraftforge.fluids.FluidStack; +import java.util.HashSet; -import gtPlusPlus.api.objects.data.AutoMap; +import net.minecraftforge.fluids.FluidStack; -public class GasSpargingRecipeMap extends AutoMap { +public class GasSpargingRecipeMap { - public static final AutoMap mRecipes = new AutoMap<>(); + public static final HashSet mRecipes = new HashSet<>(); public static final String mUnlocalizedName = "gtpp.recipe.lftr.sparging"; - public static final String mNEIName = mUnlocalizedName; public static final String mNEIDisplayName = "LFTR Gas Sparging"; public static final String mNEIGUIPath = GregTech.getResourcePath("textures", "gui/basicmachines/FissionFuel.png"); @@ -30,7 +29,7 @@ public class GasSpargingRecipeMap extends AutoMap { } int aMapSize = mRecipes.size(); GasSpargingRecipe aRecipe = new GasSpargingRecipe(aSpargeGas, aSpentFuel, aSpargedFuel, aOutputs, aMaxOutputs); - mRecipes.put(aRecipe); + mRecipes.add(aRecipe); return mRecipes.size() > aMapSize; } diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java index ef6b1759e9..8823304e89 100644 --- a/src/main/java/gtPlusPlus/GTplusplus.java +++ b/src/main/java/gtPlusPlus/GTplusplus.java @@ -280,25 +280,25 @@ public class GTplusplus implements ActionListener { } private static void setupMaterialBlacklist() { - Material.invalidMaterials.put(Materials._NULL); - Material.invalidMaterials.put(Materials.Clay); - Material.invalidMaterials.put(Materials.Phosphorus); - Material.invalidMaterials.put(Materials.Steel); - Material.invalidMaterials.put(Materials.Bronze); - Material.invalidMaterials.put(Materials.Hydrogen); + Material.invalidMaterials.add(Materials._NULL); + Material.invalidMaterials.add(Materials.Clay); + Material.invalidMaterials.add(Materials.Phosphorus); + Material.invalidMaterials.add(Materials.Steel); + Material.invalidMaterials.add(Materials.Bronze); + Material.invalidMaterials.add(Materials.Hydrogen); // Infused TC stuff - Material.invalidMaterials.put(Materials.InfusedAir); - Material.invalidMaterials.put(Materials.InfusedEarth); - Material.invalidMaterials.put(Materials.InfusedFire); - Material.invalidMaterials.put(Materials.InfusedWater); + Material.invalidMaterials.add(Materials.InfusedAir); + Material.invalidMaterials.add(Materials.InfusedEarth); + Material.invalidMaterials.add(Materials.InfusedFire); + Material.invalidMaterials.add(Materials.InfusedWater); // EIO Materials - Material.invalidMaterials.put(Materials.SoulSand); - Material.invalidMaterials.put(Materials.EnderPearl); - Material.invalidMaterials.put(Materials.EnderEye); - Material.invalidMaterials.put(Materials.Redstone); - Material.invalidMaterials.put(Materials.Glowstone); - Material.invalidMaterials.put(Materials.Soularium); - Material.invalidMaterials.put(Materials.PhasedIron); + Material.invalidMaterials.add(Materials.SoulSand); + Material.invalidMaterials.add(Materials.EnderPearl); + Material.invalidMaterials.add(Materials.EnderEye); + Material.invalidMaterials.add(Materials.Redstone); + Material.invalidMaterials.add(Materials.Glowstone); + Material.invalidMaterials.add(Materials.Soularium); + Material.invalidMaterials.add(Materials.PhasedIron); } diff --git a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java deleted file mode 100644 index 4de2e9ab78..0000000000 --- a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java +++ /dev/null @@ -1,356 +0,0 @@ -package gtPlusPlus.api.objects.data; - -import java.io.Serializable; -import java.util.Collection; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.Queue; -import java.util.Set; - -public class AutoMap implements Iterable, Cloneable, Serializable, Collection, Queue, List { - - /** - * The Internal Map - */ - protected final Map mInternalMap; - - protected final Map mInternalNameMap; - - /** - * The Internal ID - */ - private int mInternalID = 0; - - private static final long serialVersionUID = 3771412318075131790L; - - public AutoMap() { - this(new LinkedHashMap<>()); - } - - public Map getMap() { - return mInternalMap; - } - - public AutoMap(Map defaultMapType) { - mInternalMap = defaultMapType; - mInternalNameMap = new LinkedHashMap<>(); - } - - /** - * Generates an AutoMap from the List. - * - * @param aList - Data to be inserted into the AutoMap. - */ - public AutoMap(List aList) { - mInternalMap = new LinkedHashMap<>(); - mInternalNameMap = new LinkedHashMap<>(); - if (aList != null && !aList.isEmpty()) { - for (V obj : aList) { - add(obj); - } - } - } - - /** - * Generates an AutoMap from a Set. - * - * @param aList - Data to be inserted into the AutoMap. - */ - public AutoMap(Set aList) { - mInternalMap = new LinkedHashMap<>(); - mInternalNameMap = new LinkedHashMap<>(); - if (aList != null && !aList.isEmpty()) { - for (V obj : aList) { - add(obj); - } - } - } - - /** - * Generates an AutoMap from a Collection. - * - * @param aList - Data to be inserted into the AutoMap. - */ - public AutoMap(Collection aList) { - mInternalMap = new LinkedHashMap<>(); - mInternalNameMap = new LinkedHashMap<>(); - if (aList != null && !aList.isEmpty()) { - for (V obj : aList) { - add(obj); - } - } - } - - /** - * Generates an AutoMap from a Array. - * - * @param aArray - Data to be inserted into the AutoMap. - */ - public AutoMap(V[] aArray) { - mInternalMap = new LinkedHashMap<>(); - mInternalNameMap = new LinkedHashMap<>(); - if (aArray != null) { - for (V obj : aArray) { - add(obj); - } - } - } - - @Override - public Iterator iterator() { - return values().iterator(); - } - - public synchronized boolean setValue(V object) { - int mOriginalID = this.mInternalID; - put(object); - return this.mInternalMap.get(mOriginalID) - .equals(object) || mOriginalID > this.mInternalID; - } - - public synchronized V put(V object) { - return set(object); - } - - @Override - public synchronized boolean add(V object) { - return set(object) != null; - } - - public synchronized V set(V object) { - if (object == null) { - return null; - } - mInternalNameMap.put("" + object.hashCode(), (mInternalID + 1)); - return mInternalMap.put(mInternalID++, object); - } - - @Override - public synchronized V get(int id) { - return mInternalMap.get(id); - } - - public synchronized Collection values() { - return mInternalMap.values(); - } - - @Override - public synchronized int size() { - return mInternalMap.size(); - } - - public synchronized int hashCode() { - return mInternalMap.hashCode(); - } - - public synchronized boolean containsKey(int key) { - return mInternalMap.containsKey(key); - } - - public synchronized boolean containsValue(V value) { - return mInternalMap.containsValue(value); - } - - @Override - public synchronized boolean isEmpty() { - return mInternalMap.isEmpty(); - } - - @Override - public synchronized void clear() { - this.mInternalID = 0; - this.mInternalMap.clear(); - this.mInternalNameMap.clear(); - } - - @Override - @SuppressWarnings("unchecked") - public V[] toArray() { - V[] toR = (V[]) java.lang.reflect.Array.newInstance( - mInternalMap.get(0) - .getClass(), - mInternalMap.size()); - for (int i = 0; i < mInternalMap.size(); i++) { - toR[i] = mInternalMap.get(i); - } - return toR; - } - - public final synchronized int getInternalID() { - return mInternalID; - } - - @Override - public final synchronized boolean remove(Object value) { - value.getClass(); - if (this.mInternalMap.containsValue(value)) { - return this.mInternalMap.remove(mInternalNameMap.get("" + value.hashCode()), value); - } - return false; - } - - @Override - public boolean contains(Object o) { - for (V g : this.mInternalMap.values()) { - if (g.equals(o)) { - return true; - } - } - return false; - } - - @SuppressWarnings("unchecked") - @Override - public V[] toArray(V[] a) { - return (V[]) toArray(); - } - - @Override - public boolean containsAll(Collection c) { - boolean aTrue = true; - for (Object g : c) { - if (!this.contains(g)) { - aTrue = false; - } - } - return aTrue; - } - - @Override - public boolean addAll(Collection c) { - boolean aTrue = true; - for (V g : c) { - if (!this.add(g)) { - aTrue = false; - } - } - return aTrue; - } - - @Override - public boolean removeAll(Collection c) { - boolean aTrue = true; - for (Object g : c) { - if (!this.remove(g)) { - aTrue = false; - } - } - return aTrue; - } - - @Override - public boolean retainAll(Collection c) { - AutoMap aTempAllocation = new AutoMap<>(); - boolean aTrue = false; - aTempAllocation = this; - aTempAllocation.removeAll(c); - aTempAllocation.clear(); - aTrue = aTempAllocation.isEmpty(); - aTempAllocation.clear(); - return aTrue; - } - - @Override - public boolean offer(V e) { - return add(e); - } - - @Override - public V remove() { - V y = this.get(0); - if (remove(y)) return y; - else return null; - } - - @Override - public V poll() { - if (this.mInternalMap.isEmpty()) { - return null; - } - return remove(); - } - - @Override - public V element() { - if (this.mInternalMap.isEmpty()) { - return null; - } - return this.get(0); - } - - @Override - public V peek() { - return element(); - } - - @Override - public boolean addAll(int index, Collection c) { - for (V y : c) { - add(y); - } - return true; - } - - @Override - public V set(int index, V element) { - return mInternalMap.put(index, element); - } - - @Override - public void add(int index, V element) { - add(element); - } - - @Override - public V remove(int index) { - V h = mInternalMap.get(index); - set(index, null); - return h; - } - - @Override - public int indexOf(Object o) { - int aCount = 0; - for (V of : mInternalMap.values()) { - if (of != o) { - aCount++; - } else { - return aCount; - } - } - return -1; - } - - @Override - public int lastIndexOf(Object o) { - // TODO - return indexOf(o); - } - - @Override - public ListIterator listIterator() { - // TODO Auto-generated method stub - return null; - } - - @Override - public ListIterator listIterator(int index) { - // TODO Auto-generated method stub - return null; - } - - @Override - public List subList(int fromIndex, int toIndex) { - AutoMap aNewSubList = new AutoMap<>(); - for (int slot = fromIndex; slot <= toIndex; slot++) { - V obj = mInternalMap.get(slot); - if (obj != null) { - aNewSubList.put(obj); - } - } - return aNewSubList; - } -} diff --git a/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java deleted file mode 100644 index 199d20e06a..0000000000 --- a/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java +++ /dev/null @@ -1,14 +0,0 @@ -package gtPlusPlus.api.objects.data.weakref; - -import java.util.WeakHashMap; - -import gtPlusPlus.api.objects.data.AutoMap; - -public class WeakAutoMap extends AutoMap { - - private static final long serialVersionUID = 8328345351801363386L; - - public WeakAutoMap() { - super(new WeakHashMap<>()); - } -} diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java index 3853f61793..047b5dbeaf 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java @@ -1,6 +1,7 @@ package gtPlusPlus.api.objects.minecraft; import java.io.Serializable; +import java.util.ArrayList; import java.util.HashSet; import java.util.Set; @@ -10,7 +11,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gtPlusPlus.api.objects.data.AutoMap; public class BlockPos implements Serializable { @@ -151,14 +151,14 @@ public class BlockPos implements Serializable { return new BlockPos(this.xPos, this.yPos, this.zPos - 1, this.dim); } - public AutoMap getSurroundingBlocks() { - AutoMap sides = new AutoMap<>(); - sides.put(getUp()); - sides.put(getDown()); - sides.put(getXPos()); - sides.put(getXNeg()); - sides.put(getZPos()); - sides.put(getZNeg()); + public ArrayList getSurroundingBlocks() { + ArrayList sides = new ArrayList<>(); + sides.add(getUp()); + sides.add(getDown()); + sides.add(getXPos()); + sides.add(getXNeg()); + sides.add(getZPos()); + sides.add(getZNeg()); return sides; } @@ -195,7 +195,7 @@ public class BlockPos implements Serializable { * @return - Does this block have a neighbour that is the same? */ public boolean hasSimilarNeighbour(boolean strict) { - for (BlockPos g : getSurroundingBlocks().values()) { + for (BlockPos g : getSurroundingBlocks()) { if (getBlockAtPos(g) == getBlockAtPos()) { if (!strict) { return true; @@ -209,7 +209,7 @@ public class BlockPos implements Serializable { return false; } - public AutoMap getSimilarNeighbour() { + public ArrayList getSimilarNeighbour() { return getSimilarNeighbour(false); } @@ -217,15 +217,15 @@ public class BlockPos implements Serializable { * @param strict - Does this check Meta Data? * @return - Does this block have a neighbour that is the same? */ - public AutoMap getSimilarNeighbour(boolean strict) { - AutoMap sides = new AutoMap<>(); - for (BlockPos g : getSurroundingBlocks().values()) { + public ArrayList getSimilarNeighbour(boolean strict) { + ArrayList sides = new ArrayList<>(); + for (BlockPos g : getSurroundingBlocks()) { if (getBlockAtPos(g) == getBlockAtPos()) { if (!strict) { - sides.put(g); + sides.add(g); } else { if (getMetaAtPos() == getMetaAtPos(g)) { - sides.put(g); + sides.add(g); } } } @@ -234,12 +234,8 @@ public class BlockPos implements Serializable { } public Set getValidNeighboursAndSelf() { - AutoMap h = getSimilarNeighbour(true); - h.put(this); - Set result = new HashSet<>(); - for (BlockPos f : h.values()) { - result.add(f); - } - return result; + ArrayList h = getSimilarNeighbour(true); + h.add(this); + return new HashSet<>(h); } } diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java b/src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java index 5620b76895..fe3c6da840 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java @@ -1,8 +1,8 @@ package gtPlusPlus.api.objects.minecraft; -import net.minecraftforge.common.util.ForgeDirection; +import java.util.ArrayList; -import gtPlusPlus.api.objects.data.AutoMap; +import net.minecraftforge.common.util.ForgeDirection; public class CubicObject { @@ -15,7 +15,7 @@ public class CubicObject { public final T UP; public final T DOWN; - public CubicObject(AutoMap aDataSet) { + public CubicObject(ArrayList aDataSet) { this(aDataSet.get(0), aDataSet.get(1), aDataSet.get(2), aDataSet.get(3), aDataSet.get(4), aDataSet.get(5)); } diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java index e03fbc3c12..a858f5a295 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java @@ -12,9 +12,9 @@ public abstract class ItemPackage implements RunnableWithInfo { public ItemPackage(boolean hasExtraLateRun) { // Register for late run - CompatHandler.mObjectsToRunInPostInit.put(this); + CompatHandler.mObjectsToRunInPostInit.add(this); if (hasExtraLateRun) { - CompatHandler.mObjectsToRunInOnLoadComplete.put(this); + CompatHandler.mObjectsToRunInOnLoadComplete.add(this); } init(); } diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java index 4da6ef3a1f..6852c93f05 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java @@ -1,12 +1,13 @@ package gtPlusPlus.api.objects.minecraft; +import java.util.ArrayList; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; import gregtech.api.interfaces.IRecipeMutableAccess; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -76,7 +77,7 @@ public class ShapedRecipe implements IRecipeMutableAccess { } // Build a Pair for each slot - AutoMap> aRecipePairs = new AutoMap<>(); + ArrayList> aRecipePairs = new ArrayList<>(); int aCharSlot = 0; int aMemSlot = 0; int aInfoSlot = 0; @@ -91,7 +92,7 @@ public class ShapedRecipe implements IRecipeMutableAccess { } mInfo = ((ItemStack) stack).getDisplayName(); } - aRecipePairs.put(new Pair<>(CHARS.charAt(aCharSlot), stack)); + aRecipePairs.add(new Pair<>(CHARS.charAt(aCharSlot), stack)); Logger.RECIPE( "Storing '" + CHARS.charAt(aCharSlot) + "' with an object of type " @@ -103,7 +104,7 @@ public class ShapedRecipe implements IRecipeMutableAccess { aCharSlot++; aLoggingInfo[aInfoSlot++] = mInfo; } else { - aRecipePairs.put(new Pair<>(' ', (ItemStack) null)); + aRecipePairs.add(new Pair<>(' ', (ItemStack) null)); Logger.RECIPE("Storing ' ' with an object of type null"); aChar[aMemSlot++] = ' '; aLoggingInfo[aInfoSlot++] = "Empty"; @@ -155,7 +156,7 @@ public class ShapedRecipe implements IRecipeMutableAccess { } mInfo = ((ItemStack) stack).getDisplayName(); } - aRecipePairs.put(new Pair<>(CHARS.charAt(aCharSlot), stack)); + aRecipePairs.add(new Pair<>(CHARS.charAt(aCharSlot), stack)); Logger.RECIPE( "Registering Pair of '" + CHARS.charAt(aCharSlot) + "' and a " @@ -211,7 +212,7 @@ public class ShapedRecipe implements IRecipeMutableAccess { Logger.RECIPE("+ = + = + = +"); for (int r = 0; r < 9; r++) { if (aChar[r] != ' ') { - Logger.RECIPE("" + aChar[r] + " : " + aLoggingInfo[r]); + Logger.RECIPE(aChar[r] + " : " + aLoggingInfo[r]); } } 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 fi