diff --git a/src/main/java/refinedstorage/block/BlockSolderer.java b/src/main/java/refinedstorage/block/BlockSolderer.java index f4b3d82f1..3d2c803ad 100755 --- a/src/main/java/refinedstorage/block/BlockSolderer.java +++ b/src/main/java/refinedstorage/block/BlockSolderer.java @@ -1,18 +1,15 @@ package refinedstorage.block; -import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageGui; @@ -21,10 +18,6 @@ import refinedstorage.tile.TileSolderer; import java.util.List; public class BlockSolderer extends BlockNode { - private static final AxisAlignedBB AABB_SOLDERER = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 14D / 16D, 1.0D); - - private static final PropertyBool WORKING = PropertyBool.create("working"); - public BlockSolderer() { super("solderer"); } @@ -54,30 +47,6 @@ public class BlockSolderer extends BlockNode { return true; } - @Override - public boolean hasConnectivityState() { - return true; - } - - @Override - @SuppressWarnings("deprecation") - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) { - return AABB_SOLDERER; - } - - @Override - protected BlockStateContainer createBlockState() { - return super.createBlockStateBuilder() - .add(WORKING) - .build(); - } - - @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { - return super.getActualState(state, world, pos) - .withProperty(WORKING, ((TileSolderer) world.getTileEntity(pos)).isWorking()); - } - @Override @SuppressWarnings("deprecation") public boolean isOpaqueCube(IBlockState state) { @@ -90,6 +59,11 @@ public class BlockSolderer extends BlockNode { return false; } + @Override + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.TRANSLUCENT; + } + @Override public EnumPlacementType getPlacementType() { return EnumPlacementType.HORIZONTAL; diff --git a/src/main/java/refinedstorage/gui/GuiSolderer.java b/src/main/java/refinedstorage/gui/GuiSolderer.java index 36623869b..d02036e91 100755 --- a/src/main/java/refinedstorage/gui/GuiSolderer.java +++ b/src/main/java/refinedstorage/gui/GuiSolderer.java @@ -28,7 +28,7 @@ public class GuiSolderer extends GuiBase { drawTexture(x, y, 0, 0, width, height); - if (solderer.isWorking()) { + if (TileSolderer.WORKING.getValue()) { drawTexture(x + 83, y + 38 - 1, 212, 0, getProgressScaled(22), 15); } } @@ -38,7 +38,7 @@ public class GuiSolderer extends GuiBase { drawString(7, 7, t("gui.refinedstorage:solderer")); drawString(7, 77, t("container.inventory")); - if (inBounds(83, 38, 22, 15, mouseX, mouseY) && solderer.isWorking()) { + if (inBounds(83, 38, 22, 15, mouseX, mouseY) && TileSolderer.WORKING.getValue()) { drawTooltip(mouseX, mouseY, getProgressScaled(100) + "%"); } } diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java index cee776b7d..4139bdc1c 100755 --- a/src/main/java/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/TileSolderer.java @@ -37,6 +37,13 @@ public class TileSolderer extends TileNode { } }); + public static final TileDataParameter WORKING = new TileDataParameter<>(DataSerializers.BOOLEAN, false, new ITileDataProducer() { + @Override + public Boolean getValue(TileSolderer tile) { + return tile.working; + } + }); + private static final String NBT_WORKING = "Working"; private static final String NBT_PROGRESS = "Progress"; @@ -72,11 +79,7 @@ public class TileSolderer extends TileNode { public TileSolderer() { dataManager.addWatchedParameter(DURATION); dataManager.addWatchedParameter(PROGRESS); - } - - @Override - public boolean hasConnectivityState() { - return true; + dataManager.addWatchedParameter(WORKING); } @Override @@ -86,8 +89,6 @@ public class TileSolderer extends TileNode { @Override public void updateNode() { - boolean wasWorking = working; - if (items.getStackInSlot(1) == null && items.getStackInSlot(2) == null && result.getStackInSlot(0) == null) { stop(); } else { @@ -129,10 +130,6 @@ public class TileSolderer extends TileNode { } } } - - if (wasWorking != working) { - updateBlock(); - } } @Override @@ -141,8 +138,6 @@ public class TileSolderer extends TileNode { if (!state) { stop(); - - updateBlock(); } } @@ -187,26 +182,6 @@ public class TileSolderer extends TileNode { return tag; } - @Override - public NBTTagCompound writeUpdate(NBTTagCompound tag) { - super.writeUpdate(tag); - - tag.setBoolean(NBT_WORKING, working); - - return tag; - } - - @Override - public void readUpdate(NBTTagCompound tag) { - working = tag.getBoolean(NBT_WORKING); - - super.readUpdate(tag); - } - - public boolean isWorking() { - return working; - } - public ItemHandlerBasic getItems() { return items; } diff --git a/src/main/resources/assets/refinedstorage/blockstates/solderer.json b/src/main/resources/assets/refinedstorage/blockstates/solderer.json index 9121a02fc..27d066cd3 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/solderer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/solderer.json @@ -1,37 +1,17 @@ { "forge_marker": 1, "defaults": { - "textures": { - "particle": "refinedstorage:blocks/side_borderless", - "3": "refinedstorage:blocks/solderer_laser", - "4": "refinedstorage:blocks/solderer_laser" - }, "model": "refinedstorage:solderer", - "uvlock": true + "textures": { + "particle": "refinedstorage:blocks/solderer_side" + } }, "variants": { "inventory": [ { - "model": "refinedstorage:solderer", "transform": "forge:default-block" } ], - "working": { - "true": { - "textures": { - "3": "refinedstorage:blocks/solderer_laser_working", - "4": "refinedstorage:blocks/solderer_laser_working" - } - }, - "false": { - } - }, - "connected": { - "true": { - }, - "false": { - } - }, "direction": { "north": { "y": 0 diff --git a/src/main/resources/assets/refinedstorage/models/block/solderer.json b/src/main/resources/assets/refinedstorage/models/block/solderer.json index 5d84a1218..c2883a841 100755 --- a/src/main/resources/assets/refinedstorage/models/block/solderer.json +++ b/src/main/resources/assets/refinedstorage/models/block/solderer.json @@ -1,200 +1,1257 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "refinedstorage:blocks/side", - "1": "refinedstorage:blocks/side", - "2": "refinedstorage:blocks/side_borderless" - }, - "elements": [ - { - "name": "base", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 4.0, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 12.0, 16.0, 16.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 12.0, 16.0, 16.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 12.0, 16.0, 16.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 12.0, 16.0, 16.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } + "__comment": "Model made by CyanideX", + "textures": { + "0": "refinedstorage:blocks/solderer_side", + "1": "refinedstorage:blocks/solderer_top", + "2": "refinedstorage:blocks/solderer_bottom", + "3": "refinedstorage:blocks/solderer_middle", + "4": "refinedstorage:blocks/solderer_roof", + "5": "refinedstorage:blocks/solderer_elements", + "6": "refinedstorage:blocks/solderer_glass", + "-1": "refinedstorage:blocks/solderer_glass" + }, + "elements": [ + { + "name": "Bottom", + "from": [ + 0.0, + 0.0, + 0.0 + ], + "to": [ + 16.0, + 5.0, + 16.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 0.0, + 11.0, + 16.0, + 16.0 + ] }, - { - "name": "pedestalNW", - "from": [ 3.0, 4.0, 3.0 ], - "to": [ 7.0, 5.0, 7.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 4.0, 0.0, 8.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 7.0, 0.0, 11.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 12.0, 0.0, 16.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 2.0, 2.0, 6.0, 6.0 ] } - } + "east": { + "texture": "#0", + "uv": [ + 0.0, + 11.0, + 16.0, + 16.0 + ] }, - { - "name": "pedestalNE", - "from": [ 9.0, 4.0, 3.0 ], - "to": [ 13.0, 5.0, 7.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 4.0, 0.0, 8.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 8.0, 0.0, 12.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 12.0, 0.0, 16.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 10.0, 2.0, 14.0, 6.0 ] } - } + "south": { + "texture": "#0", + "uv": [ + 0.0, + 11.0, + 16.0, + 16.0 + ] }, - { - "name": "pedestalS", - "from": [ 6.0, 4.0, 9.0 ], - "to": [ 10.0, 5.0, 13.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 4.0, 1.0 ] }, - "east": { "texture": "#1", "uv": [ 4.0, 0.0, 8.0, 1.0 ] }, - "south": { "texture": "#1", "uv": [ 8.0, 0.0, 12.0, 1.0 ] }, - "west": { "texture": "#1", "uv": [ 12.0, 0.0, 16.0, 1.0 ] }, - "up": { "texture": "#1", "uv": [ 6.0, 11.0, 10.0, 15.0 ] } - } + "west": { + "texture": "#0", + "uv": [ + 0.0, + 11.0, + 16.0, + 16.0 + ] }, - { - "name": "poleNW", - "from": [ 1.0, 4.0, 1.0 ], - "to": [ 1.5, 12.0, 1.5 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] } - } + "up": { + "texture": "#1", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] }, - { - "name": "poleNE", - "from": [ 15.0, 4.0, 1.0 ], - "to": [ 15.5, 12.0, 1.5 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] } - } - }, - { - "name": "poleSW", - "from": [ 1.0, 4.0, 15.0 ], - "to": [ 1.5, 12.0, 15.5 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] } - } - }, - { - "name": "poleSE", - "from": [ 15.0, 4.0, 15.0 ], - "to": [ 15.5, 12.0, 15.5 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 0.5, 8.0 ] } - } - }, - { - "name": "roof", - "from": [ 0.0, 12.0, 0.0 ], - "to": [ 16.0, 13.5, 16.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.5 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.5 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.5 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.5 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "roofAccent", - "from": [ 2.0, 13.5, 2.0 ], - "to": [ 14.0, 14.0, 14.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 0.5 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 0.5 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 0.5 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 0.5 ] }, - "up": { "texture": "#0", "uv": [ 2.0, 2.0, 14.0, 14.0 ] } - } - }, - { - "name": "laserbaseNW", - "from": [ 4.0, 9.0, 4.0 ], - "to": [ 6.0, 12.0, 6.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "east": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "south": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "west": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "down": { "texture": "#2", "uv": [ 1.0, 1.0, 3.0, 3.0 ] } - } - }, - { - "name": "laserbaseNE", - "from": [ 10.0, 9.0, 4.0 ], - "to": [ 12.0, 12.0, 6.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "east": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "south": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "west": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "down": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 3.0 ] } - } - }, - { - "name": "laserbaseS", - "from": [ 7.0, 9.0, 10.0 ], - "to": [ 9.0, 12.0, 12.0 ], - "faces": { - "north": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "east": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "south": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "west": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 4.0 ] }, - "down": { "texture": "#0", "uv": [ 1.0, 1.0, 3.0, 3.0 ] } - } - }, - { - "name": "laserNW", - "from": [ 4.5, 6.0, 4.5 ], - "to": [ 5.5, 9.0, 5.5 ], - "faces": { - "north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "down": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "laserNE", - "from": [ 10.5, 6.0, 4.5 ], - "to": [ 11.5, 9.0, 5.5 ], - "faces": { - "north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "down": { "texture": "#4", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } - }, - { - "name": "laserS", - "from": [ 7.5, 6.0, 10.5 ], - "to": [ 8.5, 9.0, 11.5 ], - "faces": { - "north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "down": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } - } + "down": { + "texture": "#2", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] } - ] + } + }, + { + "name": "Divider", + "from": [ + 1.0, + 5.0, + 1.0 + ], + "to": [ + 15.0, + 6.0, + 15.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 1.0, + 10.0, + 15.0, + 11.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 1.0, + 10.0, + 15.0, + 11.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 1.0, + 10.0, + 15.0, + 11.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 1.0, + 10.0, + 15.0, + 11.0 + ] + }, + "up": { + "texture": "#3", + "uv": [ + 2.0, + 2.0, + 14.0, + 14.0 + ] + }, + "down": { + "texture": "#3", + "uv": [ + 2.0, + 2.0, + 14.0, + 14.0 + ] + } + } + }, + { + "name": "Middle", + "from": [ + 0.0, + 6.0, + 0.0 + ], + "to": [ + 16.0, + 7.0, + 16.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 0.0, + 9.0, + 16.0, + 10.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 9.0, + 16.0, + 10.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 9.0, + 16.0, + 10.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 9.0, + 16.0, + 10.0 + ] + }, + "up": { + "texture": "#3", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "down": { + "texture": "#2", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + } + } + }, + { + "name": "Top", + "from": [ + 0.0, + 13.0, + 0.0 + ], + "to": [ + 16.0, + 16.0, + 16.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 3.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 3.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 3.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 16.0, + 3.0 + ] + }, + "up": { + "texture": "#1", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "down": { + "texture": "#4", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + } + } + }, + { + "name": "Tray", + "from": [ + 4.0, + 6.5, + 4.0 + ], + "to": [ + 12.0, + 7.5, + 12.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 4.0, + 8.0, + 12.0, + 9.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 4.0, + 8.0, + 12.0, + 9.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 4.0, + 8.0, + 12.0, + 9.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 4.0, + 8.0, + 12.0, + 9.0 + ] + }, + "up": { + "texture": "#5", + "uv": [ + 6.0, + 4.0, + 14.0, + 12.0 + ] + }, + "down": { + "texture": "#5", + "uv": [ + 6.0, + 4.0, + 14.0, + 12.0 + ] + } + } + }, + { + "name": "Pipe1", + "from": [ + 1.0, + 7.0, + 1.0 + ], + "to": [ + 2.0, + 13.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 1.0, + 3.0, + 2.0, + 9.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 14.0, + 3.0, + 15.0, + 9.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 1.0, + 3.0, + 2.0, + 9.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 14.0, + 3.0, + 15.0, + 9.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + }, + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + } + } + }, + { + "name": "Track1", + "from": [ + 2.0, + 11.0, + 2.0 + ], + "to": [ + 3.0, + 13.0, + 14.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 2.0, + 3.0, + 3.0, + 5.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 2.0, + 3.0, + 14.0, + 5.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 13.0, + 3.0, + 14.0, + 5.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 2.0, + 3.0, + 14.0, + 5.0 + ] + }, + "up": { + "texture": "#5", + "uv": [ + 2.0, + 2.0, + 3.0, + 14.0 + ] + }, + "down": { + "texture": "#5", + "uv": [ + 3.0, + 2.0, + 2.0, + 14.0 + ] + } + } + }, + { + "name": "Track2", + "from": [ + 13.0, + 11.0, + 2.0 + ], + "to": [ + 14.0, + 13.0, + 14.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 2.0, + 3.0, + 3.0, + 5.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 2.0, + 3.0, + 14.0, + 5.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 14.0, + 3.0, + 13.0, + 5.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 2.0, + 3.0, + 14.0, + 5.0 + ] + }, + "up": { + "texture": "#5", + "uv": [ + 2.0, + 2.0, + 3.0, + 14.0 + ] + }, + "down": { + "texture": "#5", + "uv": [ + 3.0, + 2.0, + 4.0, + 14.0 + ] + } + } + }, + { + "name": "Track3", + "from": [ + 3.0, + 11.5, + 6.0 + ], + "to": [ + 13.0, + 12.5, + 7.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 3.0, + 1.0, + 13.0, + 2.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 1.0, + 0.0, + 2.0, + 1.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 3.0, + 1.0, + 13.0, + 2.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 1.0, + 0.0, + 2.0, + 1.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 3.0, + 1.0, + 13.0, + 2.0 + ] + }, + "down": { + "texture": "#0", + "uv": [ + 3.0, + 14.0, + 13.0, + 15.0 + ] + } + } + }, + { + "name": "Pipe2", + "from": [ + 14.0, + 7.0, + 1.0 + ], + "to": [ + 15.0, + 13.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 1.0, + 3.0, + 2.0, + 9.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 14.0, + 3.0, + 15.0, + 9.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 1.0, + 3.0, + 2.0, + 9.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 14.0, + 3.0, + 15.0, + 9.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + }, + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + } + } + }, + { + "name": "Pipe3", + "from": [ + 14.0, + 7.0, + 14.0 + ], + "to": [ + 15.0, + 13.0, + 15.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 1.0, + 3.0, + 2.0, + 9.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 14.0, + 3.0, + 15.0, + 9.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 1.0, + 3.0, + 2.0, + 9.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 14.0, + 3.0, + 15.0, + 9.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + }, + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + } + } + }, + { + "name": "Pipe4", + "from": [ + 1.0, + 7.0, + 14.0 + ], + "to": [ + 2.0, + 13.0, + 15.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 1.0, + 3.0, + 2.0, + 9.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 14.0, + 3.0, + 15.0, + 9.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 1.0, + 3.0, + 2.0, + 9.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 14.0, + 3.0, + 15.0, + 9.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + }, + "down": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + } + } + }, + { + "name": "Ring", + "from": [ + 6.0, + 11.0, + 5.5 + ], + "to": [ + 7.0, + 13.0, + 7.5 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 13.0, + 5.0, + 14.0, + 7.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 12.0, + 5.0, + 14.0, + 7.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 13.0, + 5.0, + 14.0, + 7.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 12.0, + 7.0, + 14.0, + 9.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 12.0, + 6.0, + 13.0, + 8.0 + ] + }, + "down": { + "texture": "#0", + "uv": [ + 12.0, + 6.0, + 13.0, + 8.0 + ] + } + } + }, + { + "name": "Solderer", + "from": [ + 6.0, + 8.0, + 6.0 + ], + "to": [ + 7.0, + 11.0, + 7.0 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 3.0, + 5.0, + 4.0, + 9.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 2.0, + 5.0, + 3.0, + 9.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 3.0, + 5.0, + 4.0, + 9.0 + ] + }, + "west": { + "texture": "#0", + "uv": [ + 2.0, + 5.0, + 3.0, + 9.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + }, + "down": { + "texture": "#0", + "uv": [ + 3.0, + 8.0, + 4.0, + 9.0 + ] + } + } + }, + { + "name": "Window1", + "from": [ + 2.0, + 7.0, + 14.0 + ], + "to": [ + 14.0, + 13.0, + 15.0 + ], + "faces": { + "north": { + "texture": "#6", + "uv": [ + 2.0, + 5.0, + 14.0, + 11.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 6.0 + ] + }, + "south": { + "texture": "#6", + "uv": [ + 2.0, + 5.0, + 14.0, + 11.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 6.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 12.0, + 1.0 + ] + }, + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 12.0, + 1.0 + ] + } + } + }, + { + "name": "Window2", + "from": [ + 2.0, + 7.0, + 1.0 + ], + "to": [ + 14.0, + 13.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#6", + "uv": [ + 2.0, + 5.0, + 14.0, + 11.0 + ] + }, + "east": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 6.0 + ] + }, + "south": { + "texture": "#6", + "uv": [ + 2.0, + 5.0, + 14.0, + 11.0 + ] + }, + "west": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 6.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 12.0, + 1.0 + ] + }, + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 12.0, + 1.0 + ] + } + } + }, + { + "name": "Window3", + "from": [ + 14.0, + 7.0, + 2.0 + ], + "to": [ + 15.0, + 13.0, + 14.0 + ], + "faces": { + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 6.0 + ] + }, + "east": { + "texture": "#6", + "uv": [ + 2.0, + 5.0, + 14.0, + 11.0 + ] + }, + "south": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 6.0 + ] + }, + "west": { + "texture": "#6", + "uv": [ + 2.0, + 5.0, + 14.0, + 11.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 12.0 + ] + }, + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 12.0 + ] + } + } + }, + { + "name": "Window4", + "from": [ + 1.0, + 7.0, + 2.0 + ], + "to": [ + 2.0, + 13.0, + 14.0 + ], + "faces": { + "north": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 6.0 + ] + }, + "east": { + "texture": "#6", + "uv": [ + 2.0, + 5.0, + 14.0, + 11.0 + ] + }, + "south": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 6.0 + ] + }, + "west": { + "texture": "#6", + "uv": [ + 2.0, + 5.0, + 14.0, + 11.0 + ] + }, + "up": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 12.0 + ] + }, + "down": { + "texture": "#-1", + "uv": [ + 0.0, + 0.0, + 1.0, + 12.0 + ] + } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_bottom.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_bottom.png new file mode 100755 index 000000000..e9c9d23a9 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_bottom.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_elements.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_elements.png new file mode 100755 index 000000000..b73508ae0 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_elements.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_glass.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_glass.png new file mode 100755 index 000000000..0ff7c19c6 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_glass.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_laser.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_laser.png deleted file mode 100755 index d7c097f6f..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_laser.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_laser_working.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_laser_working.png deleted file mode 100755 index 7d7a0a151..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_laser_working.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_middle.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_middle.png new file mode 100755 index 000000000..24d445801 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_middle.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_roof.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_roof.png new file mode 100755 index 000000000..a9d9bae33 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_roof.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_side.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_side.png new file mode 100755 index 000000000..f5ba86fe9 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_side.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_top.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_top.png new file mode 100755 index 000000000..9504d025b Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_top.png differ