Crafter fullbright texture. #1860

src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafter.java

@@ -1,9 +1,11 @@
 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.block.info.BlockInfoBuilder;
 import com.raoulvdberge.refinedstorage.render.IModelRegistration;
+import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright;
 import com.raoulvdberge.refinedstorage.tile.TileCrafter;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
@@ -12,6 +14,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.NonNullList;
@@ -32,6 +35,20 @@ public class BlockCrafter extends BlockNode {
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
         modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "connected=false,direction=north"));
+
+        modelRegistration.addBakedModelOverride(info.getId(), base -> new BakedModelFullbright(
+            base,
+            RS.ID + ":blocks/crafter/cutouts/side_connected",
+            RS.ID + ":blocks/crafter/cutouts/side_connected_90",
+            RS.ID + ":blocks/crafter/cutouts/side_connected_180",
+            RS.ID + ":blocks/crafter/cutouts/side_connected_270",
+            RS.ID + ":blocks/crafter/cutouts/front_connected"
+        ));
+    }
+
+    @Override
+    public BlockRenderLayer getBlockLayer() {
+        return BlockRenderLayer.CUTOUT;
     }
 
     @Override

src/main/resources/assets/refinedstorage/blockstates/crafter.json

@@ -1,14 +1,19 @@
 {
   "forge_marker": 1,
   "defaults": {
-    "model": "cube",
+    "model": "refinedstorage:cube_cutout",
     "textures": {
-      "particle": "refinedstorage:blocks/crafter_side",
-      "side": "refinedstorage:blocks/crafter_side",
-      "side_90": "refinedstorage:blocks/crafter_side_90",
-      "side_180": "refinedstorage:blocks/crafter_side_180",
-      "side_270": "refinedstorage:blocks/crafter_side_270",
-      "front": "refinedstorage:blocks/crafter_front"
+      "particle": "refinedstorage:blocks/crafter/side",
+      "side": "refinedstorage:blocks/crafter/side",
+      "side_90": "refinedstorage:blocks/crafter/side_90",
+      "side_180": "refinedstorage:blocks/crafter/side_180",
+      "side_270": "refinedstorage:blocks/crafter/side_270",
+      "cutout_side": "refinedstorage:blocks/crafter/cutouts/side_disconnected",
+      "cutout_side_90": "refinedstorage:blocks/crafter/cutouts/side_disconnected_90",
+      "cutout_side_180": "refinedstorage:blocks/crafter/cutouts/side_disconnected_180",
+      "cutout_side_270": "refinedstorage:blocks/crafter/cutouts/side_disconnected_270",
+      "front": "refinedstorage:blocks/crafter/front",
+      "cutout_front": "refinedstorage:blocks/crafter/cutouts/front_disconnected"
     },
     "uvlock": true
   },
@@ -16,11 +21,11 @@
     "connected": {
       "true": {
         "textures": {
-          "side": "refinedstorage:blocks/crafter_side_connected",
-          "side_90": "refinedstorage:blocks/crafter_side_connected_90",
-          "side_180": "refinedstorage:blocks/crafter_side_connected_180",
-          "side_270": "refinedstorage:blocks/crafter_side_connected_270",
-          "front": "refinedstorage:blocks/crafter_front_connected"
+          "cutout_side": "refinedstorage:blocks/crafter/cutouts/side_connected",
+          "cutout_side_90": "refinedstorage:blocks/crafter/cutouts/side_connected_90",
+          "cutout_side_180": "refinedstorage:blocks/crafter/cutouts/side_connected_180",
+          "cutout_side_270": "refinedstorage:blocks/crafter/cutouts/side_connected_270",
+          "cutout_front": "refinedstorage:blocks/crafter/cutouts/front_connected"
         }
       },
       "false": {
@@ -31,62 +36,98 @@
     "direction": {
       "north": {
         "textures": {
-          "down": "#side",
+          "down": "#side_180",
           "up": "#side",
           "north": "#front",
           "east": "#side_90",
-          "south": "refinedstorage:blocks/crafter_bottom",
-          "west": "#side_270"
+          "south": "refinedstorage:blocks/crafter/bottom",
+          "west": "#side_270",
+          "cutout_down": "#cutout_side_180",
+          "cutout_up": "#cutout_side",
+          "cutout_north": "#cutout_front",
+          "cutout_east": "#cutout_side_90",
+          "cutout_south": "refinedstorage:blocks/crafter/bottom",
+          "cutout_west": "#cutout_side_270"
         }
       },
       "east": {
         "textures": {
-          "down": "refinedstorage:blocks/crafter_bottom",
+          "down": "#side_90",
           "up": "#side_90",
           "north": "#side_270",
           "east": "#front",
           "south": "#side_90",
-          "west": "refinedstorage:blocks/crafter_bottom"
+          "west": "refinedstorage:blocks/crafter/bottom",
+          "cutout_down": "#cutout_side_90",
+          "cutout_up": "#cutout_side_90",
+          "cutout_north": "#cutout_side_270",
+          "cutout_east": "#cutout_front",
+          "cutout_south": "#cutout_side_90",
+          "cutout_west": "refinedstorage:blocks/crafter/bottom"
         }
       },
       "south": {
         "textures": {
-          "down": "refinedstorage:blocks/crafter_bottom",
+          "down": "#side",
           "up": "#side_180",
-          "north": "refinedstorage:blocks/crafter_bottom",
+          "north": "refinedstorage:blocks/crafter/bottom",
           "east": "#side_270",
           "south": "#front",
-          "west": "#side_90"
+          "west": "#side_90",
+          "cutout_down": "#cutout_side",
+          "cutout_up": "#cutout_side_180",
+          "cutout_north": "refinedstorage:blocks/crafter/bottom",
+          "cutout_east": "#cutout_side_270",
+          "cutout_south": "#cutout_front",
+          "cutout_west": "#cutout_side_90"
         }
       },
       "west": {
         "textures": {
-          "down": "refinedstorage:blocks/crafter_bottom",
+          "down": "#side_270",
           "up": "#side_270",
           "north": "#side_90",
-          "east": "refinedstorage:blocks/crafter_bottom",
+          "east": "refinedstorage:blocks/crafter/bottom",
           "south": "#side_270",
-          "west": "#front"
+          "west": "#front",
+          "cutout_down": "#cutout_side_270",
+          "cutout_up": "#cutout_side_270",
+          "cutout_north": "#cutout_side_90",
+          "cutout_east": "refinedstorage:blocks/crafter/bottom",
+          "cutout_south": "#cutout_side_270",
+          "cutout_west": "#cutout_front"
         }
       },
       "up": {
         "textures": {
-          "down": "refinedstorage:blocks/crafter_bottom",
+          "down": "refinedstorage:blocks/crafter/bottom",
           "up": "#front",
           "north": "#side",
           "east": "#side",
           "south": "#side",
-          "west": "#side"
+          "west": "#side",
+          "cutout_down": "refinedstorage:blocks/crafter/bottom",
+          "cutout_up": "#cutout_front",
+          "cutout_north": "#cutout_side",
+          "cutout_east": "#cutout_side",
+          "cutout_south": "#cutout_side",
+          "cutout_west": "#cutout_side"
         }
       },
       "down": {
         "textures": {
           "down": "#front",
-          "up": "refinedstorage:blocks/crafter_bottom",
+          "up": "refinedstorage:blocks/crafter/bottom",
           "north": "#side_180",
           "east": "#side_180",
           "south": "#side_180",
-          "west": "#side_180"
+          "west": "#side_180",
+          "cutout_down": "#cutout_front",
+          "cutout_up": "refinedstorage:blocks/crafter/bottom",
+          "cutout_north": "#cutout_side_180",
+          "cutout_east": "#cutout_side_180",
+          "cutout_south": "#cutout_side_180",
+          "cutout_west": "#cutout_side_180"
         }
       }
     }

src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json

@@ -6,7 +6,7 @@
       "particle": "refinedstorage:blocks/side",
       "north": "refinedstorage:blocks/storage_monitor_front",
       "east": "refinedstorage:blocks/storage_monitor_left",
-      "south": "refinedstorage:blocks/grid_back",
+      "south": "refinedstorage:blocks/storage_monitor_back",
       "west": "refinedstorage:blocks/storage_monitor_right",
       "up": "refinedstorage:blocks/storage_monitor_top",
       "down": "refinedstorage:blocks/bottom"

src/main/resources/assets/refinedstorage/models/block/cube_cutout.json

@@ -0,0 +1,81 @@
+{
+  "parent": "block/cube",
+  "elements": [
+    {
+      "from": [
+        0,
+        0,
+        0
+      ],
+      "to": [
+        16,
+        16,
+        16
+      ],
+      "faces": {
+        "down": {
+          "texture": "#down",
+          "cullface": "down"
+        },
+        "up": {
+          "texture": "#up",
+          "cullface": "up"
+        },
+        "north": {
+          "texture": "#north",
+          "cullface": "north"
+        },
+        "south": {
+          "texture": "#south",
+          "cullface": "south"
+        },
+        "west": {
+          "texture": "#west",
+          "cullface": "west"
+        },
+        "east": {
+          "texture": "#east",
+          "cullface": "east"
+        }
+      }
+    },
+    {
+      "from": [
+        0,
+        0,
+        0
+      ],
+      "to": [
+        16,
+        16,
+        16
+      ],
+      "faces": {
+        "up": {
+          "texture": "#cutout_up",
+          "cullface": "up"
+        },
+        "down": {
+          "texture": "#cutout_down",
+          "cullface": "down"
+        },
+        "north": {
+          "texture": "#cutout_north",
+          "cullface": "north"
+        },
+        "south": {
+          "texture": "#cutout_south",
+          "cullface": "south"
+        },
+        "west": {
+          "texture": "#cutout_west",
+          "cullface": "west"
+        },
+        "east": {
+          "texture": "#cutout_east",
+          "cullface": "east"
+        }
+      }
+    }
+  ]
+}

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

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

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

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

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

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

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

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

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

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