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 a1246790e..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/cable_old.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/cable_part.png b/src/main/resources/assets/refinedstorage/textures/blocks/cable_part.png deleted file mode 100755 index d2915c337..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/cable_part.png and /dev/null differ 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 9f1fcda0b..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/cable_striped.png and /dev/null differ 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 000000000..f41fb222f Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/detector/cutouts/off.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector/cutouts/on.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on_glow.png rename to src/main/resources/assets/refinedstorage/textures/blocks/detector/cutouts/on.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector/side.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector/side.png new file mode 100644 index 000000000..0c0d6b4a9 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/detector/side.png differ 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 71b27c2d3..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/detector_side_off.png and /dev/null differ 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 aa99a1721..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on_glow.png.mcmeta deleted file mode 100644 index eea6c1fe1..000000000 --- a/src/main/resources/assets/refinedstorage/textures/blocks/detector_side_on_glow.png.mcmeta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ctm": { - "ctm_version": 1, - "layer": "CUTOUT", - "extra": { - "light": 15 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator/cutouts/connected.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_connected_glow.png rename to src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator/cutouts/connected.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator/cutouts/disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator/cutouts/disconnected.png new file mode 100644 index 000000000..6e6d6facf Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator/cutouts/disconnected.png differ 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 000000000..faf04c29e Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator/disk_manipulator.png differ 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 11ffbff13..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_connected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_connected_glow.png.mcmeta deleted file mode 100644 index eea6c1fe1..000000000 --- a/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_connected_glow.png.mcmeta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ctm": { - "ctm_version": 1, - "layer": "CUTOUT", - "extra": { - "light": 15 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_disconnected.png deleted file mode 100755 index 1b8e271a0..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_disconnected.png and /dev/null differ 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 e3fdca654..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_back.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter/cutouts/connected.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected_glow.png rename to src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter/cutouts/connected.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter/cutouts/disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter/cutouts/disconnected.png new file mode 100644 index 000000000..bfc8fa11c Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter/cutouts/disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter/wireless_transmitter.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter/wireless_transmitter.png new file mode 100644 index 000000000..ba68cb972 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter/wireless_transmitter.png differ 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 3f6dd7d6e..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected_glow.png.mcmeta deleted file mode 100644 index eea6c1fe1..000000000 --- a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected_glow.png.mcmeta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ctm": { - "ctm_version": 1, - "layer": "CUTOUT", - "extra": { - "light": 15 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_disconnected.png deleted file mode 100755 index 13aa433b3..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_disconnected.png and /dev/null differ