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 000000000..6514e4cb6 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/constructor/constructor.png differ 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 000000000..8a36d4710 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/constructor/cutouts/disconnected.png differ 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 5ae493b75..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected_glow.png.mcmeta deleted file mode 100644 index f82377449..000000000 --- a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected_glow.png.mcmeta +++ /dev/null @@ -1,26 +0,0 @@ -{ - "ctm": { - "ctm_version": 1, - "layer": "CUTOUT", - "extra": { - "light": 15 - } - }, - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor_disconnected.png deleted file mode 100755 index 50a325d45..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_disconnected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/destructor/cutouts/connected.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected_glow.png rename to src/main/resources/assets/refinedstorage/textures/blocks/destructor/cutouts/connected.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/destructor/cutouts/connected.png.mcmeta old mode 100755 new mode 100644 similarity index 99% rename from src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected.png.mcmeta rename to src/main/resources/assets/refinedstorage/textures/blocks/destructor/cutouts/connected.png.mcmeta index 1880c61c9..5459937ec --- a/src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected.png.mcmeta +++ b/src/main/resources/assets/refinedstorage/textures/blocks/destructor/cutouts/connected.png.mcmeta @@ -24,4 +24,4 @@ 19 ] } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor/cutouts/disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/destructor/cutouts/disconnected.png new file mode 100644 index 000000000..10f32dd66 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/destructor/cutouts/disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor/destructor.png b/src/main/resources/assets/refinedstorage/textures/blocks/destructor/destructor.png new file mode 100644 index 000000000..187d1a79c Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/destructor/destructor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected.png deleted file mode 100755 index e1c170f0b..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected.png and /dev/null differ 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 41a21e509..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/destructor_disconnected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/reader.png b/src/main/resources/assets/refinedstorage/textures/blocks/reader.png deleted file mode 100755 index 8469abb59..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/reader.png and /dev/null differ 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 000000000..3743277f1 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/reader/cutouts/disconnected.png differ 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 000000000..f9b85d020 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/reader/reader.png differ 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 e37beecf9..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/reader_connected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/reader_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/reader_connected_glow.png.mcmeta deleted file mode 100644 index eea6c1fe1..000000000 --- a/src/main/resources/assets/refinedstorage/textures/blocks/reader_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/writer.png b/src/main/resources/assets/refinedstorage/textures/blocks/writer.png deleted file mode 100755 index 8774c032f..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/writer.png and /dev/null differ 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 000000000..3743277f1 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/writer/cutouts/disconnected.png differ 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 000000000..e663b0c5c Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/writer/writer.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/writer_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/writer_connected.png deleted file mode 100644 index 302b3bc28..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/writer_connected.png and /dev/null differ 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