From cca8f6752b776735987f36970e6d71d4c8a8a026 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 12 Jul 2018 14:27:04 +0200 Subject: [PATCH] Fullbright disk drive and disk manipulator disks. #1860 --- .../render/model/ModelDiskDrive.java | 15 ++-- .../render/model/ModelDiskManipulator.java | 14 ++-- .../model/baked/BakedModelFullbright.java | 39 ++++++--- .../models/block/{ => disks}/disk.json | 75 +++++++++--------- .../block/{ => disks}/disk_disconnected.json | 75 +++++++++--------- .../models/block/{ => disks}/disk_full.json | 63 +++++++-------- .../block/{ => disks}/disk_near_capacity.json | 75 +++++++++--------- .../refinedstorage/textures/blocks/disk.png | Bin 1070 -> 0 bytes .../textures/blocks/disk_disconnected.png | Bin 1073 -> 0 bytes .../textures/blocks/disk_full.png | Bin 1081 -> 0 bytes .../textures/blocks/disk_near_capacity.png | Bin 1074 -> 0 bytes .../textures/blocks/disks/disk.png | Bin 0 -> 306 bytes .../textures/blocks/disks/leds.png | Bin 0 -> 217 bytes 13 files changed, 188 insertions(+), 168 deletions(-) rename src/main/resources/assets/refinedstorage/models/block/{ => disks}/disk.json (66%) mode change 100755 => 100644 rename src/main/resources/assets/refinedstorage/models/block/{ => disks}/disk_disconnected.json (66%) mode change 100755 => 100644 rename src/main/resources/assets/refinedstorage/models/block/{ => disks}/disk_full.json (70%) mode change 100755 => 100644 rename src/main/resources/assets/refinedstorage/models/block/{ => disks}/disk_near_capacity.json (66%) mode change 100755 => 100644 delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/disk.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/disk_disconnected.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/disk_full.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/disk_near_capacity.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/disks/disk.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/disks/leds.png diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/ModelDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/ModelDiskDrive.java index ea211a165..50d502608 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/ModelDiskDrive.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/ModelDiskDrive.java @@ -2,6 +2,7 @@ package com.raoulvdberge.refinedstorage.render.model; import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelDiskDrive; +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; @@ -18,10 +19,10 @@ import java.util.function.Function; public class ModelDiskDrive implements IModel { private static final ResourceLocation MODEL_BASE = new ResourceLocation(RS.ID + ":block/disk_drive"); - private static final ResourceLocation MODEL_DISK = new ResourceLocation(RS.ID + ":block/disk"); - private static final ResourceLocation MODEL_DISK_NEAR_CAPACITY = new ResourceLocation(RS.ID + ":block/disk_near_capacity"); - 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"); + private static final ResourceLocation MODEL_DISK = new ResourceLocation(RS.ID + ":block/disks/disk"); + private static final ResourceLocation MODEL_DISK_NEAR_CAPACITY = new ResourceLocation(RS.ID + ":block/disks/disk_near_capacity"); + private static final ResourceLocation MODEL_DISK_FULL = new ResourceLocation(RS.ID + ":block/disks/disk_full"); + private static final ResourceLocation MODEL_DISK_DISCONNECTED = new ResourceLocation(RS.ID + ":block/disks/disk_disconnected"); @Override public Collection getDependencies() { @@ -56,9 +57,9 @@ public class ModelDiskDrive implements IModel { return new BakedModelDiskDrive( baseModel.bake(state, format, bakedTextureGetter), - diskModel.bake(state, format, bakedTextureGetter), - diskModelNearCapacity.bake(state, format, bakedTextureGetter), - diskModelFull.bake(state, format, bakedTextureGetter), + new BakedModelFullbright(diskModel.bake(state, format, bakedTextureGetter), RS.ID + ":blocks/disks/leds").setCacheDisabled(), + new BakedModelFullbright(diskModelNearCapacity.bake(state, format, bakedTextureGetter), RS.ID + ":blocks/disks/leds").setCacheDisabled(), + new BakedModelFullbright(diskModelFull.bake(state, format, bakedTextureGetter), RS.ID + ":blocks/disks/leds").setCacheDisabled(), diskModelDisconnected.bake(state, format, bakedTextureGetter) ); } 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 8b1aef7a0..d696acbae 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/ModelDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/ModelDiskManipulator.java @@ -22,10 +22,10 @@ public class ModelDiskManipulator implements IModel { 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"); - private static final ResourceLocation MODEL_DISK = new ResourceLocation(RS.ID + ":block/disk"); - private static final ResourceLocation MODEL_DISK_NEAR_CAPACITY = new ResourceLocation(RS.ID + ":block/disk_near_capacity"); - 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"); + private static final ResourceLocation MODEL_DISK = new ResourceLocation(RS.ID + ":block/disks/disk"); + private static final ResourceLocation MODEL_DISK_NEAR_CAPACITY = new ResourceLocation(RS.ID + ":block/disks/disk_near_capacity"); + private static final ResourceLocation MODEL_DISK_FULL = new ResourceLocation(RS.ID + ":block/disks/disk_full"); + private static final ResourceLocation MODEL_DISK_DISCONNECTED = new ResourceLocation(RS.ID + ":block/disks/disk_disconnected"); @Override public Collection getDependencies() { @@ -69,9 +69,9 @@ public class ModelDiskManipulator implements IModel { return new BakedModelDiskManipulator( 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), - diskModelFull.bake(state, format, bakedTextureGetter), + new BakedModelFullbright(diskModel.bake(state, format, bakedTextureGetter), RS.ID + ":blocks/disks/leds").setCacheDisabled(), + new BakedModelFullbright(diskModelNearCapacity.bake(state, format, bakedTextureGetter), RS.ID + ":blocks/disks/leds").setCacheDisabled(), + new BakedModelFullbright(diskModelFull.bake(state, format, bakedTextureGetter), RS.ID + ":blocks/disks/leds").setCacheDisabled(), diskModelDisconnected.bake(state, format, bakedTextureGetter) ); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelFullbright.java b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelFullbright.java index b552caf0d..edcd6ed30 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelFullbright.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/model/baked/BakedModelFullbright.java @@ -62,22 +62,13 @@ public class BakedModelFullbright extends BakedModelDelegate { private static final LoadingCache> CACHE = CacheBuilder.newBuilder().build(new CacheLoader>() { @Override - public List load(CacheKey key) throws Exception { - List quads = new ArrayList<>(key.base.getQuads(key.state, key.side, 0)); - - for (int i = 0; i < quads.size(); ++i) { - BakedQuad quad = quads.get(i); - - if (key.textures.contains(quad.getSprite().getIconName())) { - quads.set(i, transformQuad(quad, 0.007F)); - } - } - - return quads; + public List load(CacheKey key) { + return transformQuads(key.base.getQuads(key.state, key.side, 0), key.textures); } }); private Set textures; + private boolean cacheDisabled = false; public BakedModelFullbright(IBakedModel base, String... textures) { super(base); @@ -85,15 +76,39 @@ public class BakedModelFullbright extends BakedModelDelegate { this.textures = new HashSet<>(Arrays.asList(textures)); } + public BakedModelFullbright setCacheDisabled() { + this.cacheDisabled = true; + + return this; + } + @Override public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, long rand) { if (state == null) { return base.getQuads(state, side, rand); } + if (cacheDisabled) { + return transformQuads(base.getQuads(state, side, 0), textures); + } + return CACHE.getUnchecked(new CacheKey(base, textures, state instanceof IExtendedBlockState ? ((IExtendedBlockState) state).getClean() : state, side)); } + private static List transformQuads(List oldQuads, Set textures) { + List quads = new ArrayList<>(oldQuads); + + for (int i = 0; i < quads.size(); ++i) { + BakedQuad quad = quads.get(i); + + if (textures.contains(quad.getSprite().getIconName())) { + quads.set(i, transformQuad(quad, 0.007F)); + } + } + + return quads; + } + private static BakedQuad transformQuad(BakedQuad quad, float light) { VertexFormat newFormat = RenderUtils.getFormatWithLightMap(quad.getFormat()); diff --git a/src/main/resources/assets/refinedstorage/models/block/disk.json b/src/main/resources/assets/refinedstorage/models/block/disks/disk.json old mode 100755 new mode 100644 similarity index 66% rename from src/main/resources/assets/refinedstorage/models/block/disk.json rename to src/main/resources/assets/refinedstorage/models/block/disks/disk.json index 08d5a1e01..652dd1c61 --- a/src/main/resources/assets/refinedstorage/models/block/disk.json +++ b/src/main/resources/assets/refinedstorage/models/block/disks/disk.json @@ -1,7 +1,8 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "textures": { - "0": "refinedstorage:blocks/disk" + "base": "refinedstorage:blocks/disks/disk", + "led": "refinedstorage:blocks/disks/leds" }, "elements": [ { @@ -18,7 +19,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#base", "uv": [ 3.0, 0.0, @@ -27,7 +28,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#base", "uv": [ 2.0, 0.0, @@ -36,7 +37,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#base", "uv": [ 9.0, 0.0, @@ -45,7 +46,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#base", "uv": [ 8.0, 0.0, @@ -54,7 +55,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#base", "uv": [ 3.0, 2.0, @@ -63,7 +64,7 @@ ] }, "down": { - "texture": "#0", + "texture": "#base", "uv": [ 3.0, 3.0, @@ -87,57 +88,57 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, - 1.0, - 15.0, - 2.0 + 2.0, + 0.0, + 2.0, + 0.0 ] }, "east": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, - 1.0, - 15.0, - 2.0 + 2.0, + 0.0, + 2.0, + 0.0 ] }, "south": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, - 1.0, - 15.0, - 2.0 + 2.0, + 0.0, + 2.0, + 0.0 ] }, "west": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, - 1.0, - 15.0, - 2.0 + 2.0, + 0.0, + 2.0, + 0.0 ] }, "up": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, - 1.0, - 15.0, - 2.0 + 2.0, + 0.0, + 2.0, + 0.0 ] }, "down": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, - 1.0, - 15.0, - 2.0 + 2.0, + 0.0, + 2.0, + 0.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/disk_disconnected.json b/src/main/resources/assets/refinedstorage/models/block/disks/disk_disconnected.json old mode 100755 new mode 100644 similarity index 66% rename from src/main/resources/assets/refinedstorage/models/block/disk_disconnected.json rename to src/main/resources/assets/refinedstorage/models/block/disks/disk_disconnected.json index 36197d7d6..f670fed99 --- a/src/main/resources/assets/refinedstorage/models/block/disk_disconnected.json +++ b/src/main/resources/assets/refinedstorage/models/block/disks/disk_disconnected.json @@ -1,7 +1,8 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "textures": { - "0": "refinedstorage:blocks/disk_disconnected" + "base": "refinedstorage:blocks/disks/disk", + "led": "refinedstorage:blocks/disks/leds" }, "elements": [ { @@ -18,7 +19,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#base", "uv": [ 3.0, 0.0, @@ -27,7 +28,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#base", "uv": [ 2.0, 0.0, @@ -36,7 +37,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#base", "uv": [ 9.0, 0.0, @@ -45,7 +46,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#base", "uv": [ 8.0, 0.0, @@ -54,7 +55,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#base", "uv": [ 3.0, 2.0, @@ -63,7 +64,7 @@ ] }, "down": { - "texture": "#0", + "texture": "#base", "uv": [ 3.0, 3.0, @@ -87,57 +88,57 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, - 1.0, - 15.0, - 2.0 + 3.0, + 0.0, + 3.0, + 0.0 ] }, "east": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, - 1.0, - 15.0, - 2.0 + 3.0, + 0.0, + 3.0, + 0.0 ] }, "south": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, - 1.0, - 15.0, - 2.0 + 3.0, + 0.0, + 3.0, + 0.0 ] }, "west": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, - 1.0, - 15.0, - 2.0 + 3.0, + 0.0, + 3.0, + 0.0 ] }, "up": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, - 1.0, - 15.0, - 2.0 + 3.0, + 0.0, + 3.0, + 0.0 ] }, "down": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, - 1.0, - 15.0, - 2.0 + 3.0, + 0.0, + 3.0, + 0.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/disk_full.json b/src/main/resources/assets/refinedstorage/models/block/disks/disk_full.json old mode 100755 new mode 100644 similarity index 70% rename from src/main/resources/assets/refinedstorage/models/block/disk_full.json rename to src/main/resources/assets/refinedstorage/models/block/disks/disk_full.json index 26068c216..44f456b25 --- a/src/main/resources/assets/refinedstorage/models/block/disk_full.json +++ b/src/main/resources/assets/refinedstorage/models/block/disks/disk_full.json @@ -1,7 +1,8 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "textures": { - "0": "refinedstorage:blocks/disk_full" + "base": "refinedstorage:blocks/disks/disk", + "led": "refinedstorage:blocks/disks/leds" }, "elements": [ { @@ -18,7 +19,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#base", "uv": [ 3.0, 0.0, @@ -27,7 +28,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#base", "uv": [ 2.0, 0.0, @@ -36,7 +37,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#base", "uv": [ 9.0, 0.0, @@ -45,7 +46,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#base", "uv": [ 8.0, 0.0, @@ -54,7 +55,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#base", "uv": [ 3.0, 2.0, @@ -63,7 +64,7 @@ ] }, "down": { - "texture": "#0", + "texture": "#base", "uv": [ 3.0, 3.0, @@ -87,57 +88,57 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, 1.0, - 15.0, - 2.0 + 0.0, + 1.0, + 0.0 ] }, "east": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, 1.0, - 15.0, - 2.0 + 0.0, + 1.0, + 0.0 ] }, "south": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, 1.0, - 15.0, - 2.0 + 0.0, + 1.0, + 0.0 ] }, "west": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, 1.0, - 15.0, - 2.0 + 0.0, + 1.0, + 0.0 ] }, "up": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, 1.0, - 15.0, - 2.0 + 0.0, + 1.0, + 0.0 ] }, "down": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, 1.0, - 15.0, - 2.0 + 0.0, + 1.0, + 0.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/disk_near_capacity.json b/src/main/resources/assets/refinedstorage/models/block/disks/disk_near_capacity.json old mode 100755 new mode 100644 similarity index 66% rename from src/main/resources/assets/refinedstorage/models/block/disk_near_capacity.json rename to src/main/resources/assets/refinedstorage/models/block/disks/disk_near_capacity.json index 5670751f2..1002b12b4 --- a/src/main/resources/assets/refinedstorage/models/block/disk_near_capacity.json +++ b/src/main/resources/assets/refinedstorage/models/block/disks/disk_near_capacity.json @@ -1,7 +1,8 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "textures": { - "0": "refinedstorage:blocks/disk_near_capacity" + "base": "refinedstorage:blocks/disks/disk", + "led": "refinedstorage:blocks/disks/leds" }, "elements": [ { @@ -18,7 +19,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#base", "uv": [ 3.0, 0.0, @@ -27,7 +28,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#base", "uv": [ 2.0, 0.0, @@ -36,7 +37,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#base", "uv": [ 9.0, 0.0, @@ -45,7 +46,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#base", "uv": [ 8.0, 0.0, @@ -54,7 +55,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#base", "uv": [ 3.0, 2.0, @@ -63,7 +64,7 @@ ] }, "down": { - "texture": "#0", + "texture": "#base", "uv": [ 3.0, 3.0, @@ -87,57 +88,57 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, - 1.0, - 15.0, - 2.0 + 0.0, + 0.0, + 0.0, + 0.0 ] }, "east": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, - 1.0, - 15.0, - 2.0 + 0.0, + 0.0, + 0.0, + 0.0 ] }, "south": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, - 1.0, - 15.0, - 2.0 + 0.0, + 0.0, + 0.0, + 0.0 ] }, "west": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, - 1.0, - 15.0, - 2.0 + 0.0, + 0.0, + 0.0, + 0.0 ] }, "up": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, - 1.0, - 15.0, - 2.0 + 0.0, + 0.0, + 0.0, + 0.0 ] }, "down": { - "texture": "#0", + "texture": "#led", "uv": [ - 14.0, - 1.0, - 15.0, - 2.0 + 0.0, + 0.0, + 0.0, + 0.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk.png deleted file mode 100755 index 163593866c2f4d0bf76efacb18751f8f8b35f955..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1070 zcmaJ=Pe>F|7#}di48uc+b?G%yn6x`HyY8PEcU#t(H8)yY)&;Fo@vT&vq1~ zvLL*OkSIi`2cc6Q`g5r$%Tqx`7Y}(*q$naV@DPYlZ`NJyU=B0$-uw9dzVG+_d86sJ zb5)hcDk+MpO14TFvR1oaMLGE&-}obwc;&#-H^Rfl0xQet5FUPm_xo1!8y$CQ;E#GniIXhxJ?fBuRFni{1$0x33Sim+E} z9kO8iP+L|R$|<}`$IgO?BM=8V#4>R7KEoEAC|&R?kiBbWXi$LQT$J7x)tO2I5m^uf zyg`q`aU2NoUM>*!`vPZxkL3ak%QGD7VL5?g1s@BF4^5(3YPXP)T8gpADN6TZYzhpM z&*!~)zZY3O49D|4!}=JX&qEL%d(gnL<1y^Ik_QReilv!YLk4g?%3WvxM`@yTI|bcL zrFI+}cCk>TWQ-%54CiGTU3c>;plzIiyE67f+u1=AG8t&20ZSqM=&mb~N$vIzI|EcwMmfDHwMA+f|w8a9><1(vwl zE?3-_D~J}9F|x7<^_9Ap?nM~cy~qTjSm+k0@6ZetnmY44K-2cF@4UabQ-=;Sr z%1VB2f*q^7`Vi0+CuS#pbWNsPa#PFSKiwGRf;rFJ#Bl$m8fX0=8vi(>-P?pU=AoBc mqf_N8;8)#))gxPXRvQ+mvijI0zd(iE8=OqEN%PHDM*ac?L}3j8 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_disconnected.png deleted file mode 100755 index b74c1ecd1d8b5a226761806a49716b5cc97e8776..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1073 zcmaJ=U1-x#6b`tl8%!sAQXIw%e~PyGY11~L)pbd`b*{5^g-t~;OYYV%lba>Cwws7B z_adkdJ`4q4)D2%`_%fNOs0>l@K|xVa5hsF(!URQq7|fg6P9LTr$-VdRedm1V=blJ+ zw$|0It0f4cF4-n$@LKPFE0^Q{hOY|>Ue=;`59)$_sG!(@h-t7FkV!-72N|GfLxT@N zgdmn}*0VjRC)FXU(C{fP##b~f%qED)&Z4EL0|1e|pkFtm)ZC5R6sc=bs+&(SDN6!5 zy=~YAUBjJOb$CD(G-~G#GEx+=0|Ow1EE3URpVID;(tn_yZ zhLuV!IyRkhp>WCQqGHjkkD(32&8viVPzL;wu_W5b4q1TC00-u675AgBsY1rJ`+p!8 zh}DQPRPzQfQBsal*y7W4P2__?j$?v+I2ektY&;kX#Y0jc!G|R|77j~%g_|@Tq?jtG zaP>djz<;@-WCI03I}72VO83$^h@g{$7AZ-kZjoENbyI@{$K#f_tQOe%VW1^!Xpp7) zi24#5{9GX1l3>DNzYs6!7o@l(1X|cooRe`9RGF(Sk$agd{F6&#F|^y~BhGTtdqwj3P!1r}Ukv;Y7A diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_full.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_full.png deleted file mode 100755 index 05ab10b245591e152d558e3d866dc906a1a88a97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1081 zcmaJ=Pe>F|7@smqMZu0*=rlrQxjTQ>U1tV2b7$7tY(>_MOfVW}o;v8vn`WNvC`O@3 zBvKtx!!8j~)Io|Mf{3IJCK2T|DR1dPFtVUSP;b^H3R_;#xFI)Yi;H?-%TTnCXKqTM*CT>ZfOF!Ok zgXaFmq}t!D3K~^=gsgEz?7#p>Azh=#bVN5yrTvQd?3rnbOhZt2m|7Fn5^o|UXah3n z5BXGXh7Hn;K(maGVMUe^Ifl%96pm(V9b!VR&&0yFFx7>SCDL>% zmGY+oerR{ntRM(9!_ge)!w8?#XClS*nNE4ugA5$i)-9w%lk_|)?XVYxDXerY1;dKR z*BzTqrck(Kw5wP&>t|@g@bXHd9h3kYGB!m!$vz9v3E;q9TgCn8D9@5{?Y0i&0kIlU zhH9??OcayD6t?&^T@!28q+PwS=zQ%;3f-i%sc>lc7lZ$pDj*GJSh z(GcLO_((m&^8q31>8}%{s3cTH*y<=J^O8(uxY{PUXSl+Dxil6-d(Hi)*;x~wAn&+7 zy7;m_{J_K$Z{yJ}&;2lopT)zNT$gk|Enj=2jXT@&N=63Wug*SLDIH5p7rbdIGv@E=CHHPVo;ut<`mt4=e>VAh zMjzexW#akM%7*yj-bn7P`*{}^$`=c$!J_Ra9v`=%z&O#6O)KXA5WU}*aK@?hJyvccO#4lx!xI^OVfHQ+twShP`|ikut# E3qpQpGXMYp diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_near_capacity.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_near_capacity.png deleted file mode 100755 index 706e89e27a47ae714fb2fb905706238e0787567a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1074 zcmaJ=O=#0l9FNQ|hSjMsKbZK4I2^7`UbA#fTpexFZB<)mEv$+Mv*fLfHF;U`X1n1* zhKOF&gY2e<;k+sMaS%nv^duhiAS&u%vV#|4py02WR5GB z%b~Im!ft_sk|c3_m)jnSEv0L+Eypi+WkL}52R{j z73(7wvPnvfvD6YWOhb+futQSfNhvOLLYRz1BZ80+`Djw$!%*oE>)e#>5zW?7oooK# zs{iH6ii)q=wVuHOQc7UQ(y9IU(n6`n-UYlRunp)(VCy>$OVhdF3Bb$q8 z5EBt73Z02)q%-d8PpHwbD)cB37^R8vQMSf47RkNFRsPB4s2I*~?qAKWo9G1j+lA4k zhlSxsHl28vj`r2$nOS-*CR1uWS9$aC{I1oHL6cg5<1a5in+du=O+LNs1~wddG_iA_ zdAfLj-JYgz0#LT=By}Z;C1rt33 zJtM=93Yk-ZiWYggIEGmGPd($v)odWpns|Q7<`+t*Gkg@>I|Mj(a5jktd|0vGcfq!$ z`4=N=eEzU6XTG3wx+&|n*_+?@(!4kg-JZ;OzjIyo?Y;kY^Pl+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disks/leds.png b/src/main/resources/assets/refinedstorage/textures/blocks/disks/leds.png new file mode 100644 index 0000000000000000000000000000000000000000..502afcf1310d1e3210700d039d147802a30b103b GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJtM=93Yk-Ziab4C978Ppr=BnrJYXPjXj))78&qol`;+09z_YK>z>% literal 0 HcmV?d00001