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) --- .../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 ++-- 4 files changed, 32 insertions(+), 32 deletions(-) (limited to 'src/main/java/gtPlusPlus/plugin') diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java index 263971cdc4..5164967a90 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java @@ -47,7 +47,6 @@ import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTRecipeConstants; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.item.chemistry.AgriculturalChem; @@ -535,8 +534,8 @@ public class BioRecipes { public static final HashSet mNuts = new HashSet<>(); public static final HashSet mSeeds = new HashSet<>(); - public static final AutoMap mList_Master_FruitVege = new AutoMap<>(); - public static final AutoMap mList_Master_Seeds = new AutoMap<>(); + public static final ArrayList mList_Master_FruitVege = new ArrayList<>(); + public static final ArrayList mList_Master_Seeds = new ArrayList<>(); private static void processFermentationOreDict() { processOreDictEntry("listAllfruit", mFruits); @@ -550,22 +549,22 @@ public class BioRecipes { if (!mFruits.isEmpty()) { for (GTItemStack g : mFruits) { - mList_Master_FruitVege.put(g.toStack()); + mList_Master_FruitVege.add(g.toStack()); } } if (!mVege.isEmpty()) { for (GTItemStack g : mVege) { - mList_Master_FruitVege.put(g.toStack()); + mList_Master_FruitVege.add(g.toStack()); } } if (!mNuts.isEmpty()) { for (GTItemStack g : mNuts) { - mList_Master_FruitVege.put(g.toStack()); + mList_Master_FruitVege.add(g.toStack()); } } if (!mSeeds.isEmpty()) { for (GTItemStack g : mSeeds) { - mList_Master_Seeds.put(g.toStack()); + mList_Master_Seeds.add(g.toStack()); } } } @@ -582,8 +581,8 @@ public class BioRecipes { private static void recipeFermentationBase() { processFermentationOreDict(); - AutoMap aFruitVege = mList_Master_FruitVege; - AutoMap aSeeds = mList_Master_Seeds; + ArrayList aFruitVege = mList_Master_FruitVege; + ArrayList aSeeds = mList_Master_Seeds; ArrayList aMap = OreDictionary.getOres("cropSugarbeet"); for (ItemStack a : aFruitVege) { if (aMap.contains(a)) { @@ -797,17 +796,17 @@ public class BioRecipes { private static void recipeAluminiumPellet() { // Ore Names, no prefix - AutoMap aOreNames = new AutoMap<>(); - - aOreNames.put("Lazurite"); - aOreNames.put("Bauxite"); - aOreNames.put("Grossular"); - aOreNames.put("Pyrope"); - aOreNames.put("Sodalite"); - aOreNames.put("Spodumene"); - aOreNames.put("Ruby"); - aOreNames.put("Sapphire"); - aOreNames.put("GreenSapphire"); + ArrayList aOreNames = new ArrayList<>(); + + aOreNames.add("Lazurite"); + aOreNames.add("Bauxite"); + aOreNames.add("Grossular"); + aOreNames.add("Pyrope"); + aOreNames.add("Sodalite"); + aOreNames.add("Spodumene"); + aOreNames.add("Ruby"); + aOreNames.add("Sapphire"); + aOreNames.add("GreenSapphire"); // Voltage HashMap aOreData1 = new HashMap<>(); diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java index f34348a3af..ac38b78936 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java @@ -2,6 +2,7 @@ package gtPlusPlus.plugin.agrichem.item.algae; import static gregtech.api.enums.Mods.GTPlusPlus; +import java.util.ArrayList; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -17,7 +18,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.plugin.agrichem.AlgaeDefinition; import gtPlusPlus.plugin.agrichem.IAlgalItem; @@ -213,7 +213,7 @@ public class ItemAlgaeBase extends Item implements IAlgalItem { aSpeed, aLifespan, 0, - new AutoMap<>()); + new ArrayList<>()); aTag = aGenes.writeToNBT(); } } else { diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java index 6b7b72aa71..ef36d73686 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java @@ -1,8 +1,8 @@ package gtPlusPlus.plugin.agrichem.logic; -import net.minecraft.nbt.NBTTagCompound; +import java.util.ArrayList; -import gtPlusPlus.api.objects.data.AutoMap; +import net.minecraft.nbt.NBTTagCompound; public class AlgaeGeneticData { @@ -24,15 +24,15 @@ public class AlgaeGeneticData { private final float mProductionSpeed; - private final AutoMap mSpecialRequirements; + private final ArrayList mSpecialRequirements; public AlgaeGeneticData() { - this(true, true, true, true, (byte) 0, 1f, 1f, (byte) 30, 0, new AutoMap<>()); + this(true, true, true, true, (byte) 0, 1f, 1f, (byte) 30, 0, new ArrayList<>()); } public AlgaeGeneticData(boolean isDominant, boolean requiresLight, boolean isSalt, boolean isFresh, byte aTempTolerance, float aFertility, float aSpeed, byte aLifespan, int aGeneration, - AutoMap aRequirements) { + ArrayList aRequirements) { mIsDominant = isDominant; mRequiresLight = requiresLight; mSaltWater = isSalt; @@ -67,7 +67,7 @@ public class AlgaeGeneticData { mLifespan = aNBT.getByte("mLifespan"); mGeneration = aNBT.getInteger("mGeneration"); } - mSpecialRequirements = new AutoMap<>(); + mSpecialRequirements = new ArrayList<>(); } /** @@ -109,7 +109,7 @@ public class AlgaeGeneticData { return this.mGeneration; } - public final AutoMap getSpecialRequirements() { + public final ArrayList getSpecialRequirements() { return this.mSpecialRequirements; } diff --git a/src/main/java/gtPlusPlus/plugin/manager/CoreManager.java b/src/main/java/gtPlusPlus/plugin/manager/CoreManager.java index d547ace5cb..f618be2d9f 100644 --- a/src/main/java/gtPlusPlus/plugin/manager/CoreManager.java +++ b/src/main/java/gtPlusPlus/plugin/manager/CoreManager.java @@ -1,20 +1,21 @@ package gtPlusPlus.plugin.manager; +import java.util.ArrayList; + import gtPlusPlus.api.interfaces.IPlugin; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.util.reflect.ReflectionUtils; public class CoreManager { - public static AutoMap mPlugins = new AutoMap<>(); + public static ArrayList mPlugins = new ArrayList<>(); /** * @param plugin - Dynamically registers the plugin for loading. */ public static void registerPlugin(IPlugin plugin) { Logger.INFO("[Plugin] " + "Registered " + plugin.getPluginName() + "."); - mPlugins.put(plugin); + mPlugins.add(plugin); } /** -- cgit