aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/thaumcraft/objects
diff options
context:
space:
mode:
authorNotAPenguin <michiel.vandeginste@gmail.com>2024-09-16 00:53:18 +0200
committerGitHub <noreply@github.com>2024-09-15 22:53:18 +0000
commitb530fdac89f5d764613a6a69339e4324083c9895 (patch)
treea7c36051f84f8e4a7a654ec2266a3ea5a49a4ed8 /src/main/java/gtPlusPlus/xmod/thaumcraft/objects
parent43af160db2e04f06bba3792a11860ee42c3d1947 (diff)
downloadGT5-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/thaumcraft/objects')
-rw-r--r--src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java13
1 files changed, 6 insertions, 7 deletions
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<String, AutoMap<ItemStack>> mAllGameContent = new HashMap<>();
+ private static final Map<String, ArrayList<ItemStack>> mAllGameContent = new HashMap<>();
public final File mAspectCacheFile;
public ThreadAspectScanner() {
@@ -52,11 +51,11 @@ public class ThreadAspectScanner extends Thread {
}
}
}
- AutoMap<ItemStack> m = new AutoMap<>();
+ ArrayList<ItemStack> 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<ItemStack> group = mAllGameContent.get(key);
+ ArrayList<ItemStack> 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<Pair<String, Integer>> aspectPairs = new AutoMap<>();
+ ArrayList<Pair<String, Integer>> 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 {