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) --- .../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 +-- 31 files changed, 165 insertions(+), 176 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchCatalysts.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchCatalysts.java index 13bb4b44f1..ca8624a7d2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchCatalysts.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchCatalysts.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers; +import java.util.ArrayList; + import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; @@ -9,7 +11,6 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.objects.GTRenderedTexture; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -55,8 +56,8 @@ public class MTEHatchCatalysts extends MTEHatchNbtConsumable { } @Override - public AutoMap getItemsValidForUsageSlots() { - return new AutoMap<>(); + public ArrayList getItemsValidForUsageSlots() { + return new ArrayList<>(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchMillingBalls.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchMillingBalls.java index a40ea08ec1..9f50f9846e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchMillingBalls.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchMillingBalls.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers; +import java.util.ArrayList; + import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; @@ -9,7 +11,6 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.objects.GTRenderedTexture; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -55,8 +56,8 @@ public class MTEHatchMillingBalls extends MTEHatchNbtConsumable { } @Override - public AutoMap getItemsValidForUsageSlots() { - return new AutoMap<>(); + public ArrayList getItemsValidForUsageSlots() { + return new ArrayList<>(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchNbtConsumable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchNbtConsumable.java index dbcef2d9e7..b626bcc8ba 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchNbtConsumable.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchNbtConsumable.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers; +import java.util.ArrayList; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; @@ -18,7 +20,6 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.MTEHatch; import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.util.minecraft.ItemUtils; public abstract class MTEHatchNbtConsumable extends MTEHatch implements IAddGregtechLogo { @@ -165,8 +166,8 @@ public abstract class MTEHatchNbtConsumable extends MTEHatch implements IAddGreg return mTotalSlotCount - 1; } - public final AutoMap getContentUsageSlots() { - AutoMap aItems = new AutoMap<>(); + public final ArrayList getContentUsageSlots() { + ArrayList aItems = new ArrayList<>(); for (int i = mInputslotCount; i < mTotalSlotCount; i++) { if (mInventory[i] != null) { aItems.add(mInventory[i]); @@ -248,7 +249,7 @@ public abstract class MTEHatchNbtConsumable extends MTEHatch implements IAddGreg * * @return */ - public abstract AutoMap getItemsValidForUsageSlots(); + public abstract ArrayList getItemsValidForUsageSlots(); /** * Checks if the given item is valid for Usage Slots. Can be overridden for easier handling if you already have diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java index 57d01bcc5f..f19263bb57 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java @@ -2,6 +2,8 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures; import static gregtech.api.enums.Mods.GTPlusPlus; +import java.util.ArrayList; + import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; @@ -11,13 +13,12 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.objects.GTRenderedTexture; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.lib.GTPPCore; public class TexturesGtBlock { private static final boolean mAnimated = GTPPCore.ConfigSwitches.enableAnimatedTextures; - private static final AutoMap mCustomiconMap = new AutoMap<>(); + private static final ArrayList mCustomiconMap = new ArrayList<>(); /* * Handles Custom Textures. @@ -36,7 +37,7 @@ public class TexturesGtBlock { public CustomIcon(final String aModID, final String aIconName) { this.mIconName = aIconName; this.mModID = aModID; - mCustomiconMap.put(this); + mCustomiconMap.add(this); Logger.WARNING("Constructing a Custom Texture. " + this.mIconName); GregTechAPI.sGTBlockIconload.add(this); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/CapeRenderer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/CapeRenderer.java index f9ec4b9433..bf7de52ff2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/CapeRenderer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/CapeRenderer.java @@ -5,6 +5,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.net.URL; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.concurrent.ForkJoinPool; @@ -23,7 +24,6 @@ import org.lwjgl.opengl.GL11; import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.lib.GTPPCore.ConfigSwitches; @@ -252,11 +252,11 @@ public class CapeRenderer extends RenderPlayer { private static boolean mapsPopulated = false; // UUID - Username - private static final AutoMap> mOrangeCapes = new AutoMap<>(); - private static final AutoMap> mMiscCapes = new AutoMap<>(); - private static final AutoMap> mBetaTestCapes = new AutoMap<>(); - private static final AutoMap> mPatreonCapes = new AutoMap<>(); - private static final AutoMap> mDevCapes = new AutoMap<>(); + private static final ArrayList> mOrangeCapes = new ArrayList<>(); + private static final ArrayList> mMiscCapes = new ArrayList<>(); + private static final ArrayList> mBetaTestCapes = new ArrayList<>(); + private static final ArrayList> mPatreonCapes = new ArrayList<>(); + private static final ArrayList> mDevCapes = new ArrayList<>(); private static boolean init() { CapeUtils.handleOldCapeCache(); @@ -353,7 +353,7 @@ public class CapeRenderer extends RenderPlayer { if (aCache != null && !aCache.isEmpty()) { return aCache; } - return new AutoMap<>(); + return new ArrayList<>(); } private static File allocateTempFile() { @@ -377,16 +377,16 @@ public class CapeRenderer extends RenderPlayer { if (sAES == null) { sAES = new AES(); } - AutoMap aDecodedData = new AutoMap<>(); + ArrayList aDecodedData = new ArrayList<>(); for (String aToDecode : aCacheData) { - aDecodedData.put(sAES.decode(aToDecode)); + aDecodedData.add(sAES.decode(aToDecode)); } if (!aDecodedData.isEmpty()) { - AutoMap> aCapeType1 = new AutoMap<>(); - AutoMap> aCapeType2 = new AutoMap<>(); - AutoMap> aCapeType3 = new AutoMap<>(); - AutoMap> aCapeType4 = new AutoMap<>(); - AutoMap> aCapeType5 = new AutoMap<>(); + ArrayList> aCapeType1 = new ArrayList<>(); + ArrayList> aCapeType2 = new ArrayList<>(); + ArrayList> aCapeType3 = new ArrayList<>(); + ArrayList> aCapeType4 = new ArrayList<>(); + ArrayList> aCapeType5 = new ArrayList<>(); boolean didProcessStringData = false; Logger.INFO("Decoded String Count: " + aDecodedData.size()); for (String aToSplit : aDecodedData) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java index 3a85e0aae3..67a0c349e9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java @@ -2,6 +2,8 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; import static gregtech.api.enums.GTValues.V; +import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import net.minecraft.entity.player.EntityPlayer; @@ -35,7 +37,6 @@ import gregtech.api.util.GTUtility; import gregtech.common.items.IDMetaTool01; import gregtech.common.items.MetaGeneratedTool01; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.item.general.ItemAirFilter; import gtPlusPlus.core.item.general.ItemBasicScrubberTurbine; import gtPlusPlus.core.recipe.common.CI; @@ -360,7 +361,7 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { if (this.mTier < 7) { mCurrentChunkPollution = PollutionUtils.getPollution(getBaseMetaTileEntity()); } else { - AutoMap aSurrounding = new AutoMap<>(); + ArrayList aSurrounding = new ArrayList<>(); World aWorld = this.getBaseMetaTileEntity() .getWorld(); int xPos = this.getBaseMetaTileEntity() @@ -376,15 +377,15 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { Chunk c1 = aWorld.getChunkFromBlockCoords(xPos + 32, zPos - 32); Chunk c2 = aWorld.getChunkFromBlockCoords(xPos + 32, zPos); Chunk c3 = aWorld.getChunkFromBlockCoords(xPos + 32, zPos + 32); - aSurrounding.put(a1); - aSurrounding.put(a2); - aSurrounding.put(a3); - aSurrounding.put(b1); - aSurrounding.put(b2); - aSurrounding.put(b3); - aSurrounding.put(c1); - aSurrounding.put(c2); - aSurrounding.put(c3); + aSurrounding.add(a1); + aSurrounding.add(a2); + aSurrounding.add(a3); + aSurrounding.add(b1); + aSurrounding.add(b2); + aSurrounding.add(b3); + aSurrounding.add(c1); + aSurrounding.add(c2); + aSurrounding.add(c3); for (Chunk r : aSurrounding) { mCurrentChunkPollution += getPollutionInChunk(r); } @@ -587,7 +588,7 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { } else { int chunksWithRemoval = 0; int totalRemoved = 0; - AutoMap aSurrounding = new AutoMap<>(); + ArrayList aSurrounding = new ArrayList<>(); Chunk aThisChunk = this.getBaseMetaTileEntity() .getWorld() .getChunkFromBlockCoords( @@ -615,15 +616,15 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { Chunk c2 = aWorld.getChunkFromBlockCoords(xPos + 32, zPos); Chunk c3 = aWorld.getChunkFromBlockCoords(xPos + 32, zPos + 32); - aSurrounding.put(a1); - aSurrounding.put(a2); - aSurrounding.put(a3); - aSurrounding.put(b1); - aSurrounding.put(b2); - aSurrounding.put(b3); - aSurrounding.put(c1); - aSurrounding.put(c2); - aSurrounding.put(c3); + aSurrounding.add(a1); + aSurrounding.add(a2); + aSurrounding.add(a3); + aSurrounding.add(b1); + aSurrounding.add(b2); + aSurrounding.add(b3); + aSurrounding.add(c1); + aSurrounding.add(c2); + aSurrounding.add(c3); for (Chunk r : aSurrounding) { if (!r.isChunkLoaded) { @@ -763,10 +764,8 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { @Override public String[] getInfoData() { - AutoMap aTooltipSuper = new AutoMap<>(); - for (String s : super.getInfoData()) { - aTooltipSuper.put(s); - } + ArrayList aTooltipSuper = new ArrayList<>(); + aTooltipSuper.addAll(Arrays.asList(super.getInfoData())); int mAirSides = getFreeSpaces(); int reduction = 0; @@ -778,11 +777,11 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { * Math.max((tTier - 2), 1); reduction = MathUtils.safeInt(((long) reduction / 100) * this.mOptimalAirFlow); - aTooltipSuper.put("Maximum pollution removed per second: " + reduction); + aTooltipSuper.add("Maximum pollution removed per second: " + reduction); } catch (Throwable t) { - aTooltipSuper.put("Maximum pollution removed per second: " + mPollutionReduction); + aTooltipSuper.add("Maximum pollution removed per second: " + mPollutionReduction); } - aTooltipSuper.put("Air Sides: " + mAirSides); + aTooltipSuper.add("Air Sides: " + mAirSides); String[] mBuiltOutput = new String[aTooltipSuper.size()]; int aIndex = 0; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java index 98e1ce15ba..23e587ef2f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java @@ -48,7 +48,6 @@ import gregtech.api.util.GTRecipe; import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; @@ -225,7 +224,7 @@ public class MTEIsaMill extends GTPPMultiBlockBase implements ISurvi super.onPostTick(aBaseMetaTileEntity, aTick); } - private final AutoMap mFrontBlockPosCache = new AutoMap<>(); + private final ArrayList mFrontBlockPosCache = new ArrayList<>(); public void checkForEntities(IGregTechTileEntity aBaseMetaTileEntity, long aTime) { @@ -252,7 +251,7 @@ public class MTEIsaMill extends GTPPMultiBlockBase implements ISurvi } } - AutoMap aEntities = getEntities(mFrontBlockPosCache, aBaseMetaTileEntity.getWorld()); + ArrayList aEntities = getEntities(mFrontBlockPosCache, aBaseMetaTileEntity.getWorld()); if (!aEntities.isEmpty()) { for (EntityLivingBase aFoundEntity : aEntities) { if (aFoundEntity instanceof EntityPlayer aPlayer) { @@ -286,8 +285,8 @@ public class MTEIsaMill extends GTPPMultiBlockBase implements ISurvi return Math.max(reducedDamage, 0); } - private static AutoMap getEntities(AutoMap aPositionsToCheck, World aWorld) { - AutoMap aEntities = new AutoMap<>(); + private static ArrayList getEntities(ArrayList aPositionsToCheck, World aWorld) { + ArrayList aEntities = new ArrayList<>(); HashSet aChunksToCheck = new HashSet<>(); if (!aPositionsToCheck.isEmpty()) { Chunk aLocalChunk; @@ -297,7 +296,7 @@ public class MTEIsaMill extends GTPPMultiBlockBase implements ISurvi } } if (!aChunksToCheck.isEmpty()) { - AutoMap aEntitiesFound = new AutoMap<>(); + ArrayList aEntitiesFound = new ArrayList<>(); for (Chunk aChunk : aChunksToCheck) { if (aChunk.isChunkLoaded) { List[] aEntityLists = aChunk.entityLists; @@ -327,7 +326,7 @@ public class MTEIsaMill extends GTPPMultiBlockBase implements ISurvi private static void generateParticles(EntityLivingBase aEntity) { BlockPos aPlayerPosBottom = EntityUtils.findBlockPosOfEntity(aEntity); BlockPos aPlayerPosTop = aPlayerPosBottom.getUp(); - AutoMap aEntityPositions = new AutoMap<>(); + ArrayList aEntityPositions = new ArrayList<>(); aEntityPositions.add(aPlayerPosBottom); aEntityPositions.add(aPlayerPosTop); for (int i = 0; i < 64; i++) { @@ -438,7 +437,7 @@ public class MTEIsaMill extends GTPPMultiBlockBase implements ISurvi public ArrayList getStoredInputs() { ArrayList tItems = super.getStoredInputs(); for (MTEHatchMillingBalls tHatch : validMTEList(mMillingBallBuses)) { - AutoMap aHatchContent = tHatch.getContentUsageSlots(); + ArrayList aHatchContent = tHatch.getContentUsageSlots(); if (!aHatchContent.isEmpty()) { tItems.addAll(aHatchContent); } @@ -456,7 +455,7 @@ public class MTEIsaMill extends GTPPMultiBlockBase implements ISurvi } else { MTEHatchMillingBalls aBus = mMillingBallBuses.get(0); if (aBus != null) { - AutoMap aAvailableItems = aBus.getContentUsageSlots(); + ArrayList aAvailableItems = aBus.getContentUsageSlots(); if (!aAvailableItems.isEmpty()) { for (final ItemStack aInput : aItemInputs) { if (ItemUtils.isMillingBall(aInput)) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java index 3a7370cf25..9751218aae 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java @@ -12,6 +12,7 @@ import static gregtech.api.enums.HatchElement.OutputBus; import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import static gtPlusPlus.core.util.data.ArrayUtils.removeNulls; +import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -45,7 +46,6 @@ import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; import gregtech.api.util.ParallelHelper; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.GTPPCore; @@ -364,10 +364,10 @@ public class MTEIndustrialFishingPond extends GTPPMultiBlockBase> categories = new AutoMap<>(); - private static AutoMap categoryFish = new AutoMap<>(); - private static AutoMap categoryJunk = new AutoMap<>(); - private static AutoMap categoryLoot = new AutoMap<>(); + private static ArrayList> categories = new ArrayList<>(); + private static ArrayList categoryFish = new ArrayList<>(); + private static ArrayList categoryJunk = new ArrayList<>(); + private static ArrayList categoryLoot = new ArrayList<>(); private static boolean hasGenerateRecipes = false; private int mMode = 14; private int mMax = 8; @@ -375,18 +375,12 @@ public class MTEIndustrialFishingPond extends GTPPMultiBlockBase imple public ArrayList getCatalystInputs() { ArrayList tItems = new ArrayList<>(); for (MTEHatchCatalysts tHatch : validMTEList(mCatalystBuses)) { - AutoMap aHatchContent = tHatch.getContentUsageSlots(); + ArrayList aHatchContent = tHatch.getContentUsageSlots(); if (!aHatchContent.isEmpty()) { tItems.addAll(aHatchContent); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java index 62d73b310f..2de926e31f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java @@ -49,7 +49,6 @@ import gregtech.api.util.TurbineStatCalculator; import gregtech.api.util.shutdown.ShutDownReason; import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.GTPPCore; @@ -334,8 +333,8 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase aTurbineMats = new AutoMap<>(); - AutoMap aTurbineSizes = new AutoMap<>(); + ArrayList aTurbineMats = new ArrayList<>(); + ArrayList aTurbineSizes = new ArrayList<>(); for (MTEHatchTurbine aHatch : aTurbineAssemblies) { aTurbineMats.add(MetaGeneratedTool.getPrimaryMaterial(aHatch.getTurbine())); aTurbineSizes.add(getTurbineSize(aHatch.getTurbine())); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAlloySmelter.java index 8ef73917b7..dfe8db8dc8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAlloySmelter.java @@ -17,7 +17,7 @@ public class RecipeGenAlloySmelter extends RecipeGenBase { public static final Set> mRecipeGenMap = new HashSet<>(); static { - MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); + MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap); } public RecipeGenAlloySmelter(final Material M) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAssembler.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAssembler.java index 64ce9d1c42..3963390dbc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAssembler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAssembler.java @@ -21,7 +21,7 @@ public class RecipeGenAssembler extends RecipeGenBase { public static final Set> mRecipeGenMap = new HashSet<>(); static { - MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); + MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap); } public RecipeGenAssembler(final Material M) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java index a0104cd809..c64c846541 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java @@ -36,7 +36,7 @@ public class RecipeGenBlastSmelter extends RecipeGenBase { public static final Set> mRecipeGenMap = new HashSet<>(); static { - MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); + MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap); } public RecipeGenBlastSmelter(final Material M) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java index 62fd4d39b1..4b7d94f1f4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java @@ -36,7 +36,7 @@ public class RecipeGenDustGeneration extends RecipeGenBase { public static final Set> mRecipeGenMap = new HashSet<>(); static { - MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); + MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap); } public RecipeGenDustGeneration(final Material M) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenExtruder.java index 80b9a75a14..a3bf9e6c06 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenExtruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenExtruder.java @@ -21,7 +21,7 @@ public class RecipeGenExtruder extends RecipeGenBase { public static final Set> mRecipeGenMap = new HashSet<>(); static { - MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); + MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap); } public RecipeGenExtruder(final Material M) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluids.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluids.java index aa2f85f037..aae19c22bd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluids.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluids.java @@ -20,7 +20,7 @@ public class RecipeGenFluids extends RecipeGenBase { public static final Set> mRecipeGenMap = new HashSet<>(); static { - MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); + MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap); } public RecipeGenFluids(final Material M) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluorite.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluorite.java index 0916febadc..9ed9d2d8a6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluorite.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluorite.java @@ -33,7 +33,7 @@ public class RecipeGenFluorite extends RecipeGenBase { public static final Set> mRecipeGenMap = new HashSet<>(); static { - MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); + MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap); } public RecipeGenFluorite(final Material material) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMaterialProcessing.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMaterialProcessing.java index 8ca1e6f447..352217ff95 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMaterialProcessing.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMaterialProcessing.java @@ -16,7 +16,6 @@ import net.minecraft.item.ItemStack; import gregtech.api.enums.GTValues; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; @@ -30,7 +29,7 @@ public class RecipeGenMaterialProcessing extends RecipeGenBase { public static final Set> mRecipeGenMap = new HashSet<>(); static { - MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); + MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap); } public RecipeGenMaterialProcessing(final Material M) { @@ -63,11 +62,11 @@ public class RecipeGenMaterialProcessing extends RecipeGenBase { partSizes[hu] = (int) material.vSmallestRatio[hu]; } } - AutoMap> componentMap = new AutoMap<>(); + ArrayList> componentMap = new ArrayList<>(); int alnsnfds = 0; for (MaterialStack r : material.getComposites()) { if (r != null) { - componentMap.put(new Pair<>(partSizes[alnsnfds], r.getStackMaterial())); + componentMap.add(new Pair<>(partSizes[alnsnfds], r.getStackMaterial())); } alnsnfds++; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java index 975d903e87..634784952a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java @@ -22,7 +22,7 @@ public class RecipeGenMetalRecipe extends RecipeGenBase { public static final Set> mRecipeGenMap = new HashSet<>(); static { - MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); + MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap); } public RecipeGenMetalRecipe(final Material M) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMultisUsingFluidInsteadOfCells.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMultisUsingFluidInsteadOfCells.java index 20d4fcdb36..196cf30e86 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMultisUsingFluidInsteadOfCells.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMultisUsingFluidInsteadOfCells.java @@ -11,7 +11,6 @@ import gregtech.api.recipe.RecipeMap; import gregtech.api.util.GTRecipe; import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.recipe.GTRecipeUtils; @@ -19,7 +18,7 @@ import gtPlusPlus.core.util.recipe.GTRecipeUtils; public class RecipeGenMultisUsingFluidInsteadOfCells { private static ItemStack mEmptyCell; - private static final AutoMap mItemsToIgnore = new AutoMap<>(); + private static final ArrayList mItemsToIgnore = new ArrayList<>(); private static boolean mInit = false; private static void init() { @@ -82,10 +81,10 @@ public class RecipeGenMultisUsingFluidInsteadOfCells { FluidStack[] aInputFluids = x.mFluidInputs.clone(); FluidStack[] aOutputFluids = x.mFluidOutputs.clone(); - AutoMap aInputItemsMap = new AutoMap<>(); - AutoMap aOutputItemsMap = new AutoMap<>(); - AutoMap aInputFluidsMap = new AutoMap<>(); - AutoMap aOutputFluidsMap = new AutoMap<>(); + ArrayList aInputItemsMap = new ArrayList<>(); + ArrayList aOutputItemsMap = new ArrayList<>(); + ArrayList aInputFluidsMap = new ArrayList<>(); + ArrayList aOutputFluidsMap = new ArrayList<>(); // Iterate Inputs, Convert valid items into fluids for (ItemStack aInputStack : aInputItems) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java index 14d5e86e7b..ed8f446bab 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java @@ -25,7 +25,6 @@ import gregtech.api.enums.Materials; import gregtech.api.util.GTModHandler; import gtPlusPlus.api.interfaces.RunnableWithInfo; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.MaterialGenerator; @@ -41,7 +40,7 @@ public class RecipeGenOre extends RecipeGenBase { public static final Set> mRecipeGenMap = new HashSet<>(); static { - MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); + MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap); } public RecipeGenOre(final Material M) { @@ -100,12 +99,12 @@ public class RecipeGenOre extends RecipeGenBase { } } - AutoMap amJ = new AutoMap<>(); + ArrayList amJ = new ArrayList<>(); int aIndexCounter = 0; for (Material g : aMatComp) { if (g.hasSolidForm()) { if (getDust(g) != null && getTinyDust(g) != null) { - amJ.put(g); + amJ.add(g); } } } @@ -167,10 +166,10 @@ public class RecipeGenOre extends RecipeGenBase { bonusB = tVoltageMultiplier > 100 ? material : mStone; } - AutoMap> componentMap = new AutoMap<>(); + ArrayList> componentMap = new ArrayList<>(); for (MaterialStack r : material.getComposites()) { if (r != null) { - componentMap.put(new Pair<>(r.getPartsPerOneHundred(), r.getStackMaterial())); + componentMap.add(new Pair<>(r.getPartsPerOneHundred(), r.getStackMaterial())); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlasma.java index d281c528dc..b2ec9167c2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlasma.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlasma.java @@ -24,7 +24,7 @@ public class RecipeGenPlasma extends RecipeGenBase { public static final Set> mRecipeGenMap = new HashSet<>(); static { - MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); + MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap); } public RecipeGenPlasma(final Material M) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlates.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlates.java index eb48d6d8e7..defc71232b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlates.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlates.java @@ -26,7 +26,7 @@ public class RecipeGenPlates extends RecipeGenBase { public static final Set> mRecipeGenMap = new HashSet<>(); static { - MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); + MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap); } public RecipeGenPlates(final Material M) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java index 305422ccea..89fdf23ec6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java @@ -22,7 +22,6 @@ import gregtech.api.enums.OrePrefixes; 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.core.material.Material; import gtPlusPlus.core.material.state.MaterialState; @@ -31,11 +30,11 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGenRecycling implements Runnable { - public static AutoMap mQueuedRecyclingGenerators = new AutoMap<>(); + public static ArrayList mQueuedRecyclingGenerators = new ArrayList<>(); public static void executeGenerators() { if (mQueuedRecyclingGenerators.size() > 0) { - for (Runnable R : mQueuedRecyclingGenerators.values()) { + for (Runnable R : mQueuedRecyclingGenerators) { R.run(); } } @@ -49,7 +48,7 @@ public class RecipeGenRecycling implements Runnable { if (mNameMap == null) { mNameMap = this.getNameMap(); } - mQueuedRecyclingGenerators.put(this); + mQueuedRecyclingGenerators.add(this); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenShapedCrafting.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenShapedCrafting.java index 0c07b382ec..97445915f2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenShapedCrafting.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenShapedCrafting.java @@ -15,7 +15,7 @@ public class RecipeGenShapedCrafting extends RecipeGenBase { public static final Set> mRecipeGenMap = new HashSet<>(); static { - MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); + MaterialGenerator.mRecipeMapsToGenerate.add(mRecipeGenMap); } public RecipeGenShapedCrafting(final Material M) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderAlgaeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderAlgaeFarm.java index bfa8b6d1b1..d5fe301173 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderAlgaeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderAlgaeFarm.java @@ -1,5 +1,6 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; +import java.util.ArrayList; import java.util.HashMap; import net.minecraft.item.ItemStack; @@ -8,7 +9,6 @@ import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.GTValues; import gregtech.api.util.GTRecipe; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.WeightedCollection; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.util.math.MathUtils; @@ -16,8 +16,8 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeLoaderAlgaeFarm { - private static final HashMap> mRecipeCache = new HashMap<>(); - private static final HashMap> mRecipeCompostCache = new HashMap<>(); + private static final HashMap> mRecipeCache = new HashMap<>(); + private static final HashMap> mRecipeCompostCache = new HashMap<>(); public static void generateRecipes() { for (int i = 0; i < 15; i++) { @@ -29,12 +29,12 @@ public class RecipeLoaderAlgaeFarm { } public static GTRecipe getTieredRecipeFromCache(int aTier, boolean aCompost) { - HashMap> aMap = aCompost ? mRecipeCompostCache : mRecipeCache; + HashMap> aMap = aCompost ? mRecipeCompostCache : mRecipeCache; String aComp = aCompost ? "(Compost)" : ""; - AutoMap aTemp = aMap.get(aTier); + ArrayList aTemp = aMap.get(aTier); if (aTemp == null || aTemp.isEmpty()) { - aTemp = new AutoMap<>(); + aTemp = new ArrayList<>(); aMap.put(aTier, aTemp); Logger.INFO("Tier " + aTier + aComp + " had no recipes, initialising new map."); } @@ -42,7 +42,7 @@ public class RecipeLoaderAlgaeFarm { Logger .INFO("Tier " + aTier + aComp + " has less than 500 recipes, generating " + (500 - aTemp.size()) + "."); for (int i = aTemp.size(); i < 500; i++) { - aTemp.put(generateBaseRecipe(aCompost, aTier)); + aTemp.add(generateBaseRecipe(aCompost, aTier)); } } int aIndex = MathUtils.randInt(0, aTemp.isEmpty() ? 1 : aTemp.size()); @@ -109,61 +109,59 @@ public class RecipeLoaderAlgaeFarm { } private static ItemStack[] getOutputsForTier(int aTier) { - - // Create an Automap to dump contents into - AutoMap aOutputMap = new AutoMap<>(); + ArrayList aOutputMap = new ArrayList<>(); // Add loot relevant to tier and also add any from lower tiers. if (aTier >= 0) { - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 2)); - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 4)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 2)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 4)); if (MathUtils.randInt(0, 10) > 9) { - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 2)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 2)); } } if (aTier >= 1) { - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 4)); - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 2)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 4)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 2)); if (MathUtils.randInt(0, 10) > 9) { - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 4)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 4)); } } if (aTier >= 2) { - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 2)); - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 3)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 2)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 3)); if (MathUtils.randInt(0, 10) > 9) { - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 8)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 8)); } } if (aTier >= 3) { - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 4)); - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 1)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 4)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 1)); if (MathUtils.randInt(0, 10) > 9) { - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 4)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 4)); } } if (aTier >= 4) { - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 2)); - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 3)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 2)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 3)); if (MathUtils.randInt(0, 10) > 9) { - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 4)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 4)); } } if (aTier >= 5) { - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 4)); - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 2)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 4)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 2)); if (MathUtils.randInt(0, 10) > 9) { - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 4)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 4)); } } // Tier 6 is Highest for outputs if (aTier >= 6) { - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 4)); - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 2)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, 4)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 2)); if (MathUtils.randInt(0, 10) > 9) { - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 8)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, 8)); } } @@ -171,10 +169,10 @@ public class RecipeLoaderAlgaeFarm { for (int i2 = 0; i2 < 20; i2++) { if (aTier >= (6 + i2)) { int aMulti = i2 + 1; - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, aMulti * 4)); - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, aMulti * 3)); - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, aMulti * 2)); - aOutputMap.put(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, aMulti)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, aMulti * 4)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, aMulti * 3)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownAlgaeBiosmass, aMulti * 2)); + aOutputMap.add(ItemUtils.getSimpleStack(AgriculturalChem.mRedAlgaeBiosmass, aMulti)); } else { i2 = 20; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderLFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderLFTR.java index b5a3a55cd0..4c87da567b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderLFTR.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderLFTR.java @@ -5,26 +5,27 @@ import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeConstants.LFTR_OUTPUT_POWER; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.liquidFluorineThoriumReactorRecipes; +import java.util.ArrayList; + import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.util.GasSpargingRecipeMap; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.material.nuclear.MaterialsFluorides; import gtPlusPlus.core.material.nuclear.MaterialsNuclides; public class RecipeLoaderLFTR { - private static AutoMap mNobleGases; - private static AutoMap mFluorideGases; - private static AutoMap mSpargeGases; + private static ArrayList mNobleGases; + private static ArrayList mFluorideGases; + private static ArrayList mSpargeGases; private static void configureSparging() { if (mSpargeGases == null) { - mSpargeGases = new AutoMap<>(); + mSpargeGases = new ArrayList<>(); mSpargeGases.add( Materials.Helium.getGas(1) .getFluid()); @@ -33,7 +34,7 @@ public class RecipeLoaderLFTR { .getFluid()); } if (mNobleGases == null) { - mNobleGases = new AutoMap<>(); + mNobleGases = new ArrayList<>(); mNobleGases.add(mSpargeGases.get(0)); mNobleGases.add(MaterialsElements.getInstance().XENON.getFluid()); mNobleGases.add(MaterialsElements.getInstance().NEON.getFluid()); @@ -42,7 +43,7 @@ public class RecipeLoaderLFTR { mNobleGases.add(MaterialsElements.getInstance().RADON.getFluid()); } if (mFluorideGases == null) { - mFluorideGases = new AutoMap<>(); + mFluorideGases = new ArrayList<>(); mFluorideGases.add(mSpargeGases.get(1)); mFluorideGases.add(MaterialsFluorides.LITHIUM_FLUORIDE.getFluid()); mFluorideGases.add(MaterialsFluorides.NEPTUNIUM_HEXAFLUORIDE.getFluid()); diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java index 1f053220ab..2d6a4ab3dd 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java @@ -13,7 +13,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.FileUtils; @@ -23,7 +22,7 @@ import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects; public class ThreadAspectScanner extends Thread { public static boolean mDoWeScan = false; - private static final Map> mAllGameContent = new HashMap<>(); + private static final Map> mAllGameContent = new HashMap<>(); public final File mAspectCacheFile; public ThreadAspectScanner() { @@ -52,11 +51,11 @@ public class ThreadAspectScanner extends Thread { } } } - AutoMap m = new AutoMap<>(); + ArrayList m = new ArrayList<>(); if (mAllGameContent.containsKey(nameKey)) { m = mAllGameContent.get(nameKey); } - m.put(aStack); + m.add(aStack); mAllGameContent.put(nameKey, m); } @@ -118,7 +117,7 @@ public class ThreadAspectScanner extends Thread { for (String key : y) { // Logger.INFO("Looking for key: "+key); if (mAllGameContent.containsKey(key)) { - AutoMap group = mAllGameContent.get(key); + ArrayList group = mAllGameContent.get(key); if (group == null || group.size() <= 0) { continue; } @@ -128,10 +127,10 @@ public class ThreadAspectScanner extends Thread { if (a == null) { continue; } else { - AutoMap> aspectPairs = new AutoMap<>(); + ArrayList> aspectPairs = new ArrayList<>(); for (thaumcraft.api.aspects.Aspect c : a.getAspectsSortedAmount()) { if (c != null) { - aspectPairs.put(new Pair<>(c.getName(), a.getAmount(c))); + aspectPairs.add(new Pair<>(c.getName(), a.getAmount(c))); } } try { diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/HandlerTinkers.java b/src/main/java/gtPlusPlus/xmod/tinkers/HandlerTinkers.java index faa94542b9..338fe86b2d 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/HandlerTinkers.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/HandlerTinkers.java @@ -1,17 +1,18 @@ package gtPlusPlus.xmod.tinkers; +import java.util.ArrayList; + import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import gregtech.api.enums.Mods; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.xmod.tinkers.material.BaseTinkersMaterial; import gtPlusPlus.xmod.tinkers.util.TinkersDryingRecipe; import gtPlusPlus.xmod.tinkers.util.TinkersUtils; public class HandlerTinkers { - public static AutoMap mTinkerMaterials = new AutoMap<>(); + public static ArrayList mTinkerMaterials = new ArrayList<>(); public static void postInit() { if (Mods.TinkerConstruct.isModLoaded()) { diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java b/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java index 68685b7b8b..103a44e665 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java @@ -40,7 +40,7 @@ public class BaseTinkersMaterial { mID = aNextFreeID++; Logger.INFO("[TiCon] Assigning ID " + mID + " to " + mLocalName + "."); aInternalMaterialIdMap.put(mUnlocalName, mID); - HandlerTinkers.mTinkerMaterials.put(this); + HandlerTinkers.mTinkerMaterials.add(this); } public String getUnlocalName() { diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java index 4136b54309..7c48f1bd74 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java @@ -2,6 +2,7 @@ package gtPlusPlus.xmod.tinkers.util; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; +import java.util.ArrayList; import java.util.List; import net.minecraft.item.ItemStack; @@ -11,12 +12,11 @@ import gregtech.api.enums.GTValues; import gregtech.api.enums.TierEU; import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import tconstruct.library.crafting.DryingRackRecipes; public class TinkersDryingRecipe { - public static AutoMap recipes = new AutoMap<>(); + public static ArrayList recipes = new ArrayList<>(); public final int time; public final ItemStack input; @@ -60,10 +60,10 @@ public class TinkersDryingRecipe { } private static List getDryingRecipes() { - AutoMap aData = new AutoMap<>(); + ArrayList aData = new ArrayList<>(); int aCount = 0; for (DryingRackRecipes.DryingRecipe recipe : DryingRackRecipes.recipes) { - aData.put(recipe); + aData.add(recipe); aCount++; } Logger.INFO("Found " + aCount + " Tinkers drying rack recipes."); -- cgit