From 9eb96eef867d55ade5ddd7d9b861239362bbd8ca Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 11 Jul 2018 21:39:04 +0200 Subject: [PATCH] Fullbright constructor, destructor, reader, writer. #1860 --- .../refinedstorage/block/BlockCable.java | 5 +++ .../block/BlockConstructor.java | 3 +- .../refinedstorage/block/BlockDestructor.java | 3 +- .../refinedstorage/block/BlockReader.java | 3 +- .../refinedstorage/block/BlockWriter.java | 3 +- .../model/baked/BakedModelFullbright.java | 3 +- .../blockstates/constructor.json | 5 +-- .../blockstates/destructor.json | 5 +-- .../refinedstorage/blockstates/reader.json | 5 +-- .../refinedstorage/blockstates/writer.json | 5 +-- .../models/block/constructor_destructor.json | 24 +++++++++++++ .../block/constructor_destructor_item.json | 24 +++++++++++++ .../blocks/constructor/constructor.png | Bin 0 -> 316 bytes .../cutouts/connected.png} | Bin .../cutouts/connected.png.mcmeta} | 2 +- .../constructor/cutouts/disconnected.png | Bin 0 -> 694 bytes .../textures/blocks/constructor_connected.png | Bin 4534 -> 0 bytes .../constructor_connected_glow.png.mcmeta | 26 -------------- .../blocks/constructor_disconnected.png | Bin 16573 -> 0 bytes .../cutouts/connected.png} | Bin .../cutouts/connected.png.mcmeta} | 2 +- .../destructor/cutouts/disconnected.png | Bin 0 -> 628 bytes .../textures/blocks/destructor/destructor.png | Bin 0 -> 303 bytes .../textures/blocks/destructor_connected.png | Bin 5933 -> 0 bytes .../destructor_connected_glow.png.mcmeta | 34 ------------------ .../blocks/destructor_disconnected.png | Bin 16412 -> 0 bytes .../refinedstorage/textures/blocks/reader.png | Bin 1357 -> 0 bytes .../cutouts/connected.png} | Bin .../blocks/reader/cutouts/disconnected.png | Bin 0 -> 247 bytes .../textures/blocks/reader/reader.png | Bin 0 -> 582 bytes .../textures/blocks/reader_connected.png | Bin 1476 -> 0 bytes .../blocks/reader_connected_glow.png.mcmeta | 9 ----- .../refinedstorage/textures/blocks/writer.png | Bin 1358 -> 0 bytes .../cutouts/connected.png} | Bin .../blocks/writer/cutouts/disconnected.png | Bin 0 -> 247 bytes .../textures/blocks/writer/writer.png | Bin 0 -> 594 bytes .../textures/blocks/writer_connected.png | Bin 1465 -> 0 bytes .../blocks/writer_connected_glow.png.mcmeta | 9 ----- 38 files changed, 77 insertions(+), 93 deletions(-) create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/constructor/constructor.png rename src/main/resources/assets/refinedstorage/textures/blocks/{constructor_connected_glow.png => constructor/cutouts/connected.png} (100%) rename src/main/resources/assets/refinedstorage/textures/blocks/{constructor_connected.png.mcmeta => constructor/cutouts/connected.png.mcmeta} (98%) mode change 100755 => 100644 create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/constructor/cutouts/disconnected.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected_glow.png.mcmeta delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/constructor_disconnected.png rename src/main/resources/assets/refinedstorage/textures/blocks/{destructor_connected_glow.png => destructor/cutouts/connected.png} (100%) rename src/main/resources/assets/refinedstorage/textures/blocks/{destructor_connected.png.mcmeta => destructor/cutouts/connected.png.mcmeta} (99%) mode change 100755 => 100644 create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/destructor/cutouts/disconnected.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/destructor/destructor.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected_glow.png.mcmeta delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/destructor_disconnected.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/reader.png rename src/main/resources/assets/refinedstorage/textures/blocks/{reader_connected_glow.png => reader/cutouts/connected.png} (100%) create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/reader/cutouts/disconnected.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/reader/reader.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/reader_connected.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/reader_connected_glow.png.mcmeta delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/writer.png rename src/main/resources/assets/refinedstorage/textures/blocks/{writer_connected_glow.png => writer/cutouts/connected.png} (100%) create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/writer/cutouts/disconnected.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/writer/writer.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/writer_connected.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/writer_connected_glow.png.mcmeta diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java index c428e31be..ee6b064de 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java @@ -15,6 +15,7 @@ import com.raoulvdberge.refinedstorage.render.collision.AdvancedRayTracer; import com.raoulvdberge.refinedstorage.render.collision.CollisionGroup; import com.raoulvdberge.refinedstorage.render.collision.constants.ConstantsCable; import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelCableCover; +import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright; import com.raoulvdberge.refinedstorage.tile.TileBase; import com.raoulvdberge.refinedstorage.tile.TileCable; import com.raoulvdberge.refinedstorage.tile.TileNode; @@ -75,6 +76,10 @@ public class BlockCable extends BlockNode { modelRegistration.addBakedModelOverride(info.getId(), BakedModelCableCover::new); } + void registerCoverAndFullbright(IModelRegistration modelRegistration, String... textures) { + modelRegistration.addBakedModelOverride(info.getId(), base -> new BakedModelCableCover(new BakedModelFullbright(base, textures))); + } + @Override @SideOnly(Side.CLIENT) public void registerModels(IModelRegistration modelRegistration) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java index 102510a98..cc87207b3 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java @@ -1,5 +1,6 @@ package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSGui; import com.raoulvdberge.refinedstorage.block.info.BlockDirection; import com.raoulvdberge.refinedstorage.render.IModelRegistration; @@ -31,7 +32,7 @@ public class BlockConstructor extends BlockCable { public void registerModels(IModelRegistration modelRegistration) { modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); - registerCover(modelRegistration); + registerCoverAndFullbright(modelRegistration, RS.ID + ":blocks/constructor/cutouts/connected"); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java index 24eba1b8e..9e81fbd7c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java @@ -1,5 +1,6 @@ package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSBlocks; import com.raoulvdberge.refinedstorage.RSGui; import com.raoulvdberge.refinedstorage.block.info.BlockDirection; @@ -30,7 +31,7 @@ public class BlockDestructor extends BlockCable { public void registerModels(IModelRegistration modelRegistration) { modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); - registerCover(modelRegistration); + registerCoverAndFullbright(modelRegistration, RS.ID + ":blocks/destructor/cutouts/connected"); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java index e72c7f3a7..29c81cbd6 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java @@ -1,5 +1,6 @@ package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSBlocks; import com.raoulvdberge.refinedstorage.RSGui; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterChannel; @@ -33,7 +34,7 @@ public class BlockReader extends BlockCable { public void registerModels(IModelRegistration modelRegistration) { modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); - registerCover(modelRegistration); + registerCoverAndFullbright(modelRegistration, RS.ID + ":blocks/reader/cutouts/connected"); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java index 8b7dbb7a2..3e9674744 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java @@ -1,5 +1,6 @@ package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSBlocks; import com.raoulvdberge.refinedstorage.RSGui; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterChannel; @@ -34,7 +35,7 @@ public class BlockWriter extends BlockCable { public void registerModels(IModelRegistration modelRegistration) { modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); - registerCover(modelRegistration); + registerCoverAndFullbright(modelRegistration, RS.ID + ":blocks/writer/cutouts/connected"); } @Override 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 4cfc20ef6..55012af22 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 @@ -16,6 +16,7 @@ import net.minecraftforge.common.property.IExtendedBlockState; import scala.actors.threadpool.Arrays; import javax.annotation.Nullable; +import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -66,7 +67,7 @@ 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 = key.base.getQuads(key.state, key.side, 0); + 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); diff --git a/src/main/resources/assets/refinedstorage/blockstates/constructor.json b/src/main/resources/assets/refinedstorage/blockstates/constructor.json index c53921f67..420fe7914 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/constructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/constructor.json @@ -4,7 +4,8 @@ "textures": { "cable": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable", - "front": "refinedstorage:blocks/constructor_disconnected", + "front": "refinedstorage:blocks/constructor/constructor", + "cutout": "refinedstorage:blocks/constructor/cutouts/disconnected", "line": "refinedstorage:blocks/generic_grey" }, "model": "refinedstorage:cable_core", @@ -20,7 +21,7 @@ "connected": { "true": { "textures": { - "front": "refinedstorage:blocks/constructor_connected" + "cutout": "refinedstorage:blocks/constructor/cutouts/connected" } }, "false": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/destructor.json b/src/main/resources/assets/refinedstorage/blockstates/destructor.json index 29c98c6c2..26703dd8d 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/destructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/destructor.json @@ -4,7 +4,8 @@ "textures": { "cable": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable", - "front": "refinedstorage:blocks/destructor_disconnected", + "front": "refinedstorage:blocks/destructor/destructor", + "cutout": "refinedstorage:blocks/destructor/cutouts/disconnected", "line": "refinedstorage:blocks/generic_grey" }, "model": "refinedstorage:cable_core", @@ -20,7 +21,7 @@ "connected": { "true": { "textures": { - "front": "refinedstorage:blocks/destructor_connected" + "cutout": "refinedstorage:blocks/destructor/cutouts/connected" } }, "false": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/reader.json b/src/main/resources/assets/refinedstorage/blockstates/reader.json index c7ede0795..4a0b1f6c2 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/reader.json +++ b/src/main/resources/assets/refinedstorage/blockstates/reader.json @@ -4,7 +4,8 @@ "textures": { "cable": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable", - "front": "refinedstorage:blocks/reader", + "front": "refinedstorage:blocks/reader/reader", + "cutout": "refinedstorage:blocks/reader/cutouts/disconnected", "line": "refinedstorage:blocks/generic_grey" }, "model": "refinedstorage:cable_core", @@ -20,7 +21,7 @@ "connected": { "true": { "textures": { - "front": "refinedstorage:blocks/reader_connected" + "cutout": "refinedstorage:blocks/reader/cutouts/connected" } }, "false": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/writer.json b/src/main/resources/assets/refinedstorage/blockstates/writer.json index f225a163e..655e16437 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/writer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/writer.json @@ -4,7 +4,8 @@ "textures": { "cable": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable", - "front": "refinedstorage:blocks/writer", + "front": "refinedstorage:blocks/writer/writer", + "cutout": "refinedstorage:blocks/writer/cutouts/disconnected", "line": "refinedstorage:blocks/generic_grey" }, "model": "refinedstorage:cable_core", @@ -20,7 +21,7 @@ "connected": { "true": { "textures": { - "front": "refinedstorage:blocks/writer_connected" + "cutout": "refinedstorage:blocks/writer/cutouts/connected" } }, "false": { diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json index 4ff9975eb..b52b37ee2 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json @@ -129,6 +129,30 @@ ] } } + }, + { + "name": "Line3", + "from": [ + 2.0, + 2.0, + 0.0 + ], + "to": [ + 14.0, + 14.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#cutout", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + } + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_item.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_item.json index 5059d0fb3..abdccd606 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_item.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_item.json @@ -130,6 +130,30 @@ } } }, + { + "name": "Line3", + "from": [ + 2.0, + 2.0, + 0.0 + ], + "to": [ + 14.0, + 14.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#cutout", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + } + } + }, { "name": "Core", "from": [ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor/constructor.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor/constructor.png new file mode 100644 index 0000000000000000000000000000000000000000..6514e4cb6f8e7b40602ae9d8175815e9f2e369ed GIT binary patch literal 316 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-Ziq?3#IEGmGADtY{bwq*3HFnz9i|s*o|92V9JMgDtL63Z}#RRj5vtoij z+w?D)qSB&p&eHOH@JY+lwfBGV?)fg1ERwx;pZsyf>!qDsTaN!>V$bKiuyy6uZ51&F z%@fc3-lr=kekPzX$gBG}tFghg2PN|(Tv;;~`>$D~w&;?2SYkZS=?m&%Klih**&=mO zJ?vuWJ;}!V3EmB=S5`Z8-af$3BH2AdGIO%Tioe$!ygcpR@oh}?W^o3E4}+(xpUXO@ GgeCxJ+IEZp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor/cutouts/connected.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected_glow.png rename to src/main/resources/assets/refinedstorage/textures/blocks/constructor/cutouts/connected.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/constructor/cutouts/connected.png.mcmeta old mode 100755 new mode 100644 similarity index 98% rename from src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected.png.mcmeta rename to src/main/resources/assets/refinedstorage/textures/blocks/constructor/cutouts/connected.png.mcmeta index 1d71d19d9..cd4999598 --- a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected.png.mcmeta +++ b/src/main/resources/assets/refinedstorage/textures/blocks/constructor/cutouts/connected.png.mcmeta @@ -16,4 +16,4 @@ 11 ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor/cutouts/disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor/cutouts/disconnected.png new file mode 100644 index 0000000000000000000000000000000000000000..8a36d4710747f62d2408bd1cc01e24a44a4efb58 GIT binary patch literal 694 zcmV;n0!jUeP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000iX000iX0Z03g ztpET38FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMGBNQWX_Wu~0vAa{K~y+TrIJ~C zqc9MJbBkmWgSXf$5+J}}Hi^a9x&Mi3N{l}<&od8=07-v$SJxYW|BB`D{_SHU6r50D zm*hBRB@StUeR5&s*r^=bh{1PPX880Ye4IjFeFDD17{_acQ&T|<9pbTv=vxTWAQ}v$ z(Fl42-}E?l4Yp;0U%p%c4zqjQIF&U-!^@RM+>MABvKbJxJ;IuRy2C!J@Lf0flIaR? zqio46cqr&6_~QUMjqrwv|0jgw1UcUD-D-H1!C80Mu$33U_8IjWq8*UVcf{s~Y`7yI zAISSVl$jCtGm>eBf3@v&aH+`)aL5WsR^VSdZVrDg4-XX2u;0qu5fKn|6B3@aVy*yI zAW8LG1Hn==W-XZAUR>UvkZ7E#1@$4oVcRdjKDHH5Ft(sZUgBX3D5sxgz1)5lP|ONK zY7mVLTyt)oR6A1%oJ+6bA%&;=>~P9`W&rzRuGyF zJ393R*aQj9ab1k$mmLpvi-~+1NOHCQ5Vm*g6Yhn&1p7;KP$}L<)z!Ih?Vbvvue$En!=983zhyZSTqipI)>A c{yp&a8>Ch4!PmY^Pyhe`07*qoM6N<$g1rMLmH+?% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected.png deleted file mode 100755 index 5ae493b750b2a482f920ebce79da994a3683c1e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4534 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 tILl!< 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 SxAOiRVC!faXq2ft-Tfaf?H!N+ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected_glow.png.mcmeta deleted file mode 100644 index 7bd39fa33..000000000 --- a/src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected_glow.png.mcmeta +++ /dev/null @@ -1,34 +0,0 @@ -{ - "ctm": { - "ctm_version": 1, - "layer": "CUTOUT", - "extra": { - "light": 15 - } - }, - "animation": { - "frametime": 1, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/destructor_disconnected.png deleted file mode 100755 index 41a21e5096253a96e410eb0674d647edcf638d97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16412 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 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/reader_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/reader/cutouts/connected.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/reader_connected_glow.png rename to src/main/resources/assets/refinedstorage/textures/blocks/reader/cutouts/connected.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/reader/cutouts/disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/reader/cutouts/disconnected.png new file mode 100644 index 0000000000000000000000000000000000000000..3743277f1703357c3509db98d88e6521640e6663 GIT binary patch literal 247 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-Ziqbt@978Pp&rWpYI$*%T@>xsp|9}14x*VplUEcb(JjXf>+t!@6{q$Gw-iIboAeG31}sQr>mdKI;Vst09KM!F#rGn literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/reader/reader.png b/src/main/resources/assets/refinedstorage/textures/blocks/reader/reader.png new file mode 100644 index 0000000000000000000000000000000000000000..f9b85d020f2bfab8f7b898c6a9c44a6b56e8581a GIT binary patch literal 582 zcmV-M0=fN(P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00Fj1L_t(IPkocgiUL6pMC%h8ao_jt;Mu*k zMZGF2E{K8$|Njqi=EYDV4k!dwRz*feW>&lTd~Q(`*?2s*;c#fv=~P%O7B-vBbOuJF zkxeEO>-YQmKNt)w3`3JZCX=yZv1sLT*(#Na)$4VwrBX>}+~smP@mN!-l*M8(C6)k( z1T>pXYqeU|Znv$`Xh?`NR#2H#G%YwzG2s2>3w@T48~dFwQ@IY|k;lB&W>=7an zd-!|{j8_8KL6HXW!T6Or-;qwI#e*LNfg0@?1xieVejrF$?5Po(>;YWQ0Z|m$5BG7k UGH+i2KmY&$07*qoM6N<$f(W$tH~;_u literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/reader_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/reader_connected.png deleted file mode 100644 index e37beecf95f1132a1e7094681629a84818b215b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1476 zcmaJ>eQeZZ7%#Ap35-ny&kYE*8$=?#e%$qF%Wm84ddF^YA31I?0}}f2-d4A3YujE3*aXH1LKqB!1QQ}4OpuQ=&RmqwLrU+G<_al5P5`&3S6rjPg2wJd!E^I1u4$ zKoIa!<7;O?J_Lav$uQH|L7q>eon(JV9sVd)GG!Xb0dRxS!Vt+D52R16U9k zYJ)CX^$6#tz*g>_>?o;dv0*E8*(wTOWV1Sn>Jb0gM`U6Li%!{8j{^V43AVhFRH(jp_E0_BuYfu zS<^Rl&*V*Rj7qZ44JUB0|1^Not)IQzineU$iY3IA+C3%SS;^z1BN_5ATi}Uo&_2{&M^H#Y@X}1`%Y>Cc}Pm zjjcz^7K_u58DCXZP5MGO1f^GK3+vt(o$XQ%^$Owc@W(Gd|I;*D`?I%bTnr@R|8mxbgNJu&^D9ZCR8+Zrxt|UBkLli4h6mkJd~LN}HzCZ%?z$z`q}9C(k5`GSBbXkMNm$|FtcFeoix4vGw%yeM}o=7(bXA>4uUeTR{2ayv<}F*ZXL%y}Qtjw%595E3#5nGGoGhyuhvWu3Qg# zC0RrUONN_4G%OP$3nu6^S={257#K5CGo)Fvh2hMYe<+KaA7~&LlOe+^P~0D6m)yPY z`@GNZd4A8=9j~fq%Y%kXup( z00&}x0|)_LN;Q86${}b|yBx07YlHh)QH@#ojE>ca#Z5E>mG3d)ych*KEPw`CaUp+= zTtQ%2av>2ahzH|d&?xV1(?E4wWms&Bij0Kp*$tN)tZ5(ybRIThO-h0_T*!)D*4$^r z7y_@T=usE4N~$(k1$$Kuz?9X2iUdKxPR2@5w2h?7U=k-N3}-L`M{$BBaF)d3wFfc1 zX;M8K;{0pA%##ag)b%)vVaa6DnzUI}tpOt#hQV+WBT3ZMKocoN=M7Xz?8sW+Ktj~y zxGt*-oUzCYYK!hdOs1JU*w}M*0ZKp20G-oAcNS&Pi|->9D!8*npDI zc|`#7!3)uwC*R5hx)nrKwxu-Cg%ad=lmRwOl>`PZ3{L|G4oF-g5zM5BW!mPkHp+_3-pp**hr&Fp zj}=hNS<=j*sT(f+8iI190Ot-HclP&=C`aqIbbVPk(Knxa_WhTB`>H20zUX|t=2EH6 zBLqB_oQJ0;A9cT6wmdd4vw3dLI5A@s9!q_Ay{vnvEIlk=JsR8<=xr{(nZ9r@^=DDb z8}D_#9sgihsy=bDFZf{2sA{E)N86pLTi-0_7FLFiTR$6bcQkLeS-OWRHuvMt6yawk zYdS&4fsgvH`!5Y_{bN|>(vzJZpT4p9&yl&%jq?-A((J!Se#zUEH&%GZa%(hwdw!u= z+nJc3o!-85_ps;i!p>9au3tyaMW+vn726&zpwVQ7@PM%2nx6YKL zd$)XFak*gIxA>1C{K2F9W7D&J(w{cg|DS@gLNx<}d&N diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/writer_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/writer/cutouts/connected.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/writer_connected_glow.png rename to src/main/resources/assets/refinedstorage/textures/blocks/writer/cutouts/connected.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/writer/cutouts/disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/writer/cutouts/disconnected.png new file mode 100644 index 0000000000000000000000000000000000000000..3743277f1703357c3509db98d88e6521640e6663 GIT binary patch literal 247 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-Ziqbt@978Pp&rWpYI$*%T@>xsp|9}14x*VplUEcb(JjXf>+t!@6{q$Gw-iIboAeG31}sQr>mdKI;Vst09KM!F#rGn literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/writer/writer.png b/src/main/resources/assets/refinedstorage/textures/blocks/writer/writer.png new file mode 100644 index 0000000000000000000000000000000000000000..e663b0c5ccd4ce96b4e4221d4d0c3022b8d49f25 GIT binary patch literal 594 zcmV-Y0Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00F{DL_t(IPkoc=Y63wJg!d6dyzl!0{q23M zsBa*_L=%H+)ci``A3FIejEDgjnwg!cuBon`@n*A``Mz(%;n4d1zKzFY#e6=u>2#_! zVlWukXf(2Jx2ykNuV<6V#6*xxCM}oCS)ov{VzFqIN=0KnpVu0D>2z8+#&|q#;c!?7 zi-1KEYPFix>vd~18dj}VMZ_8-Q7)IQR4NG{i^ZhcTdh_)2|%aQu~w_4r29k;AQ@s5 zp@NdU#bO}>5}M7X{eIq~pd|1p5W#Y})B>^zKyUAFb~>Nz5FG6Ian!hZ*=R45$p{~f zMrEvr(@1hP1N!>@x^@Gj!0cXk+9Nre%}Rj?ka15C90Rqn-EPYlh_<`!m4JvuB7Y{r zf~zEB5}@<>tR6c8R5$`ocP2vY0i-VHIH1etMG63*kl63{+DoNU!vFK&R>A)8Zb1;p zJZj%OZ*2Xv)*i`D!PNswpw~{pqo95WP{5V;Fv6990)k6JP%pupB&U>-F6b�t&bw zsBq!l1z_e7aS(Ixyak?t2#^CK2Jv9rNS(KlNF;;<9}0zxOX%S=OmqW3Afznj)QC*i g3D*@cgzx+I1Aq^-0yeQx&;S4c07*qoM6N<$f{r->eEeQXnD7(bZ8MqH?fWZNI(I8evO^*-7wy_1fVUP}w?!>-!7IN*BscDrot9oHM} z217vP+wc*=0f}3dO%Rk3Cg>1EU<@R>Idq#5q9Gy9fpH`<94gMY+lu@_xa976Kc3(7 z{GPAdlApUUbwb7j1VK_gZr%%}A^s+hh2NdKN-a>N>&`;GKndzmK?8_gQUU<=goF~{ z1%gz$;wvx@L6X+WzCyh)X9*`NA)^r2F~&kFL?g(&`7u=x%YcpsK#3f-Vf~+<#ZXzY zVSXlu%uyYnRCZTspr9((Csvh-tc1tVt+7Vx+3J5QV zC>5Fr>k*uu0K?op*-=~(vf=VH85Tt-=M}Lc1j4$9w_)(cD9I9MXGxxMx~vYKVJXUK zv0F?oC+jk~c&F1&JLrUs$6=jLigD0nT$timD@>ltZZpNQog8W40v^C?Psq66|v6WltkX)J) zLWgtA$&cY6n8{!u5MXet$OiBLW0vrM)ym=^5VT4xGuK1{0UO0jkK}HoN8t&KLru`( zXwhml(`FM6D2Bu-3Rv)fS)_516|BHQ0-BU)jDQr0c-uVEMu{WXoAKqtp@5r*V+F!+ zmNYmtcbhx25M)e;hqwD;KQ8fpvuL{A@O$lkk6~d-R@R(b_R}>N1`&+ins?mawDjJw z_p0|)kIh@!`qG`9$+ zteW&^2S3x=D~dOn8hv{krR|r*8PhhD_1lh**|?*i`i-{@$dTJc$l$_Ea;2EH5%sP( zaQwrhqDfOQydv?52^&E&!iYB+ITYFBZ z!XJ0fC#9|bS&a1_+@#;MVQ-y7(hZsaPWrBSw@1EOe0cNeSsz6QoT*cr*Uj3;&wiy9 zJXh5I;_elHb}!D0&Y!q!W%jI|v{ie%JN8^#nsK19r!BcQ{ON;#+&%u;{UvR`rlopX z(lfn-Yy1z^EDIvz(lZadsYr{0*Kf3LE6}dE`wZFiw@2F#mY=E{I?-J`E%_pN`NEBS r=UVlz<@pnTJ5-N!eSh<{p%fC4$WTMy^Xm@Af2JO1E`M~v^7a1#FjE#& diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/writer_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/writer_connected_glow.png.mcmeta deleted file mode 100644 index eea6c1fe1..000000000 --- a/src/main/resources/assets/refinedstorage/textures/blocks/writer_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