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/bartcrops | |
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/bartcrops')
4 files changed, 30 insertions, 42 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java b/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java index e1b1d53b45..c3c2f0b6cc 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java @@ -19,7 +19,7 @@ import ic2.api.crops.Crops; */ public class LoaderOfTheCrops { - private static List<Boolean> mHasCropObj = new ArrayList<Boolean>(); + private static List<Boolean> mHasCropObj = new ArrayList<>(); private CropCard mCropObj; private ItemStack mBaseSeed; private static List<LoaderOfTheCrops> mCropList = cropLoader(); @@ -46,35 +46,35 @@ public class LoaderOfTheCrops { } public static List<LoaderOfTheCrops> cropLoader() { - List<LoaderOfTheCrops> p = new ArrayList<LoaderOfTheCrops>(); + List<LoaderOfTheCrops> p = new ArrayList<>(); p.add(new LoaderOfTheCrops(new Crop_Hemp(), new ItemStack(Item.getItemById(111), 3))); return p; } - private static final List<CropCard> cropObjs() { - List<CropCard> p = new ArrayList<CropCard>(); + private static List<CropCard> cropObjs() { + List<CropCard> p = new ArrayList<>(); - for (int i = 0; i < mCropList.size(); ++i) { - p.add(cropUnpackerCC((LoaderOfTheCrops) mCropList.get(i))); + for (LoaderOfTheCrops loaderOfTheCrops : mCropList) { + p.add(cropUnpackerCC((LoaderOfTheCrops) loaderOfTheCrops)); } return p; } - private static final List<ItemStack> setBaseSeed() { - List<ItemStack> p = new ArrayList<ItemStack>(); + private static List<ItemStack> setBaseSeed() { + List<ItemStack> p = new ArrayList<>(); - for (int i = 0; i < mCropList.size(); ++i) { - p.add(cropUnpackerCG((LoaderOfTheCrops) mCropList.get(i))); + for (LoaderOfTheCrops loaderOfTheCrops : mCropList) { + p.add(cropUnpackerCG((LoaderOfTheCrops) loaderOfTheCrops)); } return p; } - private static final List<String> setnames() { - List<String> s = new ArrayList<String>(); + private static List<String> setnames() { + List<String> s = new ArrayList<>(); for (int i = 0; i < mCropList.size(); ++i) { s.add(((CropCard) cropObjs().get(i)).name()); @@ -98,7 +98,7 @@ public class LoaderOfTheCrops { } public static void registerBaseSeed() { - List<ItemStack> baseseed = new ArrayList<ItemStack>(setBaseSeed()); + List<ItemStack> baseseed = new ArrayList<>(setBaseSeed()); for (int i = 0; i < mCropList.size(); ++i) { if (baseseed.get(i) != null && cropObjs().get(i) != null) { diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java index 60d4601132..c794c40878 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java @@ -12,20 +12,14 @@ public abstract class BaseAestheticCrop extends BaseHarvestableCrop { @Override public int stat(int n) { - switch (n) { - case 0: - return 0; - case 1: - return 0; - case 2: - return 0; - case 3: - return 4; - case 4: - return 0; - default: - return 0; - } + return switch (n) { + case 0 -> 0; + case 1 -> 0; + case 2 -> 0; + case 3 -> 4; + case 4 -> 0; + default -> 0; + }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java index dec6413a82..22fce2ae5a 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java @@ -56,7 +56,7 @@ public abstract class BaseCrop extends CropCard implements ICropCardInfo { @Override public List<String> getCropInformation() { - List<String> ret = new ArrayList<String>(); + List<String> ret = new ArrayList<>(); ret.add(Arrays.toString(this.attributes())); return ret; } diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java index f5daa20fdf..80325edff0 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java @@ -12,20 +12,14 @@ public abstract class BaseHarvestableCrop extends BaseCrop { @Override public int stat(int n) { - switch (n) { - case 0: - return 0; - case 1: - return 4; - case 2: - return 0; - case 3: - return 4; - case 4: - return 0; - default: - return 0; - } + return switch (n) { + case 0 -> 0; + case 1 -> 4; + case 2 -> 0; + case 3 -> 4; + case 4 -> 0; + default -> 0; + }; } @Override |