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 --- src/main/java/gregtech/api/enums/TAE.java | 6 +++--- src/main/java/gregtech/api/util/FishPondFakeRecipe.java | 14 +++++++------- src/main/java/gregtech/api/util/GasSpargingRecipe.java | 5 ++--- src/main/java/gregtech/api/util/GasSpargingRecipeMap.java | 2 +- src/main/java/gregtech/api/util/SemiFluidFuelHandler.java | 4 ++-- 5 files changed, 15 insertions(+), 16 deletions(-) (limited to 'src/main/java/gregtech') diff --git a/src/main/java/gregtech/api/enums/TAE.java b/src/main/java/gregtech/api/enums/TAE.java index de4f9d6d77..73a18dc771 100644 --- a/src/main/java/gregtech/api/enums/TAE.java +++ b/src/main/java/gregtech/api/enums/TAE.java @@ -19,8 +19,8 @@ public class TAE { public static int gtPPLastUsedIndex = 64; public static int secondaryIndex = 0; - public static HashMap mTAE = new HashMap(); - private static final HashSet mFreeSlots = new HashSet(64); + public static HashMap mTAE = new HashMap<>(); + private static final HashSet mFreeSlots = new HashSet<>(64); static { for (int i = 64; i < 128; i++) { @@ -55,7 +55,7 @@ public class TAE { public static void finalizeTAE() { String aFreeSpaces = ""; String aPageAndSlotFree = ""; - AutoMap aTemp = new AutoMap(mFreeSlots); + AutoMap aTemp = new AutoMap<>(mFreeSlots); for (int i = 0; i < mFreeSlots.size(); i++) { int j = aTemp.get(i); aFreeSpaces += j; diff --git a/src/main/java/gregtech/api/util/FishPondFakeRecipe.java b/src/main/java/gregtech/api/util/FishPondFakeRecipe.java index 57e210a8f2..e6b754deb7 100644 --- a/src/main/java/gregtech/api/util/FishPondFakeRecipe.java +++ b/src/main/java/gregtech/api/util/FishPondFakeRecipe.java @@ -15,9 +15,9 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils; public class FishPondFakeRecipe { - public static ArrayList fish = new ArrayList(); - public static ArrayList junk = new ArrayList(); - public static ArrayList treasure = new ArrayList(); + public static ArrayList fish = new ArrayList<>(); + public static ArrayList junk = new ArrayList<>(); + public static ArrayList treasure = new ArrayList<>(); @SuppressWarnings("unchecked") public static boolean generateFishPondRecipes() { @@ -32,16 +32,16 @@ public class FishPondFakeRecipe { e.printStackTrace(); } - AutoMap> mega = new AutoMap>(); + AutoMap> mega = new AutoMap<>(); mega.put(fish); mega.put(junk); mega.put(treasure); int mType = 14; for (ArrayList f : mega.values()) { - for (int e = 0; e < f.size(); e++) { - if (f.get(e) != null) { - WeightedRandomFishable u = f.get(e); + for (WeightedRandomFishable weightedRandomFishable : f) { + if (weightedRandomFishable != null) { + WeightedRandomFishable u = weightedRandomFishable; try { ItemStack t = (ItemStack) ReflectionUtils .getField(WeightedRandomFishable.class, "field_150711_b").get(u); diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipe.java b/src/main/java/gregtech/api/util/GasSpargingRecipe.java index 55eb828e3e..9853b392be 100644 --- a/src/main/java/gregtech/api/util/GasSpargingRecipe.java +++ b/src/main/java/gregtech/api/util/GasSpargingRecipe.java @@ -34,8 +34,7 @@ public class GasSpargingRecipe implements Comparable { @Override public boolean equals(Object o) { - if (o instanceof GasSpargingRecipe) { - GasSpargingRecipe i = (GasSpargingRecipe) o; + if (o instanceof GasSpargingRecipe i) { if (this.mInputGas.equals(i.mInputGas) && this.mInputSpentFuel.equals(i.mInputSpentFuel)) { return true; } @@ -91,7 +90,7 @@ public class GasSpargingRecipe implements Comparable { } public String[] getRecipeInfo() { - AutoMap result = new AutoMap(); + AutoMap result = new AutoMap<>(); result.put("Input " + ItemUtils.getArrayStackNames(mFluidInputs)); result.put("Output " + ItemUtils.getArrayStackNames(mFluidOutputs)); result.put("Duration: " + mDuration); diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java index 094ef5a08c..b078394f92 100644 --- a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java +++ b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java @@ -8,7 +8,7 @@ import gtPlusPlus.api.objects.data.AutoMap; public class GasSpargingRecipeMap extends AutoMap { - public static final AutoMap mRecipes = new AutoMap(); + public static final AutoMap mRecipes = new AutoMap<>(); public static final String mUnlocalizedName = "gtpp.recipe.lftr.sparging"; public static final String mNEIName = mUnlocalizedName; public static final String mNEIDisplayName = "LFTR Gas Sparging"; diff --git a/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java b/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java index 2a40cad100..c808a892dc 100644 --- a/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java +++ b/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java @@ -57,7 +57,7 @@ public class SemiFluidFuelHandler { final FluidStack aCreosote = FluidUtils.getFluidStack("creosote", 1000); final FluidStack aHeavyFuel = FluidUtils.getFluidStack("liquid_heavy_fuel", 1000); final FluidStack aHeavyOil = FluidUtils.getFluidStack("liquid_heavy_oil", 1000); - final HashMap> aFoundFluidsFromItems = new HashMap>(); + final HashMap> aFoundFluidsFromItems = new HashMap<>(); // Find Fluids From items for (final GT_Recipe r : gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDenseLiquidFuels.mRecipeList) { @@ -67,7 +67,7 @@ public class SemiFluidFuelHandler { for (ItemStack i : g.mInputs) { FluidStack f = FluidContainerRegistry.getFluidForFilledItem(i); if (f != null) { - Pair aData = new Pair(f, g.mSpecialValue); + Pair aData = new Pair<>(f, g.mSpecialValue); aFoundFluidsFromItems.put(aData.hashCode(), aData); } } -- cgit