diff --git a/CHANGELOG.md b/CHANGELOG.md index a5a4cdf12..fefc95333 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,6 @@ ### 1.4.1 - Added Storage Monitor (raoulvdberge) - Fixed Processing Pattern Encoder and Security Manager recipes not supporting oredict workbench and chest (VT-14) -- Fixed network nodes not saving correctly (raoulvdberge) - Fixed network nodes not respecting redstone mode (raoulvdberge) - Fixed "Clear" and "Create Pattern" buttons not working correctly when using Grid Filter tabs (raoulvdberge) - Fixed Wrench in Dismantling Mode voiding Storage Block contents (raoulvdberge) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/TileEntitySpecialRendererStorageMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/render/TileEntitySpecialRendererStorageMonitor.java index bce3a6a7b..6ba34f60e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/TileEntitySpecialRendererStorageMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/TileEntitySpecialRendererStorageMonitor.java @@ -19,7 +19,7 @@ public class TileEntitySpecialRendererStorageMonitor extends TileEntitySpecialRe setLightmapDisabled(true); float disX = 0, disXText = 0; - float disY = 0.5F, disYText = 0.2F; + float disY = 0.5F, disYText = 0.23F; float disZ = 0, disZText = 0; float spacing = 0.01F; diff --git a/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json b/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json index 2349a107a..a1599018c 100644 --- a/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json @@ -4,19 +4,19 @@ "model": "cube", "textures": { "particle": "refinedstorage:blocks/side", - "north": "refinedstorage:blocks/interface_disconnected", - "east": "refinedstorage:blocks/side", - "south": "refinedstorage:blocks/side", - "west": "refinedstorage:blocks/side", - "up": "refinedstorage:blocks/side", - "down": "refinedstorage:blocks/side" + "north": "refinedstorage:blocks/storage_monitor_front", + "east": "refinedstorage:blocks/storage_monitor_left", + "south": "refinedstorage:blocks/grid_back", + "west": "refinedstorage:blocks/storage_monitor_right", + "up": "refinedstorage:blocks/storage_monitor_top", + "down": "refinedstorage:blocks/bottom" } }, "variants": { "connected": { "true": { "textures": { - "north": "refinedstorage:blocks/interface_connected" + "north": "refinedstorage:blocks/storage_monitor_front" } }, "false": { diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/storage_monitor_front.png b/src/main/resources/assets/refinedstorage/textures/blocks/storage_monitor_front.png new file mode 100644 index 000000000..d7a267815 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/storage_monitor_front.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/storage_monitor_left.png b/src/main/resources/assets/refinedstorage/textures/blocks/storage_monitor_left.png new file mode 100644 index 000000000..7e9f8a1a4 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/storage_monitor_left.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/storage_monitor_right.png b/src/main/resources/assets/refinedstorage/textures/blocks/storage_monitor_right.png new file mode 100644 index 000000000..8a7d7d2c5 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/storage_monitor_right.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/storage_monitor_top.png b/src/main/resources/assets/refinedstorage/textures/blocks/storage_monitor_top.png new file mode 100644 index 000000000..6c9395b6e Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/storage_monitor_top.png differ