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/gregtech/common/render/CapeRenderer.java | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common/render/CapeRenderer.java') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/CapeRenderer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/CapeRenderer.java index f9ec4b9433..bf7de52ff2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/CapeRenderer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/CapeRenderer.java @@ -5,6 +5,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.net.URL; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.concurrent.ForkJoinPool; @@ -23,7 +24,6 @@ import org.lwjgl.opengl.GL11; import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.lib.GTPPCore.ConfigSwitches; @@ -252,11 +252,11 @@ public class CapeRenderer extends RenderPlayer { private static boolean mapsPopulated = false; // UUID - Username - private static final AutoMap> mOrangeCapes = new AutoMap<>(); - private static final AutoMap> mMiscCapes = new AutoMap<>(); - private static final AutoMap> mBetaTestCapes = new AutoMap<>(); - private static final AutoMap> mPatreonCapes = new AutoMap<>(); - private static final AutoMap> mDevCapes = new AutoMap<>(); + private static final ArrayList> mOrangeCapes = new ArrayList<>(); + private static final ArrayList> mMiscCapes = new ArrayList<>(); + private static final ArrayList> mBetaTestCapes = new ArrayList<>(); + private static final ArrayList> mPatreonCapes = new ArrayList<>(); + private static final ArrayList> mDevCapes = new ArrayList<>(); private static boolean init() { CapeUtils.handleOldCapeCache(); @@ -353,7 +353,7 @@ public class CapeRenderer extends RenderPlayer { if (aCache != null && !aCache.isEmpty()) { return aCache; } - return new AutoMap<>(); + return new ArrayList<>(); } private static File allocateTempFile() { @@ -377,16 +377,16 @@ public class CapeRenderer extends RenderPlayer { if (sAES == null) { sAES = new AES(); } - AutoMap aDecodedData = new AutoMap<>(); + ArrayList aDecodedData = new ArrayList<>(); for (String aToDecode : aCacheData) { - aDecodedData.put(sAES.decode(aToDecode)); + aDecodedData.add(sAES.decode(aToDecode)); } if (!aDecodedData.isEmpty()) { - AutoMap> aCapeType1 = new AutoMap<>(); - AutoMap> aCapeType2 = new AutoMap<>(); - AutoMap> aCapeType3 = new AutoMap<>(); - AutoMap> aCapeType4 = new AutoMap<>(); - AutoMap> aCapeType5 = new AutoMap<>(); + ArrayList> aCapeType1 = new ArrayList<>(); + ArrayList> aCapeType2 = new ArrayList<>(); + ArrayList> aCapeType3 = new ArrayList<>(); + ArrayList> aCapeType4 = new ArrayList<>(); + ArrayList> aCapeType5 = new ArrayList<>(); boolean didProcessStringData = false; Logger.INFO("Decoded String Count: " + aDecodedData.size()); for (String aToSplit : aDecodedData) { -- cgit