diff options
author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2023-10-18 17:03:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-18 18:03:23 +0200 |
commit | fbdbb388c369fae549cfde3eed38b536f7461d90 (patch) | |
tree | b46f7fc949d7e4c6e3be910b81ed725e6dc1648e /src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe | |
parent | b670446fdf49991093b485f0aa14050039632775 (diff) | |
download | GT5-Unofficial-fbdbb388c369fae549cfde3eed38b536f7461d90.tar.gz GT5-Unofficial-fbdbb388c369fae549cfde3eed38b536f7461d90.tar.bz2 GT5-Unofficial-fbdbb388c369fae549cfde3eed38b536f7461d90.zip |
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 <colen@CONNORSPC>
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe')
3 files changed, 9 insertions, 10 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java index 7ca8d4d78e..980bf983ca 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java @@ -17,8 +17,8 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeLoader_AlgaeFarm { - private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCache = new HashMap<Integer, AutoMap<GT_Recipe>>(); - private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCompostCache = new HashMap<Integer, AutoMap<GT_Recipe>>(); + private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCache = new HashMap<>(); + private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCompostCache = new HashMap<>(); public static void generateRecipes() { for (int i = 0; i < 10; i++) { @@ -35,7 +35,7 @@ public class RecipeLoader_AlgaeFarm { AutoMap<GT_Recipe> aTemp = aMap.get(aTier); if (aTemp == null || aTemp.isEmpty()) { - aTemp = new AutoMap<GT_Recipe>(); + aTemp = new AutoMap<>(); aMap.put(aTier, aTemp); Logger.INFO("Tier " + aTier + aComp + " had no recipes, initialising new map."); } @@ -62,7 +62,7 @@ public class RecipeLoader_AlgaeFarm { return null; } - WeightedCollection<Float> aOutputTimeMulti = new WeightedCollection<Float>(); + WeightedCollection<Float> aOutputTimeMulti = new WeightedCollection<>(); for (int i = 100; i > 0; i--) { float aValue = 0; if (i < 10) { @@ -112,7 +112,7 @@ public class RecipeLoader_AlgaeFarm { private static ItemStack[] getOutputsForTier(int aTier) { // Create an Automap to dump contents into - AutoMap<ItemStack> aOutputMap = new AutoMap<ItemStack>(); + AutoMap<ItemStack> aOutputMap = new AutoMap<>(); // Add loot relevant to tier and also add any from lower tiers. diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java index 9c92f40608..27f289a7c5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java @@ -20,12 +20,12 @@ public class RecipeLoader_LFTR { private static void configureSparging() { if (mSpargeGases == null) { - mSpargeGases = new AutoMap<Fluid>(); + mSpargeGases = new AutoMap<>(); mSpargeGases.add(Materials.Helium.getGas(1).getFluid()); mSpargeGases.add(Materials.Fluorine.getGas(1).getFluid()); } if (mNobleGases == null) { - mNobleGases = new AutoMap<Fluid>(); + mNobleGases = new AutoMap<>(); mNobleGases.add(mSpargeGases.get(0)); mNobleGases.add(ELEMENT.getInstance().XENON.getFluid()); mNobleGases.add(ELEMENT.getInstance().NEON.getFluid()); @@ -34,7 +34,7 @@ public class RecipeLoader_LFTR { mNobleGases.add(ELEMENT.getInstance().RADON.getFluid()); } if (mFluorideGases == null) { - mFluorideGases = new AutoMap<Fluid>(); + mFluorideGases = new AutoMap<>(); mFluorideGases.add(mSpargeGases.get(1)); mFluorideGases.add(FLUORIDES.LITHIUM_FLUORIDE.getFluid()); mFluorideGases.add(FLUORIDES.NEPTUNIUM_HEXAFLUORIDE.getFluid()); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java index c31500d084..8b59e2d232 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java @@ -18,8 +18,7 @@ public class RecipeLoader_MolecularTransformer { public static void run() { - for (int i = 0; i < transformerRecipes.size(); i++) { - MTRecipeRecord aRecipe = transformerRecipes.get(i); + for (MTRecipeRecord aRecipe : transformerRecipes) { int aEU = MaterialUtils.getVoltageForTier(5); Logger.INFO("======================="); Logger.INFO("Generating GT recipe for Molecular Transformer."); |