aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/plugin/agrichem
diff options
context:
space:
mode:
authorConnor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>2023-10-18 17:03:23 +0100
committerGitHub <noreply@github.com>2023-10-18 18:03:23 +0200
commitfbdbb388c369fae549cfde3eed38b536f7461d90 (patch)
treeb46f7fc949d7e4c6e3be910b81ed725e6dc1648e /src/main/java/gtPlusPlus/plugin/agrichem
parentb670446fdf49991093b485f0aa14050039632775 (diff)
downloadGT5-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/plugin/agrichem')
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java28
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java34
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java4
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java3
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java4
5 files changed, 32 insertions, 41 deletions
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java b/src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java
index 4eb1b553c1..890a9020c9 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java
@@ -32,26 +32,18 @@ public enum AlgaeDefinition {
}
public static AlgaeDefinition getByIndex(int aIndex) {
- switch (aIndex) {
- default:
- case 0:
- return Euglenophyta;
- case 1:
- return Chrysophyta;
- case 2:
- return Pyrrophyta;
- case 3:
- return Chlorophyta;
- case 4:
- return Rhodophyta;
- case 5:
- return Paeophyta;
- case 6:
- return Xanthophyta;
- }
+ return switch (aIndex) {
+ default -> Euglenophyta;
+ case 1 -> Chrysophyta;
+ case 2 -> Pyrrophyta;
+ case 3 -> Chlorophyta;
+ case 4 -> Rhodophyta;
+ case 5 -> Paeophyta;
+ case 6 -> Xanthophyta;
+ };
}
- private static final int getRGB(int r, int g, int b) {
+ private static int getRGB(int r, int g, int b) {
return AlgaeUtils.rgbtoHexValue(r, g, b);
}
}
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
index f3125325ed..7194921650 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
@@ -96,23 +96,23 @@ public class BioRecipes {
private static Fluid mButanol;
private static Fluid mAcetone;
- private static final ItemStack getGreenAlgaeRecipeChip() {
+ private static ItemStack getGreenAlgaeRecipeChip() {
return getBioChip(4);
}
- private static final ItemStack getBrownAlgaeRecipeChip() {
+ private static ItemStack getBrownAlgaeRecipeChip() {
return getBioChip(8);
}
- private static final ItemStack getGoldenBrownAlgaeRecipeChip() {
+ private static ItemStack getGoldenBrownAlgaeRecipeChip() {
return getBioChip(12);
}
- private static final ItemStack getRedAlgaeRecipeChip() {
+ private static ItemStack getRedAlgaeRecipeChip() {
return getBioChip(16);
}
- private static final ItemStack getBioChip(int aID) {
+ private static ItemStack getBioChip(int aID) {
return ItemUtils.simpleMetaStack(AgriculturalChem.mBioCircuit, aID, 0);
}
@@ -126,7 +126,7 @@ public class BioRecipes {
Logger.INFO("[Bio] Finished with recipes");
}
- private static final void initRecipeVars() {
+ private static void initRecipeVars() {
mFert = AgriculturalChem.dustOrganicFertilizer;
mDustDirt = AgriculturalChem.dustDirt;
@@ -454,13 +454,13 @@ public class BioRecipes {
16);
}
- public static final HashSet<GT_ItemStack> mFruits = new HashSet<GT_ItemStack>();
- public static final HashSet<GT_ItemStack> mVege = new HashSet<GT_ItemStack>();
- public static final HashSet<GT_ItemStack> mNuts = new HashSet<GT_ItemStack>();
- public static final HashSet<GT_ItemStack> mSeeds = new HashSet<GT_ItemStack>();
+ public static final HashSet<GT_ItemStack> mFruits = new HashSet<>();
+ public static final HashSet<GT_ItemStack> mVege = new HashSet<>();
+ public static final HashSet<GT_ItemStack> mNuts = new HashSet<>();
+ public static final HashSet<GT_ItemStack> mSeeds = new HashSet<>();
- public static final AutoMap<ItemStack> mList_Master_FruitVege = new AutoMap<ItemStack>();
- public static final AutoMap<ItemStack> mList_Master_Seeds = new AutoMap<ItemStack>();
+ public static final AutoMap<ItemStack> mList_Master_FruitVege = new AutoMap<>();
+ public static final AutoMap<ItemStack> mList_Master_Seeds = new AutoMap<>();
private static void processFermentationOreDict() {
processOreDictEntry("listAllfruit", mFruits);
@@ -689,7 +689,7 @@ public class BioRecipes {
private static void recipeAluminiumPellet() {
// Ore Names, no prefix
- AutoMap<String> aOreNames = new AutoMap<String>();
+ AutoMap<String> aOreNames = new AutoMap<>();
aOreNames.put("Lazurite");
aOreNames.put("Bauxite");
@@ -702,11 +702,11 @@ public class BioRecipes {
aOreNames.put("GreenSapphire");
// Voltage
- HashMap<String, Integer> aOreData1 = new HashMap<String, Integer>();
+ HashMap<String, Integer> aOreData1 = new HashMap<>();
// Input Count
- HashMap<String, Integer> aOreData2 = new HashMap<String, Integer>();
+ HashMap<String, Integer> aOreData2 = new HashMap<>();
// Output Count
- HashMap<String, Integer> aOreData3 = new HashMap<String, Integer>();
+ HashMap<String, Integer> aOreData3 = new HashMap<>();
aOreData1.put("Lazurite", 120);
aOreData1.put("Bauxite", 90);
@@ -737,7 +737,7 @@ public class BioRecipes {
aOreData3.put("GreenSapphire", 2);
// Assemble all valid crushed ore types for making pellet mix
- HashMap<String, ItemStack> aOreCache = new HashMap<String, ItemStack>();
+ HashMap<String, ItemStack> aOreCache = new HashMap<>();
for (String aOreName : aOreNames) {
String aTemp = aOreName;
aOreName = "crushedPurified" + aOreName;
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java b/src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java
index 22f1ef0b34..8ce137a323 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java
@@ -6,7 +6,7 @@ import gtPlusPlus.plugin.agrichem.logic.AlgaeGeneticData;
public interface IAlgalItem {
- public abstract AlgaeDefinition getAlgaeType(ItemStack aStack);
+ AlgaeDefinition getAlgaeType(ItemStack aStack);
- public abstract AlgaeGeneticData getSpeciesData(ItemStack aStack);
+ AlgaeGeneticData getSpeciesData(ItemStack aStack);
}
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java
index 0fab6a2c96..7b1fb2b148 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java
@@ -22,7 +22,6 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.plugin.agrichem.AlgaeDefinition;
import gtPlusPlus.plugin.agrichem.IAlgalItem;
import gtPlusPlus.plugin.agrichem.logic.AlgaeGeneticData;
-import gtPlusPlus.plugin.agrichem.logic.AlgaeGrowthRequirement;
public class ItemAlgaeBase extends Item implements IAlgalItem {
@@ -211,7 +210,7 @@ public class ItemAlgaeBase extends Item implements IAlgalItem {
aSpeed,
aLifespan,
0,
- new AutoMap<AlgaeGrowthRequirement>());
+ new AutoMap<>());
aTag = aGenes.writeToNBT();
}
} else {
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java
index c59076f01d..c11877b672 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java
@@ -27,7 +27,7 @@ public class AlgaeGeneticData {
private final AutoMap<AlgaeGrowthRequirement> mSpecialRequirements;
public AlgaeGeneticData() {
- this(true, true, true, true, (byte) 0, 1f, 1f, (byte) 30, 0, new AutoMap<AlgaeGrowthRequirement>());
+ this(true, true, true, true, (byte) 0, 1f, 1f, (byte) 30, 0, new AutoMap<>());
}
public AlgaeGeneticData(boolean isDominant, boolean requiresLight, boolean isSalt, boolean isFresh,
@@ -67,7 +67,7 @@ public class AlgaeGeneticData {
mLifespan = aNBT.getByte("mLifespan");
mGeneration = aNBT.getInteger("mGeneration");
}
- mSpecialRequirements = new AutoMap<AlgaeGrowthRequirement>();
+ mSpecialRequirements = new AutoMap<>();
}
/**