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) --- .../xmod/thaumcraft/objects/ThreadAspectScanner.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/thaumcraft/objects') 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 { -- cgit