From 33970b6bf7fb4a9ee2658a32c7652d1e2f9357df Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Sat, 2 Aug 2014 11:16:14 -0400 Subject: [PATCH] Updated Multiblock Controller textures, added multi-meta capability to Connected Texture Renderer --- .../common/ConnectedTextureRenderer.java | 9 +++++---- .../mekanism/common/block/BlockBasic.java | 5 +++-- .../textures/blocks/ReactorControllerOff.png | Bin 1860 -> 2203 bytes .../textures/blocks/ReactorControllerOn.png | Bin 1994 -> 2326 bytes 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/mekanism/common/ConnectedTextureRenderer.java b/src/main/java/mekanism/common/ConnectedTextureRenderer.java index 251471ae8..e18660607 100644 --- a/src/main/java/mekanism/common/ConnectedTextureRenderer.java +++ b/src/main/java/mekanism/common/ConnectedTextureRenderer.java @@ -1,6 +1,7 @@ package mekanism.common; import java.util.HashMap; +import java.util.List; import java.util.Map; import mekanism.api.Coord4D; @@ -17,13 +18,13 @@ public class ConnectedTextureRenderer public static final byte[][] sideEdges = {{2, 5, 3, 4}, {2, 5, 3, 4}, {1, 4, 0, 5}, {1, 5, 0, 4}, {1, 3, 0, 2}, {1, 2, 0, 3}}; public Block block; - public int metadata; + public List metadata; public String iconTitle; public Map glassMap = new HashMap(); - public ConnectedTextureRenderer(String title, Block b, int meta) + public ConnectedTextureRenderer(String title, Block b, List meta) { iconTitle = title; block = b; @@ -114,13 +115,13 @@ public class ConnectedTextureRenderer Coord4D coord = obj.getFromSide(ForgeDirection.getOrientation(side)); Coord4D coordAbove = obj.getFromSide(ForgeDirection.getOrientation(face)); - return (coord.getBlock(access) == block && coord.getMetadata(access) == metadata) && (coordAbove.getBlock(access) != block || coordAbove.getMetadata(access) != metadata); + return (coord.getBlock(access) == block && metadata.contains(coord.getMetadata(access))) && (coordAbove.getBlock(access) != block || metadata.contains(coordAbove.getMetadata(access))); } @SideOnly(Side.CLIENT) public boolean shouldRenderSide(IBlockAccess world, int x, int y, int z, int side) { Coord4D obj = new Coord4D(x, y, z).getFromSide(ForgeDirection.getOrientation(side).getOpposite()); - return obj.getBlock(world) != block || obj.getMetadata(world) != metadata; + return obj.getBlock(world) != block || metadata.contains(obj.getMetadata(world)); } } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 3fb227924..a02b0665f 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -1,6 +1,7 @@ package mekanism.common.block; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Random; @@ -19,8 +20,8 @@ import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicValve; -import mekanism.common.tile.TileEntitySalinationController; import mekanism.common.tile.TileEntitySalinationBlock; +import mekanism.common.tile.TileEntitySalinationController; import mekanism.common.tile.TileEntitySalinationValve; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; @@ -74,7 +75,7 @@ public class BlockBasic extends Block { public IIcon[][] icons = new IIcon[256][6]; - public ConnectedTextureRenderer glassRenderer = new ConnectedTextureRenderer("glass/DynamicGlass", this, 10); + public ConnectedTextureRenderer glassRenderer = new ConnectedTextureRenderer("glass/DynamicGlass", this, Arrays.asList(10)); public BlockBasic() { diff --git a/src/main/resources/assets/mekanism/textures/blocks/ReactorControllerOff.png b/src/main/resources/assets/mekanism/textures/blocks/ReactorControllerOff.png index 0f4edbaa74644775ec823df3dec9ae52013efe4e..2aa4295d1ace50bc9dbd6702fcd285e1161d9b41 100644 GIT binary patch delta 2104 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