From 3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 2 Oct 2024 07:31:08 +0200 Subject: Cleanup the codebase (#3311) Co-authored-by: boubou19 --- src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java | 6 ++---- .../java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'src/main/java/gtPlusPlus/plugin') diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java index 622ae92281..d871d3bc0c 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java @@ -577,10 +577,8 @@ public class BioRecipes { private static void recipeFermentationBase() { processFermentationOreDict(); - ArrayList aFruitVege = mList_Master_FruitVege; - ArrayList aSeeds = mList_Master_Seeds; ArrayList aMap = OreDictionary.getOres("cropSugarbeet"); - for (ItemStack a : aFruitVege) { + for (ItemStack a : mList_Master_FruitVege) { if (aMap.contains(a)) { continue; } @@ -596,7 +594,7 @@ public class BioRecipes { } } - for (ItemStack a : aSeeds) { + for (ItemStack a : mList_Master_Seeds) { if (ItemUtils.checkForInvalidItems(a)) { GTValues.RA.stdBuilder() .itemInputs(getBioChip(3), ItemUtils.getSimpleStack(a, 20)) 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 29c88ca5f4..ff34483d2f 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java @@ -166,8 +166,6 @@ public class ItemAlgaeBase extends Item implements IAlgalItem { AlgaeGeneticData y = aItem.getSpeciesData(aFreshAlgae); aNewTag = y.writeToNBT(); aFreshAlgae.setTagCompound(aNewTag); - } else { - aNewTag = aFreshAlgae.getTagCompound(); } } return aFreshAlgae; @@ -193,8 +191,8 @@ public class ItemAlgaeBase extends Item implements IAlgalItem { int aDam = aStack.getItemDamage(); aTemp = (byte) (aDam == 3 ? 0 : aDam == 4 ? 2 : 1); aLifespan = (byte) (aDam == 3 ? 1 : aDam == 4 ? 3f : 2f); - aFert = (float) (aDam == 3 ? 2f : aDam == 4 ? 1f : 1.75f); - aSpeed = (float) (aDam == 3 ? 1f : aDam == 4 ? 1.5f : 2f); + aFert = aDam == 3 ? 2f : aDam == 4 ? 1f : 1.75f; + aSpeed = aDam == 3 ? 1f : aDam == 4 ? 1.5f : 2f; aGenes = new AlgaeGeneticData( true, -- cgit