From 59e8f099e8f0133d423eded360bfaf4c5914dec8 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 15 Nov 2014 05:24:54 -0500 Subject: [PATCH] Add dense ME conduits and touch up conduit item rendering a bit --- resources/assets/enderio/lang/en_US.lang | 1 + .../textures/blocks/meConduitCoreDense.png | Bin 0 -> 4254 bytes .../textures/blocks/meConduitDense.png | Bin 0 -> 4254 bytes .../textures/items/itemMeConduitDense.png | Bin 0 -> 4254 bytes .../enderio/conduit/ConduitRecipes.java | 4 ++ .../enderio/conduit/me/IMEConduit.java | 2 + .../enderio/conduit/me/ItemMEConduit.java | 3 +- .../enderio/conduit/me/MEConduit.java | 44 ++++++++++++++---- .../enderio/conduit/me/MEConduitGrid.java | 4 +- .../conduit/render/ItemConduitRenderer.java | 5 +- 10 files changed, 51 insertions(+), 12 deletions(-) create mode 100644 resources/assets/enderio/textures/blocks/meConduitCoreDense.png create mode 100644 resources/assets/enderio/textures/blocks/meConduitDense.png create mode 100644 resources/assets/enderio/textures/items/itemMeConduitDense.png diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 2965c7e1..ce6df326 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -81,6 +81,7 @@ enderio.itemGasConduit.tooltip.maxIo=Max IO: enderio.itemGasConduit.tooltip.detailed.line1=Transfers Mekanism-compatible gases enderio.itemMEConduit.name=ME Conduit +enderio.itemMEConduitDense.name=Dense ME Conduit //Materials enderio.itemMaterial.name=Materials diff --git a/resources/assets/enderio/textures/blocks/meConduitCoreDense.png b/resources/assets/enderio/textures/blocks/meConduitCoreDense.png new file mode 100644 index 0000000000000000000000000000000000000000..e4f8db396791bd3bbf0047370166a2d5c15b1a75 GIT binary patch literal 4254 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_r*}Ak29D#}zZ6AbW|YuPggKZhkIK8D{n=84L^p+MX_sArYL63Ig}vGx7;*{0Ax< zFu($`nO8t&KpgP-!xILu13Tuy9DC@NscizWzXwf+aW%UN}NBid4UA5B{*XAAsK12*3*>d`)Lq1Y)bz zU~5pn>+no-DN#IW(14R!#w96*f0)KDYnZWDB5 RI)4+$EKgTImvv4FO#rX}Tb=*_ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/meConduitDense.png b/resources/assets/enderio/textures/blocks/meConduitDense.png new file mode 100644 index 0000000000000000000000000000000000000000..da8ef2c131b6e9ebfa172ebb16637480a17c95fd GIT binary patch literal 4254 zcmc(izityj5XSeci;aT3VxAt$D+w8%eBEm*@-^@4P%~60t_m-V=E2Ev^UV$4r zF0_mD;nC6e0@??+wuf$}zt({Z#@lOHHpZ0()ie9Ku6^r?lHoS=9<|O+L zixXUoabe;yPc7oY(o+x%QofSL+&E3V});-w`|ani_@&2C6G7mO#R+kYR$DiQj@BIY$EtX%3lk8jVUy;} zZ_dWBW28nEPaF(;KneOTU{E0TEst#xn+6uGjV|Y7geQOijZ;ZhgDu2vl9OxWaphI- zfjR|g4%W$$#y27l@kwkAKhK W?LB$$^~%J*0Y_WA!}m8IJ^uyZT#z*Y literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/itemMeConduitDense.png b/resources/assets/enderio/textures/items/itemMeConduitDense.png new file mode 100644 index 0000000000000000000000000000000000000000..e4f8db396791bd3bbf0047370166a2d5c15b1a75 GIT binary patch literal 4254 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_r*}Ak29D#}zZ6AbW|YuPggKZhkIK8D{n=84L^p+MX_sArYL63Ig}vGx7;*{0Ax< zFu($`nO8t&KpgP-!xILu13Tuy9DC@NscizWzXwf+aW%UN}NBid4UA5B{*XAAsK12*3*>d`)Lq1Y)bz zU~5pn>+no-DN#IW(14R!#w96*f0)KDYnZWDB5 RI)4+$EKgTImvv4FO#rX}Tb=*_ literal 0 HcmV?d00001 diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java index 7d5827fd..07be747c 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java @@ -117,6 +117,10 @@ public class ConduitRecipes { GameRegistry.addRecipe(new ShapedOreRecipe(res.copy(), "bbb", "fqf", "bbb", 'b', conduitBinder, 'f', fluix, 'q', quartzFiber)); GameRegistry.addRecipe(new ShapedOreRecipe(res.copy(), "bbb", "fqf", "bbb", 'b', conduitBinder, 'f', pureFluix, 'q', quartzFiber)); + + res.stackSize = 1; + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(EnderIO.itemMEConduit, 1, 1), "bCb", "CbC", "bCb", 'b', conduitBinder, 'C', res)); + } else { throw new RuntimeException("EnderIO ME Conduits only support AE2 rv1 or rv2 build 16+"); } diff --git a/src/main/java/crazypants/enderio/conduit/me/IMEConduit.java b/src/main/java/crazypants/enderio/conduit/me/IMEConduit.java index c23a7b7e..ca0b5176 100644 --- a/src/main/java/crazypants/enderio/conduit/me/IMEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/IMEConduit.java @@ -10,5 +10,7 @@ public interface IMEConduit extends IConduit { MEConduitGrid getGrid(); EnumSet getConnections(); + + boolean isDense(); } diff --git a/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java b/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java index d56a4846..ec9c740c 100644 --- a/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java @@ -10,6 +10,7 @@ public class ItemMEConduit extends AbstractItemConduit { private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { new ItemConduitSubtype(ModObject.itemMEConduit.name(), "enderio:itemMeConduit"), + new ItemConduitSubtype(ModObject.itemMEConduit.name() + "Dense", "enderio:itemMEConduitDense") }; public static ItemMEConduit create() { @@ -31,6 +32,6 @@ public class ItemMEConduit extends AbstractItemConduit { @Override public IConduit createConduit(ItemStack item) { - return new MEConduit(); + return new MEConduit(item.getItemDamage()); } } \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java index 04f23898..d3ae0f16 100644 --- a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java @@ -40,18 +40,34 @@ public class MEConduit extends AbstractConduit implements IMEConduit { protected MEConduitNetwork network; protected MEConduitGrid grid; - public static IIcon coreTexture; - public static IIcon longTexture; + public static IIcon[] coreTextures; + public static IIcon[] longTextures; + + private boolean isDense; EnumSet validConnections = EnumSet.copyOf(Arrays.asList(ForgeDirection.VALID_DIRECTIONS)); + public MEConduit() { + this(0); + } + + public MEConduit(int itemDamage) { + isDense = itemDamage == 1; + } + public static void initIcons() { IconUtil.addIconProvider(new IconUtil.IIconProvider() { @Override public void registerIcons(IIconRegister register) { - coreTexture = register.registerIcon(EnderIO.MODID + ":meConduitCore"); - longTexture = register.registerIcon(EnderIO.MODID + ":meConduit"); + coreTextures = new IIcon[2]; + longTextures = new IIcon[2]; + + coreTextures[0] = register.registerIcon(EnderIO.MODID + ":meConduitCore"); + coreTextures[1] = register.registerIcon(EnderIO.MODID + ":meConduitCoreDense"); + + longTextures[0] = register.registerIcon(EnderIO.MODID + ":meConduit"); + longTextures[1] = register.registerIcon(EnderIO.MODID + ":meConduitDense"); } @Override @@ -61,6 +77,10 @@ public class MEConduit extends AbstractConduit implements IMEConduit { }); } + + public static int getDamageForState(boolean isDense) { + return isDense ? 1 : 0; + } @Override public Class getBaseConduitType() { @@ -69,7 +89,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit { @Override public ItemStack createItem() { - return new ItemStack(EnderIO.itemMEConduit); + return new ItemStack(EnderIO.itemMEConduit, 1, getDamageForState(isDense)); } @Override @@ -92,6 +112,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit { list.appendTag(name); } nbtRoot.setTag("validConnections", list); + nbtRoot.setBoolean("isDense", isDense); } @Override @@ -104,6 +125,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit { validConnections.add(ForgeDirection.valueOf(connections.getStringTagAt(i))); } } + this.isDense = nbtRoot.getBoolean("isDense"); } @Override @@ -132,10 +154,11 @@ public class MEConduit extends AbstractConduit implements IMEConduit { @Override public IIcon getTextureForState(CollidableComponent component) { + int state = getDamageForState(isDense); if(component.dir == ForgeDirection.UNKNOWN) { - return coreTexture; + return coreTextures[state]; } else { - return longTexture; + return longTextures[state]; } } @@ -205,7 +228,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit { @Override public void conduitConnectionRemoved(ForgeDirection fromDirection) { super.conduitConnectionRemoved(fromDirection); - validConnections.remove(fromDirection); +// validConnections.remove(fromDirection); // this causes more annoying behavior than wanted behavior. Let's leave it out for now. } @Override @@ -304,4 +327,9 @@ public class MEConduit extends AbstractConduit implements IMEConduit { public EnumSet getConnections() { return validConnections; } + + @Override + public boolean isDense() { + return isDense; + } } diff --git a/src/main/java/crazypants/enderio/conduit/me/MEConduitGrid.java b/src/main/java/crazypants/enderio/conduit/me/MEConduitGrid.java index c8f340e1..8373f0cc 100644 --- a/src/main/java/crazypants/enderio/conduit/me/MEConduitGrid.java +++ b/src/main/java/crazypants/enderio/conduit/me/MEConduitGrid.java @@ -22,7 +22,7 @@ public class MEConduitGrid implements IGridBlock { @Override public double getIdlePowerUsage() { - return 0; // TODO Balance + return 0; } @Override @@ -42,7 +42,7 @@ public class MEConduitGrid implements IGridBlock { @Override public EnumSet getFlags() { - return EnumSet.noneOf(GridFlags.class); + return conduit.isDense() ? EnumSet.of(GridFlags.DENSE_CAPACITY) : EnumSet.noneOf(GridFlags.class); } @Override diff --git a/src/main/java/crazypants/enderio/conduit/render/ItemConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/render/ItemConduitRenderer.java index b23ed351..2081813f 100644 --- a/src/main/java/crazypants/enderio/conduit/render/ItemConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/ItemConduitRenderer.java @@ -33,15 +33,18 @@ public class ItemConduitRenderer implements IItemRenderer { public void renderItem(ItemRenderType type, ItemStack item, Object... data) { RenderBlocks renderBlocks = (RenderBlocks) data[0]; if(type == ItemRenderType.INVENTORY) { + GL11.glTranslatef(0, -0.1f, 0); renderToInventory(item, renderBlocks); } else if(type == ItemRenderType.EQUIPPED) { renderEquipped(item, renderBlocks); } else if(type == ItemRenderType.ENTITY) { renderEntity(item, renderBlocks); } else if(type == ItemRenderType.EQUIPPED_FIRST_PERSON) { + GL11.glTranslatef(0.3f, 0.2f, 0); + GL11.glScalef(1.25f, 1.25f, 1.25f); renderEntity(item, renderBlocks); } else { - System.out.println("FacadeRenderer.renderItem: Unsupported render type"); + System.out.println("ItemConduitRenderer.renderItem: Unsupported render type"); } }