From b1a11b0ba23f11a29f201294bf8dc641d3e378cd Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Mon, 1 Sep 2014 18:19:21 +0100 Subject: [PATCH] Further adapt the multiblock code. This will allow inter-block connected textures. I'll try and get side-specific texture overrides (eg. for the Salination Controller) working next. --- src/main/java/mekanism/client/render/CTM.java | 112 ++++++++++-------- .../render/block/CTMRenderingHandler.java | 2 +- .../client/render/block/RenderBlocksCTM.java | 15 +-- src/main/java/mekanism/common/CTMData.java | 30 ++++- .../mekanism/common/block/BlockBasic.java | 34 ++---- .../generators/common/block/BlockReactor.java | 26 ++-- .../blocks/ctm/SalinationBlock-ctm.png | Bin 0 -> 1292 bytes .../textures/blocks/ctm/SalinationBlock.png | Bin 0 -> 1206 bytes .../blocks/ctm/SalinationController.png | Bin 0 -> 1802 bytes .../blocks/ctm/SalinationControllerOn.png | Bin 0 -> 1952 bytes .../ctm/SalinationControllerOn.png.mcmeta | 5 + .../blocks/ctm/SalinationValve-ctm.png | Bin 0 -> 1438 bytes .../textures/blocks/ctm/SalinationValve.png | Bin 0 -> 1316 bytes 13 files changed, 116 insertions(+), 108 deletions(-) create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/SalinationBlock-ctm.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/SalinationBlock.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/SalinationController.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/SalinationControllerOn.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/SalinationControllerOn.png.mcmeta create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/SalinationValve-ctm.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/ctm/SalinationValve.png diff --git a/src/main/java/mekanism/client/render/CTM.java b/src/main/java/mekanism/client/render/CTM.java index 544b5f84c..2af53ba90 100644 --- a/src/main/java/mekanism/client/render/CTM.java +++ b/src/main/java/mekanism/client/render/CTM.java @@ -2,7 +2,9 @@ package mekanism.client.render; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.Map.Entry; import net.minecraft.block.Block; import net.minecraft.world.IBlockAccess; @@ -81,55 +83,51 @@ public class CTM {}, }; - public static int[] getSubmapIndices(IBlockAccess world, int x, int y, int z, int side, List metas) + public static int[] getSubmapIndices(IBlockAccess world, int x, int y, int z, int side, HashMap> blockMetas) { - int index = getTexture(world, x, y, z, side, metas); + int index = getTexture(world, x, y, z, side, blockMetas); return submaps[index]; } - public static int getTexture(IBlockAccess world, int x, int y, int z, int side, List metas) + public static int getTexture(IBlockAccess world, int x, int y, int z, int side, HashMap> blockMetas) { if(world == null) return 0; int texture = 0; - Block block = world.getBlock(x, y, z); - - if(metas == null || metas.size() <= 0) - metas = Arrays.asList(world.getBlockMetadata(x, y, z)); boolean b[] = new boolean[6]; if(side <= 1) { - b[0] = isConnected(world, x - 1, y, z, side, block, metas); - b[1] = isConnected(world, x + 1, y, z, side, block, metas); - b[2] = isConnected(world, x, y, z + 1, side, block, metas); - b[3] = isConnected(world, x, y, z - 1, side, block, metas); + b[0] = isConnected(world, x - 1, y, z, side, blockMetas); + b[1] = isConnected(world, x + 1, y, z, side, blockMetas); + b[2] = isConnected(world, x, y, z + 1, side, blockMetas); + b[3] = isConnected(world, x, y, z - 1, side, blockMetas); } else if(side == 2) { - b[0] = isConnected(world, x + 1, y, z, side, block, metas); - b[1] = isConnected(world, x - 1, y, z, side, block, metas); - b[2] = isConnected(world, x, y - 1, z, side, block, metas); - b[3] = isConnected(world, x, y + 1, z, side, block, metas); + b[0] = isConnected(world, x + 1, y, z, side, blockMetas); + b[1] = isConnected(world, x - 1, y, z, side, blockMetas); + b[2] = isConnected(world, x, y - 1, z, side, blockMetas); + b[3] = isConnected(world, x, y + 1, z, side, blockMetas); } else if(side == 3) { - b[0] = isConnected(world, x - 1, y, z, side, block, metas); - b[1] = isConnected(world, x + 1, y, z, side, block, metas); - b[2] = isConnected(world, x, y - 1, z, side, block, metas); - b[3] = isConnected(world, x, y + 1, z, side, block, metas); + b[0] = isConnected(world, x - 1, y, z, side, blockMetas); + b[1] = isConnected(world, x + 1, y, z, side, blockMetas); + b[2] = isConnected(world, x, y - 1, z, side, blockMetas); + b[3] = isConnected(world, x, y + 1, z, side, blockMetas); } else if(side == 4) { - b[0] = isConnected(world, x, y, z - 1, side, block, metas); - b[1] = isConnected(world, x, y, z + 1, side, block, metas); - b[2] = isConnected(world, x, y - 1, z, side, block, metas); - b[3] = isConnected(world, x, y + 1, z, side, block, metas); + b[0] = isConnected(world, x, y, z - 1, side, blockMetas); + b[1] = isConnected(world, x, y, z + 1, side, blockMetas); + b[2] = isConnected(world, x, y - 1, z, side, blockMetas); + b[3] = isConnected(world, x, y + 1, z, side, blockMetas); } else if(side == 5) { - b[0] = isConnected(world, x, y, z + 1, side, block, metas); - b[1] = isConnected(world, x, y, z - 1, side, block, metas); - b[2] = isConnected(world, x, y - 1, z, side, block, metas); - b[3] = isConnected(world, x, y + 1, z, side, block, metas); + b[0] = isConnected(world, x, y, z + 1, side, blockMetas); + b[1] = isConnected(world, x, y, z - 1, side, blockMetas); + b[2] = isConnected(world, x, y - 1, z, side, blockMetas); + b[3] = isConnected(world, x, y + 1, z, side, blockMetas); } if(b[0] & !b[1] & !b[2] & !b[3]) texture = 3; @@ -165,34 +163,34 @@ public class CTM boolean b2[] = new boolean[6]; if(side <= 1) { - b2[0] = !isConnected(world, x + 1, y, z + 1, side, block, metas); - b2[1] = !isConnected(world, x - 1, y, z + 1, side, block, metas); - b2[2] = !isConnected(world, x + 1, y, z - 1, side, block, metas); - b2[3] = !isConnected(world, x - 1, y, z - 1, side, block, metas); + b2[0] = !isConnected(world, x + 1, y, z + 1, side, blockMetas); + b2[1] = !isConnected(world, x - 1, y, z + 1, side, blockMetas); + b2[2] = !isConnected(world, x + 1, y, z - 1, side, blockMetas); + b2[3] = !isConnected(world, x - 1, y, z - 1, side, blockMetas); } else if(side == 2) { - b2[0] = !isConnected(world, x - 1, y - 1, z, side, block, metas); - b2[1] = !isConnected(world, x + 1, y - 1, z, side, block, metas); - b2[2] = !isConnected(world, x - 1, y + 1, z, side, block, metas); - b2[3] = !isConnected(world, x + 1, y + 1, z, side, block, metas); + b2[0] = !isConnected(world, x - 1, y - 1, z, side, blockMetas); + b2[1] = !isConnected(world, x + 1, y - 1, z, side, blockMetas); + b2[2] = !isConnected(world, x - 1, y + 1, z, side, blockMetas); + b2[3] = !isConnected(world, x + 1, y + 1, z, side, blockMetas); } else if(side == 3) { - b2[0] = !isConnected(world, x + 1, y - 1, z, side, block, metas); - b2[1] = !isConnected(world, x - 1, y - 1, z, side, block, metas); - b2[2] = !isConnected(world, x + 1, y + 1, z, side, block, metas); - b2[3] = !isConnected(world, x - 1, y + 1, z, side, block, metas); + b2[0] = !isConnected(world, x + 1, y - 1, z, side, blockMetas); + b2[1] = !isConnected(world, x - 1, y - 1, z, side, blockMetas); + b2[2] = !isConnected(world, x + 1, y + 1, z, side, blockMetas); + b2[3] = !isConnected(world, x - 1, y + 1, z, side, blockMetas); } else if(side == 4) { - b2[0] = !isConnected(world, x, y - 1, z + 1, side, block, metas); - b2[1] = !isConnected(world, x, y - 1, z - 1, side, block, metas); - b2[2] = !isConnected(world, x, y + 1, z + 1, side, block, metas); - b2[3] = !isConnected(world, x, y + 1, z - 1, side, block, metas); + b2[0] = !isConnected(world, x, y - 1, z + 1, side, blockMetas); + b2[1] = !isConnected(world, x, y - 1, z - 1, side, blockMetas); + b2[2] = !isConnected(world, x, y + 1, z + 1, side, blockMetas); + b2[3] = !isConnected(world, x, y + 1, z - 1, side, blockMetas); } else if(side == 5) { - b2[0] = !isConnected(world, x, y - 1, z - 1, side, block, metas); - b2[1] = !isConnected(world, x, y - 1, z + 1, side, block, metas); - b2[2] = !isConnected(world, x, y + 1, z - 1, side, block, metas); - b2[3] = !isConnected(world, x, y + 1, z + 1, side, block, metas); + b2[0] = !isConnected(world, x, y - 1, z - 1, side, blockMetas); + b2[1] = !isConnected(world, x, y - 1, z + 1, side, blockMetas); + b2[2] = !isConnected(world, x, y + 1, z - 1, side, blockMetas); + b2[3] = !isConnected(world, x, y + 1, z + 1, side, blockMetas); } if(texture == 17 && b2[0]) @@ -269,7 +267,7 @@ public class CTM return texture; } - public static boolean isConnected(IBlockAccess world, int x, int y, int z, int side, Block block, List metas) + public static boolean isConnected(IBlockAccess world, int x, int y, int z, int side, HashMap> blockMetas) { int x2 = x, y2 = y, z2 = z; @@ -295,12 +293,22 @@ public class CTM break; } - int meta = world.getBlockMetadata(x, y, z); + Block block1 = world.getBlock(x, y, z); + Block block2 = world.getBlock(x2, y2, z2); + + int meta1 = world.getBlockMetadata(x, y, z); int meta2 = world.getBlockMetadata(x2, y2, z2); - boolean validMeta = metas.contains(meta); - boolean validMeta2 = metas.contains(meta2); + boolean validBlockMeta1 = false; + boolean invalidBlockMeta2 = true; - return world.getBlock(x, y, z).equals(block) && validMeta && !(world.getBlock(x2, y2, z2).equals(block) && validMeta2); + for(Entry> entry : blockMetas.entrySet()) + { + validBlockMeta1 |= block1.equals(entry.getKey()) && entry.getValue().contains(meta1); + + invalidBlockMeta2 &= !(block2.equals(entry.getKey()) && entry.getValue().contains(meta2)); + } + + return validBlockMeta1 && invalidBlockMeta2; } } \ No newline at end of file diff --git a/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java b/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java index b37da4b77..48d27c97d 100644 --- a/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java @@ -43,7 +43,7 @@ public class CTMRenderingHandler implements ISimpleBlockRenderingHandler rendererCTM.submap = blockCTM.submap; rendererCTM.submapSmall = blockCTM.submapSmall; - rendererCTM.metas = blockCTM.acceptableMetas; + rendererCTM.blockMetas = blockCTM.acceptableBlockMetas; rendererCTM.rendererOld = rendererOld; diff --git a/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java b/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java index a93c92a6b..d399f0dda 100644 --- a/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java +++ b/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java @@ -1,5 +1,6 @@ package mekanism.client.render.block; +import java.util.HashMap; import java.util.List; import mekanism.client.render.CTM; @@ -37,7 +38,7 @@ public class RenderBlocksCTM extends RenderBlocks TextureSubmap submap; TextureSubmap submapSmall; RenderBlocks rendererOld; - List metas; + HashMap> blockMetas; int bx, by, bz; @@ -152,7 +153,7 @@ public class RenderBlocksCTM extends RenderBlocks tessellator.addVertexWithUV(0.0, 1.0, 1.0, i.getMaxU(), i.getMinV()); } else { - int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 4, metas); + int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 4, blockMetas); setupSides(1, 0, 4, 5, 14, 19, 17, 23, 9); side(1, 14, 9, 23, tex[0], false); @@ -175,7 +176,7 @@ public class RenderBlocksCTM extends RenderBlocks tessellator.addVertexWithUV(1.0, 1.0, 0.0, i.getMinU(), i.getMinV()); } else { - int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 5, metas); + int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 5, blockMetas); setupSides(3, 2, 6, 7, 15, 25, 16, 21, 11); side(11, 21, 3, 15, tex[3], false); @@ -198,7 +199,7 @@ public class RenderBlocksCTM extends RenderBlocks tessellator.addVertexWithUV(0.0, 1.0, 0.0, i.getMinU(), i.getMinV()); } else { - int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 2, metas); + int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 2, blockMetas); setupSides(2, 3, 0, 1, 15, 18, 14, 22, 8); side(2, 15, 8, 22, tex[0], false); @@ -222,7 +223,7 @@ public class RenderBlocksCTM extends RenderBlocks tessellator.addVertexWithUV(1.0, 1.0, 1.0, i.getMaxU(), i.getMinV()); } else { - int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 3, metas); + int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 3, blockMetas); setupSides(4, 7, 6, 5, 20, 16, 24, 17, 10); side(17, 4, 20, 10, tex[2], false); @@ -245,7 +246,7 @@ public class RenderBlocksCTM extends RenderBlocks tessellator.addVertexWithUV(1.0, 0.0, 1.0, i.getMaxU(), i.getMaxV()); } else { - int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 0, metas); + int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 0, blockMetas); setupSides(0, 3, 7, 4, 18, 21, 20, 19, 13); side(13, 21, 7, 20, tex[3], true); @@ -268,7 +269,7 @@ public class RenderBlocksCTM extends RenderBlocks tessellator.addVertexWithUV(1.0, 1.0, 0.0, i.getMaxU(), i.getMinV()); } else { - int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 1, metas); + int tex[] = CTM.getSubmapIndices(blockAccess, bx, by, bz, 1, blockMetas); setupSides(2, 1, 5, 6, 22, 23, 24, 25, 12); side(12, 24, 6, 25, tex[3], false); diff --git a/src/main/java/mekanism/common/CTMData.java b/src/main/java/mekanism/common/CTMData.java index ccd24df07..908bfa0b0 100644 --- a/src/main/java/mekanism/common/CTMData.java +++ b/src/main/java/mekanism/common/CTMData.java @@ -1,6 +1,8 @@ package mekanism.common; +import java.util.HashMap; import java.util.List; +import java.util.Map.Entry; import mekanism.api.Coord4D; import mekanism.client.render.block.TextureSubmap; @@ -22,26 +24,42 @@ public class CTMData public String texture; - public List acceptableMetas; + public HashMap> acceptableBlockMetas = new HashMap>(); - public CTMData(String textureName, List connectableMeta) + public CTMData(String textureName, Block block, List connectableMeta) { texture = textureName; - acceptableMetas = connectableMeta; + acceptableBlockMetas.put(block, connectableMeta); } - public void registerIcons(IIconRegister register) + public CTMData registerIcons(IIconRegister register) { icon = register.registerIcon("mekanism:" + texture); submap = new TextureSubmap(register.registerIcon("mekanism:" + texture + "-ctm"), 4, 4); submapSmall = new TextureSubmap(icon, 2, 2); + + return this; + } + + public CTMData addOtherBlockConnectivities(Block block, List connectableMeta) + { + acceptableBlockMetas.put(block, connectableMeta); + return this; } @SideOnly(Side.CLIENT) - public boolean shouldRenderSide(IBlockAccess world, int x, int y, int z, int side, Block block) + public boolean shouldRenderSide(IBlockAccess world, int x, int y, int z, int side) { Coord4D obj = new Coord4D(x, y, z); - return !(obj.getBlock(world).equals(block) && acceptableMetas.contains(obj.getMetadata(world))); + Block coordBlock = obj.getBlock(world); + int coordMeta = obj.getMetadata(world); + boolean valid = false; + + for(Entry> entry : acceptableBlockMetas.entrySet()) + { + valid |= entry.getKey().equals(coordBlock) && entry.getValue().contains(coordMeta); + } + return !valid; } } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index a689199a0..ad51332ce 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -77,9 +77,7 @@ public class BlockBasic extends Block implements IBlockCTM { public IIcon[][] icons = new IIcon[256][6]; - public CTMData dynamicTankCTM = new CTMData("ctm/DynamicTank", Arrays.asList(9, 11)); - public CTMData dynamicGlassCTM = new CTMData("ctm/DynamicGlass",Arrays.asList(10)); - public CTMData dynamicValveCTM = new CTMData("ctm/DynamicValve", Arrays.asList(11, 9)); + public CTMData[] ctms = new CTMData[16]; public BlockBasic() { @@ -137,13 +135,17 @@ public class BlockBasic extends Block implements IBlockCTM icons[14][2] = register.registerIcon("mekanism:SalinationBlock"); icons[15][0] = register.registerIcon("mekanism:SalinationValve"); - dynamicTankCTM.registerIcons(register); - dynamicGlassCTM.registerIcons(register); - dynamicValveCTM.registerIcons(register); + ctms[9] = new CTMData("ctm/DynamicTank", this, Arrays.asList(9, 11)).registerIcons(register); + ctms[10] = new CTMData("ctm/DynamicGlass", this, Arrays.asList(10)).registerIcons(register); + ctms[11] = new CTMData("ctm/DynamicValve", this, Arrays.asList(11, 9)).registerIcons(register); + + ctms[15] = new CTMData("ctm/SalinationValve", this, Arrays.asList(15)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock2, Arrays.asList(0)).registerIcons(register); } else if(this == MekanismBlocks.BasicBlock2) { icons[0][0] = register.registerIcon("mekanism:SalinationBlock"); + + ctms[0] = new CTMData("ctm/SalinationBlock", this, Arrays.asList(0)).addOtherBlockConnectivities(MekanismBlocks.BasicBlock, Arrays.asList(15)).registerIcons(register); } } @@ -173,11 +175,9 @@ public class BlockBasic extends Block implements IBlockCTM return icons[6][0]; } case 9: - return dynamicTankCTM.icon; case 10: - return dynamicGlassCTM.icon; case 11: - return dynamicValveCTM.icon; + return ctms[metadata].icon; case 14: TileEntitySalinationController tileEntity14 = (TileEntitySalinationController)world.getTileEntity(x, y, z); @@ -805,7 +805,7 @@ public class BlockBasic extends Block implements IBlockCTM Coord4D obj = new Coord4D(x, y, z).getFromSide(ForgeDirection.getOrientation(side).getOpposite()); if(this == MekanismBlocks.BasicBlock && obj.getMetadata(world) == 10) { - return dynamicGlassCTM.shouldRenderSide(world, x, y, z, side, this); + return ctms[10].shouldRenderSide(world, x, y, z, side); } else { return super.shouldSideBeRendered(world, x, y, z, side); @@ -855,18 +855,6 @@ public class BlockBasic extends Block implements IBlockCTM @Override public CTMData getCTMData(int meta) { - if(this == MekanismBlocks.BasicBlock) - { - switch(meta) - { - case 9: - return dynamicTankCTM; - case 10: - return dynamicGlassCTM; - case 11: - return dynamicValveCTM; - } - } - return null; + return ctms[meta]; } } \ No newline at end of file diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index 75f8d391b..42c3cedaf 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -46,9 +46,7 @@ public class BlockReactor extends BlockContainer implements IBlockCTM { public IIcon[][] icons = new IIcon[16][16]; - public CTMData reactorGlassCTM = new CTMData("ctm/ReactorGlass", Arrays.asList(0, 1)); - - public CTMData reactorLaserFocusCTM = new CTMData("ctm/ReactorLaserFocus", Arrays.asList(1, 0)); + public CTMData[] ctms = new CTMData[16]; public BlockReactor() { @@ -76,8 +74,8 @@ public class BlockReactor extends BlockContainer implements IBlockCTM icons[0][0] = register.registerIcon("mekanism:ReactorGlass"); icons[1][0] = register.registerIcon("mekanism:ReactorLaserFocus"); - reactorGlassCTM.registerIcons(register); - reactorLaserFocusCTM.registerIcons(register); + ctms[0] = new CTMData("ctm/ReactorGlass", this, Arrays.asList(0, 1)).registerIcons(register); + ctms[1] = new CTMData("ctm/ReactorLaserFocus", this, Arrays.asList(1, 0)).registerIcons(register); } } @@ -304,17 +302,7 @@ public class BlockReactor extends BlockContainer implements IBlockCTM @Override public CTMData getCTMData(int meta) { - if(this == GeneratorsBlocks.ReactorGlass) - { - switch(meta) - { - case 0: - return reactorGlassCTM; - case 1: - return reactorLaserFocusCTM; - } - } - return null; + return ctms[meta]; } @Override @@ -324,12 +312,12 @@ public class BlockReactor extends BlockContainer implements IBlockCTM Coord4D obj = new Coord4D(x, y, z).getFromSide(ForgeDirection.getOrientation(side).getOpposite()); if(this == GeneratorsBlocks.ReactorGlass) { - switch(obj.getMetadata(world)) + int metadata = obj.getMetadata(world); + switch(metadata) { case 0: - return reactorGlassCTM.shouldRenderSide(world, x, y, z, side, this); case 1: - return reactorLaserFocusCTM.shouldRenderSide(world, x, y, z, side, this); + return ctms[metadata].shouldRenderSide(world, x, y, z, side); default: return super.shouldSideBeRendered(world, x, y, z, side); } diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/SalinationBlock-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/SalinationBlock-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..91611254d28403c39c0fc8df2cfda451953cbffa GIT binary patch literal 1292 zcmaKs{WsGK9LK*(!^%W?UN^OF+;NpsAsRNCNFMT3c5|5Fki}$Nv1x_Pl@&^o%wtvy z8Qm9}omkg_wQ;wAxL=W-Mh>E(t*ns~+IaZxeh0FWfi$?wPS4>#yWaAcoeYS^gxs${oO z5oEe^QwSa8MC9}~dG+GPLdOaVCG%qw^`E~iKK-%;bBGfdKPQoCQ2WB96K&VDExArR zHJp$!Xb+qGRTxUgGGnOSgQynSsaWRA(w<2b8}`z?biUZ{EAg`)|91v6e`#d3qoUxg zQ&B`9@=P={aZ3F0pF?D(lw%*iu;~Gw63PptTe6omJ=~0;eU1%!qYZRBP;>MKTy;jT zP8>OxNl(_B^O@O~NAKBzSuwK&FuvaQkc1k+1q3#j%QhZ1!p^3b)S%v%WWlt6gn|mw zg0QOvK9lelv+S9VcP6@nxB5?hYkIhHS|ytD_&$>Bk3JCnJpBTc6dI5X<7U&F=QG#9 zb%s79Hm)n4dm4>6#e)3dvby}j)TkW4R1^_S+gQv*e(7Mn+pfe)Ln zcT6T;w`JhH#feYEm@8-tIP?&ynbX)vSffMp1J>QS@ zk=`)c<1oc3--JSU88mJD*2>lOvNTL<<<|jyJN38)m(mRS}exp?Ch8|093KG*Li#@%+s)gbT!$fvJI2Dp|JB8U(~84PS=GDc=An)crgP*xFWUOLd--Xxu;t5ddKK zzHO@jMa2e6sFvV%(M4@iLq*Hhbg_h`rbLh3P)?VVgpx6aHu?A-M*)|y*Mh9t4PY{A zMrkT^o+X+4!9X{elx{7xd_7TLd(C>DiI0(uViSX^=3vRn3qLFqBr>RK91w3-V7|XQ pX!^rlfDF|PNPU7R8&<4kWgYbOhCI4t=S4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0000@NklusKuiW7!85Z5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC70TxgnaUgrh0CuYg Ug(bnEbN~PV07*qoM6N<$g3*#ZH2?qr literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/SalinationController.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/SalinationController.png new file mode 100644 index 0000000000000000000000000000000000000000..1275a0a8bddb96aa82bb4b8f4827aa0f77c60f54 GIT binary patch literal 1802 zcmV+l2le=gP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0007^NklW6Uy_fl}BHDYsZcT9=L;c1`lQ~#Yqm+70D!aDP03X z96>+__Z$m8l%z#fhmCdAxnW{AzN^cOqNIH$*+1|ae?fp7xP18htFDan|LWNTC9)tO zPyM%xKylia@?;)f31!1_;E5_sHzG$xy?^wucMziyVDP_xe%~H}A>hnT%s^g#{!>S& zz09xcu->TqjDi@hyT4x(=#X_b^@B|z0HaBofQGKKDIRQt2$+COHU!;8_7Z3V8k%H% zWCQ`vsrP%m!@hv@xX=ZGByA1|G>#>4xN&?zU@R~_ZloRe;xMY0pg!+ShlU<#U%DWG zfNxKhs46l}Hi`}<-kPJ9JtWpP9`u7$2&^|L?35QxQreb9{NoZPja@jG6@OaK-o#Sd z=QDMc)2tx=;X)$_T*Uo183vS7)t%VoZAhj;? zViH-duDk5V>n#@~rC-h-7i|R_*H6#SDv6tT9B3nObk`;2 zWdw$t*}SfOh2J9hmQCOQ)<>*n1T{~y!@#A@c6#PB>P#$|T-(&kK3#Q@1H2E&n~MD0 s>I#5a(0!2Qx?R^R0(c?ojW?nH2QWVS&5zaFumAu607*qoM6N<$g40WAjsO4v literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/SalinationControllerOn.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/SalinationControllerOn.png new file mode 100644 index 0000000000000000000000000000000000000000..7769211beb7fbfb6d3efeef9f822a134871d3a7e GIT binary patch literal 1952 zcmV;R2VeM!P)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0009wNkl3|lAIJr1};IT8~-MQVh!#PL6u9WP~ z!!zH`j@P^6y?T5(yS{%${Hqpx`MxN8`+i5HX=21tCpSK55x~R)l!NoppevS9imYQj zfY_$lCWLkf0C(OCJk$|UoE2l_0gYo2bo@$pew2tsWR4{0k9w6p0RRECw}(H=!H)j# zUA>@KCIE8ipS*mhD78hrdGY9&DIYm|JsK9QXAkZQ`0ct;1h}Ku?>}kL00Hpcr-w%jHdF%aZt?o05$8cqTe|2ae)F){Q0GlD5 zqo(U@v)c%O&XJC1b7Yd$0x&shnq(%&$R_~3pxp0KfPGtz&>rszKonOW2(HvNjUP9# zO90w-VzRejpL^Ph%Oxnk_qvaU$>2%(1ON>^y*b69(l4X6LL;%MU!+-;l)mQ)_(2P!iciYeP4_RK>SVao&yyEKqRTU?y?@Nx7;u(hk5j%u@$UT zKVLg2oXjR=4-O{>vx0Xn@8fvO#jZ>%BP9YT0cYM1Q8>vadH=O^23HtxJVZsQ=QBkS z&KT*0MZ|l4Ym!}=4#nT(z{CBJUZ=gTJ_k$yE}rcQl)le@Lkq9N5_1| zYDS3aYIc6q73)oS#sgtZEE$|B^s5*Dad?i~`reEa!Yq7Xa{v%!Q{x z2atfSJ^-P1^#M#cS0BJgoK|oA8nyudE;V&+X8=q$Dh_C80Gi&Y2!N{(@U`KzE}@#P zGq)wvv;;Dfk9Cf8JpNo0x)y-RQPU)=13>^>eV{H>ZOL7IfJc%}#UOC?0f>UD4?uCk m)dyUCz|{v}KlpFz1AhSH2mGmSeF{kc00004Tx0C?Jsl+SMzWf;dlyYtSh2{;E+0gJ(jKY)-zwqTG3L3g{$wouDv+hW_8 znCoMPiX1$ccrw9X5iY<%0|`MxY)DKvl=ve=5-x_+!%TMv zXvO#R%=3Pq@AvyW?~{Sd=T+Z#(-zEnp{kVf*7(GvmAOHhXIMiwYpQnO=gQ?FfU57i zJaX>+ObX!I_LcAd^Q@`Kz=qTlK(iLuvyeIlx@-F?1mhO4=V<7Mka-s9QsWbokjVmF z^(Za?T~kp!4s@x}No`@q40Cbh4CzWGcl~Ud+tLC)h%7op= zT>sBA>$aBlHUVpcnUO=lR!ALdsDVlxe_~gQBfyK0y6lJf3a}Ycf3#-Ca={irt|ajcdi^v~yrE#?Sk1c_{KG&Z<^rEXG`|s$wbP5r0c> zEaucV)T)I;zz)#&b0k$o(qsyWjmLc~DwN1$;iG6Wje|=GiHAhtq@H93XBAu-iHhS6 zqK?F45ru=j3MNvx9b=key~v7PA}jWaA+b;F5q((VHSxOGFA5?n`o!LLZ8@QDQRjA> z=UrMzEGir!f4aN1wWD`Zz3tdnPThH+y7`D_x$Gx70Rm>)$nDAgFU^0qp~G=qoO|oq z+Dr2se%yTZTl%7YUB9K@&=)!g{a1ZKU(j!m!^NeJWEP2oha^ZiNcM06myjwhzv0nL z;2uz%_D*+qZtN?k?#TCs?+tUZr<2Y8lKnG#J^N|)Z1(quro7^mw2!o}wC}aAwQsZ^ zv9$Br1?>mzqV}csZQ`v~-;eg&lS_0f@m8F*#5MEgM)L);U_NKQWDa%s%=KokIbd!v z3+Bf5yCwCKy*NzZwx_zXR)ibF!{I0rML-o7kK+&Re_Sm#iC!`I(AMq|dqvx&Q8Wrh z4$IhP^clUzK_l1kXKXPFMxU|8C_b=t_9`971S;9*cBYU7%%E_XL*f!3LwPI&=x_SR zl~Zqo*3NA96)WfauCxX{dqmf>0EI;Zx{P zkU=yQZPg|;1ui{Gt-VJ*LG&s;g+yaRfulItAYnm6O%0L_%GEpE|BP4U-216VFB}{D z<@7BY;~b{qj@nvsdlN^RVt4=m00000000000AOlZMNhaUBE63N_jteYs&vAt^A`q4 z(wEG}T^aUTKgW)jxbiEeI=@wB5>fn=_3o4zJ8T!V-L@+8Qv?CvEl@5tD>wUG-X671 zTvh&306}!m9dp{Y^quM#uQGpOfce1IddsTLPZ0zF00000000000KnAUpf_>M2JnN# z*v0!n!Xp3x0000000000VD6`I(G%zopg(~A0E!?0Ccg!~L4QEb82te?1pNUNK>z>% s000000000*o1t@5?GP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0002HNklusKuiW7!85Z5Eu=C0S^HdQcJ>HpBNZ~cv*336Jh*~Qx2O1$qxAR?Kgv-5