Fullbright constructor, destructor, reader, writer. #1860

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) {

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

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

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

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

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<CacheKey, List<BakedQuad>> CACHE = CacheBuilder.newBuilder().build(new CacheLoader<CacheKey, List<BakedQuad>>() {
         @Override
         public List<BakedQuad> load(CacheKey key) throws Exception {
-            List<BakedQuad> quads = key.base.getQuads(key.state, key.side, 0);
+            List<BakedQuad> quads = new ArrayList<>(key.base.getQuads(key.state, key.side, 0));
 
             for (int i = 0; i < quads.size(); ++i) {
                 BakedQuad quad = quads.get(i);

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": {

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": {

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": {

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": {

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
+          ]
+        }
+      }
     }
   ]
 }

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": [

src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected_glow.png.mcmeta

@@ -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
-    ]
-  }
-}

src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected_glow.png.mcmeta

@@ -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
-    ]
-  }
-}

src/main/resources/assets/refinedstorage/textures/blocks/reader_connected_glow.png.mcmeta

@@ -1,9 +0,0 @@
-{
-  "ctm": {
-    "ctm_version": 1,
-    "layer": "CUTOUT",
-    "extra": {
-      "light": 15
-    }
-  }
-}

src/main/resources/assets/refinedstorage/textures/blocks/writer_connected_glow.png.mcmeta

@@ -1,9 +0,0 @@
-{
-  "ctm": {
-    "ctm_version": 1,
-    "layer": "CUTOUT",
-    "extra": {
-      "light": 15
-    }
-  }
-}