diff --git a/src/main/java/forestry/api/apiculture/EnumBeeChromosome.java b/src/main/java/forestry/api/apiculture/EnumBeeChromosome.java index 5b8ea22ad..9e992127b 100644 --- a/src/main/java/forestry/api/apiculture/EnumBeeChromosome.java +++ b/src/main/java/forestry/api/apiculture/EnumBeeChromosome.java @@ -84,7 +84,12 @@ public enum EnumBeeChromosome implements IChromosomeType { */ EFFECT(IAlleleBeeEffect.class); - Class clss; + final Class clss; + + /** + * Cached values() array for frequent read-only operations, the array should NOT be mutated. + */ + public static final EnumBeeChromosome[] VALUES = values(); EnumBeeChromosome(Class clss) { this.clss = clss; diff --git a/src/main/java/forestry/api/apiculture/EnumBeeType.java b/src/main/java/forestry/api/apiculture/EnumBeeType.java index fff076dd5..9e1df81d9 100644 --- a/src/main/java/forestry/api/apiculture/EnumBeeType.java +++ b/src/main/java/forestry/api/apiculture/EnumBeeType.java @@ -17,9 +17,12 @@ public enum EnumBeeType implements ISpeciesType { LARVAE, NONE; + /** + * Cached values() array for frequent read-only operations, the array should NOT be mutated. + */ public static final EnumBeeType[] VALUES = values(); - String name; + private final String name; EnumBeeType() { this.name = this.toString().toLowerCase(Locale.ENGLISH); @@ -28,4 +31,8 @@ public enum EnumBeeType implements ISpeciesType { public String getName() { return name; } + + public static EnumBeeType fromOrdinal(int ordinal) { + return VALUES[ordinal]; + } } diff --git a/src/main/java/forestry/api/arboriculture/EnumTreeChromosome.java b/src/main/java/forestry/api/arboriculture/EnumTreeChromosome.java index e8581ac12..1efeb96b8 100644 --- a/src/main/java/forestry/api/arboriculture/EnumTreeChromosome.java +++ b/src/main/java/forestry/api/arboriculture/EnumTreeChromosome.java @@ -73,9 +73,14 @@ public enum EnumTreeChromosome implements IChromosomeType { /** * Determines if the tree can burn. */ - FIREPROOF(IAlleleBoolean.class),; + FIREPROOF(IAlleleBoolean.class); - Class clss; + final Class clss; + + /** + * Cached values() array for frequent read-only operations, the array should NOT be mutated. + */ + public static final EnumTreeChromosome[] VALUES = values(); EnumTreeChromosome(Class clss) { this.clss = clss; diff --git a/src/main/java/forestry/api/core/EnumHumidity.java b/src/main/java/forestry/api/core/EnumHumidity.java index 0f4d6592b..6e47028fd 100644 --- a/src/main/java/forestry/api/core/EnumHumidity.java +++ b/src/main/java/forestry/api/core/EnumHumidity.java @@ -17,9 +17,14 @@ public enum EnumHumidity { NORMAL("Normal"), DAMP("Damp"); + /** + * Cached values() array for frequent read-only operations, the array should NOT be mutated. + */ + public static final EnumHumidity[] VALUES = values(); + public final String name; - private EnumHumidity(String name) { + EnumHumidity(String name) { this.name = name; } diff --git a/src/main/java/forestry/api/core/EnumTemperature.java b/src/main/java/forestry/api/core/EnumTemperature.java index 9bc57eb52..805759f0c 100644 --- a/src/main/java/forestry/api/core/EnumTemperature.java +++ b/src/main/java/forestry/api/core/EnumTemperature.java @@ -27,10 +27,15 @@ public enum EnumTemperature { HOT("Hot", "habitats/desert"), HELLISH("Hellish", "habitats/nether"); + /** + * Cached values() array for frequent read-only operations, the array should NOT be mutated. + */ + public static final EnumTemperature[] VALUES = values(); + public final String name; public final String iconIndex; - private EnumTemperature(String name, String iconIndex) { + EnumTemperature(String name, String iconIndex) { this.name = name; this.iconIndex = iconIndex; } diff --git a/src/main/java/forestry/api/farming/FarmDirection.java b/src/main/java/forestry/api/farming/FarmDirection.java index 170e93457..e07377f67 100644 --- a/src/main/java/forestry/api/farming/FarmDirection.java +++ b/src/main/java/forestry/api/farming/FarmDirection.java @@ -16,6 +16,11 @@ public enum FarmDirection { private final ForgeDirection forgeDirection; + /** + * Cached values() array for frequent read-only operations, the array should NOT be mutated. + */ + public static final FarmDirection[] VALUES = values(); + FarmDirection(ForgeDirection forgeDirection) { this.forgeDirection = forgeDirection; } @@ -25,17 +30,16 @@ public enum FarmDirection { } public static FarmDirection getFarmDirection(ForgeDirection forgeDirection) { - switch (forgeDirection) { - case NORTH: - return NORTH; - case EAST: - return EAST; - case SOUTH: - return SOUTH; - case WEST: - return WEST; - default: - return null; - } + return switch (forgeDirection) { + case NORTH -> NORTH; + case EAST -> EAST; + case SOUTH -> SOUTH; + case WEST -> WEST; + default -> null; + }; + } + + public static FarmDirection fromOrdinal(int ordinal) { + return VALUES[ordinal]; } } diff --git a/src/main/java/forestry/api/lepidopterology/EnumButterflyChromosome.java b/src/main/java/forestry/api/lepidopterology/EnumButterflyChromosome.java index 353f8d2cf..7f941a5c0 100644 --- a/src/main/java/forestry/api/lepidopterology/EnumButterflyChromosome.java +++ b/src/main/java/forestry/api/lepidopterology/EnumButterflyChromosome.java @@ -77,7 +77,12 @@ public enum EnumButterflyChromosome implements IChromosomeType { */ TERRITORY(IAlleleArea.class),; - Class clss; + final Class clss; + + /** + * Cached values() array for frequent read-only operations, the array should NOT be mutated. + */ + public static final EnumButterflyChromosome[] VALUES = values(); EnumButterflyChromosome(Class clss) { this.clss = clss; diff --git a/src/main/java/forestry/apiculture/commands/CommandBeeGive.java b/src/main/java/forestry/apiculture/commands/CommandBeeGive.java index 95705aec4..14039f1c3 100644 --- a/src/main/java/forestry/apiculture/commands/CommandBeeGive.java +++ b/src/main/java/forestry/apiculture/commands/CommandBeeGive.java @@ -38,7 +38,7 @@ public class CommandBeeGive extends SubCommand { setPermLevel(PermLevel.ADMIN); List beeTypeStrings = new ArrayList<>(); - for (EnumBeeType type : EnumBeeType.values()) { + for (EnumBeeType type : EnumBeeType.VALUES) { if (type == EnumBeeType.NONE) { continue; } @@ -166,7 +166,7 @@ public class CommandBeeGive extends SubCommand { } private static EnumBeeType getBeeType(String beeTypeName) { - for (EnumBeeType beeType : EnumBeeType.values()) { + for (EnumBeeType beeType : EnumBeeType.VALUES) { if (beeType.getName().equalsIgnoreCase(beeTypeName)) { return beeType; } diff --git a/src/main/java/forestry/apiculture/genetics/BeeBranchDefinition.java b/src/main/java/forestry/apiculture/genetics/BeeBranchDefinition.java index f2b5765f3..1bddbfbb1 100644 --- a/src/main/java/forestry/apiculture/genetics/BeeBranchDefinition.java +++ b/src/main/java/forestry/apiculture/genetics/BeeBranchDefinition.java @@ -148,7 +148,7 @@ public enum BeeBranchDefinition implements IBranchDefinition { private static IAllele[] getDefaultTemplate() { if (defaultTemplate == null) { - defaultTemplate = new IAllele[EnumBeeChromosome.values().length]; + defaultTemplate = new IAllele[EnumBeeChromosome.VALUES.length]; AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST); AlleleHelper.instance.set(defaultTemplate, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER); diff --git a/src/main/java/forestry/apiculture/genetics/BeeHelper.java b/src/main/java/forestry/apiculture/genetics/BeeHelper.java index 83e58b22a..46fd24481 100755 --- a/src/main/java/forestry/apiculture/genetics/BeeHelper.java +++ b/src/main/java/forestry/apiculture/genetics/BeeHelper.java @@ -102,7 +102,7 @@ public class BeeHelper extends SpeciesRoot implements IBeeRoot { IBee bee = (IBee) individual; Item beeItem; - switch (EnumBeeType.VALUES[type]) { + switch (EnumBeeType.fromOrdinal(type)) { case QUEEN: beeItem = PluginApiculture.items.beeQueenGE; // ensure a queen is always mated @@ -353,7 +353,7 @@ public class BeeHelper extends SpeciesRoot implements IBeeRoot { @Override public IChromosomeType[] getKaryotype() { - return EnumBeeChromosome.values(); + return EnumBeeChromosome.VALUES; } @Override diff --git a/src/main/java/forestry/apiculture/genetics/DefaultBeeIconProvider.java b/src/main/java/forestry/apiculture/genetics/DefaultBeeIconProvider.java index b358e0988..e4a7598b4 100644 --- a/src/main/java/forestry/apiculture/genetics/DefaultBeeIconProvider.java +++ b/src/main/java/forestry/apiculture/genetics/DefaultBeeIconProvider.java @@ -8,8 +8,6 @@ ******************************************************************************/ package forestry.apiculture.genetics; -import java.util.Locale; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; @@ -22,24 +20,23 @@ import forestry.core.render.TextureManager; public class DefaultBeeIconProvider implements IBeeIconProvider { public static final DefaultBeeIconProvider instance = new DefaultBeeIconProvider(); + private static final IIcon[][] icons = new IIcon[EnumBeeType.VALUES.length][3]; private DefaultBeeIconProvider() {} - private static final IIcon[][] icons = new IIcon[EnumBeeType.values().length][3]; - @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister register) { String beeIconDir = "bees/default/"; IIcon body1 = TextureManager.registerTex(register, beeIconDir + "body1"); - for (int i = 0; i < EnumBeeType.values().length; i++) { - EnumBeeType beeType = EnumBeeType.values()[i]; + for (int i = 0; i < EnumBeeType.VALUES.length; i++) { + EnumBeeType beeType = EnumBeeType.VALUES[i]; if (beeType == EnumBeeType.NONE) { continue; } - String beeTypeNameBase = beeIconDir + beeType.toString().toLowerCase(Locale.ENGLISH); + String beeTypeNameBase = beeIconDir + beeType.getName(); icons[i][0] = TextureManager.registerTex(register, beeTypeNameBase + ".outline"); if (beeType == EnumBeeType.LARVAE) { diff --git a/src/main/java/forestry/arboriculture/genetics/TreeBranchDefinition.java b/src/main/java/forestry/arboriculture/genetics/TreeBranchDefinition.java index 37122ade3..cc0ed1a48 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeBranchDefinition.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeBranchDefinition.java @@ -82,7 +82,7 @@ public enum TreeBranchDefinition implements IBranchDefinition { @Override public IAllele[] getTemplate() { if (defaultTemplate == null) { - defaultTemplate = new IAllele[EnumTreeChromosome.values().length]; + defaultTemplate = new IAllele[EnumTreeChromosome.VALUES.length]; AlleleHelper.instance.set(defaultTemplate, EnumTreeChromosome.FRUITS, AlleleFruit.fruitNone); AlleleHelper.instance.set(defaultTemplate, EnumTreeChromosome.GROWTH, AlleleGrowth.growthLightLevel); diff --git a/src/main/java/forestry/arboriculture/genetics/TreeHelper.java b/src/main/java/forestry/arboriculture/genetics/TreeHelper.java index 7f8ddf27b..d359c9704 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeHelper.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeHelper.java @@ -389,7 +389,7 @@ public class TreeHelper extends SpeciesRoot implements ITreeRoot { @Override public IChromosomeType[] getKaryotype() { - return EnumTreeChromosome.values(); + return EnumTreeChromosome.VALUES; } @Override diff --git a/src/main/java/forestry/core/access/AccessHandler.java b/src/main/java/forestry/core/access/AccessHandler.java index 61208ac0e..fc14e662d 100644 --- a/src/main/java/forestry/core/access/AccessHandler.java +++ b/src/main/java/forestry/core/access/AccessHandler.java @@ -113,11 +113,7 @@ public final class AccessHandler implements IAccessHandler { if (!isOwner(player)) { return false; } - - int ordinal = (access.ordinal() + 1) % EnumAccess.values().length; - EnumAccess newAccess = EnumAccess.values()[ordinal]; - setAccess(player.worldObj, newAccess); - + setAccess(player.worldObj, access.next()); return true; } @@ -156,7 +152,7 @@ public final class AccessHandler implements IAccessHandler { public void readData(DataInputStreamForestry data) throws IOException { byte accessOrdinal = data.readByte(); if (accessOrdinal >= 0) { - access = EnumAccess.values()[accessOrdinal]; + access = EnumAccess.fromOrdinal(accessOrdinal); GameProfile owner = new GameProfile(new UUID(data.readLong(), data.readLong()), data.readUTF()); setOwner(owner); } @@ -164,8 +160,7 @@ public final class AccessHandler implements IAccessHandler { @Override public void readFromNBT(NBTTagCompound data) { - access = EnumAccess.values()[data.getInteger("Access")]; - + access = EnumAccess.fromOrdinal(data.getInteger("Access")); if (data.hasKey("owner")) { owner = NBTUtil.func_152459_a(data.getCompoundTag("owner")); } diff --git a/src/main/java/forestry/core/access/EnumAccess.java b/src/main/java/forestry/core/access/EnumAccess.java index fe26eb720..a43b1a1b0 100644 --- a/src/main/java/forestry/core/access/EnumAccess.java +++ b/src/main/java/forestry/core/access/EnumAccess.java @@ -8,22 +8,15 @@ ******************************************************************************/ package forestry.core.access; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public enum EnumAccess { SHARED("gui.rule.shared"), VIEWABLE("gui.rule.restricted"), PRIVATE("gui.rule.private"); + private static final EnumAccess[] VALUES = values(); private final String name; - @SideOnly(Side.CLIENT) - private IIcon icon; - EnumAccess(String name) { this.name = name; } @@ -31,4 +24,13 @@ public enum EnumAccess { public String getName() { return this.name; } + + public EnumAccess next() { + int ordinal = (this.ordinal() + 1) % VALUES.length; + return VALUES[ordinal]; + } + + public static EnumAccess fromOrdinal(int ordinal) { + return VALUES[ordinal]; + } } diff --git a/src/main/java/forestry/core/circuits/CircuitBoard.java b/src/main/java/forestry/core/circuits/CircuitBoard.java index 103d7d27e..823cd56b4 100755 --- a/src/main/java/forestry/core/circuits/CircuitBoard.java +++ b/src/main/java/forestry/core/circuits/CircuitBoard.java @@ -71,7 +71,7 @@ public class CircuitBoard implements ICircuitBoard { @Override public void readFromNBT(NBTTagCompound nbttagcompound) { - type = EnumCircuitBoardType.values()[nbttagcompound.getShort("T")]; + type = EnumCircuitBoardType.VALUES[nbttagcompound.getShort("T")]; // Layout if (nbttagcompound.hasKey("LY")) { diff --git a/src/main/java/forestry/core/circuits/EnumCircuitBoardType.java b/src/main/java/forestry/core/circuits/EnumCircuitBoardType.java index e2e8873d3..f517217f9 100755 --- a/src/main/java/forestry/core/circuits/EnumCircuitBoardType.java +++ b/src/main/java/forestry/core/circuits/EnumCircuitBoardType.java @@ -15,6 +15,11 @@ public enum EnumCircuitBoardType { REFINED((short) 3, 0x191919, 0xc9c9c9), INTRICATE((short) 4, 0x191919, 0xe2cb6b); + /** + * Cached values() array for frequent read-only operations, the array should NOT be mutated. + */ + public static final EnumCircuitBoardType[] VALUES = values(); + private final short sockets; private final int primaryColor; private final int secondaryColor; diff --git a/src/main/java/forestry/core/circuits/GuiSolderingIron.java b/src/main/java/forestry/core/circuits/GuiSolderingIron.java index eed5046cf..3182e6e85 100755 --- a/src/main/java/forestry/core/circuits/GuiSolderingIron.java +++ b/src/main/java/forestry/core/circuits/GuiSolderingIron.java @@ -63,7 +63,7 @@ public class GuiSolderingIron extends GuiForestry= EnumCircuitBoardType.values().length) { + if (blank.getItemDamage() < 0 || blank.getItemDamage() >= EnumCircuitBoardType.VALUES.length) { return; } - EnumCircuitBoardType type = EnumCircuitBoardType.values()[blank.getItemDamage()]; + EnumCircuitBoardType type = EnumCircuitBoardType.VALUES[blank.getItemDamage()]; if (getCircuitCount() != type.getSockets()) { return; } @@ -172,7 +172,7 @@ public class ItemInventorySolderingIron extends ItemInventory implements IErrorS if (blankCircuitBoard == null) { errorStates.add(EnumErrorCode.NO_CIRCUIT_BOARD); } else { - EnumCircuitBoardType type = EnumCircuitBoardType.values()[blankCircuitBoard.getItemDamage()]; + EnumCircuitBoardType type = EnumCircuitBoardType.VALUES[blankCircuitBoard.getItemDamage()]; int circuitCount = 0; for (short i = 0; i < type.getSockets(); i++) { diff --git a/src/main/java/forestry/core/items/ItemFruit.java b/src/main/java/forestry/core/items/ItemFruit.java index e0cf30b6b..073f11edc 100755 --- a/src/main/java/forestry/core/items/ItemFruit.java +++ b/src/main/java/forestry/core/items/ItemFruit.java @@ -34,6 +34,9 @@ public class ItemFruit extends ItemForestryFood { DATES("cropDate"), PAPAYA("cropPapaya"); // , COCONUT("cropCoconut"); + /** + * Cached values() array for frequent read-only operations, the array should NOT be mutated. + */ public static final EnumFruit[] VALUES = values(); private final String oreDict; @@ -94,13 +97,13 @@ public class ItemFruit extends ItemForestryFood { @SideOnly(Side.CLIENT) @Override public IIcon getIconFromDamage(int meta) { - return EnumFruit.values()[meta].getIcon(); + return EnumFruit.VALUES[meta].getIcon(); } @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - for (int i = 0; i < EnumFruit.values().length; i++) { + for (int i = 0; i < EnumFruit.VALUES.length; i++) { itemList.add(new ItemStack(this, 1, i)); } } diff --git a/src/main/java/forestry/core/items/ItemRegistryCore.java b/src/main/java/forestry/core/items/ItemRegistryCore.java index b37f272f2..af366f462 100644 --- a/src/main/java/forestry/core/items/ItemRegistryCore.java +++ b/src/main/java/forestry/core/items/ItemRegistryCore.java @@ -194,7 +194,7 @@ public class ItemRegistryCore extends ItemRegistry { // FRUITS fruits = registerItem(new ItemFruit(), "fruits"); - for (ItemFruit.EnumFruit def : ItemFruit.EnumFruit.values()) { + for (ItemFruit.EnumFruit def : ItemFruit.EnumFruit.VALUES) { ItemStack fruit = new ItemStack(fruits, 1, def.ordinal()); OreDictionary.registerOre(def.getOreDict(), fruit); } diff --git a/src/main/java/forestry/core/utils/ClimateUtil.java b/src/main/java/forestry/core/utils/ClimateUtil.java index b3ff096a0..95bfb4708 100644 --- a/src/main/java/forestry/core/utils/ClimateUtil.java +++ b/src/main/java/forestry/core/utils/ClimateUtil.java @@ -45,18 +45,18 @@ public class ClimateUtil implements IClimateHelper { case BOTH_4: case BOTH_3: case BOTH_2: - if (prefered.ordinal() + 2 < EnumHumidity.values().length) { - tolerated.add(EnumHumidity.values()[prefered.ordinal() + 2]); + if (prefered.ordinal() + 2 < EnumHumidity.VALUES.length) { + tolerated.add(EnumHumidity.VALUES[prefered.ordinal() + 2]); } if (prefered.ordinal() - 2 >= 0) { - tolerated.add(EnumHumidity.values()[prefered.ordinal() - 2]); + tolerated.add(EnumHumidity.VALUES[prefered.ordinal() - 2]); } case BOTH_1: - if (prefered.ordinal() + 1 < EnumHumidity.values().length) { - tolerated.add(EnumHumidity.values()[prefered.ordinal() + 1]); + if (prefered.ordinal() + 1 < EnumHumidity.VALUES.length) { + tolerated.add(EnumHumidity.VALUES[prefered.ordinal() + 1]); } if (prefered.ordinal() - 1 >= 0) { - tolerated.add(EnumHumidity.values()[prefered.ordinal() - 1]); + tolerated.add(EnumHumidity.VALUES[prefered.ordinal() - 1]); } return tolerated; @@ -64,12 +64,12 @@ public class ClimateUtil implements IClimateHelper { case UP_4: case UP_3: case UP_2: - if (prefered.ordinal() + 2 < EnumHumidity.values().length) { - tolerated.add(EnumHumidity.values()[prefered.ordinal() + 2]); + if (prefered.ordinal() + 2 < EnumHumidity.VALUES.length) { + tolerated.add(EnumHumidity.VALUES[prefered.ordinal() + 2]); } case UP_1: - if (prefered.ordinal() + 1 < EnumHumidity.values().length) { - tolerated.add(EnumHumidity.values()[prefered.ordinal() + 1]); + if (prefered.ordinal() + 1 < EnumHumidity.VALUES.length) { + tolerated.add(EnumHumidity.VALUES[prefered.ordinal() + 1]); } return tolerated; @@ -78,11 +78,11 @@ public class ClimateUtil implements IClimateHelper { case DOWN_3: case DOWN_2: if (prefered.ordinal() - 2 >= 0) { - tolerated.add(EnumHumidity.values()[prefered.ordinal() - 2]); + tolerated.add(EnumHumidity.VALUES[prefered.ordinal() - 2]); } case DOWN_1: if (prefered.ordinal() - 1 >= 0) { - tolerated.add(EnumHumidity.values()[prefered.ordinal() - 1]); + tolerated.add(EnumHumidity.VALUES[prefered.ordinal() - 1]); } return tolerated; @@ -96,85 +96,86 @@ public class ClimateUtil implements IClimateHelper { ArrayList tolerated = new ArrayList<>(); tolerated.add(prefered); + final EnumTemperature[] TEMP_VALUES = EnumTemperature.VALUES; switch (tolerance) { case BOTH_5: - if (prefered.ordinal() + 5 < EnumTemperature.values().length) { - tolerated.add(EnumTemperature.values()[prefered.ordinal() + 5]); + if (prefered.ordinal() + 5 < TEMP_VALUES.length) { + tolerated.add(TEMP_VALUES[prefered.ordinal() + 5]); } if (prefered.ordinal() - 5 >= 0) { - tolerated.add(EnumTemperature.values()[prefered.ordinal() - 5]); + tolerated.add(TEMP_VALUES[prefered.ordinal() - 5]); } case BOTH_4: - if (prefered.ordinal() + 4 < EnumTemperature.values().length) { - tolerated.add(EnumTemperature.values()[prefered.ordinal() + 4]); + if (prefered.ordinal() + 4 < TEMP_VALUES.length) { + tolerated.add(TEMP_VALUES[prefered.ordinal() + 4]); } if (prefered.ordinal() - 4 >= 0) { - tolerated.add(EnumTemperature.values()[prefered.ordinal() - 4]); + tolerated.add(TEMP_VALUES[prefered.ordinal() - 4]); } case BOTH_3: - if (prefered.ordinal() + 3 < EnumTemperature.values().length) { - tolerated.add(EnumTemperature.values()[prefered.ordinal() + 3]); + if (prefered.ordinal() + 3 < TEMP_VALUES.length) { + tolerated.add(TEMP_VALUES[prefered.ordinal() + 3]); } if (prefered.ordinal() - 3 >= 0) { - tolerated.add(EnumTemperature.values()[prefered.ordinal() - 3]); + tolerated.add(TEMP_VALUES[prefered.ordinal() - 3]); } case BOTH_2: - if (prefered.ordinal() + 2 < EnumTemperature.values().length) { - tolerated.add(EnumTemperature.values()[prefered.ordinal() + 2]); + if (prefered.ordinal() + 2 < TEMP_VALUES.length) { + tolerated.add(TEMP_VALUES[prefered.ordinal() + 2]); } if (prefered.ordinal() - 2 >= 0) { - tolerated.add(EnumTemperature.values()[prefered.ordinal() - 2]); + tolerated.add(TEMP_VALUES[prefered.ordinal() - 2]); } case BOTH_1: - if (prefered.ordinal() + 1 < EnumTemperature.values().length) { - tolerated.add(EnumTemperature.values()[prefered.ordinal() + 1]); + if (prefered.ordinal() + 1 < TEMP_VALUES.length) { + tolerated.add(TEMP_VALUES[prefered.ordinal() + 1]); } if (prefered.ordinal() - 1 >= 0) { - tolerated.add(EnumTemperature.values()[prefered.ordinal() - 1]); + tolerated.add(TEMP_VALUES[prefered.ordinal() - 1]); } return tolerated; case UP_5: - if (prefered.ordinal() + 5 < EnumTemperature.values().length) { - tolerated.add(EnumTemperature.values()[prefered.ordinal() + 5]); + if (prefered.ordinal() + 5 < TEMP_VALUES.length) { + tolerated.add(TEMP_VALUES[prefered.ordinal() + 5]); } case UP_4: - if (prefered.ordinal() + 4 < EnumTemperature.values().length) { - tolerated.add(EnumTemperature.values()[prefered.ordinal() + 4]); + if (prefered.ordinal() + 4 < TEMP_VALUES.length) { + tolerated.add(TEMP_VALUES[prefered.ordinal() + 4]); } case UP_3: - if (prefered.ordinal() + 3 < EnumTemperature.values().length) { - tolerated.add(EnumTemperature.values()[prefered.ordinal() + 3]); + if (prefered.ordinal() + 3 < TEMP_VALUES.length) { + tolerated.add(TEMP_VALUES[prefered.ordinal() + 3]); } case UP_2: - if (prefered.ordinal() + 2 < EnumTemperature.values().length) { - tolerated.add(EnumTemperature.values()[prefered.ordinal() + 2]); + if (prefered.ordinal() + 2 < TEMP_VALUES.length) { + tolerated.add(TEMP_VALUES[prefered.ordinal() + 2]); } case UP_1: - if (prefered.ordinal() + 1 < EnumTemperature.values().length) { - tolerated.add(EnumTemperature.values()[prefered.ordinal() + 1]); + if (prefered.ordinal() + 1 < TEMP_VALUES.length) { + tolerated.add(TEMP_VALUES[prefered.ordinal() + 1]); } return tolerated; case DOWN_5: if (prefered.ordinal() - 5 >= 0) { - tolerated.add(EnumTemperature.values()[prefered.ordinal() - 5]); + tolerated.add(TEMP_VALUES[prefered.ordinal() - 5]); } case DOWN_4: if (prefered.ordinal() - 4 >= 0) { - tolerated.add(EnumTemperature.values()[prefered.ordinal() - 4]); + tolerated.add(TEMP_VALUES[prefered.ordinal() - 4]); } case DOWN_3: if (prefered.ordinal() - 3 >= 0) { - tolerated.add(EnumTemperature.values()[prefered.ordinal() - 3]); + tolerated.add(TEMP_VALUES[prefered.ordinal() - 3]); } case DOWN_2: if (prefered.ordinal() - 2 >= 0) { - tolerated.add(EnumTemperature.values()[prefered.ordinal() - 2]); + tolerated.add(TEMP_VALUES[prefered.ordinal() - 2]); } case DOWN_1: if (prefered.ordinal() - 1 >= 0) { - tolerated.add(EnumTemperature.values()[prefered.ordinal() - 1]); + tolerated.add(TEMP_VALUES[prefered.ordinal() - 1]); } return tolerated; diff --git a/src/main/java/forestry/farming/blocks/BlockFarm.java b/src/main/java/forestry/farming/blocks/BlockFarm.java index 967176fab..ea6bfbe4f 100644 --- a/src/main/java/forestry/farming/blocks/BlockFarm.java +++ b/src/main/java/forestry/farming/blocks/BlockFarm.java @@ -61,7 +61,7 @@ public class BlockFarm extends BlockStructure { continue; } - for (EnumFarmBlockTexture block : EnumFarmBlockTexture.values()) { + for (EnumFarmBlockTexture block : EnumFarmBlockTexture.VALUES) { ItemStack stack = new ItemStack(item, 1, i); NBTTagCompound compound = new NBTTagCompound(); block.saveToCompound(compound); diff --git a/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java b/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java index 98e83bc15..b3eaa3fca 100755 --- a/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java +++ b/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java @@ -61,7 +61,7 @@ public class CircuitFarmLogic extends Circuit { } catch (Throwable e) { // uses older version of the API that doesn't implement setManual } - housing.setFarmLogic(FarmDirection.values()[slot], logic); + housing.setFarmLogic(FarmDirection.fromOrdinal(slot), logic); } @Override @@ -75,8 +75,7 @@ public class CircuitFarmLogic extends Circuit { if (farmHousing == null) { return; } - - farmHousing.resetFarmLogic(FarmDirection.values()[slot]); + farmHousing.resetFarmLogic(FarmDirection.fromOrdinal(slot)); } @Override diff --git a/src/main/java/forestry/farming/multiblock/FarmController.java b/src/main/java/forestry/farming/multiblock/FarmController.java index 99b912091..c904c0989 100644 --- a/src/main/java/forestry/farming/multiblock/FarmController.java +++ b/src/main/java/forestry/farming/multiblock/FarmController.java @@ -372,7 +372,7 @@ public class FarmController extends RectangularMultiblockControllerBase } private void refreshFarmLogics() { - for (FarmDirection direction : FarmDirection.values()) { + for (FarmDirection direction : FarmDirection.VALUES) { resetFarmLogic(direction); } @@ -475,7 +475,7 @@ public class FarmController extends RectangularMultiblockControllerBase // Cultivation and collection FarmWorkStatus farmWorkStatus = new FarmWorkStatus(); - for (FarmDirection farmSide : FarmDirection.values()) { + for (FarmDirection farmSide : FarmDirection.VALUES) { IFarmLogic logic = getFarmLogic(farmSide); if (logic == null) { @@ -541,7 +541,7 @@ public class FarmController extends RectangularMultiblockControllerBase private static void createTargets(World world, Map> targets, Vect targetStart, final int allowedExtent, final int farmSizeNorthSouth, final int farmSizeEastWest) { - for (FarmDirection farmSide : FarmDirection.values()) { + for (FarmDirection farmSide : FarmDirection.VALUES) { final int farmWidth; if (farmSide == FarmDirection.NORTH || farmSide == FarmDirection.SOUTH) { diff --git a/src/main/java/forestry/farming/multiblock/InventoryFarm.java b/src/main/java/forestry/farming/multiblock/InventoryFarm.java index d311ecefc..bfc98d943 100644 --- a/src/main/java/forestry/farming/multiblock/InventoryFarm.java +++ b/src/main/java/forestry/farming/multiblock/InventoryFarm.java @@ -106,7 +106,7 @@ public class InventoryFarm extends InventoryAdapterRestricted implements IFarmIn return false; } - for (FarmDirection farmDirection : FarmDirection.values()) { + for (FarmDirection farmDirection : FarmDirection.VALUES) { IFarmLogic logic = farmController.getFarmLogic(farmDirection); if (logic.isAcceptedGermling(itemstack)) { return true; @@ -122,7 +122,7 @@ public class InventoryFarm extends InventoryAdapterRestricted implements IFarmIn return false; } - for (FarmDirection farmDirection : FarmDirection.values()) { + for (FarmDirection farmDirection : FarmDirection.VALUES) { IFarmLogic logic = farmController.getFarmLogic(farmDirection); if (logic.isAcceptedResource(itemstack)) { return true; diff --git a/src/main/java/forestry/farming/render/EnumFarmBlockTexture.java b/src/main/java/forestry/farming/render/EnumFarmBlockTexture.java index 9685919a6..3b2661447 100644 --- a/src/main/java/forestry/farming/render/EnumFarmBlockTexture.java +++ b/src/main/java/forestry/farming/render/EnumFarmBlockTexture.java @@ -45,8 +45,17 @@ public enum EnumFarmBlockTexture { private static final int TYPE_VALVE = 6; private static final int TYPE_CONTROL = 7; + /** + * Cached values() array for frequent read-only operations, the array should NOT be mutated. + */ + public static final EnumFarmBlockTexture[] VALUES = values(); @SideOnly(Side.CLIENT) private static List icons; + private final ItemStack base; + + EnumFarmBlockTexture(ItemStack base) { + this.base = base; + } @SideOnly(Side.CLIENT) public static void registerIcons(IIconRegister register) { @@ -61,12 +70,6 @@ public enum EnumFarmBlockTexture { TextureManager.registerTex(register, "farm/control")); } - private final ItemStack base; - - EnumFarmBlockTexture(ItemStack base) { - this.base = base; - } - @SideOnly(Side.CLIENT) public static IIcon getIcon(BlockFarmType type, int side) { switch (type) { @@ -109,11 +112,10 @@ public enum EnumFarmBlockTexture { public static EnumFarmBlockTexture getFromCompound(NBTTagCompound compound) { if (compound != null) { int farmBlockOrdinal = compound.getInteger("FarmBlock"); - if (farmBlockOrdinal < EnumFarmBlockTexture.values().length) { - return EnumFarmBlockTexture.values()[farmBlockOrdinal]; + if (farmBlockOrdinal < EnumFarmBlockTexture.VALUES.length) { + return EnumFarmBlockTexture.VALUES[farmBlockOrdinal]; } } - return EnumFarmBlockTexture.BRICK_STONE; } } diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyBranchDefinition.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyBranchDefinition.java index a6344b0a9..9ad8036de 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyBranchDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyBranchDefinition.java @@ -57,7 +57,7 @@ public enum ButterflyBranchDefinition implements IBranchDefinition { @Override public IAllele[] getTemplate() { if (defaultTemplate == null) { - defaultTemplate = new IAllele[EnumButterflyChromosome.values().length]; + defaultTemplate = new IAllele[EnumButterflyChromosome.VALUES.length]; AlleleHelper.instance.set(defaultTemplate, EnumButterflyChromosome.SIZE, EnumAllele.Size.SMALL); AlleleHelper.instance.set(defaultTemplate, EnumButterflyChromosome.SPEED, EnumAllele.Speed.SLOWEST); diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyHelper.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyHelper.java index 6dee75c79..007eed8bc 100755 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyHelper.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyHelper.java @@ -245,7 +245,7 @@ public class ButterflyHelper extends SpeciesRoot implements IButterflyRoot { @Override public IChromosomeType[] getKaryotype() { - return EnumButterflyChromosome.values(); + return EnumButterflyChromosome.VALUES; } @Override diff --git a/src/main/java/forestry/plugins/PluginFarming.java b/src/main/java/forestry/plugins/PluginFarming.java index d09b0feda..489d199ec 100644 --- a/src/main/java/forestry/plugins/PluginFarming.java +++ b/src/main/java/forestry/plugins/PluginFarming.java @@ -300,7 +300,7 @@ public class PluginFarming extends ForestryPlugin { ItemStack valve = blocks.farm.get(BlockFarmType.VALVE, 1); ItemStack control = blocks.farm.get(BlockFarmType.CONTROL, 1); - for (EnumFarmBlockTexture block : EnumFarmBlockTexture.values()) { + for (EnumFarmBlockTexture block : EnumFarmBlockTexture.VALUES) { NBTTagCompound compound = new NBTTagCompound(); block.saveToCompound(compound);