diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java index 9b11ca396..2edb86cd8 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java @@ -206,7 +206,6 @@ public class ProxyClient extends ProxyCommon { ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.SOLDERER), 0, new ModelResourceLocation("refinedstorage:solderer", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.INTERFACE), 0, new ModelResourceLocation("refinedstorage:interface", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_INTERFACE), 0, new ModelResourceLocation("refinedstorage:fluid_interface", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.CRAFTER), 0, new ModelResourceLocation("refinedstorage:crafter", "connected=false,direction=north")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.STORAGE), ItemStorageType.TYPE_1K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=1k")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.STORAGE), ItemStorageType.TYPE_4K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=4k")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.STORAGE), ItemStorageType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=16k")); @@ -257,6 +256,9 @@ public class ProxyClient extends ProxyCommon { ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.WRITER), 0, new ModelResourceLocation("refinedstorage:writer", "inventory")); ModelLoader.setCustomStateMapper(RSBlocks.WRITER, new StateMapperCTM("refinedstorage:writer")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.CRAFTER), 0, new ModelResourceLocation("refinedstorage:crafter", "connected=false,direction=north")); + ModelLoader.setCustomStateMapper(RSBlocks.CRAFTER, new StateMapperCTM("refinedstorage:crafter")); + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(RSBlocks.CONTROLLER), stack -> { ControllerEnergyType energyType = stack.getItemDamage() == ControllerType.CREATIVE.getId() ? ControllerEnergyType.ON : TileController.getEnergyType(ItemBlockController.getEnergyStored(stack), ItemBlockController.getEnergyCapacity(stack)); diff --git a/src/main/resources/assets/refinedstorage/blockstates/crafter_glow.json b/src/main/resources/assets/refinedstorage/blockstates/crafter_glow.json new file mode 100644 index 000000000..2d59d8c30 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/crafter_glow.json @@ -0,0 +1,137 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "refinedstorage:cube_glow", + "textures": { + "particle": "refinedstorage:blocks/crafter_side", + "crafter_side": "refinedstorage:blocks/crafter_side", + "crafter_side_90": "refinedstorage:blocks/crafter_side_90", + "crafter_side_180": "refinedstorage:blocks/crafter_side_180", + "crafter_side_270": "refinedstorage:blocks/crafter_side_270", + "crafter_front": "refinedstorage:blocks/crafter_front", + "glow_side": "refinedstorage:blocks/none", + "glow_side_90": "refinedstorage:blocks/none", + "glow_side_180": "refinedstorage:blocks/none", + "glow_side_270": "refinedstorage:blocks/none", + "glow_front": "refinedstorage:blocks/none", + "glow_up": "refinedstorage:blocks/none", + "glow_down": "refinedstorage:blocks/none" + }, + "uvlock": true + }, + "variants": { + "connected": { + "true": { + "textures": { + "crafter_side": "refinedstorage:blocks/crafter_side_connected", + "crafter_side_90": "refinedstorage:blocks/crafter_side_connected_90", + "crafter_side_180": "refinedstorage:blocks/crafter_side_connected_180", + "crafter_side_270": "refinedstorage:blocks/crafter_side_connected_270", + "crafter_front": "refinedstorage:blocks/crafter_front_connected", + "glow_side": "refinedstorage:blocks/crafter_side_connected_glow", + "glow_side_90": "refinedstorage:blocks/crafter_side_connected_90_glow", + "glow_side_180": "refinedstorage:blocks/crafter_side_connected_180_glow", + "glow_side_270": "refinedstorage:blocks/crafter_side_connected_270_glow", + "glow_front": "refinedstorage:blocks/crafter_front_connected_glow" + } + }, + "false": { + "textures": { + } + } + }, + "direction": { + "north": { + "textures": { + "down": "#crafter_side", + "up": "#crafter_side", + "north": "#crafter_front", + "east": "#crafter_side_90", + "south": "refinedstorage:blocks/crafter_bottom", + "west": "#crafter_side_270", + "glow_down": "#glow_side", + "glow_up": "#glow_side", + "glow_north": "#glow_front", + "glow_east": "#glow_side_90", + "glow_south": "refinedstorage:blocks/none", + "glow_west": "#glow_side_270" + } + }, + "east": { + "textures": { + "down": "refinedstorage:blocks/crafter_bottom", + "up": "#crafter_side_90", + "north": "#crafter_side_270", + "east": "#crafter_front", + "south": "#crafter_side_90", + "west": "refinedstorage:blocks/crafter_bottom", + "glow_up": "#glow_side_90", + "glow_north": "#glow_side_270", + "glow_east": "#glow_front", + "glow_south": "#glow_side_90", + "glow_west": "refinedstorage:blocks/none" + } + }, + "south": { + "textures": { + "down": "refinedstorage:blocks/crafter_bottom", + "up": "#crafter_side_180", + "north": "refinedstorage:blocks/crafter_bottom", + "east": "#crafter_side_270", + "south": "#crafter_front", + "west": "#crafter_side_90", + "glow_up": "#glow_side_180", + "glow_north": "refinedstorage:blocks/none", + "glow_east": "#glow_side_270", + "glow_south": "#glow_front", + "glow_west": "#glow_side_90" + } + }, + "west": { + "textures": { + "down": "refinedstorage:blocks/crafter_bottom", + "up": "#crafter_side_270", + "north": "#crafter_side_90", + "east": "refinedstorage:blocks/crafter_bottom", + "south": "#crafter_side_270", + "west": "#crafter_front", + "glow_up": "#glow_side_270", + "glow_north": "#glow_side_90", + "glow_east": "refinedstorage:blocks/none", + "glow_south": "#glow_side_270", + "glow_west": "#glow_front" + } + }, + "up": { + "textures": { + "down": "refinedstorage:blocks/crafter_bottom", + "up": "#crafter_front", + "north": "#crafter_side", + "east": "#crafter_side", + "south": "#crafter_side", + "west": "#crafter_side", + "glow_up": "#glow_front", + "glow_north": "#glow_side", + "glow_east": "#glow_side", + "glow_south": "#glow_side", + "glow_west": "#glow_side" + } + }, + "down": { + "textures": { + "down": "#crafter_front", + "up": "refinedstorage:blocks/crafter_bottom", + "north": "#crafter_side_180", + "east": "#crafter_side_180", + "south": "#crafter_side_180", + "west": "#crafter_side_180", + "glow_down": "#glow_front", + "glow_north": "#glow_side_180", + "glow_east": "#glow_side_180", + "glow_south": "#glow_side_180", + "glow_west": "#glow_side_180" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_front_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_front_connected_glow.png new file mode 100644 index 000000000..55aff2bb7 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_front_connected_glow.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_front_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_front_connected_glow.png.mcmeta new file mode 100644 index 000000000..eea6c1fe1 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_front_connected_glow.png.mcmeta @@ -0,0 +1,9 @@ +{ + "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/crafter_side_connected_180_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_180_glow.png new file mode 100644 index 000000000..9fb5520e5 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_180_glow.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_180_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_180_glow.png.mcmeta new file mode 100644 index 000000000..eea6c1fe1 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_180_glow.png.mcmeta @@ -0,0 +1,9 @@ +{ + "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/crafter_side_connected_270_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_270_glow.png new file mode 100644 index 000000000..deedd4780 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_270_glow.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_270_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_270_glow.png.mcmeta new file mode 100644 index 000000000..eea6c1fe1 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_270_glow.png.mcmeta @@ -0,0 +1,9 @@ +{ + "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/crafter_side_connected_90_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_90_glow.png new file mode 100644 index 000000000..1dea08148 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_90_glow.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_90_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_90_glow.png.mcmeta new file mode 100644 index 000000000..eea6c1fe1 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_90_glow.png.mcmeta @@ -0,0 +1,9 @@ +{ + "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/crafter_side_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_glow.png new file mode 100644 index 000000000..111f98e77 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_glow.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_glow.png.mcmeta new file mode 100644 index 000000000..eea6c1fe1 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_side_connected_glow.png.mcmeta @@ -0,0 +1,9 @@ +{ + "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/crafter_top.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top.png deleted file mode 100755 index 9b5be0fd2..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top_connected.png deleted file mode 100755 index 05b302039..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_top_connected.png and /dev/null differ