diff options
| author | NotAPenguin <michiel.vandeginste@gmail.com> | 2024-09-16 00:53:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-15 22:53:18 +0000 |
| commit | b530fdac89f5d764613a6a69339e4324083c9895 (patch) | |
| tree | a7c36051f84f8e4a7a654ec2266a3ea5a49a4ed8 /src/main/java/gtPlusPlus/xmod/tinkers | |
| parent | 43af160db2e04f06bba3792a11860ee42c3d1947 (diff) | |
| download | GT5-Unofficial-b530fdac89f5d764613a6a69339e4324083c9895.tar.gz GT5-Unofficial-b530fdac89f5d764613a6a69339e4324083c9895.tar.bz2 GT5-Unofficial-b530fdac89f5d764613a6a69339e4324083c9895.zip | |
Remove GT++ AutoMap (#3199)
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/tinkers')
3 files changed, 8 insertions, 7 deletions
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<BaseTinkersMaterial> mTinkerMaterials = new AutoMap<>(); + public static ArrayList<BaseTinkersMaterial> 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<TinkersDryingRecipe> recipes = new AutoMap<>(); + public static ArrayList<TinkersDryingRecipe> recipes = new ArrayList<>(); public final int time; public final ItemStack input; @@ -60,10 +60,10 @@ public class TinkersDryingRecipe { } private static List<DryingRackRecipes.DryingRecipe> getDryingRecipes() { - AutoMap<DryingRackRecipes.DryingRecipe> aData = new AutoMap<>(); + ArrayList<DryingRackRecipes.DryingRecipe> 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."); |
