Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
181d48ac60 | ||
|
|
267adc0a31 | ||
|
|
503a6e7a76 |
No files matched your search
@@ -0,0 +1,17 @@
|
||||
name: Optimize images
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches: [ master, main, release/** ]
|
||||
paths:
|
||||
- "**/*.png"
|
||||
|
||||
push:
|
||||
branches: [ master, main, release/** ]
|
||||
paths:
|
||||
- "**/*.png"
|
||||
|
||||
jobs:
|
||||
optimize-images:
|
||||
uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/optimize-images.yml@master
|
||||
secrets: inherit
|
||||
@@ -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")
|
||||
@@ -12,6 +12,7 @@ dependencies {
|
||||
|
||||
devOnlyNonPublishable('com.github.GTNewHorizons:waila:1.19.22:dev') {transitive = false}
|
||||
runtimeOnlyNonPublishable('com.github.GTNewHorizons:WAILAPlugins:0.7.2:dev') {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:Backhand:1.8.4:dev") { transitive = false }
|
||||
compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-812-GTNH:api') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH:dev') {transitive = false}
|
||||
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.261:dev') {transitive = false}
|
||||
|
||||
@@ -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++;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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<ILiquidConduit>
|
||||
@@ -42,9 +43,9 @@ public class PacketFluidChannel extends AbstractConduitPacket<ILiquidConduit>
|
||||
@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
|
||||
|
||||
@@ -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<ILiquidConduit>
|
||||
@@ -44,7 +45,7 @@ public class PacketFluidFilter extends AbstractConduitPacket<ILiquidConduit>
|
||||
@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();
|
||||
|
||||
@@ -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<TileEntity>
|
||||
@@ -34,7 +35,7 @@ public class PacketOpenConduitUI extends MessageTileEntity<TileEntity>
|
||||
@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) {
|
||||
|
||||
@@ -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()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -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<IItemConduit>
|
||||
implements IMessageHandler<PacketExistingItemFilterSnapshot, IMessage> {
|
||||
|
||||
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<IIte
|
||||
@Override
|
||||
public void fromBytes(ByteBuf buf) {
|
||||
super.fromBytes(buf);
|
||||
dir = ForgeDirection.values()[buf.readShort()];
|
||||
dir = ForgeDirections.DIRECTIONS[buf.readShort()];
|
||||
isInput = buf.readBoolean();
|
||||
opcode = Opcode.values()[buf.readByte() & 255];
|
||||
opcode = Opcode.fromOrdinal(buf.readByte() & 255);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -10,6 +10,7 @@ import crazypants.enderio.conduit.item.IItemConduit;
|
||||
import crazypants.enderio.conduit.item.filter.ModItemFilter;
|
||||
import crazypants.enderio.conduit.packet.AbstractConduitPacket;
|
||||
import crazypants.enderio.conduit.packet.ConTypeEnum;
|
||||
import crazypants.util.ForgeDirections;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
public class PacketModItemFilter extends AbstractConduitPacket<IItemConduit>
|
||||
@@ -33,7 +34,7 @@ public class PacketModItemFilter extends AbstractConduitPacket<IItemConduit>
|
||||
@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();
|
||||
|
||||
@@ -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]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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<ForgeDirection> conns = getConnections();
|
||||
for (DyeColor color : DyeColor.values()) {
|
||||
for (DyeColor color : DyeColor.VALUES) {
|
||||
Set<Node> should = new HashSet<Node>();
|
||||
for (ForgeDirection direction : conns) {
|
||||
if (getSignalColor(direction) == color) {
|
||||
|
||||
@@ -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<IOCConduit, IOCConduit> 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<IOCConduit, IOCCond
|
||||
|
||||
@Override
|
||||
public void destroyNetwork() {
|
||||
for (DyeColor dyeColor : DyeColor.values()) {
|
||||
for (DyeColor dyeColor : DyeColor.VALUES) {
|
||||
node[dyeColor.ordinal()].remove();
|
||||
}
|
||||
super.destroyNetwork();
|
||||
|
||||
@@ -8,6 +8,7 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||
import crazypants.enderio.conduit.ConnectionMode;
|
||||
import crazypants.enderio.conduit.IConduit;
|
||||
import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit;
|
||||
import crazypants.util.ForgeDirections;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
public class PacketConnectionMode extends AbstractConduitPacket<IConduit>
|
||||
@@ -34,8 +35,8 @@ public class PacketConnectionMode extends AbstractConduitPacket<IConduit>
|
||||
@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
|
||||
|
||||
@@ -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<IExtractor>
|
||||
@@ -38,9 +39,9 @@ public class PacketExtractMode extends AbstractConduitPacket<IExtractor>
|
||||
@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
|
||||
|
||||
@@ -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<IItemConduit>
|
||||
@@ -56,12 +57,12 @@ public class PacketItemConduitFilter extends AbstractConduitPacket<IItemConduit>
|
||||
@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);
|
||||
}
|
||||
|
||||
@@ -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<IOCConduit>
|
||||
@@ -34,8 +35,8 @@ public class PacketOCConduitSignalColor extends AbstractConduitPacket<IOCConduit
|
||||
@Override
|
||||
public void fromBytes(ByteBuf buf) {
|
||||
super.fromBytes(buf);
|
||||
dir = ForgeDirection.values()[buf.readShort()];
|
||||
col = DyeColor.values()[buf.readShort()];
|
||||
dir = ForgeDirections.DIRECTIONS[buf.readShort()];
|
||||
col = DyeColor.VALUES[buf.readShort()];
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -6,6 +6,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.redstone.IInsulatedRedstoneConduit;
|
||||
import crazypants.util.ForgeDirections;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
public class PacketRedstoneConduitOutputStrength extends AbstractConduitPacket<IInsulatedRedstoneConduit>
|
||||
@@ -32,7 +33,7 @@ public class PacketRedstoneConduitOutputStrength extends AbstractConduitPacket<I
|
||||
@Override
|
||||
public void fromBytes(ByteBuf buf) {
|
||||
super.fromBytes(buf);
|
||||
dir = ForgeDirection.values()[buf.readShort()];
|
||||
dir = ForgeDirections.DIRECTIONS[buf.readShort()];
|
||||
isStrong = buf.readBoolean();
|
||||
}
|
||||
|
||||
|
||||
@@ -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.redstone.IInsulatedRedstoneConduit;
|
||||
import crazypants.util.ForgeDirections;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
public class PacketRedstoneConduitSignalColor extends AbstractConduitPacket<IInsulatedRedstoneConduit>
|
||||
@@ -34,8 +35,8 @@ public class PacketRedstoneConduitSignalColor extends AbstractConduitPacket<IIns
|
||||
@Override
|
||||
public void fromBytes(ByteBuf buf) {
|
||||
super.fromBytes(buf);
|
||||
dir = ForgeDirection.values()[buf.readShort()];
|
||||
col = DyeColor.values()[buf.readShort()];
|
||||
dir = ForgeDirections.DIRECTIONS[buf.readShort()];
|
||||
col = DyeColor.VALUES[buf.readShort()];
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -7,6 +7,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||
import crazypants.enderio.conduit.liquid.AbstractEnderLiquidConduit;
|
||||
import crazypants.enderio.conduit.liquid.ILiquidConduit;
|
||||
import crazypants.util.ForgeDirections;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
public class PacketRoundRobinMode extends AbstractConduitPacket<ILiquidConduit>
|
||||
@@ -33,7 +34,7 @@ public class PacketRoundRobinMode extends AbstractConduitPacket<ILiquidConduit>
|
||||
@Override
|
||||
public void fromBytes(ByteBuf buf) {
|
||||
super.fromBytes(buf);
|
||||
dir = ForgeDirection.values()[buf.readShort()];
|
||||
dir = ForgeDirections.DIRECTIONS[buf.readShort()];
|
||||
roundRobin = buf.readBoolean();
|
||||
}
|
||||
|
||||
|
||||
@@ -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]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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++;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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");
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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<PacketIoMode, IMessage> {
|
||||
@@ -55,7 +56,7 @@ public class PacketIoMode implements IMessage, IMessageHandler<PacketIoMode, IMe
|
||||
y = buf.readInt();
|
||||
z = buf.readInt();
|
||||
mode = IoMode.values()[buf.readShort()];
|
||||
face = ForgeDirection.values()[buf.readShort()];
|
||||
face = ForgeDirections.DIRECTIONS[buf.readShort()];
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -54,6 +54,7 @@ import crazypants.enderio.power.PowerDisplayUtil;
|
||||
import crazypants.enderio.power.PowerHandlerUtil;
|
||||
import crazypants.enderio.tool.ToolUtil;
|
||||
import crazypants.enderio.waila.IWailaInfoProvider;
|
||||
import crazypants.util.ForgeDirections;
|
||||
|
||||
public class BlockCapBank extends BlockEio
|
||||
implements IGuiHandler, IAdvancedTooltipProvider, IWailaInfoProvider, IRedstoneConnectable {
|
||||
@@ -345,7 +346,7 @@ public class BlockCapBank extends BlockEio
|
||||
// }
|
||||
|
||||
TileCapBank cb = (TileCapBank) te;
|
||||
ForgeDirection face = ForgeDirection.values()[side];
|
||||
ForgeDirection face = ForgeDirections.DIRECTIONS[side];
|
||||
|
||||
int meta = ba.getBlockMetadata(x, y, z);
|
||||
meta = MathHelper.clamp_int(meta, 0, CapBankType.types().size() - 1);
|
||||
@@ -452,14 +453,14 @@ public class BlockCapBank extends BlockEio
|
||||
protected ForgeDirection getDirForHeading(int heading) {
|
||||
switch (heading) {
|
||||
case 0:
|
||||
return ForgeDirection.values()[2];
|
||||
return ForgeDirections.DIRECTIONS[2];
|
||||
case 1:
|
||||
return ForgeDirection.values()[5];
|
||||
return ForgeDirections.DIRECTIONS[5];
|
||||
case 2:
|
||||
return ForgeDirection.values()[3];
|
||||
return ForgeDirections.DIRECTIONS[3];
|
||||
case 3:
|
||||
default:
|
||||
return ForgeDirection.values()[4];
|
||||
return ForgeDirections.DIRECTIONS[4];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -13,6 +13,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 BlockCrusher extends AbstractMachineBlock<TileCrusher> {
|
||||
|
||||
@@ -70,7 +71,7 @@ public class BlockCrusher extends AbstractMachineBlock<TileCrusher> {
|
||||
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;
|
||||
|
||||
@@ -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<TileEntityStirlingGenerator> {
|
||||
|
||||
@@ -59,7 +60,7 @@ public class BlockStirlingGenerator extends AbstractMachineBlock<TileEntityStirl
|
||||
public void randomDisplayTick(World world, int x, int y, int z, Random rand) {
|
||||
TileEntityStirlingGenerator te = (TileEntityStirlingGenerator) 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 < 2; i++) {
|
||||
double px = x + 0.5 + front.offsetX * 0.6;
|
||||
|
||||
@@ -23,6 +23,7 @@ import com.enderio.core.common.vecmath.Vector3d;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.util.ForgeDirections;
|
||||
import crazypants.util.RenderPassHelper;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@@ -64,7 +65,7 @@ public class ZombieGeneratorRenderer extends TileEntitySpecialRenderer implement
|
||||
Tessellator tes = Tessellator.instance;
|
||||
tes.startDrawingQuads();
|
||||
|
||||
ForgeDirection facingDir = ForgeDirection.values()[gen.facing];
|
||||
ForgeDirection facingDir = ForgeDirections.DIRECTIONS[gen.facing];
|
||||
double facingOffset = 0.075;
|
||||
|
||||
BoundingBox bb = BoundingBox.UNIT_CUBE.scale(0.85, 0.96, 0.85);
|
||||
|
||||
@@ -26,6 +26,7 @@ import com.enderio.core.common.vecmath.Vector3d;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.machine.generator.zombie.ModelZombieJar;
|
||||
import crazypants.util.ForgeDirections;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class KillerJoeRenderer extends TileEntitySpecialRenderer implements IItemRenderer {
|
||||
@@ -130,7 +131,7 @@ public class KillerJoeRenderer extends TileEntitySpecialRenderer implements IIte
|
||||
bb = bb.scale(1, 0.85 * fullness, 1);
|
||||
float ty = -(0.85f - (bb.maxY - bb.minY)) / 2;
|
||||
|
||||
Vector3d offset = ForgeDirectionOffsets.offsetScaled(ForgeDirection.values()[gen.facing], -0.075);
|
||||
Vector3d offset = ForgeDirectionOffsets.offsetScaled(ForgeDirections.DIRECTIONS[gen.facing], -0.075);
|
||||
bb = bb.translate((float) offset.x, ty, (float) offset.z);
|
||||
|
||||
int brightness;
|
||||
|
||||
@@ -18,6 +18,7 @@ import com.enderio.core.api.client.gui.IResourceTooltipProvider;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.EnderIOTab;
|
||||
import crazypants.util.ForgeDirections;
|
||||
|
||||
public class BlockItemElectricLight extends ItemBlockWithMetadata implements IResourceTooltipProvider {
|
||||
|
||||
@@ -70,7 +71,7 @@ public class BlockItemElectricLight extends ItemBlockWithMetadata implements IRe
|
||||
return false;
|
||||
}
|
||||
if (world.getBlock(x, y, z) == field_150939_a) {
|
||||
ForgeDirection onFace = ForgeDirection.values()[side].getOpposite();
|
||||
ForgeDirection onFace = ForgeDirections.DIRECTIONS[side].getOpposite();
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if (te instanceof TileElectricLight) {
|
||||
TileElectricLight el = ((TileElectricLight) te);
|
||||
|
||||
@@ -22,6 +22,7 @@ import crazypants.enderio.machine.wireless.WirelessChargedLocation;
|
||||
import crazypants.enderio.power.Capacitors;
|
||||
import crazypants.enderio.power.IInternalPowerReceiver;
|
||||
import crazypants.enderio.power.PowerHandlerUtil;
|
||||
import crazypants.util.ForgeDirections;
|
||||
|
||||
public class TileElectricLight extends TileEntityEio implements IInternalPowerReceiver {
|
||||
|
||||
@@ -334,7 +335,7 @@ public class TileElectricLight extends TileEntityEio implements IInternalPowerRe
|
||||
@Override
|
||||
public void readCustomNBT(NBTTagCompound root) {
|
||||
|
||||
face = ForgeDirection.values()[root.getShort("face")];
|
||||
face = ForgeDirections.DIRECTIONS[root.getShort("face")];
|
||||
isInvereted = root.getBoolean("isInverted");
|
||||
requiresPower = root.getBoolean("requiresPower");
|
||||
setWireless(root.getBoolean("isWireless"));
|
||||
|
||||
@@ -4,7 +4,6 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import com.enderio.core.common.util.DyeColor;
|
||||
|
||||
@@ -14,6 +13,7 @@ import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.machine.AbstractMachineBlock;
|
||||
import crazypants.enderio.machine.ContainerNoInv;
|
||||
import crazypants.enderio.network.PacketHandler;
|
||||
import crazypants.util.ForgeDirections;
|
||||
|
||||
public class BlockPowerMonitor extends AbstractMachineBlock<TilePowerMonitor> {
|
||||
|
||||
@@ -74,7 +74,8 @@ public class BlockPowerMonitor extends AbstractMachineBlock<TilePowerMonitor> {
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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<TileSliceAndSplice> {
|
||||
|
||||
@@ -84,7 +85,7 @@ public class BlockSliceAndSplice extends AbstractMachineBlock<TileSliceAndSplice
|
||||
TileSliceAndSplice te = (TileSliceAndSplice) world.getTileEntity(x, y, z);
|
||||
if (isActive(world, x, y, z) && te != null) {
|
||||
|
||||
ForgeDirection front = ForgeDirection.values()[te.facing];
|
||||
ForgeDirection front = ForgeDirections.DIRECTIONS[te.facing];
|
||||
|
||||
for (int i = 0; i < 2; i++) {
|
||||
double px = x + 0.5 + front.offsetX * 0.6;
|
||||
|
||||
@@ -19,6 +19,7 @@ import com.gtnewhorizons.angelica.api.ThreadSafeISBRH;
|
||||
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
|
||||
import crazypants.enderio.ClientProxy;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.util.ForgeDirections;
|
||||
|
||||
@ThreadSafeISBRH(perThread = true)
|
||||
public class SoulBinderRenderer implements ISimpleBlockRenderingHandler {
|
||||
@@ -97,7 +98,7 @@ public class SoulBinderRenderer implements ISimpleBlockRenderingHandler {
|
||||
}
|
||||
|
||||
private ForgeDirection forFacing(ForgeDirection side, int facing) {
|
||||
return ForgeDirection.values()[ClientProxy.sideAndFacingToSpriteOffset[side.ordinal()][facing]];
|
||||
return ForgeDirections.DIRECTIONS[ClientProxy.sideAndFacingToSpriteOffset[side.ordinal()][facing]];
|
||||
}
|
||||
|
||||
private void renderSkull(ForgeDirection face, IIcon soulariumIcon, IIcon faceIcon) {
|
||||
|
||||
@@ -21,13 +21,17 @@ public enum Alloy {
|
||||
SOULARIUM("soularium", 10.0f),
|
||||
END_STEEL("endSteel", 10.0f);
|
||||
|
||||
/**
|
||||
* Cached values() array for frequent read-only operations, the array should NOT be mutated.
|
||||
*/
|
||||
public static final Alloy[] VALUES = values();
|
||||
public final String unlocalisedName;
|
||||
public final String iconKey;
|
||||
private final List<String> oreIngots = new ArrayList<String>();
|
||||
private final List<String> oreBlocks = new ArrayList<String>();
|
||||
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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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<ItemStack> list) {
|
||||
for (Alloy alloy : Alloy.values()) {
|
||||
for (Alloy alloy : Alloy.VALUES) {
|
||||
list.add(new ItemStack(this, 1, alloy.ordinal()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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<ItemStack> 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
|
||||
|
||||
@@ -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";
|
||||
}
|
||||
}
|
||||
@@ -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<ItemStack> 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;
|
||||
}
|
||||
}
|
||||
@@ -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()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -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<String> oreIngots = new ArrayList<String>();
|
||||
private final List<String> oreBlocks = new ArrayList<String>();
|
||||
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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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<ItemStack> list) {
|
||||
for (AlloyEndergy alloy : AlloyEndergy.values()) {
|
||||
for (AlloyEndergy alloy : AlloyEndergy.VALUES) {
|
||||
list.add(new ItemStack(this, 1, alloy.ordinal()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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";
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
@@ -15,6 +15,7 @@ import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
@@ -66,7 +67,9 @@ import crazypants.enderio.teleport.packet.PacketDrainStaff;
|
||||
import crazypants.enderio.teleport.packet.PacketLongDistanceTravelEvent;
|
||||
import crazypants.enderio.teleport.packet.PacketOpenAuthGui;
|
||||
import crazypants.enderio.teleport.packet.PacketTravelEvent;
|
||||
import crazypants.util.BackhandUtil;
|
||||
import crazypants.util.BaublesUtil;
|
||||
import xonin.backhand.api.core.BackhandUtils;
|
||||
|
||||
public class TravelController {
|
||||
|
||||
@@ -538,6 +541,21 @@ public class TravelController {
|
||||
return action < 2;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
private TravelSource getTravelSource(final EntityPlayer ep, final ItemStack stack) {
|
||||
final Item item = stack.getItem();
|
||||
if (item instanceof ItemTeleportStaff) {
|
||||
if (((ItemTeleportStaff) item).isActive(ep, stack)) {
|
||||
return TravelSource.TELEPORT_STAFF;
|
||||
}
|
||||
} else if (item instanceof IItemOfTravel) {
|
||||
if (((IItemOfTravel) item).isActive(ep, stack)) {
|
||||
return TravelSource.STAFF;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/** Returns null if no travel item is in inventory/baubles. */
|
||||
@Nullable
|
||||
public TravelSource getTravelItemTravelSource(EntityPlayer ep, boolean checkInventoryAndBaubles) {
|
||||
@@ -545,6 +563,16 @@ public class TravelController {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (BackhandUtil.backhandLoaded) {
|
||||
final ItemStack offhand = BackhandUtils.getOffhandItem(ep);
|
||||
if (offhand != null && offhand.getItem() != null) {
|
||||
final TravelSource source = getTravelSource(ep, offhand);
|
||||
if (source != null) {
|
||||
return source;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ItemStack equipped = ep.getCurrentEquippedItem();
|
||||
if (checkInventoryAndBaubles) {
|
||||
if (equipped == null || !(equipped.getItem() instanceof IItemOfTravel)
|
||||
@@ -552,16 +580,9 @@ public class TravelController {
|
||||
equipped = findTravelItemInInventoryOrBaubles(ep);
|
||||
}
|
||||
}
|
||||
|
||||
if (equipped != null) {
|
||||
if (equipped.getItem() instanceof ItemTeleportStaff) {
|
||||
if (((ItemTeleportStaff) equipped.getItem()).isActive(ep, equipped)) {
|
||||
return TravelSource.TELEPORT_STAFF;
|
||||
}
|
||||
} else if (equipped.getItem() instanceof IItemOfTravel) {
|
||||
if (((IItemOfTravel) equipped.getItem()).isActive(ep, equipped)) {
|
||||
return TravelSource.STAFF;
|
||||
}
|
||||
}
|
||||
return getTravelSource(ep, equipped);
|
||||
}
|
||||
|
||||
return null;
|
||||
@@ -634,6 +655,7 @@ public class TravelController {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return travelItemSlot;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
package crazypants.util;
|
||||
|
||||
import cpw.mods.fml.common.Loader;
|
||||
|
||||
public class BackhandUtil {
|
||||
|
||||
public final static boolean backhandLoaded = Loader.isModLoaded("backhand");
|
||||
|
||||
}
|
||||
@@ -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();
|
||||
}
|
||||
|
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 6.6 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 60 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 60 KiB |
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 364 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 395 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 429 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 373 B |
|
Before Width: | Height: | Size: 199 B After Width: | Height: | Size: 171 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 896 B |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 733 B |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 472 B After Width: | Height: | Size: 456 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 292 B |
|
Before Width: | Height: | Size: 362 B After Width: | Height: | Size: 336 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 220 B After Width: | Height: | Size: 202 B |