diff --git a/dependencies.gradle b/dependencies.gradle index f0cadc7f..34101b81 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:EnderCore:0.5.5:dev') {transitive = false} + api('com.github.GTNewHorizons:EnderCore:0.5.7:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:ForestryMC:4.11.4:dev') compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.8.60-GTNH:dev') api("com.github.GTNewHorizons:GTNHLib:0.9.10:dev") diff --git a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java index e6f0ddd4..8f1ca8c0 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java @@ -47,6 +47,7 @@ import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.power.PowerConduitNetwork; import crazypants.enderio.conduit.redstone.IRedstoneConduit; import crazypants.enderio.conduit.redstone.RedstoneConduitNetwork; +import crazypants.util.ForgeDirections; import mods.immibis.microblocks.api.EnumPartClass; import mods.immibis.microblocks.api.EnumPosition; import mods.immibis.microblocks.api.IMicroblockCoverSystem; @@ -118,7 +119,7 @@ public abstract class AbstractConduit implements IConduit { return false; } if (dataRoot.hasKey("connectionMode")) { - ConnectionMode mode = ConnectionMode.values()[dataRoot.getShort("connectionMode")]; + ConnectionMode mode = ConnectionMode.VALUES[dataRoot.getShort("connectionMode")]; setConnectionMode(dir, mode); } readTypeSettings(dir, dataRoot); @@ -382,13 +383,13 @@ public abstract class AbstractConduit implements IConduit { conduitConnections.clear(); int[] dirs = nbtRoot.getIntArray("connections"); for (int i = 0; i < dirs.length; i++) { - conduitConnections.add(ForgeDirection.values()[dirs[i]]); + conduitConnections.add(ForgeDirections.DIRECTIONS[dirs[i]]); } externalConnections.clear(); dirs = nbtRoot.getIntArray("externalConnections"); for (int i = 0; i < dirs.length; i++) { - externalConnections.add(ForgeDirection.values()[dirs[i]]); + externalConnections.add(ForgeDirections.DIRECTIONS[dirs[i]]); } active = nbtRoot.getBoolean("signalActive"); @@ -397,7 +398,7 @@ public abstract class AbstractConduit implements IConduit { if (modes != null && modes.length == 6) { int i = 0; for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - conectionModes.put(dir, ConnectionMode.values()[modes[i]]); + conectionModes.put(dir, ConnectionMode.VALUES[modes[i]]); i++; } } diff --git a/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java index 1c1c2471..98d4f44d 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java @@ -24,6 +24,7 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; +import crazypants.util.ForgeDirections; import mods.immibis.microblocks.api.IMicroblockCoverSystem; import mods.immibis.microblocks.api.IMicroblockSupporterTile; import mods.immibis.microblocks.api.MicroblockAPIUtils; @@ -84,7 +85,7 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem { } return true; } else { - ForgeDirection dir = ForgeDirection.values()[side]; + ForgeDirection dir = ForgeDirections.DIRECTIONS[side]; int placeX = x + dir.offsetX; int placeY = y + dir.offsetY; int placeZ = z + dir.offsetZ; diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index 3ba108ef..bd9628b4 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -71,6 +71,7 @@ import crazypants.enderio.item.ItemConduitProbe; import crazypants.enderio.machine.painter.PainterUtil; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.tool.ToolUtil; +import crazypants.util.ForgeDirections; import crazypants.util.IFacade; import mods.immibis.core.api.multipart.IMultipartRenderingBlockMarker; import mods.immibis.core.api.multipart.IMultipartSystem; @@ -819,7 +820,7 @@ public class BlockConduitBundle extends BlockEio return new ExternalConnectionContainer( player.inventory, (IConduitBundle) te, - ForgeDirection.values()[id - GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE]); + ForgeDirections.DIRECTIONS[id - GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE]); } return null; } @@ -834,7 +835,7 @@ public class BlockConduitBundle extends BlockEio return new GuiExternalConnection( player.inventory, (IConduitBundle) te, - ForgeDirection.values()[id - GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE]); + ForgeDirections.DIRECTIONS[id - GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE]); } return null; } diff --git a/src/main/java/crazypants/enderio/conduit/ConnectionMode.java b/src/main/java/crazypants/enderio/conduit/ConnectionMode.java index 12742c9b..2daa86c1 100644 --- a/src/main/java/crazypants/enderio/conduit/ConnectionMode.java +++ b/src/main/java/crazypants/enderio/conduit/ConnectionMode.java @@ -10,6 +10,10 @@ public enum ConnectionMode { DISABLED("gui.conduit.ioMode.disabled"), NOT_SET("gui.conduit.ioMode.notSet"); + /** + * Cached values() array for frequent read-only operations, the array should NOT be mutated. + */ + public static final ConnectionMode[] VALUES = values(); private final String unlocalisedName; ConnectionMode(String unlocalisedName) { @@ -22,19 +26,19 @@ public enum ConnectionMode { public static ConnectionMode getNext(ConnectionMode mode) { int ord = mode.ordinal() + 1; - if (ord >= ConnectionMode.values().length) { + if (ord >= ConnectionMode.VALUES.length) { ord = 0; } - return ConnectionMode.values()[ord]; + return ConnectionMode.VALUES[ord]; } public static ConnectionMode getPrevious(ConnectionMode mode) { int ord = mode.ordinal() - 1; if (ord < 0) { - ord = ConnectionMode.values().length - 1; + ord = ConnectionMode.VALUES.length - 1; } - return ConnectionMode.values()[ord]; + return ConnectionMode.VALUES[ord]; } public boolean acceptsInput() { diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index 7317283e..5e3eeac5 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -51,6 +51,7 @@ import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.redstone.IRedstoneConduit; import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit; import crazypants.enderio.config.Config; +import crazypants.util.ForgeDirections; import li.cil.oc.api.network.Message; import li.cil.oc.api.network.Node; import mekanism.api.gas.Gas; @@ -412,7 +413,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { } // If you're wondering why I am not using conduit.writeToNBT, it is because there is some data that should not // persist, some of which causes crashes with energy conduits. - NBTTagCompound[] originalData = new NBTTagCompound[ForgeDirection.values().length]; + NBTTagCompound[] originalData = new NBTTagCompound[ForgeDirections.DIRECTIONS.length]; for (ForgeDirection conduitConnection : original.getExternalConnections()) { NBTTagCompound tag = new NBTTagCompound(); original.writeConnectionSettingsToNBT(conduitConnection, tag); @@ -423,7 +424,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { for (int i = 0; i < originalData.length; i++) { NBTTagCompound nbt = originalData[i]; if (nbt != null) { - replacement.readConduitSettingsFromNBT(ForgeDirection.values()[i], nbt); + replacement.readConduitSettingsFromNBT(ForgeDirections.DIRECTIONS[i], nbt); } } } diff --git a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java index 089f0433..28264236 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java +++ b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java @@ -32,10 +32,11 @@ import crazypants.enderio.machine.painter.BasicPainterTemplate; import crazypants.enderio.machine.painter.IPaintedBlock; import crazypants.enderio.machine.painter.PaintSourceValidator; import crazypants.enderio.machine.painter.PainterUtil; +import crazypants.util.ForgeDirections; public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider, IResourceTooltipProvider { - public static enum FacadeType { + public enum FacadeType { BASIC, HARDENED; @@ -115,7 +116,7 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider, return true; } - ForgeDirection dir = ForgeDirection.values()[side]; + ForgeDirection dir = ForgeDirections.DIRECTIONS[side]; int placeX = x + dir.offsetX; int placeY = y + dir.offsetY; int placeZ = z + dir.offsetZ; diff --git a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java index 6ef2f017..d408ee7a 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java @@ -193,8 +193,8 @@ public abstract class AbstractGasConduit extends AbstractConduit implements IGas key = "extSC." + dir.name(); if (nbtRoot.hasKey(key)) { short ord = nbtRoot.getShort(key); - if (ord >= 0 && ord < DyeColor.values().length) { - extractionColors.put(dir, DyeColor.values()[ord]); + if (ord >= 0 && ord < DyeColor.VALUES.length) { + extractionColors.put(dir, DyeColor.VALUES[ord]); } } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java b/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java index ccdceb0f..88387fed 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GasSettings.java @@ -72,7 +72,7 @@ public class GasSettings extends BaseSettingsPanel { public void actionPerformed(GuiButton guiButton) { super.actionPerformed(guiButton); if (guiButton.id == ID_COLOR_BUTTON) { - conduit.setExtractionSignalColor(gui.getDir(), DyeColor.values()[colorB.getColorIndex()]); + conduit.setExtractionSignalColor(gui.getDir(), DyeColor.VALUES[colorB.getColorIndex()]); PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir())); } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java index 6afa65fa..55ed5500 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java @@ -23,6 +23,7 @@ import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; import crazypants.enderio.network.PacketHandler; +import crazypants.util.ForgeDirections; public class GuiExternalConnectionSelector extends GuiScreen { @@ -51,7 +52,7 @@ public class GuiExternalConnectionSelector extends GuiScreen { @Override protected void actionPerformed(GuiButton b) { - ForgeDirection dir = ForgeDirection.values()[b.id]; + ForgeDirection dir = ForgeDirections.DIRECTIONS[b.id]; EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; BlockCoord loc = cb.getLocation(); PacketHandler.INSTANCE.sendToServer(new PacketOpenConduitUI(cb.getEntity(), dir)); diff --git a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java index 8a20c533..f86c513b 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java @@ -172,7 +172,7 @@ public class LiquidSettings extends BaseSettingsPanel { public void actionPerformed(GuiButton guiButton) { super.actionPerformed(guiButton); if (guiButton.id == ID_COLOR_BUTTON) { - conduit.setExtractionSignalColor(gui.getDir(), DyeColor.values()[colorB.getColorIndex()]); + conduit.setExtractionSignalColor(gui.getDir(), DyeColor.VALUES[colorB.getColorIndex()]); PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir())); } else if (guiButton.id == ID_INSERT_WHITELIST || guiButton.id == ID_EXTRACT_WHITELIST) { toggleBlacklist(guiButton.id == ID_EXTRACT_WHITELIST); @@ -180,7 +180,7 @@ public class LiquidSettings extends BaseSettingsPanel { ColorButton btn = (ColorButton) guiButton; if (isEnder) { - DyeColor col = DyeColor.values()[btn.getColorIndex()]; + DyeColor col = DyeColor.VALUES[btn.getColorIndex()]; boolean isInput = guiButton.id == ID_EXTRACT_CHANNEL; if (isInput) { diff --git a/src/main/java/crazypants/enderio/conduit/gui/OCSettings.java b/src/main/java/crazypants/enderio/conduit/gui/OCSettings.java index 1d04b98e..06a2df48 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/OCSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/OCSettings.java @@ -42,7 +42,7 @@ public class OCSettings extends BaseSettingsPanel { public void actionPerformed(GuiButton guiButton) { super.actionPerformed(guiButton); if (guiButton.id == ID_COLOR_BUTTON && cb != null) { - occon.setSignalColor(gui.getDir(), DyeColor.values()[cb.getColorIndex()]); + occon.setSignalColor(gui.getDir(), DyeColor.VALUES[cb.getColorIndex()]); PacketHandler.INSTANCE.sendToServer(new PacketOCConduitSignalColor(occon, gui.getDir())); } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/PacketFluidChannel.java b/src/main/java/crazypants/enderio/conduit/gui/PacketFluidChannel.java index 2a7983cb..35514c67 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/PacketFluidChannel.java +++ b/src/main/java/crazypants/enderio/conduit/gui/PacketFluidChannel.java @@ -11,6 +11,7 @@ import crazypants.enderio.conduit.liquid.AbstractEnderLiquidConduit; import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.packet.AbstractConduitPacket; import crazypants.enderio.conduit.packet.ConTypeEnum; +import crazypants.util.ForgeDirections; import io.netty.buffer.ByteBuf; public class PacketFluidChannel extends AbstractConduitPacket @@ -42,9 +43,9 @@ public class PacketFluidChannel extends AbstractConduitPacket @Override public void fromBytes(ByteBuf buf) { super.fromBytes(buf); - dir = ForgeDirection.values()[buf.readShort()]; + dir = ForgeDirections.DIRECTIONS[buf.readShort()]; isInput = buf.readBoolean(); - channel = DyeColor.values()[buf.readShort()]; + channel = DyeColor.VALUES[buf.readShort()]; } @Override diff --git a/src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java b/src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java index 4a5a5243..04014851 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java +++ b/src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java @@ -12,6 +12,7 @@ import crazypants.enderio.conduit.liquid.FluidFilter; import crazypants.enderio.conduit.liquid.ILiquidConduit; import crazypants.enderio.conduit.packet.AbstractConduitPacket; import crazypants.enderio.conduit.packet.ConTypeEnum; +import crazypants.util.ForgeDirections; import io.netty.buffer.ByteBuf; public class PacketFluidFilter extends AbstractConduitPacket @@ -44,7 +45,7 @@ public class PacketFluidFilter extends AbstractConduitPacket @Override public void fromBytes(ByteBuf buf) { super.fromBytes(buf); - dir = ForgeDirection.values()[buf.readShort()]; + dir = ForgeDirections.DIRECTIONS[buf.readShort()]; isInput = buf.readBoolean(); NBTTagCompound tag = ByteBufUtils.readTag(buf); filter = new FluidFilter(); diff --git a/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java b/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java index 5970dfe7..e7c1823d 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java +++ b/src/main/java/crazypants/enderio/conduit/gui/PacketOpenConduitUI.java @@ -11,6 +11,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; +import crazypants.util.ForgeDirections; import io.netty.buffer.ByteBuf; public class PacketOpenConduitUI extends MessageTileEntity @@ -34,7 +35,7 @@ public class PacketOpenConduitUI extends MessageTileEntity @Override public void fromBytes(ByteBuf buf) { super.fromBytes(buf); - dir = ForgeDirection.values()[buf.readShort()]; + dir = ForgeDirections.DIRECTIONS[buf.readShort()]; } public IMessage onMessage(PacketOpenConduitUI message, MessageContext ctx) { diff --git a/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java b/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java index 66b0eff8..c1796c93 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/PowerSettings.java @@ -59,7 +59,7 @@ public class PowerSettings extends BaseSettingsPanel { public void actionPerformed(GuiButton guiButton) { super.actionPerformed(guiButton); if (guiButton.id == ID_COLOR_BUTTON) { - conduit.setExtractionSignalColor(gui.getDir(), DyeColor.values()[colorB.getColorIndex()]); + conduit.setExtractionSignalColor(gui.getDir(), DyeColor.VALUES[colorB.getColorIndex()]); PacketHandler.INSTANCE.sendToServer(new PacketExtractMode(conduit, gui.getDir())); } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java b/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java index fbb1085c..fb3ad6d9 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/RedstoneSettings.java @@ -61,7 +61,7 @@ public class RedstoneSettings extends BaseSettingsPanel { public void actionPerformed(GuiButton guiButton) { super.actionPerformed(guiButton); if (guiButton.id == ID_COLOR_BUTTON && cb != null) { - insCon.setSignalColor(gui.getDir(), DyeColor.values()[cb.getColorIndex()]); + insCon.setSignalColor(gui.getDir(), DyeColor.VALUES[cb.getColorIndex()]); PacketHandler.INSTANCE.sendToServer(new PacketRedstoneConduitSignalColor(insCon, gui.getDir())); } else if (guiButton.id == ID_STRONG_BUTTON && strongCB != null) { insCon.setOutputStrength(gui.getDir(), strongCB.isSelected()); diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java b/src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java index f20507f4..a15501a2 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java @@ -14,17 +14,25 @@ import crazypants.enderio.conduit.item.NetworkedInventory; import crazypants.enderio.conduit.item.filter.ExistingItemFilter; import crazypants.enderio.conduit.packet.AbstractConduitPacket; import crazypants.enderio.conduit.packet.ConTypeEnum; +import crazypants.util.ForgeDirections; import io.netty.buffer.ByteBuf; public class PacketExistingItemFilterSnapshot extends AbstractConduitPacket implements IMessageHandler { - public static enum Opcode { + public enum Opcode { + CLEAR, SET, MERGE, SET_BLACK, - UNSET_BLACK + UNSET_BLACK; + + private static final Opcode[] VALUES = values(); + + public static Opcode fromOrdinal(int ordinal) { + return VALUES[ordinal]; + } } private ForgeDirection dir; @@ -43,9 +51,9 @@ public class PacketExistingItemFilterSnapshot extends AbstractConduitPacket @@ -33,7 +34,7 @@ public class PacketModItemFilter extends AbstractConduitPacket @Override public void fromBytes(ByteBuf buf) { super.fromBytes(buf); - dir = ForgeDirection.values()[buf.readShort()]; + dir = ForgeDirections.DIRECTIONS[buf.readShort()]; isInput = buf.readBoolean(); index = buf.readInt(); boolean isNull = buf.readBoolean(); diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java index d5d0d3f0..228bfb89 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java @@ -164,10 +164,10 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { @Override protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { - setExtractionSignalColor(dir, DyeColor.values()[dataRoot.getShort("extractionSignalColor")]); + setExtractionSignalColor(dir, DyeColor.VALUES[dataRoot.getShort("extractionSignalColor")]); setExtractionRedstoneMode(RedstoneControlMode.values()[dataRoot.getShort("extractionRedstoneMode")], dir); - setInputColor(dir, DyeColor.values()[dataRoot.getShort("inputColor")]); - setOutputColor(dir, DyeColor.values()[dataRoot.getShort("outputColor")]); + setInputColor(dir, DyeColor.VALUES[dataRoot.getShort("inputColor")]); + setOutputColor(dir, DyeColor.VALUES[dataRoot.getShort("outputColor")]); setSelfFeedEnabled(dir, dataRoot.getBoolean("selfFeed")); setRoundRobinEnabled(dir, dataRoot.getBoolean("roundRobin")); setOutputPriority(dir, dataRoot.getInteger("outputPriority")); @@ -857,8 +857,8 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { key = "extSC." + dir.name(); if (nbtRoot.hasKey(key)) { short ord = nbtRoot.getShort(key); - if (ord >= 0 && ord < DyeColor.values().length) { - extractionColors.put(dir, DyeColor.values()[ord]); + if (ord >= 0 && ord < DyeColor.VALUES.length) { + extractionColors.put(dir, DyeColor.VALUES[ord]); } } key = "selfFeed." + dir.name(); @@ -882,16 +882,16 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { key = "inSC." + dir.name(); if (nbtRoot.hasKey(key)) { short ord = nbtRoot.getShort(key); - if (ord >= 0 && ord < DyeColor.values().length) { - inputColors.put(dir, DyeColor.values()[ord]); + if (ord >= 0 && ord < DyeColor.VALUES.length) { + inputColors.put(dir, DyeColor.VALUES[ord]); } } key = "outSC." + dir.name(); if (nbtRoot.hasKey(key)) { short ord = nbtRoot.getShort(key); - if (ord >= 0 && ord < DyeColor.values().length) { - outputColors.put(dir, DyeColor.values()[ord]); + if (ord >= 0 && ord < DyeColor.VALUES.length) { + outputColors.put(dir, DyeColor.VALUES[ord]); } } } diff --git a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java index 96068858..9f6ef8fd 100644 --- a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java +++ b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java @@ -24,6 +24,7 @@ import crazypants.enderio.conduit.item.filter.IItemFilter; import crazypants.enderio.conduit.item.filter.ItemFilterLimited; import crazypants.enderio.config.Config; import crazypants.enderio.machine.invpanel.TileInventoryPanel; +import crazypants.util.ForgeDirections; public class NetworkedInventory { @@ -327,7 +328,7 @@ public class NetworkedInventory { return 0; } } - return ItemUtil.doInsertItem(getInventory(), item, ForgeDirection.values()[inventorySide]); + return ItemUtil.doInsertItem(getInventory(), item, ForgeDirections.DIRECTIONS[inventorySide]); } void updateInsertOrder() { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java index ce98c629..597d859a 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractEnderLiquidConduit.java @@ -424,10 +424,10 @@ public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit { super.readTypeSettings(dir, dataRoot); if (dataRoot.hasKey("inputColor")) { - setInputColor(dir, DyeColor.values()[dataRoot.getShort("inputColor")]); + setInputColor(dir, DyeColor.VALUES[dataRoot.getShort("inputColor")]); } if (dataRoot.hasKey("outputColor")) { - setOutputColor(dir, DyeColor.values()[dataRoot.getShort("outputColor")]); + setOutputColor(dir, DyeColor.VALUES[dataRoot.getShort("outputColor")]); } if (dataRoot.hasKey("roundRobin")) { @@ -542,16 +542,16 @@ public abstract class AbstractEnderLiquidConduit extends AbstractLiquidConduit { key = "inSC." + dir.name(); if (nbtRoot.hasKey(key)) { short ord = nbtRoot.getShort(key); - if (ord >= 0 && ord < DyeColor.values().length) { - inputColors.put(dir, DyeColor.values()[ord]); + if (ord >= 0 && ord < DyeColor.VALUES.length) { + inputColors.put(dir, DyeColor.VALUES[ord]); } } key = "outSC." + dir.name(); if (nbtRoot.hasKey(key)) { short ord = nbtRoot.getShort(key); - if (ord >= 0 && ord < DyeColor.values().length) { - outputColors.put(dir, DyeColor.values()[ord]); + if (ord >= 0 && ord < DyeColor.VALUES.length) { + outputColors.put(dir, DyeColor.VALUES[ord]); } } } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java index fbb25f36..5ac3fb2a 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java @@ -204,7 +204,7 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I @Override protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { - setExtractionSignalColor(dir, DyeColor.values()[dataRoot.getShort("extractionSignalColor")]); + setExtractionSignalColor(dir, DyeColor.VALUES[dataRoot.getShort("extractionSignalColor")]); setExtractionRedstoneMode(RedstoneControlMode.values()[dataRoot.getShort("extractionRedstoneMode")], dir); } @@ -248,8 +248,8 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I key = "extSC." + dir.name(); if (nbtRoot.hasKey(key)) { short ord = nbtRoot.getShort(key); - if (ord >= 0 && ord < DyeColor.values().length) { - extractionColors.put(dir, DyeColor.values()[ord]); + if (ord >= 0 && ord < DyeColor.VALUES.length) { + extractionColors.put(dir, DyeColor.VALUES[ord]); } } } diff --git a/src/main/java/crazypants/enderio/conduit/oc/OCConduit.java b/src/main/java/crazypants/enderio/conduit/oc/OCConduit.java index 2387b76f..81baa20c 100644 --- a/src/main/java/crazypants/enderio/conduit/oc/OCConduit.java +++ b/src/main/java/crazypants/enderio/conduit/oc/OCConduit.java @@ -86,7 +86,7 @@ public class OCConduit extends AbstractConduit implements IOCConduit { @Override protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { - setSignalColor(dir, DyeColor.values()[dataRoot.getShort("signalColor")]); + setSignalColor(dir, DyeColor.VALUES[dataRoot.getShort("signalColor")]); } @Override @@ -148,7 +148,7 @@ public class OCConduit extends AbstractConduit implements IOCConduit { int i = 0; for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { if (cols[i] >= 0) { - signalColors.put(dir, DyeColor.values()[cols[i]]); + signalColors.put(dir, DyeColor.VALUES[cols[i]]); } i++; } @@ -274,7 +274,7 @@ public class OCConduit extends AbstractConduit implements IOCConduit { BlockCoord bc = getLocation(); if (network != null) { boolean noconnections = true; - for (DyeColor color : DyeColor.values()) { + for (DyeColor color : DyeColor.VALUES) { if (node(color).neighbors().iterator().hasNext()) { noconnections = false; ChatComponentText coltxt = new ChatComponentText(color.getLocalisedName()); @@ -350,7 +350,7 @@ public class OCConduit extends AbstractConduit implements IOCConduit { if (loc != null && network != null) { World world = getBundle().getWorld(); EnumSet conns = getConnections(); - for (DyeColor color : DyeColor.values()) { + for (DyeColor color : DyeColor.VALUES) { Set should = new HashSet(); for (ForgeDirection direction : conns) { if (getSignalColor(direction) == color) { diff --git a/src/main/java/crazypants/enderio/conduit/oc/OCConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/oc/OCConduitNetwork.java index 94bc81e3..b4760650 100644 --- a/src/main/java/crazypants/enderio/conduit/oc/OCConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/oc/OCConduitNetwork.java @@ -16,11 +16,11 @@ import li.cil.oc.api.network.Visibility; @Interface(iface = "li.cil.oc.api.network.ManagedEnvironment", modid = "OpenComputersAPI|Network") public class OCConduitNetwork extends AbstractConduitNetwork implements ManagedEnvironment { - private Node[] node = new Node[DyeColor.values().length]; + private final Node[] node = new Node[DyeColor.VALUES.length]; public OCConduitNetwork() { super(IOCConduit.class, IOCConduit.class); - for (DyeColor dyeColor : DyeColor.values()) { + for (DyeColor dyeColor : DyeColor.VALUES) { node[dyeColor.ordinal()] = Network.newNode(this, Visibility.Network).create(); Network.joinNewNetwork(node[dyeColor.ordinal()]); } @@ -68,7 +68,7 @@ public class OCConduitNetwork extends AbstractConduitNetwork @@ -34,8 +35,8 @@ public class PacketConnectionMode extends AbstractConduitPacket @Override public void fromBytes(ByteBuf buf) { super.fromBytes(buf); - dir = ForgeDirection.values()[buf.readShort()]; - mode = ConnectionMode.values()[buf.readShort()]; + dir = ForgeDirections.DIRECTIONS[buf.readShort()]; + mode = ConnectionMode.VALUES[buf.readShort()]; } @Override diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java b/src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java index 03c2e82b..f26fd24c 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java @@ -9,6 +9,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.IExtractor; import crazypants.enderio.machine.RedstoneControlMode; +import crazypants.util.ForgeDirections; import io.netty.buffer.ByteBuf; public class PacketExtractMode extends AbstractConduitPacket @@ -38,9 +39,9 @@ public class PacketExtractMode extends AbstractConduitPacket @Override public void fromBytes(ByteBuf buf) { super.fromBytes(buf); - dir = ForgeDirection.values()[buf.readShort()]; + dir = ForgeDirections.DIRECTIONS[buf.readShort()]; mode = RedstoneControlMode.values()[buf.readShort()]; - color = DyeColor.values()[buf.readShort()]; + color = DyeColor.VALUES[buf.readShort()]; } @Override diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java b/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java index 5cca3f2b..1a18f229 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java @@ -10,6 +10,7 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.item.FilterRegister; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.filter.IItemFilter; +import crazypants.util.ForgeDirections; import io.netty.buffer.ByteBuf; public class PacketItemConduitFilter extends AbstractConduitPacket @@ -56,12 +57,12 @@ public class PacketItemConduitFilter extends AbstractConduitPacket @Override public void fromBytes(ByteBuf buf) { super.fromBytes(buf); - dir = ForgeDirection.values()[buf.readShort()]; + dir = ForgeDirections.DIRECTIONS[buf.readShort()]; loopMode = buf.readBoolean(); roundRobin = buf.readBoolean(); priority = buf.readInt(); - colIn = DyeColor.values()[buf.readShort()]; - colOut = DyeColor.values()[buf.readShort()]; + colIn = DyeColor.VALUES[buf.readShort()]; + colOut = DyeColor.VALUES[buf.readShort()]; inputFilter = FilterRegister.readFilter(buf); outputFilter = FilterRegister.readFilter(buf); } diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketOCConduitSignalColor.java b/src/main/java/crazypants/enderio/conduit/packet/PacketOCConduitSignalColor.java index 69cf54ed..46222ee7 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketOCConduitSignalColor.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketOCConduitSignalColor.java @@ -8,6 +8,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.oc.IOCConduit; +import crazypants.util.ForgeDirections; import io.netty.buffer.ByteBuf; public class PacketOCConduitSignalColor extends AbstractConduitPacket @@ -34,8 +35,8 @@ public class PacketOCConduitSignalColor extends AbstractConduitPacket @@ -32,7 +33,7 @@ public class PacketRedstoneConduitOutputStrength extends AbstractConduitPacket @@ -34,8 +35,8 @@ public class PacketRedstoneConduitSignalColor extends AbstractConduitPacket @@ -33,7 +34,7 @@ public class PacketRoundRobinMode extends AbstractConduitPacket @Override public void fromBytes(ByteBuf buf) { super.fromBytes(buf); - dir = ForgeDirection.values()[buf.readShort()]; + dir = ForgeDirections.DIRECTIONS[buf.readShort()]; roundRobin = buf.readBoolean(); } diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java index 0772d340..af998221 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java @@ -210,7 +210,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { @Override protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { - setExtractionSignalColor(dir, DyeColor.values()[dataRoot.getShort("extractionSignalColor")]); + setExtractionSignalColor(dir, DyeColor.VALUES[dataRoot.getShort("extractionSignalColor")]); setExtractionRedstoneMode(RedstoneControlMode.values()[dataRoot.getShort("extractionRedstoneMode")], dir); } @@ -262,8 +262,8 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { key = "pRsCol." + dir.name(); if (nbtRoot.hasKey(key)) { short ord = nbtRoot.getShort(key); - if (ord >= 0 && ord < DyeColor.values().length) { - rsColors.put(dir, DyeColor.values()[ord]); + if (ord >= 0 && ord < DyeColor.VALUES.length) { + rsColors.put(dir, DyeColor.VALUES[ord]); } } } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java index 47623592..99db5171 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java @@ -242,7 +242,7 @@ public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsula @Override protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { - setSignalColor(dir, DyeColor.values()[dataRoot.getShort("signalColor")]); + setSignalColor(dir, DyeColor.VALUES[dataRoot.getShort("signalColor")]); setOutputStrength(dir, dataRoot.getBoolean("signalStrong")); } @@ -583,7 +583,7 @@ public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsula int i = 0; for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { if (modes[i] >= 0) { - forcedConnections.put(dir, ConnectionMode.values()[modes[i]]); + forcedConnections.put(dir, ConnectionMode.VALUES[modes[i]]); } i++; } @@ -595,7 +595,7 @@ public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsula int i = 0; for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { if (cols[i] >= 0) { - signalColors.put(dir, DyeColor.values()[cols[i]]); + signalColors.put(dir, DyeColor.VALUES[cols[i]]); } i++; } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/SignalSource.java b/src/main/java/crazypants/enderio/conduit/redstone/SignalSource.java index 4f18c502..84f7f247 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/SignalSource.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/SignalSource.java @@ -81,7 +81,7 @@ public class SignalSource { for (int i = 0; i < enc.length; i += 5) { // Signal sig = new Signal(enc[i], enc[i + 1], enc[i + 2], enc[i + 3], ForgeDirection.UNKNOWN,14, // SignalColor.values()[enc[i + 4]]); - // result.add(new SignalSource(sig, ForgeDirection.values()[enc[i + 4]])); + // result.add(new SignalSource(sig, ForgeDirections.DIRECTIONS[enc[i + 4]])); } return result; } diff --git a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java index 3959b00b..28224e17 100644 --- a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java +++ b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java @@ -310,7 +310,7 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider { if (colorIdx < 0 || colorIdx > 15) { return null; } - return DyeColor.values()[15 - colorIdx]; + return DyeColor.VALUES[15 - colorIdx]; } private float getHealthFromStack(ItemStack item) { diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java b/src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java index 71138150..22c0d8a5 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemGliderWing.java @@ -62,7 +62,7 @@ public class ItemGliderWing extends Item implements IResourceTooltipProvider { @Override public String getUnlocalizedName(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Capacitors.values().length - 1); + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Capacitors.VALUES.length - 1); if (i == 0) { return super.getUnlocalizedName(); } diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java index ed518644..642dd18b 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredMachineEntity.java @@ -169,7 +169,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity if (contents == null || contents.getItem() != EnderIO.itemBasicCapacitor) { setCapacitor(Capacitors.BASIC_CAPACITOR); } else { - setCapacitor(Capacitors.values()[contents.getItemDamage()]); + setCapacitor(Capacitors.VALUES[contents.getItemDamage()]); } } @@ -181,7 +181,7 @@ public abstract class AbstractPoweredMachineEntity extends AbstractMachineEntity @Override public void readCommon(NBTTagCompound nbtRoot) { super.readCommon(nbtRoot); - setCapacitor(Capacitors.values()[nbtRoot.getShort("capacitorType")]); + setCapacitor(Capacitors.VALUES[nbtRoot.getShort("capacitorType")]); int energy; if (nbtRoot.hasKey("storedEnergy")) { float storedEnergyMJ = nbtRoot.getFloat("storedEnergy"); diff --git a/src/main/java/crazypants/enderio/machine/IoMode.java b/src/main/java/crazypants/enderio/machine/IoMode.java index f34c5deb..4c8f4eb1 100644 --- a/src/main/java/crazypants/enderio/machine/IoMode.java +++ b/src/main/java/crazypants/enderio/machine/IoMode.java @@ -25,19 +25,19 @@ public enum IoMode { public static ConnectionMode getNext(ConnectionMode mode) { int ord = mode.ordinal() + 1; - if (ord >= ConnectionMode.values().length) { + if (ord >= ConnectionMode.VALUES.length) { ord = 0; } - return ConnectionMode.values()[ord]; + return ConnectionMode.VALUES[ord]; } public static ConnectionMode getPrevious(ConnectionMode mode) { int ord = mode.ordinal() - 1; if (ord < 0) { - ord = ConnectionMode.values().length - 1; + ord = ConnectionMode.VALUES.length - 1; } - return ConnectionMode.values()[ord]; + return ConnectionMode.VALUES[ord]; } public boolean pulls() { diff --git a/src/main/java/crazypants/enderio/machine/PacketIoMode.java b/src/main/java/crazypants/enderio/machine/PacketIoMode.java index f6875dd5..257b5591 100644 --- a/src/main/java/crazypants/enderio/machine/PacketIoMode.java +++ b/src/main/java/crazypants/enderio/machine/PacketIoMode.java @@ -10,6 +10,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.network.PacketUtil; +import crazypants.util.ForgeDirections; import io.netty.buffer.ByteBuf; public class PacketIoMode implements IMessage, IMessageHandler { @@ -55,7 +56,7 @@ public class PacketIoMode implements IMessage, IMessageHandler { @@ -70,7 +71,7 @@ public class BlockCrusher extends AbstractMachineBlock { public void randomDisplayTick(World world, int x, int y, int z, Random rand) { TileCrusher te = (TileCrusher) world.getTileEntity(x, y, z); if (te != null && te.isActive()) { - ForgeDirection front = ForgeDirection.values()[te.facing]; + ForgeDirection front = ForgeDirections.DIRECTIONS[te.facing]; for (int i = 0; i < 3; i++) { double px = x + 0.5 + front.offsetX * 0.51; diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/BlockStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/BlockStirlingGenerator.java index 37056d05..35eef91c 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/BlockStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/BlockStirlingGenerator.java @@ -12,6 +12,7 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.network.PacketHandler; +import crazypants.util.ForgeDirections; public class BlockStirlingGenerator extends AbstractMachineBlock { @@ -59,7 +60,7 @@ public class BlockStirlingGenerator extends AbstractMachineBlock { @@ -74,7 +74,8 @@ public class BlockPowerMonitor extends AbstractMachineBlock { TileEntity te = world.getTileEntity(x, y, z); if (te instanceof TilePowerMonitor) { - return ((TilePowerMonitor) te).getRednetOutputValue(ForgeDirection.values()[side], DyeColor.RED.ordinal()); + return ((TilePowerMonitor) te) + .getRednetOutputValue(ForgeDirections.DIRECTIONS[side], DyeColor.RED.ordinal()); } return 0; } diff --git a/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java index cf4b9328..45091f1b 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java @@ -53,8 +53,8 @@ public class TilePowerMonitor extends AbstractPowerConsumerEntity implements IIn if (currentlyEmmittedSignal == null) { return new int[16]; } - int[] res = new int[DyeColor.values().length]; - for (DyeColor col : DyeColor.values()) { + int[] res = new int[DyeColor.VALUES.length]; + for (DyeColor col : DyeColor.VALUES) { res[col.ordinal()] = currentlyEmmittedSignal.color == col ? 15 : 0; } return res; diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/BlockSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/BlockSliceAndSplice.java index 0f29cf9b..0a244a97 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/BlockSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/BlockSliceAndSplice.java @@ -14,6 +14,7 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; +import crazypants.util.ForgeDirections; public class BlockSliceAndSplice extends AbstractMachineBlock { @@ -84,7 +85,7 @@ public class BlockSliceAndSplice extends AbstractMachineBlock oreIngots = new ArrayList(); private final List oreBlocks = new ArrayList(); private final float hardness; - private Alloy(String baseName, float hardness, String oreDictName) { + Alloy(String baseName, float hardness, String oreDictName) { this.unlocalisedName = "enderio." + baseName; this.iconKey = "enderio:" + baseName; if (oreDictName != null) { @@ -40,7 +44,7 @@ public enum Alloy { this.hardness = hardness; } - private Alloy(String baseName, float hardness) { + Alloy(String baseName, float hardness) { this(baseName, hardness, null); } diff --git a/src/main/java/crazypants/enderio/material/BlockIngotStorage.java b/src/main/java/crazypants/enderio/material/BlockIngotStorage.java index c3c513c5..b89f6ad2 100644 --- a/src/main/java/crazypants/enderio/material/BlockIngotStorage.java +++ b/src/main/java/crazypants/enderio/material/BlockIngotStorage.java @@ -45,8 +45,8 @@ public class BlockIngotStorage extends BlockEio implements IAdvancedTooltipProvi @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister register) { - icons = new IIcon[Alloy.values().length]; - for (Alloy alloy : Alloy.values()) { + icons = new IIcon[Alloy.VALUES.length]; + for (Alloy alloy : Alloy.VALUES) { icons[alloy.ordinal()] = register.registerIcon(alloy.iconKey + "Block"); } } @@ -54,7 +54,7 @@ public class BlockIngotStorage extends BlockEio implements IAdvancedTooltipProvi @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - meta = MathHelper.clamp_int(meta, 0, Alloy.values().length - 1); + meta = MathHelper.clamp_int(meta, 0, Alloy.VALUES.length - 1); return icons[meta]; } @@ -70,7 +70,7 @@ public class BlockIngotStorage extends BlockEio implements IAdvancedTooltipProvi @Override public float getBlockHardness(World world, int x, int y, int z) { - return Alloy.values()[world.getBlockMetadata(x, y, z)].getHardness(); + return Alloy.VALUES[world.getBlockMetadata(x, y, z)].getHardness(); } @Override diff --git a/src/main/java/crazypants/enderio/material/BlockItemIngotStorage.java b/src/main/java/crazypants/enderio/material/BlockItemIngotStorage.java index 0e9d30a7..42935d46 100644 --- a/src/main/java/crazypants/enderio/material/BlockItemIngotStorage.java +++ b/src/main/java/crazypants/enderio/material/BlockItemIngotStorage.java @@ -21,7 +21,7 @@ public class BlockItemIngotStorage extends ItemBlock { @Override public String getUnlocalizedName(ItemStack stack) { - return "tile." + Alloy.values()[stack.getItemDamage()].unlocalisedName; + return "tile." + Alloy.VALUES[stack.getItemDamage()].unlocalisedName; } @Override @@ -32,7 +32,7 @@ public class BlockItemIngotStorage extends ItemBlock { @Override @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tab, List list) { - for (Alloy alloy : Alloy.values()) { + for (Alloy alloy : Alloy.VALUES) { list.add(new ItemStack(this, 1, alloy.ordinal())); } } diff --git a/src/main/java/crazypants/enderio/material/ItemAlloy.java b/src/main/java/crazypants/enderio/material/ItemAlloy.java index a3ad4be4..423da607 100644 --- a/src/main/java/crazypants/enderio/material/ItemAlloy.java +++ b/src/main/java/crazypants/enderio/material/ItemAlloy.java @@ -34,7 +34,7 @@ public class ItemAlloy extends Item { setCreativeTab(EnderIOTab.tabEnderIO); setUnlocalizedName(ModObject.itemAlloy.unlocalisedName); - numItems = Alloy.values().length; + numItems = Alloy.VALUES.length; if (useNuggets) { numItems = numItems * 2; } @@ -55,13 +55,13 @@ public class ItemAlloy extends Item { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister IIconRegister) { - int numAlloys = Alloy.values().length; + int numAlloys = Alloy.VALUES.length; for (int i = 0; i < numAlloys; i++) { - icons[i] = IIconRegister.registerIcon(Alloy.values()[i].iconKey); + icons[i] = IIconRegister.registerIcon(Alloy.VALUES[i].iconKey); } if (useNuggets) { for (int i = 0; i < numAlloys; i++) { - icons[i + numAlloys] = IIconRegister.registerIcon(Alloy.values()[i].iconKey + "Nugget"); + icons[i + numAlloys] = IIconRegister.registerIcon(Alloy.VALUES[i].iconKey + "Nugget"); } } } @@ -69,10 +69,10 @@ public class ItemAlloy extends Item { @Override public String getUnlocalizedName(ItemStack par1ItemStack) { int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1); - if (i < Alloy.values().length) { - return Alloy.values()[i].unlocalisedName; + if (i < Alloy.VALUES.length) { + return Alloy.VALUES[i].unlocalisedName; } else { - return Alloy.values()[i - Alloy.values().length].unlocalisedName + "Nugget"; + return Alloy.VALUES[i - Alloy.VALUES.length].unlocalisedName + "Nugget"; } } diff --git a/src/main/java/crazypants/enderio/material/ItemCapacitor.java b/src/main/java/crazypants/enderio/material/ItemCapacitor.java index 468f1e9a..afb3793b 100644 --- a/src/main/java/crazypants/enderio/material/ItemCapacitor.java +++ b/src/main/java/crazypants/enderio/material/ItemCapacitor.java @@ -50,7 +50,7 @@ public class ItemCapacitor extends Item implements ICapacitorItem { setMaxDamage(0); setMaxStackSize(64); - icons = new IIcon[Capacitors.values().length]; + icons = new IIcon[Capacitors.VALUES.length]; } protected void init() { @@ -60,30 +60,30 @@ public class ItemCapacitor extends Item implements ICapacitorItem { @Override @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int damage) { - damage = MathHelper.clamp_int(damage, 0, Capacitors.values().length - 1); + damage = MathHelper.clamp_int(damage, 0, Capacitors.VALUES.length - 1); return icons[damage]; } @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister IIconRegister) { - for (int i = 0; i < Capacitors.values().length; i++) { - icons[i] = IIconRegister.registerIcon(Capacitors.values()[i].iconKey); + for (int i = 0; i < Capacitors.VALUES.length; i++) { + icons[i] = IIconRegister.registerIcon(Capacitors.VALUES[i].iconKey); } } @Override public String getUnlocalizedName(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Capacitors.values().length - 1); - return Capacitors.values()[i].unlocalisedName; + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Capacitors.VALUES.length - 1); + return Capacitors.VALUES[i].unlocalisedName; } @Override @SideOnly(Side.CLIENT) public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for (int j = 0; j < Capacitors.values().length; ++j) { + for (int j = 0; j < Capacitors.VALUES.length; ++j) { par3List.add(new ItemStack(par1, 1, j)); - if (Capacitors.values()[j] == Capacitors.TOTEMIC_CAPACITOR) { + if (Capacitors.VALUES[j] == Capacitors.TOTEMIC_CAPACITOR) { ItemStack stack = new ItemStack(par1, 1, j); stack.addEnchantment(Enchantment.efficiency, 5); par3List.add(stack); @@ -93,16 +93,16 @@ public class ItemCapacitor extends Item implements ICapacitorItem { @Override public ICapacitor getCapacitor(ItemStack stack) { - int damage = MathHelper.clamp_int(stack.getItemDamage(), 0, Capacitors.values().length - 1); + int damage = MathHelper.clamp_int(stack.getItemDamage(), 0, Capacitors.VALUES.length - 1); - if (Capacitors.values()[damage] == Capacitors.TOTEMIC_CAPACITOR) { + if (Capacitors.VALUES[damage] == Capacitors.TOTEMIC_CAPACITOR) { damage = MathHelper.clamp_int( EnchantmentHelper.getEnchantmentLevel(Enchantment.efficiency.effectId, stack) + 1, 1, Capacitors.TOTEMIC_CAPACITOR.ordinal()); } - return Capacitors.values()[damage].capacitor; + return Capacitors.VALUES[damage].capacitor; } @Override diff --git a/src/main/java/crazypants/enderio/material/ItemGrindingBall.java b/src/main/java/crazypants/enderio/material/ItemGrindingBall.java index 0cd08e76..190ca526 100644 --- a/src/main/java/crazypants/enderio/material/ItemGrindingBall.java +++ b/src/main/java/crazypants/enderio/material/ItemGrindingBall.java @@ -36,14 +36,14 @@ public class ItemGrindingBall extends ItemAlloy { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister IIconRegister) { - int numAlloys = Alloy.values().length; + int numAlloys = Alloy.VALUES.length; for (int i = 0; i < numAlloys; i++) - icons[i] = IIconRegister.registerIcon(Alloy.values()[i].iconKey + "GrindingBall"); + icons[i] = IIconRegister.registerIcon(Alloy.VALUES[i].iconKey + "GrindingBall"); } @Override public String getUnlocalizedName(ItemStack par1ItemStack) { int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1); - return Alloy.values()[i].unlocalisedName + "_ball"; + return Alloy.VALUES[i].unlocalisedName + "_ball"; } } diff --git a/src/main/java/crazypants/enderio/material/ItemMaterial.java b/src/main/java/crazypants/enderio/material/ItemMaterial.java index 1176104b..a4749d63 100644 --- a/src/main/java/crazypants/enderio/material/ItemMaterial.java +++ b/src/main/java/crazypants/enderio/material/ItemMaterial.java @@ -31,7 +31,7 @@ public class ItemMaterial extends Item { setCreativeTab(EnderIOTab.tabEnderIO); setUnlocalizedName(ModObject.itemMaterial.unlocalisedName); - icons = new IIcon[Material.values().length]; + icons = new IIcon[Material.VALUES.length]; } private void init() { @@ -41,29 +41,29 @@ public class ItemMaterial extends Item { @Override @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int damage) { - damage = MathHelper.clamp_int(damage, 0, Material.values().length - 1); + damage = MathHelper.clamp_int(damage, 0, Material.VALUES.length - 1); return icons[damage]; } @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister IIconRegister) { - int numParts = Material.values().length; + int numParts = Material.VALUES.length; for (int i = 0; i < numParts; i++) { - icons[i] = IIconRegister.registerIcon(Material.values()[i].iconKey); + icons[i] = IIconRegister.registerIcon(Material.VALUES[i].iconKey); } } @Override public String getUnlocalizedName(ItemStack par1ItemStack) { - int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Material.values().length - 1); - return Material.values()[i].unlocalisedName; + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Material.VALUES.length - 1); + return Material.VALUES[i].unlocalisedName; } @Override @SideOnly(Side.CLIENT) public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - for (int j = 0; j < Material.values().length; ++j) { + for (int j = 0; j < Material.VALUES.length; ++j) { par3List.add(new ItemStack(par1, 1, j)); } } @@ -74,7 +74,7 @@ public class ItemMaterial extends Item { if (par1ItemStack == null) { return false; } - int damage = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Material.values().length - 1); - return Material.values()[damage].hasEffect; + int damage = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Material.VALUES.length - 1); + return Material.VALUES[damage].hasEffect; } } diff --git a/src/main/java/crazypants/enderio/material/Material.java b/src/main/java/crazypants/enderio/material/Material.java index 68ee2acb..1c86c857 100644 --- a/src/main/java/crazypants/enderio/material/Material.java +++ b/src/main/java/crazypants/enderio/material/Material.java @@ -29,16 +29,20 @@ public enum Material { ENDER_POWDER("enderCrystalPowder", true), PRECIENT_POWDER("precientPowder", true); + /** + * Cached values() array for frequent read-only operations, the array should NOT be mutated. + */ + public static final Material[] VALUES = values(); public final String unlocalisedName; public final String iconKey; public final String oreDict; public final boolean hasEffect; - private Material(String unlocalisedName) { + Material(String unlocalisedName) { this(unlocalisedName, false); } - private Material(String unlocalisedName, boolean hasEffect) { + Material(String unlocalisedName, boolean hasEffect) { this.unlocalisedName = "enderio." + unlocalisedName; this.iconKey = "enderio:" + unlocalisedName; this.hasEffect = hasEffect; @@ -46,7 +50,7 @@ public enum Material { } public static void registerOres(Item item) { - for (Material m : values()) { + for (Material m : VALUES) { OreDictionary.registerOre(m.oreDict, new ItemStack(item, 1, m.ordinal())); } } diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index 7b06846d..7bf678bb 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -69,13 +69,13 @@ public class MaterialRecipes { } } - for (Capacitors capacitor : Capacitors.values()) { + for (Capacitors capacitor : Capacitors.VALUES) { OreDictionary.registerOre( capacitor.getOreTag(), new ItemStack(EnderIO.itemBasicCapacitor, 1, capacitor.ordinal())); } - for (Alloy alloy : Alloy.values()) { + for (Alloy alloy : Alloy.VALUES) { boolean isPrimaryName = true; for (String oreDictName : alloy.getOreIngots()) { OreDictionary.registerOre(oreDictName, alloy.getStackIngot()); @@ -99,7 +99,7 @@ public class MaterialRecipes { } } - for (AlloyEndergy alloy : AlloyEndergy.values()) { + for (AlloyEndergy alloy : AlloyEndergy.VALUES) { boolean isPrimaryName = true; for (String oreDictName : alloy.getOreIngots()) { OreDictionary.registerOre(oreDictName, alloy.getStackIngot()); @@ -554,13 +554,13 @@ public class MaterialRecipes { 'b', EnderIO.blockDarkIronBars); - for (Alloy alloy : Alloy.values()) { + for (Alloy alloy : Alloy.VALUES) { RecipeUtil.addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot()); RecipeUtil.addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot()); RecipeUtil.addShapeless(alloy.getStackIngot(9), alloy.getOreBlock()); } - for (AlloyEndergy alloy : AlloyEndergy.values()) { + for (AlloyEndergy alloy : AlloyEndergy.VALUES) { RecipeUtil.addShaped(alloy.getStackBlock(), "iii", "iii", "iii", 'i', alloy.getOreIngot()); RecipeUtil.addShaped(alloy.getStackBall(5), " i ", "iii", " i ", 'i', alloy.getOreIngot()); RecipeUtil.addShapeless(alloy.getStackIngot(9), alloy.getOreBlock()); diff --git a/src/main/java/crazypants/enderio/material/endergy/AlloyEndergy.java b/src/main/java/crazypants/enderio/material/endergy/AlloyEndergy.java index 440a45eb..94b2d8e2 100644 --- a/src/main/java/crazypants/enderio/material/endergy/AlloyEndergy.java +++ b/src/main/java/crazypants/enderio/material/endergy/AlloyEndergy.java @@ -19,13 +19,17 @@ public enum AlloyEndergy { ENERGETIC_SILVER("energeticSilver", 7.0f), VIVID_ALLOY("vividAlloy", 4.0f); + /** + * Cached values() array for frequent read-only operations, the array should NOT be mutated. + */ + public static final AlloyEndergy[] VALUES = values(); public final String unlocalisedName; public final String iconKey; private final List oreIngots = new ArrayList(); private final List oreBlocks = new ArrayList(); private final float hardness; - private AlloyEndergy(String baseName, float hardness, String oreDictName) { + AlloyEndergy(String baseName, float hardness, String oreDictName) { this.unlocalisedName = "enderio." + baseName; this.iconKey = "enderio:" + baseName; if (oreDictName != null) { @@ -37,7 +41,7 @@ public enum AlloyEndergy { this.hardness = hardness; } - private AlloyEndergy(String baseName, float hardness) { + AlloyEndergy(String baseName, float hardness) { this(baseName, hardness, null); } diff --git a/src/main/java/crazypants/enderio/material/endergy/BlockIngotStorageEndergy.java b/src/main/java/crazypants/enderio/material/endergy/BlockIngotStorageEndergy.java index 00b380d2..a129bf09 100644 --- a/src/main/java/crazypants/enderio/material/endergy/BlockIngotStorageEndergy.java +++ b/src/main/java/crazypants/enderio/material/endergy/BlockIngotStorageEndergy.java @@ -48,8 +48,8 @@ public class BlockIngotStorageEndergy extends BlockEio implements IAdvancedToolt @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister register) { - icons = new IIcon[AlloyEndergy.values().length]; - for (AlloyEndergy alloy : AlloyEndergy.values()) { + icons = new IIcon[AlloyEndergy.VALUES.length]; + for (AlloyEndergy alloy : AlloyEndergy.VALUES) { icons[alloy.ordinal()] = register.registerIcon(alloy.iconKey + "Block"); } } @@ -57,7 +57,7 @@ public class BlockIngotStorageEndergy extends BlockEio implements IAdvancedToolt @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - meta = MathHelper.clamp_int(meta, 0, AlloyEndergy.values().length - 1); + meta = MathHelper.clamp_int(meta, 0, AlloyEndergy.VALUES.length - 1); return icons[meta]; } @@ -73,7 +73,7 @@ public class BlockIngotStorageEndergy extends BlockEio implements IAdvancedToolt @Override public float getBlockHardness(World world, int x, int y, int z) { - return AlloyEndergy.values()[world.getBlockMetadata(x, y, z)].getHardness(); + return AlloyEndergy.VALUES[world.getBlockMetadata(x, y, z)].getHardness(); } @Override diff --git a/src/main/java/crazypants/enderio/material/endergy/BlockItemIngotStorageEndergy.java b/src/main/java/crazypants/enderio/material/endergy/BlockItemIngotStorageEndergy.java index 31f45a58..c1e9c85e 100644 --- a/src/main/java/crazypants/enderio/material/endergy/BlockItemIngotStorageEndergy.java +++ b/src/main/java/crazypants/enderio/material/endergy/BlockItemIngotStorageEndergy.java @@ -21,7 +21,7 @@ public class BlockItemIngotStorageEndergy extends ItemBlock { @Override public String getUnlocalizedName(ItemStack stack) { - return "tile." + AlloyEndergy.values()[stack.getItemDamage()].unlocalisedName; + return "tile." + AlloyEndergy.VALUES[stack.getItemDamage()].unlocalisedName; } @Override @@ -32,7 +32,7 @@ public class BlockItemIngotStorageEndergy extends ItemBlock { @Override @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tab, List list) { - for (AlloyEndergy alloy : AlloyEndergy.values()) { + for (AlloyEndergy alloy : AlloyEndergy.VALUES) { list.add(new ItemStack(this, 1, alloy.ordinal())); } } diff --git a/src/main/java/crazypants/enderio/material/endergy/ItemAlloyEndergy.java b/src/main/java/crazypants/enderio/material/endergy/ItemAlloyEndergy.java index 6faaafaf..50609f05 100644 --- a/src/main/java/crazypants/enderio/material/endergy/ItemAlloyEndergy.java +++ b/src/main/java/crazypants/enderio/material/endergy/ItemAlloyEndergy.java @@ -34,7 +34,7 @@ public class ItemAlloyEndergy extends Item { setCreativeTab(EnderIOTab.tabEnderIO); setUnlocalizedName(ModObject.itemAlloyEndergy.unlocalisedName); - numItems = AlloyEndergy.values().length; + numItems = AlloyEndergy.VALUES.length; if (useNuggets) { numItems = numItems * 2; } @@ -55,13 +55,13 @@ public class ItemAlloyEndergy extends Item { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister IIconRegister) { - int numAlloys = AlloyEndergy.values().length; + int numAlloys = AlloyEndergy.VALUES.length; for (int i = 0; i < numAlloys; i++) { - icons[i] = IIconRegister.registerIcon(AlloyEndergy.values()[i].iconKey); + icons[i] = IIconRegister.registerIcon(AlloyEndergy.VALUES[i].iconKey); } if (useNuggets) { for (int i = 0; i < numAlloys; i++) { - icons[i + numAlloys] = IIconRegister.registerIcon(AlloyEndergy.values()[i].iconKey + "Nugget"); + icons[i + numAlloys] = IIconRegister.registerIcon(AlloyEndergy.VALUES[i].iconKey + "Nugget"); } } } @@ -69,10 +69,10 @@ public class ItemAlloyEndergy extends Item { @Override public String getUnlocalizedName(ItemStack par1ItemStack) { int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1); - if (i < AlloyEndergy.values().length) { - return AlloyEndergy.values()[i].unlocalisedName; + if (i < AlloyEndergy.VALUES.length) { + return AlloyEndergy.VALUES[i].unlocalisedName; } else { - return AlloyEndergy.values()[i - AlloyEndergy.values().length].unlocalisedName + "Nugget"; + return AlloyEndergy.VALUES[i - AlloyEndergy.VALUES.length].unlocalisedName + "Nugget"; } } diff --git a/src/main/java/crazypants/enderio/material/endergy/ItemGrindingBallEndergy.java b/src/main/java/crazypants/enderio/material/endergy/ItemGrindingBallEndergy.java index c568faf1..1564c9a5 100644 --- a/src/main/java/crazypants/enderio/material/endergy/ItemGrindingBallEndergy.java +++ b/src/main/java/crazypants/enderio/material/endergy/ItemGrindingBallEndergy.java @@ -36,14 +36,14 @@ public class ItemGrindingBallEndergy extends ItemAlloyEndergy { @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister IIconRegister) { - int numAlloys = AlloyEndergy.values().length; + int numAlloys = AlloyEndergy.VALUES.length; for (int i = 0; i < numAlloys; i++) - icons[i] = IIconRegister.registerIcon(AlloyEndergy.values()[i].iconKey + "GrindingBall"); + icons[i] = IIconRegister.registerIcon(AlloyEndergy.VALUES[i].iconKey + "GrindingBall"); } @Override public String getUnlocalizedName(ItemStack par1ItemStack) { int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, numItems - 1); - return AlloyEndergy.values()[i].unlocalisedName + "GrindingBall"; + return AlloyEndergy.VALUES[i].unlocalisedName + "GrindingBall"; } } diff --git a/src/main/java/crazypants/enderio/power/Capacitors.java b/src/main/java/crazypants/enderio/power/Capacitors.java index 6305e6c9..deb25b71 100644 --- a/src/main/java/crazypants/enderio/power/Capacitors.java +++ b/src/main/java/crazypants/enderio/power/Capacitors.java @@ -26,12 +26,16 @@ public enum Capacitors { ENDERGISED_CAPACITOR(new BasicCapacitor(3, 400, 500000, 100), "endergisedCapacitor", "Ender"); + /** + * Cached values() array for frequent read-only operations, the array should NOT be mutated. + */ + public static final Capacitors[] VALUES = values(); public final ICapacitor capacitor; public final String unlocalisedName; public final String iconKey; public final String oreDict; - private Capacitors(ICapacitor capacitor, String unlocalisedName, String oreDict) { + Capacitors(ICapacitor capacitor, String unlocalisedName, String oreDict) { this.capacitor = capacitor; this.unlocalisedName = "enderio." + unlocalisedName; this.iconKey = "enderio:" + unlocalisedName; diff --git a/src/main/java/crazypants/util/ForgeDirections.java b/src/main/java/crazypants/util/ForgeDirections.java new file mode 100644 index 00000000..d7b8de5e --- /dev/null +++ b/src/main/java/crazypants/util/ForgeDirections.java @@ -0,0 +1,11 @@ +package crazypants.util; + +import net.minecraftforge.common.util.ForgeDirection; + +public class ForgeDirections { + + /** + * Cached values() array for frequent read-only operations, the array should NOT be mutated. + */ + public static final ForgeDirection[] DIRECTIONS = ForgeDirection.values(); +}