From fa376237fd11fd3fdb55369da2802678e39157b0 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Sun, 25 May 2014 17:43:17 -0500 Subject: [PATCH] remove unused variable, and added lumen cable. --- .../gui/implementations/GuiCraftAmount.java | 2 +- items/parts/PartType.java | 22 +++++++++++++++++-- parts/networking/PartCable.java | 6 +++++ parts/networking/PartCableCovered.java | 6 ++++- parts/networking/PartCableGlass.java | 6 ++++- parts/networking/PartCableSmart.java | 6 ++++- parts/networking/PartDenseCable.java | 8 +++++-- parts/networking/PartLumenCableCovered.java | 12 ++++++++++ parts/networking/PartLumenCableGlass.java | 12 ++++++++++ parts/networking/PartLumenCableSmart.java | 12 ++++++++++ parts/networking/PartLumenDenseCable.java | 12 ++++++++++ 11 files changed, 96 insertions(+), 8 deletions(-) create mode 100644 parts/networking/PartLumenCableCovered.java create mode 100644 parts/networking/PartLumenCableGlass.java create mode 100644 parts/networking/PartLumenCableSmart.java create mode 100644 parts/networking/PartLumenDenseCable.java diff --git a/client/gui/implementations/GuiCraftAmount.java b/client/gui/implementations/GuiCraftAmount.java index e5856de20..f66ffc89a 100644 --- a/client/gui/implementations/GuiCraftAmount.java +++ b/client/gui/implementations/GuiCraftAmount.java @@ -217,7 +217,7 @@ public class GuiCraftAmount extends AEBaseGui try { - long result = Long.parseLong( amountToCraft.getText() ); + Long.parseLong( amountToCraft.getText() ); next.enabled = amountToCraft.getText().length() > 0; } catch (NumberFormatException e) diff --git a/items/parts/PartType.java b/items/parts/PartType.java index 5a17dbebd..c5490fbe1 100644 --- a/items/parts/PartType.java +++ b/items/parts/PartType.java @@ -20,6 +20,10 @@ import appeng.parts.networking.PartCableCovered; import appeng.parts.networking.PartCableGlass; import appeng.parts.networking.PartCableSmart; import appeng.parts.networking.PartDenseCable; +import appeng.parts.networking.PartLumenCableCovered; +import appeng.parts.networking.PartLumenCableGlass; +import appeng.parts.networking.PartLumenCableSmart; +import appeng.parts.networking.PartLumenDenseCable; import appeng.parts.networking.PartQuartzFiber; import appeng.parts.p2p.PartP2PBCPower; import appeng.parts.p2p.PartP2PIC2Power; @@ -99,7 +103,15 @@ public enum PartType P2PTunnelEU(465, AEFeature.P2PTunnelEU, PartP2PIC2Power.class, GuiText.EUTunnel), - P2PTunnelRF(466, AEFeature.P2PTunnelRF, PartP2PRFPower.class, GuiText.RFTunnel); + P2PTunnelRF(466, AEFeature.P2PTunnelRF, PartP2PRFPower.class, GuiText.RFTunnel), + + LumenCableGlass(480, AEFeature.Core, PartLumenCableGlass.class), + + LumenCableCovered(500, AEFeature.Core, PartLumenCableCovered.class), + + LumenCableSmart(520, AEFeature.Core, PartLumenCableSmart.class), + + LumenCableDense(540, AEFeature.DenseCables, PartLumenDenseCable.class); private final EnumSet features; private final Class myPart; @@ -119,7 +131,13 @@ public enum PartType public Enum[] getVarients() { - return (this == CableSmart || this == CableCovered || this == CableGlass || this == CableDense) ? AEColor.values() : null; + if ( this == CableSmart || this == CableCovered || this == CableGlass || this == CableDense ) + return AEColor.values(); + + if ( this == LumenCableSmart || this == LumenCableCovered || this == LumenCableGlass || this == LumenCableDense ) + return AEColor.values(); + + return null; } public EnumSet getFeature() diff --git a/parts/networking/PartCable.java b/parts/networking/PartCable.java index 1c63e96cd..9280e0f8b 100644 --- a/parts/networking/PartCable.java +++ b/parts/networking/PartCable.java @@ -62,6 +62,12 @@ public class PartCable extends AEBasePart implements IPartCable return BusSupport.CABLE; } + @Override + public int getLightLevel() + { + return 11; + } + public IIcon getGlassTexture(AEColor c) { switch (c) diff --git a/parts/networking/PartCableCovered.java b/parts/networking/PartCableCovered.java index b84b75552..7e3f67ea4 100644 --- a/parts/networking/PartCableCovered.java +++ b/parts/networking/PartCableCovered.java @@ -40,8 +40,12 @@ public class PartCableCovered extends PartCable getHost().markForUpdate(); } + public PartCableCovered(Class c, ItemStack is) { + super( c, is ); + } + public PartCableCovered(ItemStack is) { - super( PartCableCovered.class, is ); + this( PartCableCovered.class, is ); } @Override diff --git a/parts/networking/PartCableGlass.java b/parts/networking/PartCableGlass.java index d82dfb21f..dee9e5cfc 100644 --- a/parts/networking/PartCableGlass.java +++ b/parts/networking/PartCableGlass.java @@ -5,8 +5,12 @@ import net.minecraft.item.ItemStack; public class PartCableGlass extends PartCable { + public PartCableGlass(Class c, ItemStack is) { + super( c, is ); + } + public PartCableGlass(ItemStack is) { - super( PartCableGlass.class, is ); + this( PartCableGlass.class, is ); } } diff --git a/parts/networking/PartCableSmart.java b/parts/networking/PartCableSmart.java index 2c8b5176d..af1c887d9 100644 --- a/parts/networking/PartCableSmart.java +++ b/parts/networking/PartCableSmart.java @@ -44,8 +44,12 @@ public class PartCableSmart extends PartCable getHost().markForUpdate(); } + public PartCableSmart(Class c, ItemStack is) { + super( c, is ); + } + public PartCableSmart(ItemStack is) { - super( PartCableSmart.class, is ); + this( PartCableSmart.class, is ); } @Override diff --git a/parts/networking/PartDenseCable.java b/parts/networking/PartDenseCable.java index 0ab229395..17363dd9e 100644 --- a/parts/networking/PartDenseCable.java +++ b/parts/networking/PartDenseCable.java @@ -54,11 +54,15 @@ public class PartDenseCable extends PartCable getHost().markForUpdate(); } - public PartDenseCable(ItemStack is) { - super( PartDenseCable.class, is ); + public PartDenseCable(Class c, ItemStack is) { + super( c, is ); proxy.setFlags( GridFlags.TIER_2_CAPACITY ); } + public PartDenseCable(ItemStack is) { + this( PartDenseCable.class, is ); + } + @Override public AECableType getCableConnectionType() { diff --git a/parts/networking/PartLumenCableCovered.java b/parts/networking/PartLumenCableCovered.java new file mode 100644 index 000000000..b1d072558 --- /dev/null +++ b/parts/networking/PartLumenCableCovered.java @@ -0,0 +1,12 @@ +package appeng.parts.networking; + +import net.minecraft.item.ItemStack; + +public class PartLumenCableCovered extends PartCableCovered +{ + + public PartLumenCableCovered(ItemStack is) { + super( is ); + } + +} diff --git a/parts/networking/PartLumenCableGlass.java b/parts/networking/PartLumenCableGlass.java new file mode 100644 index 000000000..a0f0d0203 --- /dev/null +++ b/parts/networking/PartLumenCableGlass.java @@ -0,0 +1,12 @@ +package appeng.parts.networking; + +import net.minecraft.item.ItemStack; + +public class PartLumenCableGlass extends PartCableGlass +{ + + public PartLumenCableGlass(ItemStack is) { + super( is ); + } + +} diff --git a/parts/networking/PartLumenCableSmart.java b/parts/networking/PartLumenCableSmart.java new file mode 100644 index 000000000..700b487f3 --- /dev/null +++ b/parts/networking/PartLumenCableSmart.java @@ -0,0 +1,12 @@ +package appeng.parts.networking; + +import net.minecraft.item.ItemStack; + +public class PartLumenCableSmart extends PartCableSmart +{ + + public PartLumenCableSmart(ItemStack is) { + super( is ); + } + +} diff --git a/parts/networking/PartLumenDenseCable.java b/parts/networking/PartLumenDenseCable.java new file mode 100644 index 000000000..fd09b6f81 --- /dev/null +++ b/parts/networking/PartLumenDenseCable.java @@ -0,0 +1,12 @@ +package appeng.parts.networking; + +import net.minecraft.item.ItemStack; + +public class PartLumenDenseCable extends PartDenseCable +{ + + public PartLumenDenseCable(ItemStack is) { + super( is ); + } + +}