From fbdbb388c369fae549cfde3eed38b536f7461d90 Mon Sep 17 00:00:00 2001 From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Date: Wed, 18 Oct 2023 17:03:23 +0100 Subject: Cleaning up (#767) * Kill playerAPI * Gut more events and compat that is now obsolete * Remove commented out code * Remove final modifier from methods * Make more stuff final * Remove slow building ring * Protected -> private in final classes * More cleaning * More cleaning v2 * Purging * Clean DevHelper * Clean DevHelper 2 * delete DevHelper * remove useless IFMLLoadingPlugin.MCVersion annotation from @Mod files * check for obfuscation only once in the IFMLloadingPlugin.injectData * don't instantiate the static class ASMConfig * delete unused and empty implementation of IFMLCallHook * delete empty class * delete ClassesToTransform class that just holds the class names constants * delete unused methods and unsless logging in dummymod container * delete unused transformer ClassTransformer_TT_ThaumicRestorer * spotless * Clean * Clean utils * Build checkpoint * Purge * Stage 2 * Stage 3 * Stage 4 * Stage 5 * Stage 6 * Spotless * Imports * Stage idk * Stage 1 * Fix issue * Spotless * Format numbers --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Co-authored-by: Connor Colenso --- .../java/gtPlusPlus/api/objects/data/AutoMap.java | 24 +++++++++++----------- .../java/gtPlusPlus/api/objects/data/Quad.java | 2 +- .../gtPlusPlus/api/objects/data/TypeCounter.java | 6 +++--- .../api/objects/data/WeightedCollection.java | 2 +- .../api/objects/data/weakref/WeakAutoMap.java | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src/main/java/gtPlusPlus/api/objects/data') diff --git a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java index f4b2550b5a..aedd6c6073 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java +++ b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java @@ -27,7 +27,7 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect private static final long serialVersionUID = 3771412318075131790L; public AutoMap() { - this(new LinkedHashMap()); + this(new LinkedHashMap<>()); } public Map getMap() { @@ -36,7 +36,7 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect public AutoMap(Map defaultMapType) { mInternalMap = defaultMapType; - mInternalNameMap = new LinkedHashMap(); + mInternalNameMap = new LinkedHashMap<>(); } /** @@ -45,8 +45,8 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect * @param aList - Data to be inserted into the AutoMap. */ public AutoMap(List aList) { - mInternalMap = new LinkedHashMap(); - mInternalNameMap = new LinkedHashMap(); + mInternalMap = new LinkedHashMap<>(); + mInternalNameMap = new LinkedHashMap<>(); if (aList != null && aList.size() > 0) { for (V obj : aList) { add(obj); @@ -60,8 +60,8 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect * @param aList - Data to be inserted into the AutoMap. */ public AutoMap(Set aList) { - mInternalMap = new LinkedHashMap(); - mInternalNameMap = new LinkedHashMap(); + mInternalMap = new LinkedHashMap<>(); + mInternalNameMap = new LinkedHashMap<>(); if (aList != null && aList.size() > 0) { for (V obj : aList) { add(obj); @@ -75,8 +75,8 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect * @param aList - Data to be inserted into the AutoMap. */ public AutoMap(Collection aList) { - mInternalMap = new LinkedHashMap(); - mInternalNameMap = new LinkedHashMap(); + mInternalMap = new LinkedHashMap<>(); + mInternalNameMap = new LinkedHashMap<>(); if (aList != null && aList.size() > 0) { for (V obj : aList) { add(obj); @@ -90,8 +90,8 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect * @param aArray - Data to be inserted into the AutoMap. */ public AutoMap(V[] aArray) { - mInternalMap = new LinkedHashMap(); - mInternalNameMap = new LinkedHashMap(); + mInternalMap = new LinkedHashMap<>(); + mInternalNameMap = new LinkedHashMap<>(); if (aArray != null && aArray.length > 0) { for (V obj : aArray) { add(obj); @@ -244,7 +244,7 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect @Override public boolean retainAll(Collection c) { - AutoMap aTempAllocation = new AutoMap(); + AutoMap aTempAllocation = new AutoMap<>(); boolean aTrue = false; aTempAllocation = this; aTempAllocation.removeAll(c); @@ -346,7 +346,7 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect @Override public List subList(int fromIndex, int toIndex) { - AutoMap aNewSubList = new AutoMap(); + AutoMap aNewSubList = new AutoMap<>(); for (int slot = fromIndex; slot <= toIndex; slot++) { V obj = mInternalMap.get(slot); if (obj == null) { diff --git a/src/main/java/gtPlusPlus/api/objects/data/Quad.java b/src/main/java/gtPlusPlus/api/objects/data/Quad.java index 54839ac930..a2597061e0 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/Quad.java +++ b/src/main/java/gtPlusPlus/api/objects/data/Quad.java @@ -34,7 +34,7 @@ public class Quad { } public final List values() { - List aVals = new ArrayList(); + List aVals = new ArrayList<>(); aVals.add(key); aVals.add(value); aVals.add(value2); diff --git a/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java index e4b4e0db88..ea12972af4 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java +++ b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java @@ -10,7 +10,7 @@ import gtPlusPlus.api.objects.Logger; public class TypeCounter implements Set { - private Map> mInternalMap = new LinkedHashMap>(); + private Map> mInternalMap = new LinkedHashMap<>(); private String mHighestValueKey; private int mHighestValue = 0; private final Class mClass; @@ -55,7 +55,7 @@ public class TypeCounter implements Set { String aKey = aKeyName != null ? aKeyName : arg0.toString(); InternalTypeCounterObject aValue = mInternalMap.get(aKey); if (aValue == null) { - aValue = new InternalTypeCounterObject((V) arg0); + aValue = new InternalTypeCounterObject<>((V) arg0); Logger.WARNING("Adding new key to map: " + aKey); } aValue.add(); @@ -152,7 +152,7 @@ public class TypeCounter implements Set { for (String k : this.mInternalMap.keySet()) { if (k != null) { InternalTypeCounterObject aVal = this.mInternalMap.get(k); - aArray[aPos++] = new Pair>(k, aVal); + aArray[aPos++] = new Pair<>(k, aVal); } } return aArray; diff --git a/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java index 9d9201066b..ae1f28f0c9 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java +++ b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java @@ -11,7 +11,7 @@ import gregtech.api.objects.XSTR; public class WeightedCollection implements Map { - private NavigableMap map = new TreeMap(); + private NavigableMap map = new TreeMap<>(); private Random random; private int total = 0; diff --git a/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java index c9176c00c5..199d20e06a 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java +++ b/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java @@ -9,6 +9,6 @@ public class WeakAutoMap extends AutoMap { private static final long serialVersionUID = 8328345351801363386L; public WeakAutoMap() { - super(new WeakHashMap()); + super(new WeakHashMap<>()); } } -- cgit