From f2d393d1f2d2c4fd431d6bf0be85e004ec9c9abe Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 12 Jul 2018 03:29:07 +0200 Subject: [PATCH] Detector, disk manipulator and wireless transmitter fullbright. #1860 --- .../refinedstorage/block/BlockDetector.java | 4 + .../block/BlockDiskManipulator.java | 6 + .../block/BlockWirelessTransmitter.java | 4 + .../render/model/ModelDiskManipulator.java | 10 +- .../blockstates/crafter_manager.json | 2 +- .../blockstates/crafting_monitor.json | 2 +- .../refinedstorage/blockstates/detector.json | 12 +- .../refinedstorage/blockstates/grid.json | 2 +- .../blockstates/wireless_transmitter.json | 7 +- ...tout_north.json => cube_north_cutout.json} | 0 .../refinedstorage/models/block/detector.json | 247 +++++++++--------- .../block/disk_manipulator_connected.json | 57 +--- .../block/disk_manipulator_disconnected.json | 57 +--- .../models/block/wireless_transmitter.json | 206 +++++++++++++++ .../refinedstorage/recipes/detector.json | 6 +- .../textures/blocks/cable_old.png | Bin 1266 -> 0 bytes .../textures/blocks/cable_part.png | Bin 15037 -> 0 bytes .../textures/blocks/cable_striped.png | Bin 1354 -> 0 bytes .../bottom.png} | Bin .../textures/blocks/detector/cutouts/off.png | Bin 0 -> 234 bytes .../cutouts/on.png} | Bin .../textures/blocks/detector/side.png | Bin 0 -> 433 bytes .../{detector_top.png => detector/top.png} | Bin .../textures/blocks/detector_side_off.png | Bin 1194 -> 0 bytes .../textures/blocks/detector_side_on.png | Bin 1230 -> 0 bytes .../blocks/detector_side_on_glow.png.mcmeta | 9 - .../cutouts/connected.png} | Bin .../disk_manipulator/cutouts/disconnected.png | Bin 0 -> 225 bytes .../disk_manipulator/disk_manipulator.png | Bin 0 -> 625 bytes .../blocks/disk_manipulator_connected.png | Bin 15358 -> 0 bytes ...disk_manipulator_connected_glow.png.mcmeta | 9 - .../blocks/disk_manipulator_disconnected.png | Bin 15329 -> 0 bytes .../textures/blocks/fluid_grid_back.png | Bin 1322 -> 0 bytes .../cutouts/connected.png} | Bin .../cutouts/disconnected.png | Bin 0 -> 227 bytes .../wireless_transmitter.png | Bin 0 -> 280 bytes .../blocks/wireless_transmitter_connected.png | Bin 15525 -> 0 bytes ...less_transmitter_connected_glow.png.mcmeta | 9 - .../wireless_transmitter_disconnected.png | Bin 15053 -> 0 bytes 39 files changed, 380 insertions(+), 269 deletions(-) rename src/main/resources/assets/refinedstorage/models/block/{cube_cutout_north.json => cube_north_cutout.json} (100%) create mode 100644 src/main/resources/assets/refinedstorage/models/block/wireless_transmitter.json delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/cable_old.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/cable_part.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/cable_striped.png rename src/main/resources/assets/refinedstorage/textures/blocks/{detector_bottom.png => detector/bottom.png} (100%) mode change 100755 => 100644 create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/detector/cutouts/off.png rename src/main/resources/assets/refinedstorage/textures/blocks/{detector_side_on_glow.png => detector/cutouts/on.png} (100%) create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/detector/side.png rename src/main/resources/assets/refinedstorage/textures/blocks/{detector_top.png => detector/top.png} (100%) mode change 100755 => 100644 delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/detector_side_off.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on_glow.png.mcmeta rename src/main/resources/assets/refinedstorage/textures/blocks/{disk_manipulator_connected_glow.png => disk_manipulator/cutouts/connected.png} (100%) create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator/cutouts/disconnected.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator/disk_manipulator.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_connected.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_connected_glow.png.mcmeta delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_disconnected.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_back.png rename src/main/resources/assets/refinedstorage/textures/blocks/{wireless_transmitter_connected_glow.png => wireless_transmitter/cutouts/connected.png} (100%) create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter/cutouts/disconnected.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter/wireless_transmitter.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected_glow.png.mcmeta delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_disconnected.png diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java index 26a0a89e2..dd30979f0 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java @@ -1,9 +1,11 @@ package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSGui; import com.raoulvdberge.refinedstorage.block.info.BlockInfoBuilder; import com.raoulvdberge.refinedstorage.render.IModelRegistration; import com.raoulvdberge.refinedstorage.render.collision.constants.ConstantsDetector; +import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright; import com.raoulvdberge.refinedstorage.tile.TileDetector; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockFaceShape; @@ -33,6 +35,8 @@ public class BlockDetector extends BlockNode { @SideOnly(Side.CLIENT) public void registerModels(IModelRegistration modelRegistration) { modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); + + modelRegistration.addBakedModelOverride(info.getId(), base -> new BakedModelFullbright(base, RS.ID + ":blocks/detector/cutouts/on")); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java index 469f2ac3b..0686d610a 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java @@ -13,6 +13,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; 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.BlockPos; @@ -39,6 +40,11 @@ public class BlockDiskManipulator extends BlockNode { modelRegistration.addModelLoader(() -> new CustomModelLoaderDefault(info.getId(), ModelDiskManipulator::new)); } + @Override + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.CUTOUT; + } + @Override @Nullable public BlockDirection getDirection() { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java index fdfd41b1a..81c8aadca 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java @@ -1,9 +1,11 @@ package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSGui; import com.raoulvdberge.refinedstorage.block.info.BlockInfoBuilder; import com.raoulvdberge.refinedstorage.render.IModelRegistration; import com.raoulvdberge.refinedstorage.render.collision.constants.ConstantsWirelessTransmitter; +import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright; import com.raoulvdberge.refinedstorage.tile.TileWirelessTransmitter; import net.minecraft.block.Block; import net.minecraft.block.state.BlockFaceShape; @@ -36,6 +38,8 @@ public class BlockWirelessTransmitter extends BlockNode { @SideOnly(Side.CLIENT) public void registerModels(IModelRegistration modelRegistration) { modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); + + modelRegistration.addBakedModelOverride(info.getId(), base -> new BakedModelFullbright(base, RS.ID + ":blocks/wireless_transmitter/cutouts/connected")); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/ModelDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/ModelDiskManipulator.java index f78f93395..8b1aef7a0 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/ModelDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/ModelDiskManipulator.java @@ -2,6 +2,7 @@ package com.raoulvdberge.refinedstorage.render.model; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelDiskManipulator; +import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; @@ -17,6 +18,7 @@ import java.util.List; import java.util.function.Function; public class ModelDiskManipulator implements IModel { + private static final ResourceLocation MODEL_BASE_CUTOUT = new ResourceLocation(RS.ID + ":block/cube_north_cutout"); private static final ResourceLocation MODEL_BASE_CONNECTED = new ResourceLocation(RS.ID + ":block/disk_manipulator_connected"); private static final ResourceLocation MODEL_BASE_DISCONNECTED = new ResourceLocation(RS.ID + ":block/disk_manipulator_disconnected"); @@ -25,13 +27,11 @@ public class ModelDiskManipulator implements IModel { private static final ResourceLocation MODEL_DISK_FULL = new ResourceLocation(RS.ID + ":block/disk_full"); private static final ResourceLocation MODEL_DISK_DISCONNECTED = new ResourceLocation(RS.ID + ":block/disk_disconnected"); - // TODO: Remove? - private static final ResourceLocation TEXTURE_BASE_CONNECTED_GLOW = new ResourceLocation(RS.ID + ":blocks/disk_manipulator_connected_glow"); - @Override public Collection getDependencies() { List dependencies = new ArrayList<>(); + dependencies.add(MODEL_BASE_CUTOUT); dependencies.add(MODEL_BASE_CONNECTED); dependencies.add(MODEL_BASE_DISCONNECTED); dependencies.add(MODEL_DISK); @@ -44,7 +44,7 @@ public class ModelDiskManipulator implements IModel { @Override public Collection getTextures() { - return Collections.singletonList(TEXTURE_BASE_CONNECTED_GLOW); + return Collections.emptyList(); } @Override @@ -67,7 +67,7 @@ public class ModelDiskManipulator implements IModel { } return new BakedModelDiskManipulator( - baseModelConnected.bake(state, format, bakedTextureGetter), + new BakedModelFullbright(baseModelConnected.bake(state, format, bakedTextureGetter), RS.ID + ":blocks/disk_manipulator/cutouts/connected"), baseModelDisconnected.bake(state, format, bakedTextureGetter), diskModel.bake(state, format, bakedTextureGetter), diskModelNearCapacity.bake(state, format, bakedTextureGetter), diff --git a/src/main/resources/assets/refinedstorage/blockstates/crafter_manager.json b/src/main/resources/assets/refinedstorage/blockstates/crafter_manager.json index 38d994919..56b2f2cfd 100644 --- a/src/main/resources/assets/refinedstorage/blockstates/crafter_manager.json +++ b/src/main/resources/assets/refinedstorage/blockstates/crafter_manager.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "refinedstorage:cube_cutout_north", + "model": "refinedstorage:cube_north_cutout", "textures": { "particle": "refinedstorage:blocks/side", "north": "refinedstorage:blocks/crafter_manager/front", diff --git a/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json b/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json index e46caeca3..3cfa2d309 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "refinedstorage:cube_cutout_north", + "model": "refinedstorage:cube_north_cutout", "textures": { "particle": "refinedstorage:blocks/crafting_monitor/front", "north": "refinedstorage:blocks/crafting_monitor/front", diff --git a/src/main/resources/assets/refinedstorage/blockstates/detector.json b/src/main/resources/assets/refinedstorage/blockstates/detector.json index 867e88c19..bbd687ec5 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/detector.json +++ b/src/main/resources/assets/refinedstorage/blockstates/detector.json @@ -2,11 +2,11 @@ "forge_marker": 1, "defaults": { "textures": { - "particle": "refinedstorage:blocks/detector_top", - "torch": "refinedstorage:blocks/detector_side_off", - "side": "refinedstorage:blocks/detector_side_off", - "top": "refinedstorage:blocks/detector_top", - "bottom": "refinedstorage:blocks/detector_bottom" + "side": "refinedstorage:blocks/detector/side", + "bottom": "refinedstorage:blocks/detector/bottom", + "top": "refinedstorage:blocks/detector/top", + "torch": "refinedstorage:blocks/detector/cutouts/off", + "particle": "refinedstorage:blocks/detector/side" }, "model": "refinedstorage:detector" }, @@ -19,7 +19,7 @@ "powered": { "true": { "textures": { - "torch": "refinedstorage:blocks/detector_side_on" + "torch": "refinedstorage:blocks/detector/cutouts/on" } }, "false": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/grid.json b/src/main/resources/assets/refinedstorage/blockstates/grid.json index c8bd60770..44482d3b1 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/grid.json +++ b/src/main/resources/assets/refinedstorage/blockstates/grid.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "refinedstorage:cube_cutout_north", + "model": "refinedstorage:cube_north_cutout", "textures": { "particle": "refinedstorage:blocks/side", "east": "refinedstorage:blocks/grid/left", diff --git a/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json b/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json index 80c34a129..2bd151c1a 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json +++ b/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json @@ -1,9 +1,10 @@ { "forge_marker": 1, "defaults": { - "model": "torch", + "model": "refinedstorage:wireless_transmitter", "textures": { - "torch": "refinedstorage:blocks/wireless_transmitter_disconnected" + "torch": "refinedstorage:blocks/wireless_transmitter/wireless_transmitter", + "cutout": "refinedstorage:blocks/wireless_transmitter/cutouts/disconnected" } }, "variants": { @@ -15,7 +16,7 @@ "connected": { "true": { "textures": { - "torch": "refinedstorage:blocks/wireless_transmitter_connected" + "cutout": "refinedstorage:blocks/wireless_transmitter/cutouts/connected" } }, "false": { diff --git a/src/main/resources/assets/refinedstorage/models/block/cube_cutout_north.json b/src/main/resources/assets/refinedstorage/models/block/cube_north_cutout.json similarity index 100% rename from src/main/resources/assets/refinedstorage/models/block/cube_cutout_north.json rename to src/main/resources/assets/refinedstorage/models/block/cube_north_cutout.json diff --git a/src/main/resources/assets/refinedstorage/models/block/detector.json b/src/main/resources/assets/refinedstorage/models/block/detector.json index ce8f506b6..339bc305a 100755 --- a/src/main/resources/assets/refinedstorage/models/block/detector.json +++ b/src/main/resources/assets/refinedstorage/models/block/detector.json @@ -1,210 +1,201 @@ { - "__comment": "Model made by CyanideX", + "credit": "Made with Blockbench", "elements": [ { - "name": "Element", + "name": "Handle", "from": [ - 7.0, - 5.0, - 7.0 + 7, + 5, + 7 ], "to": [ - 9.0, - 10.0, - 9.0 + 9, + 8, + 9 ], "shade": false, "faces": { "north": { - "texture": "#torch", "uv": [ - 7.0, - 5.0, - 9.0, - 11.0 - ] + 7, + 7, + 9, + 11 + ], + "texture": "#side" }, "east": { - "texture": "#torch", "uv": [ - 7.0, - 5.0, - 9.0, - 11.0 - ] + 7, + 7, + 9, + 11 + ], + "texture": "#side" }, "south": { - "texture": "#torch", "uv": [ - 7.0, - 5.0, - 9.0, - 11.0 - ] + 7, + 7, + 9, + 11 + ], + "texture": "#side" }, "west": { - "texture": "#torch", "uv": [ - 7.0, - 5.0, - 9.0, - 11.0 - ] + 7, + 7, + 9, + 11 + ], + "texture": "#side" }, "up": { - "texture": "#torch", "uv": [ - 7.0, - 5.0, - 9.0, - 7.0 - ] - }, - "down": { - "texture": "#torch", - "uv": [ - 7.0, - 7.0, - 9.0, - 9.0 - ] + 7, + 7, + 9, + 9 + ], + "texture": "#side" } } }, { - "name": "Element", + "name": "Torch", "from": [ - 7.0, - 5.0, - 6.0 + 7, + 5, + 6 ], "to": [ - 9.0, - 11.0, - 10.0 + 9, + 11, + 10 ], "shade": false, "faces": { "east": { - "texture": "#torch", "uv": [ - 6.0, - 4.0, - 10.0, - 11.0 - ] + 6, + 4, + 10, + 12 + ], + "texture": "#torch" }, "west": { - "texture": "#torch", "uv": [ - 6.0, - 4.0, - 10.0, - 11.0 - ] + 6, + 4, + 10, + 12 + ], + "texture": "#torch" } } }, { - "name": "Element", + "name": "Torch", "from": [ - 6.0, - 5.0, - 7.0 + 6, + 5, + 7 ], "to": [ - 10.0, - 11.0, - 9.0 + 10, + 11, + 9 ], "shade": false, "faces": { "north": { - "texture": "#torch", "uv": [ - 6.0, - 4.0, - 10.0, - 11.0 - ] + 6, + 4, + 10, + 12 + ], + "texture": "#torch" }, "south": { - "texture": "#torch", "uv": [ - 6.0, - 4.0, - 10.0, - 11.0 - ] + 6, + 4, + 10, + 12 + ], + "texture": "#torch" } } }, { - "name": "base", + "name": "Base", "from": [ - 0.0, - 0.0, - 0.0 + 0, + 0, + 0 ], "to": [ - 16.0, - 5.0, - 16.0 + 16, + 5, + 16 ], "faces": { "north": { - "texture": "#side", "uv": [ - 0.0, - 11.0, - 16.0, - 16.0 - ] + 0, + 11, + 16, + 16 + ], + "texture": "#side" }, "east": { - "texture": "#side", "uv": [ - 0.0, - 11.0, - 16.0, - 16.0 - ] + 0, + 11, + 16, + 16 + ], + "texture": "#side" }, "south": { - "texture": "#side", "uv": [ - 0.0, - 11.0, - 16.0, - 16.0 - ] + 0, + 11, + 16, + 16 + ], + "texture": "#side" }, "west": { - "texture": "#side", "uv": [ - 0.0, - 11.0, - 16.0, - 16.0 - ] + 0, + 11, + 16, + 16 + ], + "texture": "#side" }, "up": { - "texture": "#top", "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] + 0, + 0, + 16, + 16 + ], + "texture": "#top" }, "down": { - "texture": "#bottom", "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] + 0, + 0, + 16, + 16 + ], + "texture": "#bottom" } } } diff --git a/src/main/resources/assets/refinedstorage/models/block/disk_manipulator_connected.json b/src/main/resources/assets/refinedstorage/models/block/disk_manipulator_connected.json index 313db060a..fab0ead50 100755 --- a/src/main/resources/assets/refinedstorage/models/block/disk_manipulator_connected.json +++ b/src/main/resources/assets/refinedstorage/models/block/disk_manipulator_connected.json @@ -1,50 +1,13 @@ { - "parent": "block/block", + "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:blocks/disk_manipulator_connected", - "front": "refinedstorage:blocks/disk_manipulator_connected", - "bottom": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "side": "refinedstorage:blocks/side" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "down": { - "texture": "#bottom", - "cullface": "down" - }, - "up": { - "texture": "#top", - "cullface": "up" - }, - "north": { - "texture": "#front", - "cullface": "north" - }, - "south": { - "texture": "#side", - "cullface": "south" - }, - "west": { - "texture": "#side", - "cullface": "west" - }, - "east": { - "texture": "#side", - "cullface": "east" - } - } - } - ] + "particle": "refinedstorage:blocks/disk_manipulator/disk_manipulator", + "north": "refinedstorage:blocks/disk_manipulator/disk_manipulator", + "east": "refinedstorage:blocks/side", + "south": "refinedstorage:blocks/side", + "west": "refinedstorage:blocks/side", + "up": "refinedstorage:blocks/side", + "down": "refinedstorage:blocks/side", + "cutout": "refinedstorage:blocks/disk_manipulator/cutouts/connected" + } } diff --git a/src/main/resources/assets/refinedstorage/models/block/disk_manipulator_disconnected.json b/src/main/resources/assets/refinedstorage/models/block/disk_manipulator_disconnected.json index d8398f25a..0018da8dc 100755 --- a/src/main/resources/assets/refinedstorage/models/block/disk_manipulator_disconnected.json +++ b/src/main/resources/assets/refinedstorage/models/block/disk_manipulator_disconnected.json @@ -1,50 +1,13 @@ { - "parent": "block/block", + "parent": "refinedstorage:block/cube_north_cutout", "textures": { - "particle": "refinedstorage:blocks/disk_manipulator_disconnected", - "front": "refinedstorage:blocks/disk_manipulator_disconnected", - "bottom": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "side": "refinedstorage:blocks/side" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "down": { - "texture": "#bottom", - "cullface": "down" - }, - "up": { - "texture": "#top", - "cullface": "up" - }, - "north": { - "texture": "#front", - "cullface": "north" - }, - "south": { - "texture": "#side", - "cullface": "south" - }, - "west": { - "texture": "#side", - "cullface": "west" - }, - "east": { - "texture": "#side", - "cullface": "east" - } - } - } - ] + "particle": "refinedstorage:blocks/disk_manipulator/disk_manipulator", + "north": "refinedstorage:blocks/disk_manipulator/disk_manipulator", + "east": "refinedstorage:blocks/side", + "south": "refinedstorage:blocks/side", + "west": "refinedstorage:blocks/side", + "up": "refinedstorage:blocks/side", + "down": "refinedstorage:blocks/side", + "cutout": "refinedstorage:blocks/disk_manipulator/cutouts/disconnected" + } } diff --git a/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter.json b/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter.json new file mode 100644 index 000000000..97344370a --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter.json @@ -0,0 +1,206 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#torch" + }, + "elements": [ + { + "from": [ + 7, + 0, + 7 + ], + "to": [ + 9, + 10, + 9 + ], + "shade": false, + "faces": { + "down": { + "uv": [ + 7, + 13, + 9, + 15 + ], + "texture": "#torch" + }, + "up": { + "uv": [ + 7, + 6, + 9, + 8 + ], + "texture": "#torch" + } + } + }, + { + "from": [ + 7, + 0, + 0 + ], + "to": [ + 9, + 16, + 16 + ], + "shade": false, + "faces": { + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#torch" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#torch" + } + } + }, + { + "from": [ + 0, + 0, + 7 + ], + "to": [ + 16, + 16, + 9 + ], + "shade": false, + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#torch" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#torch" + } + } + }, + { + "from": [ + 7, + 0, + 7 + ], + "to": [ + 9, + 10, + 9 + ], + "shade": false, + "faces": { + "down": { + "uv": [ + 7, + 13, + 9, + 15 + ], + "texture": "#cutout" + }, + "up": { + "uv": [ + 7, + 6, + 9, + 8 + ], + "texture": "#cutout" + } + } + }, + { + "from": [ + 7, + 0, + 0 + ], + "to": [ + 9, + 16, + 16 + ], + "shade": false, + "faces": { + "west": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#cutout" + }, + "east": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#cutout" + } + } + }, + { + "from": [ + 0, + 0, + 7 + ], + "to": [ + 16, + 16, + 9 + ], + "shade": false, + "faces": { + "north": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#cutout" + }, + "south": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#cutout" + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/recipes/detector.json b/src/main/resources/assets/refinedstorage/recipes/detector.json index 79a87275e..08228f35c 100644 --- a/src/main/resources/assets/refinedstorage/recipes/detector.json +++ b/src/main/resources/assets/refinedstorage/recipes/detector.json @@ -1,8 +1,8 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - "ECE", - "RMR", + "ERE", + "CMC", "EPE" ], "key": { @@ -13,7 +13,7 @@ "item": "minecraft:comparator" }, "R": { - "item": "minecraft:redstone" + "item": "minecraft:redstone_torch" }, "M": { "item": "refinedstorage:machine_casing" diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/cable_old.png b/src/main/resources/assets/refinedstorage/textures/blocks/cable_old.png deleted file mode 100755 index a1246790ed2ddd0feee50f08d7e2a43737d4cc9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1266 zcmbVMTWl0n7@pduSuk9R`k(@xOht<_*PYq!OuE$V&Xz9emS(%!Roaxfob689nX}HE zcDKa@X?*a8v4}?D%}|UXK+;4J1%#y9)Br|aP#a=Ge88AmqEt!L=$Y+q^`YUxNoLMD zGvD|B-+!BzyE=EQS^dyzf*{r;+SL?Z*ZX(i9{hY`A{WBTgD9Rs-7t#^nhS`i33Wgw zY;6FffM$+9Hw&5xqI$$iXHX{Dp%~C+G#|qh?L1}^L~~0quNi{?kvbT#oCvk>>1Pya znGvc-N^;434CJi#F&A`?b*7E6K|?mFmhEJ7QNadmfHbmb4>_Jvj8G-J3f}v#S&A${ z&|rjG5|v4Ikum53Qer~1!Sg)XBs07e4hqsXQs8)rMjfOTX~%1*SWtmyxK?+` znhu9igu+UfLa_76)nr zk!`4uaqjN!$OmFI$}ZQ!MbU;-XbjuHK?yZN;V+D7nTh~Jo#S|c)&*eDrY1_XuIoG< z3hI(B@wzOUa>dR{{5CNZ=i@OcEDAxMkB6eXAVyn*TvJHkg5hveg`03Zq&Wtt__na` zGFQASSBbemL(ok_I8^C^t{gsL^!syN-jqH%ya(nudeD+kS89di<1aU+df6cu1?g zIJK}>J-hH~|J##?TK{a`bz(96x;=O0*WPQ3pDec{aQ zi97Z8<&2w=)T8H4D98KvD`Q~($j)*3(hqyQS9YGNJKZz#=IPNFH@-LB`GtN%escGw zy@A>oX`=|5L@Av!g6 zELD81?+Pov-&8Z-`}EbdU%&g!Th*KPG2I`$Gxxydkzj>-sfwY8Td06g4N@5^96@dG@d7Hu(4D9laiSyCc=oWm44K zqxNsc@XEQ1C`$C`(N3!~vQAQsgiF>81-P<_6r4>_{?*x(tZoFBLjgT{vferI=@F+x z*Xo@eLWGT^f}mG#8AyZnf%Q>!V52H(&eefhe^!DH62Ouj*+e{PO4)j6&aVWY?P130 z$W5^});k;QfR4^ct0QQnfkSY4XqDqQhgWoQg3rwhs~kMb2@EST980sD#IX|3ItrIF zPz#^@X)PwTg_;ZDpj7YdwXBrHFqurom2ta_bPvOcqR6m3!}BzpL7V+aOU}|sb7|hm zq@NHl)wG_nbR+4o{mP2bXVp8McA(-_*jFM|43snr>>x!ZE2kLF#WK~5G_`1x>PyFS zOVd;a#6bciEfd;tRqax}hGm$&#xx;|>S+VRoJ1nU*j3k?NK_4NT1}fEf&$X2mS(g+ z1(-Hq8hvRMG;M-gSz2xPmL4l5r^1u1nRe|Ut50KQYw~8fQpjh>5BDks(?GV2bks27 zfqa#b;AS7EL0PE31vm(vAqgwV&>9PJwAD$@3OG2F_RQM>HiTZ%&N0Tl2hP;%|E%T$PQp`vvWGkR2p=UAc9CvaSor-5%0n*~v96a=5gQ|I$D_ECifrBxIvp)g)_1nLx) z<#<}*fl6y~oj@y!!qFbLA}9ilF&%Eq z2Nc2QRRmfT+zRdG>R4LjM1|%BZ%p-hW30++xw5J>FKx5ndNO*!wax5iT$hGVm^J0OfN{{T1?(mZr1cpOe1DxUF#`|*fMGp%v z_%Z;mf@!%LHSNNima9?IlI4b^ZUy*4G-SBU%Kl%JZs;Fw%HJxFZqF|U$VA%^!?nvcF;p-E8b7P9HZc|QM@hsfRhtiI2 zrB}ok34#E@iv$;*527Ww5FmJw;KK7kv;-Fd1TPX?cs_`h;6i}lMS=^@2hkE-2oStT zaN+qNT7nA!f)@!cJRd|$a3MhOBEf~{gJ=mZ1PERvxbS=sEy0BV!HWbJo)4lWxDX(C zk>JAfL9_%H0t7D-TzEc+mf%8w;6;K9&j-;GTnG@nNO0l#AX4T z@FKy5=YwboE(8c(B)IT=5G}!l0Ktm{7oHEICAbhEc#+`3^Fg!(7Xkz?5?pvbh?d|& zfZ#Ba?%DRvD6P!?Z(L>` zzU%t6$44hVU!g4zEd60qM diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/cable_striped.png b/src/main/resources/assets/refinedstorage/textures/blocks/cable_striped.png deleted file mode 100755 index 9f1fcda0be7b8dc2f4b558fbc8cd2650b2f8fffc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1354 zcmbVMZA=?w96uaRoGd}MI9_5rj}5oT^`5)-+TPi2p>LzmV(lRgzRnGi#SXyON_s8^uq2eJ=7$@6;u z-~a#nzunO12;fvejSZ2^)JsX6D^ztVfSUt;SZYdmHovN<>d^Dnu$pg@>p= z#vh(e|^Gsmq ziiqCk#8yc)1VgA>Q6Wm3thhjuBx++!ByBfSbOlNQk|qE{kN^iHO9GYx=-R*xYpNJw z!yez7E#v0IqPiYu2_lh5m=b1_qP7qu!!QJ(2#UfD30&)zbuNj^T3J?u2Wo;U#dS%M z(TqlpS2}ekW-wiKAr=n?*A>g!TA+-O5lJpikS0LHVi~_yq%}PZ|D~~^v{u(0heQ}^ zN~bCq`G}Nd!A9)vZ73sXuwkE8B_k-&z z3yt$UPvTZHPxCa%GZvA_>e&cyrCnwhpv|xh8MfE3)IG7RTZNpisCA0co~?pVRM8bJs>D&ZdnN1W?s`cUm4vn@lcrU#Jy4ap zpy*ST7`hT?R@#7rog{g?V5M-t(Hw5)4gWd87Qt;K1FR8avD*b~4KM!R_z?yvB2z5? zDW2?;QIVPBdMg;0^=5*y(Lt)wDg~3dO$d_H>i1OECBJtJ`G@*JzV~e0U6gwCfv=W{ zO_BG0olVRgufF!!&da?QevsZ7uP}eY6}>iQpEe&1J$u73eQRQQ=Hmsn`kC#;H!Zc5=K1u4pQnBa^?iYW*4dZO zymD#0BL3t{9ZmIR;h#IEs%GD~gZOO2&0_w5sb)6X_uO#wVqrkMy<{8zdh^48f{i7C zP~qH230V4U6iMX`zWH{p?}g$1(d(DMR4T`}+4ocFjAzKbW3lGj{Knm9J==5T zdu~v;QonfXn^%v{)LPONl6=3Oc)a;wq<`|qkx`-a^i(=sv;WM(d24qm`R+&Z-0$0( zc7Wb1ovz!dPty;*WvP6BaeDq_K4=Ud?!PhrS8fp!Irid-;d4ix&-~r|-da!E)!g?F D*mc|h diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_bottom.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector/bottom.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/detector_bottom.png rename to src/main/resources/assets/refinedstorage/textures/blocks/detector/bottom.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector/cutouts/off.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector/cutouts/off.png new file mode 100644 index 0000000000000000000000000000000000000000..f41fb222f0ee983b81b46ba3c175697062512e7c GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXJq(MA#*BFQM#v# zV~B>|}l0#1?^#$sq~I@Xxtb%$pzloVv5hG!N2bZe?^J zG%heMGBNQWX_Wu~0WL{IK~y+TrI68zf>02KeJ0UZTkk5#BBKa|h%B_kAOv5*-le(- z1hXI_=*j+dX0fY*<**kY^YhI)XGS#u|3Z{1h*AYnsvt@gM5%%(RS;#vYPG^-GO457 zCq&thBnjs8c^&0GA<72YU^<=FQSK9>Y@q3Xe!^n0z;3t0a=8TM^?D7OoTe!@n+?J+ zk2zDNVO3S(a5&)kd?L#-Xi*g5{eJT!bjUCan5K!g z)rR$D!M49YPSDDCbUGdO bwr%4Faf!Td^qvZ?00000NkvXXu0mjf{J6P2 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_top.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector/top.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/detector_top.png rename to src/main/resources/assets/refinedstorage/textures/blocks/detector/top.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_side_off.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_side_off.png deleted file mode 100755 index 71b27c2d3b9459f9129544fae42ffd1c6c28a48b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1194 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk&``nLQqR!T z!q~`EN5ROz&{W^RQs2-(*TB%q(7?*bKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$IMft0!ZY(y z^2>`g!FqgstvvIJOA_;vQ$1a5m4K$`WoD*WIXgO=7`d7|TbLREL*CWQ(GbXWvoNqQ za<(+HG%$kcb;(aI%}vcKf$2>_=yk!V7nB@w3xGDeq!wkCrKY$Q<>xAZy=|3=+bxbb z&4cPq!R;0&oO<dK}gn%gs#DphZAP1iKQ}ci+z6hAKbvFH<&cMJZ<>}%W zQgQ3fB-^ak0D;#2s=w?<|D}pA%2QZsy|FQy9J9~m zBb#)d8%rD)ylgU;{lb_1|3Wl9Cmk-7`BK|odw=07t?roXM-6ylE|<=|KWkayyz~>B z&Xk^O&^cDfqsU^e(ZzJw;Kr|fVa^l0S2_G{UZ_fqbeeGDvrR}S>;3N&pIdIreeBjW zu_89S%+1_4_)2N7MpwdZvzFAz977)GnDyZ%zRaGJ7Ie)I6;Zsec0NYAAW-DQrk+HW zX-x_bcwTJFJ)LJUXLduF0te^I+4rW1@~SfI-Onn)aAb4;BA!W;w}MI!Pgg&ebxsLQ E0M-YbX8-^I diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on.png deleted file mode 100755 index aa99a17217a9fba63a837b5bf3c4daad66626faf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1230 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk&``nLQqR!T z!q~`EN5ROz&{W^RQs2-(*TB%q(7?*bKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$IMft0!ZY(y z^2>`g!FqgstvvIJOA_;vQ$1a5m4K$`WoD*WIh(p!n!6ghS(q9CL*CWQ(!#~U($LY( z(cIA0$->zPrq?AuximL5uLPzy1+Le~0Hy+J+U$~Alv$RV;#QQOs{r=4RVHq? zxZpGosy79vTMS)s>eUB2MjsTpNRbT_0;V7k6P|Q|9C+eS%>$EaktaqCEsbzZZB$eh-r$09blPL*Lvj6Y<)pwMxm@shKmI^Vy!-r4m@*C%Bu*NpWE zhi#@9b#-*F*>danhqQZpwy*9ntVoHhDEPa-;or;lQ}zwpq}iTWoZ9g(gPrZ9b-`}l zk1xblNo7bqFlK%C{iE&%ZX0{aB{v27MJp<6CmZ`-X0(ty&MD%mm_F}${qELX>)Jj4 zeF_Q{aZTG8p>W!$B=-9K8OlqZ7HMAX^j#j@sXm!=)vBh{$foY*O*$KI<}BDcjpg>X zhr9GT>eVMYxF6B5n|*f4(aSGcd?&sCZ885mM-#*EzjC>^y_Al60#LT=By}Z;C1rt33 zJtM=93Yk-ZiUK`d978Ppm!2`?J7B=U;<%rM@&EtFt|e}_l%|UWZ%B~$+@DaAP_jl* wY0Au1TBYBOa?6T~_eaXtG+x94KibY^?=gDI`nT$xJkW3kPgg&ebxsLQ0G1w1jsO4v literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator/disk_manipulator.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator/disk_manipulator.png new file mode 100644 index 0000000000000000000000000000000000000000..faf04c29ee656af3f328b675c11e294cd14e9930 GIT binary patch literal 625 zcmV-%0*?KOP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XT000XT0n*)m z`~Uy|8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMGBNQWX_Wu~0n$lCK~y+TjZ@c( z0znYm4-qlzH<(=$ii%>ujEZ8;`d|d{LEru0x~rBw4xED%+Mb!7sjlko)gqAybX`X< z7=+*N7f*{uqX>t?@Or&sKA%s{4bQuwPzVBWyWQ}3JaE6?#lK!JJfBZoE*CjF91d76 zmlzI*n9t|pXS10k7J&2ljCQ+?dc7{zY&ON0%Vk;97YYUB^Lb>mStJq(^!xocgJd!( z0Hsn1-#_g?mP(}rm=d*kJT3smVo|c>ayiMA$z&uO<7CO2#9}d|(`i|gp#YH1^?Jo_ zx5IY3#b&d?>2$(+y~cDpl{4z+-q1f73{b6BrI;E~_`qy7!(y?(YPG^TlS1G0YMs##+w2AN{T88 z25p|xeoG(#YooChe58^<07|gi?H>}@_MaMXP*f5KOjAi{wOa2vU=0?Fg;K(PznA(< zCX1I{#qDhccYW2!E24rG)m;jb=`88fOR5I~AZ0Je*?#^W(YqmfYNtamyc zsWuD7b+6Zxhuv;h_8dZuI*7!AupR`YEUx((lP1?R-Zk#fbX~_68anWGcp8wV00000 LNkvXXu0mjfKV}3d literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_connected.png deleted file mode 100755 index 11ffbff13ac4a5cc1c74d8a06405601d60a2952d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15358 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 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_back.png b/src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_back.png deleted file mode 100755 index e3fdca65452fd9ea6166316c808385c0f6ec9b4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1322 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk&``nLQqR!T z!q~`EN5ROz&{W^RQs2-(*TB%q(7?*bKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvryA&s6}2k5wiXHyD|_ znHw1yxS2Xxn1bBzXyj_?W@>5aWNK<*W@cic1l5~@#qSWkh6XtG>H{644~kr*$c704 zQxJ#=Pr5)3Jn^UI0aJVtFlnpo(OSvCz&Oj(#WAGfmdzx`zC#8)u9r=8b6GoBogSHV z{9gZ%AxB`fKaqC?JbxsQP=B>x&79SW7)~y3*QI#+>ej< zjSWxTdH?;(&oy={SrS$*dsbt&J-7Sw$9oa8dop+PeF_n|Y!X;tHCN+6p%2@-*H-WM ziXGQ+XldQhwn4(uXSIhn(^`j(J@1YiF59w3TWoLfw9|r%YUcFu*?Ps;)!xsZmA>I; z=ZBL{bAvYB`N`b4lxNGQmq#2pi>?Z$$T;~hNj|#Z+g{HlqvN>g)!|gf7eN(iT35rp zWQ8>P@_gq_)th~m&1B)-yydHpG6ktNJTaZSc&){q()BR~5)Cb0DH%If{J;Iuq%)(g zCB(3%BP~f*HmqsIa(jka=Zg;SK316cI;*bLILvo=L45C}{c-xWo{Ic6h5tX>ih3n8@ZF0yu{8;UmmS;+{TArl{a+zJMZbvf7dfGGdyIdEp&Lh%^p;G NdAj0#LT=By}Z;C1rt33 zJtM=93Yk-Zih?~|978Ppm!34_YA|46Ik@NWk4Q&F#*e4dgO=PrbTsL~4Q$P_$cOQIl&T>}qy~*Xx z7jKGxx%VC<^5*OE_=xPiwFf1fw_dCMlxJX7y?08H|2BV7QFX!#?{#B>=^evy^ TiLXE}GB9|$`njxgN@xNAf9Yl; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected.png deleted file mode 100755 index 3f6dd7d6e3cb4cb426d96096fadad471e51a0818..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15525 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