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) --- .../java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java') 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())); } } -- cgit