From 13d6e7f2b92f41b5009187aa2cbde50dbc72082f Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 11 Jul 2018 23:10:14 +0200 Subject: [PATCH] Crafter Manager, crafting monitor and grid fullbright. #1860 --- .../block/BlockCrafterManager.java | 10 +++ .../block/BlockCraftingMonitor.java | 10 +++ .../refinedstorage/block/BlockGrid.java | 16 +++++ .../blockstates/crafter_manager.json | 15 +++-- .../blockstates/crafting_monitor.json | 19 +++--- .../refinedstorage/blockstates/grid.json | 54 +++++++++------- .../models/block/cube_cutout_north.json | 61 ++++++++++++++++++ .../back.png} | Bin .../cutouts/front_connected.png} | Bin .../cutouts/front_disconnected.png | Bin 0 -> 313 bytes .../textures/blocks/crafter_manager/front.png | Bin 0 -> 541 bytes .../left.png} | Bin .../right.png} | Bin .../{grid_top.png => crafter_manager/top.png} | Bin .../textures/blocks/crafter_manager_front.png | Bin 596 -> 0 bytes .../crafter_manager_front_connected.png | Bin 794 -> 0 bytes ...er_manager_front_connected_glow.png.mcmeta | 9 --- .../back.png} | Bin .../cutouts/front_connected.png} | Bin .../cutouts/front_disconnected.png | Bin 0 -> 324 bytes .../blocks/crafting_monitor/front.png | Bin 0 -> 554 bytes .../left.png} | Bin .../right.png} | Bin .../top.png} | Bin .../blocks/crafting_monitor_front.png | Bin 1354 -> 0 bytes .../crafting_monitor_front_connected.png | Bin 16174 -> 0 bytes ...ng_monitor_front_connected_glow.png.mcmeta | 9 --- .../textures/blocks/grid/back.png | Bin 0 -> 1415 bytes .../textures/blocks/grid/crafting_front.png | Bin 0 -> 554 bytes .../cutouts/crafting_front_connected.png} | Bin .../cutouts/crafting_front_disconnected.png | Bin 0 -> 338 bytes .../cutouts/fluid_front_connected.png} | Bin .../grid/cutouts/fluid_front_disconnected.png | Bin 0 -> 312 bytes .../cutouts/front_connected.png} | Bin .../grid/cutouts/front_disconnected.png | Bin 0 -> 323 bytes .../cutouts/pattern_front_connected.png} | Bin .../cutouts/pattern_front_disconnected.png | Bin 0 -> 330 bytes .../fluid_back.png} | Bin .../textures/blocks/grid/fluid_front.png | Bin 0 -> 555 bytes .../fluid_left.png} | Bin .../fluid_right.png} | Bin .../fluid_side.png} | Bin .../fluid_top.png} | Bin .../textures/blocks/grid/front.png | Bin 0 -> 554 bytes .../textures/blocks/grid/left.png | Bin 0 -> 1444 bytes .../textures/blocks/grid/pattern_front.png | Bin 0 -> 554 bytes .../textures/blocks/grid/right.png | Bin 0 -> 1445 bytes .../textures/blocks/grid/top.png | Bin 0 -> 1411 bytes .../textures/blocks/grid_crafting_front.png | Bin 1377 -> 0 bytes .../blocks/grid_crafting_front_connected.png | Bin 15916 -> 0 bytes ...d_crafting_front_connected_glow.png.mcmeta | 9 --- .../textures/blocks/grid_fluid_front.png | Bin 1352 -> 0 bytes .../blocks/grid_fluid_front_connected.png | Bin 15910 -> 0 bytes ...grid_fluid_front_connected_glow.png.mcmeta | 9 --- .../textures/blocks/grid_front.png | Bin 1365 -> 0 bytes .../textures/blocks/grid_front_connected.png | Bin 15498 -> 0 bytes .../grid_front_connected_glow.png.mcmeta | 9 --- .../textures/blocks/grid_pattern_front.png | Bin 1373 -> 0 bytes .../blocks/grid_pattern_front_connected.png | Bin 15475 -> 0 bytes ...id_pattern_front_connected_glow.png.mcmeta | 9 --- 60 files changed, 144 insertions(+), 95 deletions(-) create mode 100644 src/main/resources/assets/refinedstorage/models/block/cube_cutout_north.json rename src/main/resources/assets/refinedstorage/textures/blocks/{grid_back.png => crafter_manager/back.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/refinedstorage/textures/blocks/{crafter_manager_front_connected_glow.png => crafter_manager/cutouts/front_connected.png} (100%) create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/crafter_manager/cutouts/front_disconnected.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/crafter_manager/front.png rename src/main/resources/assets/refinedstorage/textures/blocks/{grid_left.png => crafter_manager/left.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/refinedstorage/textures/blocks/{grid_right.png => crafter_manager/right.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/refinedstorage/textures/blocks/{grid_top.png => crafter_manager/top.png} (100%) mode change 100755 => 100644 delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/crafter_manager_front.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/crafter_manager_front_connected.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/crafter_manager_front_connected_glow.png.mcmeta rename src/main/resources/assets/refinedstorage/textures/blocks/{crafting_monitor_back.png => crafting_monitor/back.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/refinedstorage/textures/blocks/{crafting_monitor_front_connected_glow.png => crafting_monitor/cutouts/front_connected.png} (100%) create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor/cutouts/front_disconnected.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor/front.png rename src/main/resources/assets/refinedstorage/textures/blocks/{crafting_monitor_left.png => crafting_monitor/left.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/refinedstorage/textures/blocks/{crafting_monitor_right.png => crafting_monitor/right.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/refinedstorage/textures/blocks/{crafting_monitor_top.png => crafting_monitor/top.png} (100%) mode change 100755 => 100644 delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_front.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_front_connected.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_front_connected_glow.png.mcmeta create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/grid/back.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/grid/crafting_front.png rename src/main/resources/assets/refinedstorage/textures/blocks/{grid_crafting_front_connected_glow.png => grid/cutouts/crafting_front_connected.png} (100%) create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/grid/cutouts/crafting_front_disconnected.png rename src/main/resources/assets/refinedstorage/textures/blocks/{grid_fluid_front_connected_glow.png => grid/cutouts/fluid_front_connected.png} (100%) create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/grid/cutouts/fluid_front_disconnected.png rename src/main/resources/assets/refinedstorage/textures/blocks/{grid_front_connected_glow.png => grid/cutouts/front_connected.png} (100%) create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/grid/cutouts/front_disconnected.png rename src/main/resources/assets/refinedstorage/textures/blocks/{grid_pattern_front_connected_glow.png => grid/cutouts/pattern_front_connected.png} (100%) create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/grid/cutouts/pattern_front_disconnected.png rename src/main/resources/assets/refinedstorage/textures/blocks/{grid_fluid_back.png => grid/fluid_back.png} (100%) mode change 100755 => 100644 create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/grid/fluid_front.png rename src/main/resources/assets/refinedstorage/textures/blocks/{grid_fluid_left.png => grid/fluid_left.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/refinedstorage/textures/blocks/{grid_fluid_right.png => grid/fluid_right.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/refinedstorage/textures/blocks/{grid_fluid_side.png => grid/fluid_side.png} (100%) mode change 100755 => 100644 rename src/main/resources/assets/refinedstorage/textures/blocks/{grid_fluid_top.png => grid/fluid_top.png} (100%) mode change 100755 => 100644 create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/grid/front.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/grid/left.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/grid/pattern_front.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/grid/right.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/grid/top.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/grid_crafting_front.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/grid_crafting_front_connected.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/grid_crafting_front_connected_glow.png.mcmeta delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_front.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_front_connected.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_front_connected_glow.png.mcmeta delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/grid_front.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/grid_front_connected.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/grid_front_connected_glow.png.mcmeta delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front.png delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front_connected.png delete mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front_connected_glow.png.mcmeta diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafterManager.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafterManager.java index 0e03e5f10..493136974 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafterManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCrafterManager.java @@ -1,15 +1,18 @@ package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSGui; import com.raoulvdberge.refinedstorage.api.network.security.Permission; 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.TileCrafterManager; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; @@ -28,6 +31,13 @@ public class BlockCrafterManager 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_manager/cutouts/front_connected")); + } + + @Override + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.CUTOUT; } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCraftingMonitor.java index be2a23ff0..8819c264c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCraftingMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCraftingMonitor.java @@ -1,14 +1,17 @@ package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSGui; import com.raoulvdberge.refinedstorage.api.network.security.Permission; 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.craftingmonitor.TileCraftingMonitor; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; @@ -27,6 +30,13 @@ public class BlockCraftingMonitor extends BlockNode { @SideOnly(Side.CLIENT) public void registerModels(IModelRegistration modelRegistration) { modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); + + modelRegistration.addBakedModelOverride(info.getId(), base -> new BakedModelFullbright(base, RS.ID + ":blocks/crafting_monitor/cutouts/front_connected")); + } + + @Override + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.CUTOUT; } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java index a518235b7..043756bc2 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java @@ -1,11 +1,13 @@ package com.raoulvdberge.refinedstorage.block; +import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSGui; import com.raoulvdberge.refinedstorage.api.network.grid.GridType; import com.raoulvdberge.refinedstorage.block.info.BlockDirection; import com.raoulvdberge.refinedstorage.block.info.BlockInfoBuilder; import com.raoulvdberge.refinedstorage.item.itemblock.ItemBlockBase; import com.raoulvdberge.refinedstorage.render.IModelRegistration; +import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelFullbright; import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; @@ -15,6 +17,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; @@ -39,6 +42,19 @@ public class BlockGrid extends BlockNode { modelRegistration.setModel(this, GridType.CRAFTING.getId(), new ModelResourceLocation(info.getId(), "connected=false,direction=north,type=crafting")); modelRegistration.setModel(this, GridType.PATTERN.getId(), new ModelResourceLocation(info.getId(), "connected=false,direction=north,type=pattern")); modelRegistration.setModel(this, GridType.FLUID.getId(), new ModelResourceLocation(info.getId(), "connected=false,direction=north,type=fluid")); + + modelRegistration.addBakedModelOverride(info.getId(), base -> new BakedModelFullbright( + base, + RS.ID + ":blocks/grid/cutouts/front_connected", + RS.ID + ":blocks/grid/cutouts/crafting_front_connected", + RS.ID + ":blocks/grid/cutouts/pattern_front_connected", + RS.ID + ":blocks/grid/cutouts/fluid_front_connected" + )); + } + + @Override + public BlockRenderLayer getBlockLayer() { + return BlockRenderLayer.CUTOUT; } @Override diff --git a/src/main/resources/assets/refinedstorage/blockstates/crafter_manager.json b/src/main/resources/assets/refinedstorage/blockstates/crafter_manager.json index 993595235..38d994919 100644 --- a/src/main/resources/assets/refinedstorage/blockstates/crafter_manager.json +++ b/src/main/resources/assets/refinedstorage/blockstates/crafter_manager.json @@ -1,14 +1,15 @@ { "forge_marker": 1, "defaults": { - "model": "cube", + "model": "refinedstorage:cube_cutout_north", "textures": { "particle": "refinedstorage:blocks/side", - "north": "refinedstorage:blocks/crafter_manager_front", - "east": "refinedstorage:blocks/grid_left", - "south": "refinedstorage:blocks/grid_back", - "west": "refinedstorage:blocks/grid_right", - "up": "refinedstorage:blocks/grid_top", + "north": "refinedstorage:blocks/crafter_manager/front", + "east": "refinedstorage:blocks/crafter_manager/left", + "south": "refinedstorage:blocks/crafter_manager/back", + "west": "refinedstorage:blocks/crafter_manager/right", + "up": "refinedstorage:blocks/crafter_manager/top", + "cutout": "refinedstorage:blocks/crafter_manager/cutouts/front_disconnected", "down": "refinedstorage:blocks/bottom" } }, @@ -16,7 +17,7 @@ "connected": { "true": { "textures": { - "north": "refinedstorage:blocks/crafter_manager_front_connected" + "cutout": "refinedstorage:blocks/crafter_manager/cutouts/front_connected" } }, "false": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json b/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json index cba9745e4..e46caeca3 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json @@ -1,15 +1,16 @@ { "forge_marker": 1, "defaults": { - "model": "cube", + "model": "refinedstorage:cube_cutout_north", "textures": { - "particle": "refinedstorage:blocks/crafting_monitor_front", - "north": "refinedstorage:blocks/crafting_monitor_front", - "east": "refinedstorage:blocks/crafting_monitor_left", - "south": "refinedstorage:blocks/crafting_monitor_back", - "west": "refinedstorage:blocks/crafting_monitor_right", - "up": "refinedstorage:blocks/crafting_monitor_top", - "down": "refinedstorage:blocks/bottom" + "particle": "refinedstorage:blocks/crafting_monitor/front", + "north": "refinedstorage:blocks/crafting_monitor/front", + "east": "refinedstorage:blocks/crafting_monitor/left", + "south": "refinedstorage:blocks/crafting_monitor/back", + "west": "refinedstorage:blocks/crafting_monitor/right", + "up": "refinedstorage:blocks/crafting_monitor/top", + "down": "refinedstorage:blocks/bottom", + "cutout": "refinedstorage:blocks/crafting_monitor/cutouts/front_disconnected" } }, "variants": { @@ -22,7 +23,7 @@ "connected": { "true": { "textures": { - "north": "refinedstorage:blocks/crafting_monitor_front_connected" + "cutout": "refinedstorage:blocks/crafting_monitor/cutouts/front_connected" } }, "false": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/grid.json b/src/main/resources/assets/refinedstorage/blockstates/grid.json index 8ecb0356f..c8bd60770 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/grid.json +++ b/src/main/resources/assets/refinedstorage/blockstates/grid.json @@ -1,60 +1,64 @@ { "forge_marker": 1, "defaults": { - "model": "cube", + "model": "refinedstorage:cube_cutout_north", "textures": { "particle": "refinedstorage:blocks/side", - "north": "refinedstorage:blocks/grid_disconnected", - "east": "refinedstorage:blocks/grid_left", - "south": "refinedstorage:blocks/grid_back", - "west": "refinedstorage:blocks/grid_right", - "up": "refinedstorage:blocks/grid_top", - "down": "refinedstorage:blocks/bottom" + "east": "refinedstorage:blocks/grid/left", + "south": "refinedstorage:blocks/grid/back", + "west": "refinedstorage:blocks/grid/right", + "up": "refinedstorage:blocks/grid/top", + "down": "refinedstorage:blocks/bottom", + "north_normal": "refinedstorage:blocks/grid/front", + "north_crafting": "refinedstorage:blocks/grid/crafting_front", + "north_pattern": "refinedstorage:blocks/grid/pattern_front", + "north_fluid": "refinedstorage:blocks/grid/fluid_front", + "cutout_normal": "refinedstorage:blocks/grid/cutouts/front_disconnected", + "cutout_crafting": "refinedstorage:blocks/grid/cutouts/crafting_front_disconnected", + "cutout_pattern": "refinedstorage:blocks/grid/cutouts/pattern_front_disconnected", + "cutout_fluid": "refinedstorage:blocks/grid/cutouts/fluid_front_disconnected" } }, "variants": { "connected": { "true": { "textures": { - "north_normal": "refinedstorage:blocks/grid_front_connected", - "north_crafting": "refinedstorage:blocks/grid_crafting_front_connected", - "north_pattern": "refinedstorage:blocks/grid_pattern_front_connected", - "north_fluid": "refinedstorage:blocks/grid_fluid_front_connected" + "cutout_normal": "refinedstorage:blocks/grid/cutouts/front_connected", + "cutout_crafting": "refinedstorage:blocks/grid/cutouts/crafting_front_connected", + "cutout_pattern": "refinedstorage:blocks/grid/cutouts/pattern_front_connected", + "cutout_fluid": "refinedstorage:blocks/grid/cutouts/fluid_front_connected" } }, "false": { - "textures": { - "north_normal": "refinedstorage:blocks/grid_front", - "north_crafting": "refinedstorage:blocks/grid_crafting_front", - "north_pattern": "refinedstorage:blocks/grid_pattern_front", - "north_fluid": "refinedstorage:blocks/grid_fluid_front" - } } }, "type": { "normal": { "textures": { - "north": "#north_normal" + "north": "#north_normal", + "cutout": "#cutout_normal" } }, "crafting": { "textures": { - "north": "#north_crafting" + "north": "#north_crafting", + "cutout": "#cutout_crafting" } }, "pattern": { "textures": { - "north": "#north_pattern" + "north": "#north_pattern", + "cutout": "#cutout_pattern" } }, "fluid": { "textures": { "north": "#north_fluid", - "east": "refinedstorage:blocks/grid_fluid_left", - "south": "refinedstorage:blocks/grid_fluid_back", - "west": "refinedstorage:blocks/grid_fluid_right", - "up": "refinedstorage:blocks/grid_fluid_top", - "down": "refinedstorage:blocks/bottom" + "cutout": "#cutout_fluid", + "east": "refinedstorage:blocks/grid/fluid_left", + "south": "refinedstorage:blocks/grid/fluid_back", + "west": "refinedstorage:blocks/grid/fluid_right", + "up": "refinedstorage:blocks/grid/fluid_top" } } }, diff --git a/src/main/resources/assets/refinedstorage/models/block/cube_cutout_north.json b/src/main/resources/assets/refinedstorage/models/block/cube_cutout_north.json new file mode 100644 index 000000000..348c5e5ba --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/cube_cutout_north.json @@ -0,0 +1,61 @@ +{ + "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": { + "north": { + "texture": "#cutout", + "cullface": "north" + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_back.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_manager/back.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/grid_back.png rename to src/main/resources/assets/refinedstorage/textures/blocks/crafter_manager/back.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_manager_front_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_manager/cutouts/front_connected.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/crafter_manager_front_connected_glow.png rename to src/main/resources/assets/refinedstorage/textures/blocks/crafter_manager/cutouts/front_connected.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_manager/cutouts/front_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_manager/cutouts/front_disconnected.png new file mode 100644 index 0000000000000000000000000000000000000000..47d8df7d337c1ccc3fd311085450d30387b3a20e GIT binary patch literal 313 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-ZidK5MIEGmGFP#+4byR`JWjE)?wH>?ut1gpOyx_Fv>%IQNR}$3ts|7B` zcN~;G@_?_udF!+uLl$1efS!p#UXP^>*P3cBUAJ18S>^k^x?7*vF}%4D;H?C?l}1VLLn3Dij3znvx*ggj%M(5^>bP0l+XkK D5TR|G literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_manager/front.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_manager/front.png new file mode 100644 index 0000000000000000000000000000000000000000..951973d6350d19606a1bb8e7255527e36467595f GIT binary patch literal 541 zcmV+&0^N2bZe?^J zG%heMGBNQWX_Wu~0h&ofK~y+Tl~dQM!cY)A-(@#86nnugqGB(o_+SO`LEru0xtS4t z2obKrxJh=;WOjCA!r?G1%R(R!fY0YsBqEUrLZJ{m9*^MldiDGrSsM%nA%g4miu?VJ z+wG?Kd_M7bJa9gr^=!Z2W3^ggG#X*CSSZftbG=vur_%|YP6v%fLuj>Hij_)5*NlZi z0r`9$nM?-pcpQVl;H4muNQj_ZF2nwr{~(!6ikK~$SS%)jYPD+T+z&WG1ym>k-drvh zF**ysA)QX6R;$TOLzd(5h+?s5=iCoCLDlto9e%$bhJS~{;b#TSX7i>2#`H?{>Q?q+#s2-|wT>>tQ$?D#s->?1M}+gnp2aZSk6KrA%HE ftbNxImSy1&!8KMnv3ny900000NkvXXu0mjfLPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E-^XO*0N*(00G2FL_t(IPi>OfiUL6lMf)ejT@jt1825Hm zly+CtaY0nv7j*E!6~qU9_lM_HM+OEAbVyg_=H@1)#p7{Z*CUZgC=|kDi9{k6i+!3F z3rReYcxm@BGiv^_>;B-25yWMZo z+U+*JR;v-esZ?q>94dx%It`#&t=jE&o6UxIxm<3y+vD*N@N2bNEfz~A zlc5ByYRP00K)qfk`{SKC91g$V4+G2!KyC8jS|hH9*JXv0N_0 z?)7?oJ|7;VCFx2SXr$R}hQncv?{GN403Z+ukVIASC=mt#Ftl1N#lVc2oiK=8F^TE( zj{yK9)tJC@BpU){V znM`;*ygy*Xyrq|D09S>-D%sC4CPDgMPn18jUz)%NlKgLk(g8(;)$c iVJE;yz;lJ^y8a7`4#MM)B!lJv0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E-^XO*0N*(00N3hL_t(IPi<1$Ym#vo_8(XW=%PU}2s&K^ zQQa(^y3eWTJRg|m6w%>n2hs3CHznD{ybW)H7!~A}j&(q^MM}9-u-bK3HQMyk`FTid zic-<@*)DtGdwIX#@AtgV`@HYV7#~!}a=EvA#$+;a^3US|hr^)( z;c$3iVPSrL9zGh4Mk0}5Fo<8j-|u$2?RNY0^fdg`)D%+FfVsIjlgV_aXXE4J@LH`F z0lZSFR45cusZ<~kOiWDB3__t00F6dtU8jt@g?pdM;g6-zhhku}sSG}!55U;in0m9BYIL(le|9RJmZ*5|&8n3i2 zB+Kzq6AT7}fo4FD(K|5kQq3C> zQLEJ$Dqxr^^kKAkfr>|ZhI+sN4fJZDBy`E=^Fhhoo=r|pB89`@!17@K07HyjIu;E8 zE^y>@I^kU|7k0*MHscy9QMc7z(5-&j0`b07*qoM6N<$g5>#QssI20 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_manager_front_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_manager_front_connected_glow.png.mcmeta deleted file mode 100644 index eea6c1fe1..000000000 --- a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_manager_front_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/crafting_monitor_back.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor/back.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_back.png rename to src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor/back.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_front_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor/cutouts/front_connected.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_front_connected_glow.png rename to src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor/cutouts/front_connected.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor/cutouts/front_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor/cutouts/front_disconnected.png new file mode 100644 index 0000000000000000000000000000000000000000..0e83290075022b88264f7065e87271d5f933ba32 GIT binary patch literal 324 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-Zine&VIEGmGFP-Gb*P_7Vy0=9^sfl~fe_m_5Noo@wXc%`-KQ#T{v_~pR z^%q6mUvw#(NI##Wb6V+0?roJ8h2Q(8o6g!A_N;PW-#v*5bBgumJiobNUG~LZ!|NBN zncwean3~)(DM)L>F$RsG=O%1hDz7t!JJy>lxK${l%G7Dq9?llE_g$0e^(vDGi~Zs+ z+HOABFnvX_6!YAY^~|O}ZZYQjus*P|D(&t6e^9^VsNk+g9I+p5jcOSVH)O6gU+}jU P=za!IS3j3^P6Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00EjwL_t(IPnA>Gs=`nZJl|zEHWYioE}~*D zsQ6$7@j>7H;JKL*eFzb*!njFx&t!IXW5VGuEXzV55P;9;QzRmh2tuI{JRXnW^?LRE z9a$R;1|fp$^@{ubj@#{~_9*dL4ehABKO2!{KKI z&1UnZfOF-DepNsMPS9`^o6Sa}au$9=DwWdMKOS&Va=DzHb3fn&x3t}EzxIG0ESF1U zvspXme!vN~K+mLrJH1}7Q7Vmi`i>58Wkv?3h04WnJsV%yWLJ+Y`0rs zHk*lfJRWQB`9YD0_xu(!OiU&d#p!gaUGH|gDx_iTx!>=j*Xv<894f~pH0*;+ sG=zSTkZtjrZ>3CL6RdsL5SC@(55YB7Ik9^q4gdfE07*qoM6N<$f_Sj#zyJUM literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_left.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor/left.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_left.png rename to src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor/left.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_right.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor/right.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_right.png rename to src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor/right.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_top.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor/top.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_top.png rename to src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor/top.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_front.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_front.png deleted file mode 100755 index 5719629ccb80209c65b8a157efa56409f972bf4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1354 zcmaJ>eM}Q)9KH@`kdH`$Msy}S4>H8j-d(RB*IO&=^#i(4V6{ovg39&ogmqO>NRA|i8`Z{OEyK%k6Q|plw0Hud5yV-gB{;qfsAv?lijoVP9Ua3^ zQE*`qYmf*gJRm04bSYq4S6!IzYU3ROR<#v%Y78WZ1C>Lyc)OHjG#9qO%fPw5jbrG7 ziQ4AE7DY7%8&Hp|0Mu%-8F`WmI*37j+$cs#D(Yr#6HhQPlvmbFfXI}-p8 zfu!7_@Gu`OrCBhH-QykUhENStuZS=yT)S81JK{i616~&fPfUU+Fi~?fO14lIqm{B! zMhCE1jSeB|Fj6E%0D-g9Bu`{{mc!FN)@w1d7TRL=k)+SYdTa#Cx=F%9`)S%@&td~o zQspEbWPOX!cLqy67Rz`Pz^SqlmgV+r6*R@ryY|6*|{ z2G@(^KSh(>f|aOGms$WWmYN7iuyYjHBF}7b-$f9E67agi+V!Tx!MC~_ihBMOR}^R~ z)@e^3E$dB>g7W89Z(`E#jqf>o>5Jjw&v&LGk+rMGKG`z;V0!k!NTs_-8(QbP;{5hD zeRwi2-CtV2Qrj@~&7F}SX2u6!8UR(MkN!II^TVNy&V$E3xQ0wxZp@~TpZbUUUf4L1 zCK{Tqu3dTm_FPT$_`Ce%Z(S$L3(x2G*H)S?-=)H9-poOI2QSYzojLcnc5cUk^sPB9 zH}F-gG-q$~%~egg>AayoPIMQ&xL$gmx@4HxSJW^2*zIC$f-i78cQX;$)kx%4b-+p!PuerZ-M=s8s3hl3perI_UEuyMR!qZN) zFX!mg=}&*D8@+Sj{rgk<=l11)JyL0yyt&(Oe5hyOY~Pn_HdnmSEmmBa*!T3y9otI> z-|iMoyV8W=B)Q^(=23E{o7${p+;uvVZ_OQ4a>7jR| TdvnH$^}k!dSLgkVZSMXD2VB~_ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_front_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_front_connected.png deleted file mode 100644 index 909d701ad7e5cfdd7cb5f782e480d0ee97eb2794..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16174 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
    js(5`t?UIDBps zydCLndOza&&3)TX$$#Ntw($~PaQ$RTQ)AU-lRSy4?42*SJ0GsFxmdA9qgk$bnWoZb zMK@VnzIL^xYOW?3hx(5@Uplo(g}2{>{pby*Tuw=v7q4Ll)rDvtlj$EKMOWD+zsT?&%D#q zZSuvzUsL5n%iaGq8`gzspZGIlE89VbhDqlqTc7{@waRx&(7)?D;?{3+O?r`dBOqvk j%+JG(r;1Me=Q3c({@o?*e|U}qsA%+b^>bP0l+XkKE;Id| literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid/crafting_front.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid/crafting_front.png new file mode 100644 index 0000000000000000000000000000000000000000..d6f059405807c9dfa05e56031611beba088ad926 GIT binary patch literal 554 zcmV+_0@eMAP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00EjwL_t(IPnA>Gs=`nZJl|zEHWYioE}~*D zsQ6$7@j>7H;JKL*eFzb*!njFx&t!IXW5VGuEXzV55P;9;QzRmh2tuI{JRXnW^?LRE z9a$R;1|fp$^@{ubj@#{~_9*dL4ehABKO2!{KKI z&1UnZfOF-DepNsMPS9`^o6Sa}au$9=DwWdMKOS&Va=DzHb3fn&x3t}EzxIG0ESF1U zvspXme!vN~K+mLrJH1}7Q7Vmi`i>58Wkv?3h04WnJsV%yWLJ+Y`0rs zHk*lfJRWQB`9YD0_xu(!OiU&d#p!gaUGH|gDx_iTx!>=j*Xv<894f~pH0*;+ sG=zSTkZtjrZ>3CL6RdsL5SC@(55YB7Ik9^q4gdfE07*qoM6N<$f_Sj#zyJUM literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_crafting_front_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid/cutouts/crafting_front_connected.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/grid_crafting_front_connected_glow.png rename to src/main/resources/assets/refinedstorage/textures/blocks/grid/cutouts/crafting_front_connected.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid/cutouts/crafting_front_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid/cutouts/crafting_front_disconnected.png new file mode 100644 index 0000000000000000000000000000000000000000..00d5198c3a7a9a1265b400a630a3aa71cd720487 GIT binary patch literal 338 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-ZiVk_YIEGmGFP#+4*P_7VdbcINMpaGg_x<~_{GPpP7N^b}_gq+%?`=5w zi}=M9E+Crj8+(1#DleDkb9Su@zW+VZcb$&+)5?AFdkr1-L_k00%Sv}PEA(I?we Zb}Dw6dFQ>qHUNFY;OXk;vd$@?2>^f>g0lbs literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_front_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid/cutouts/fluid_front_connected.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_front_connected_glow.png rename to src/main/resources/assets/refinedstorage/textures/blocks/grid/cutouts/fluid_front_connected.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid/cutouts/fluid_front_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid/cutouts/fluid_front_disconnected.png new file mode 100644 index 0000000000000000000000000000000000000000..9d3830534013be20026ca71856d4259f6f63b62a GIT binary patch literal 312 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-ZidJ~KIEGmGFAa$1JFLL-T2hxwHysUZO$h$J)g7urltGZt*>7>H+-MR zU~)LdOY(qZ8iQ*2d65Rw_h-*=#N1+FG`JeY&KxoSf1>7s@BiwIKYwDYkpFMjoc@QG z%Z_aUqx69zJ!#L@Gwyc~DOc#S7C0)~@yO~$1>?DdDz+Ob{O^EnX7F_Nb6Mw<&;$U{ C6>ts! literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_front_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid/cutouts/front_connected.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/grid_front_connected_glow.png rename to src/main/resources/assets/refinedstorage/textures/blocks/grid/cutouts/front_connected.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid/cutouts/front_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid/cutouts/front_disconnected.png new file mode 100644 index 0000000000000000000000000000000000000000..0d7fbe23a623db7c4b185f1db773d81812fd8460 GIT binary patch literal 323 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-ZiZ*+?IEGmGFP)Ul*P_7FvbTkCYP;Kx|AM>gRPJUpY45OCbDn)}iwK+G zPwuNJ{HspN#WZEkIufP5q1bQFcOfT@^rB-DlE*)4>@{?lQ>>?Cajc^AdF8a)`~8=s zn^PlME=YddwT^X;AoHv_rsB-UY|6uqZOCNe5y-tACSkDe-NKU!OTX;hT=bdcj{o-c z7iQeO@L)Nk>0#LT=By}Z;C1rt33 zJtM=93Yk-ZigtOrIEGmGFP-Gb*P_7Vy0?XkOG|s=@B8Z?E3drB={7TRkBHX)?IO~G zKf9AQwE@xTV^P}2BowWlAF0;AZ1U7}=f3w#b8r8B(aZQK_x2`@r7E9oz>bZtWacu(WBHzqc!b`C)h+Rv-Q}vNG988WnWpn$H+m%>4c!bE19_R28Z|SWDhK6 zlrR0&^-hpkzwlZNkHnO&eTh5zWj`DXVOZC!$kf~a|De9eWK%GDKk*r};_OV#?_K9S QfxckyboFyt=akR{05*MjqyPW_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_back.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid/fluid_back.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_back.png rename to src/main/resources/assets/refinedstorage/textures/blocks/grid/fluid_back.png diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid/fluid_front.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid/fluid_front.png new file mode 100644 index 0000000000000000000000000000000000000000..bd1cab37adf9114c20b8d5d68cb2ddf20bff7f30 GIT binary patch literal 555 zcmV+`0@VG9P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00EmxL_t(IPnA3&`FLX8m)hhdr~0)YU0KA)I~L?Q@A^ZAVH^@_{oBEH}6xZQ3z9*^4FZns#iRv3@RSS%Le`FySyOW<%gpxf=D z*=!2!c3WJjRJ0}+i$xR)1!S{X#9}cFhr?$E@pxPU<#HL1pYb0glSv7)L?arFN}yJ& zJ%r_*U95(znwJyQns^m@IP!<@NOan_+d;Y6HKR5@oYAe*L%I50@*OuJQxhn@AokpjdVs68mxm# tYzX^7L6*feKV!a)Yl5+_7{WA7`~lcNLpLFN6o3E#002ovPDHLkV1m=8Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00EjwL_t(IPnA>Gs=`nZJl|zEHWYioE}~*D zsQ6$7@j>7H;JKL*eFzb*!njFx&t!IXW5VGuEXzV55P;9;QzRmh2tuI{JRXnW^?LRE z9a$R;1|fp$^@{ubj@#{~_9*dL4ehABKO2!{KKI z&1UnZfOF-DepNsMPS9`^o6Sa}au$9=DwWdMKOS&Va=DzHb3fn&x3t}EzxIG0ESF1U zvspXme!vN~K+mLrJH1}7Q7Vmi`i>58Wkv?3h04WnJsV%yWLJ+Y`0rs zHk*lfJRWQB`9YD0_xu(!OiU&d#p!gaUGH|gDx_iTx!>=j*Xv<894f~pH0*;+ sG=zSTkZtjrZ>3CL6RdsL5SC@(55YB7Ik9^q4gdfE07*qoM6N<$f_Sj#zyJUM literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid/left.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid/left.png new file mode 100644 index 0000000000000000000000000000000000000000..eb4e500c5ce553624ae3af919558f6e6a535d46b GIT binary patch literal 1444 zcmaJ>Z%h++7(OXs%pul|FC)&}PGfMhy}Mqo?cG{y+iRgh0SgY$gmLZt3OCxjdcD#@ z7In^zxJ(^r+{BF!+uV$cIt(sTg34Ijgb_FV#~^GfQ$HY*jV**Z;;um1J}@u2`~7>L z=Y4+fpW9trn7d?g_F@Qvmbmj6uQI9=Z+eRIeYdH`pbXE-&T_d#49GE70+5XpeE@cc z*lOSfELXqv5->xMO5jV&<#JB}?H5B@HesWUhr$XPg3Q)A^f<2dLrm8YEECP+013sP$7EVqFKDvjWL8wUrxwGMhc1VDgMX6L2gUKo=t`TK1QX__8hhrw|a84O7aAGX7CXuGu zTQfl7>j3AH#1K3aXPRF?17WvQHoe1U(&NsAew%@`nT!;}7+r*oaFNIymRlfpb6ETT zVo^m5nkbV06isqVsl>!|z6F%Ud=mjd=^ROEkyQu3&W4~x-@6%GX?)P!+#R;PlGa8J2jJaVuXY|OH$nT@IKLt{HvKalC5@o?X(rx8_s z$MA*$X7ZsW!=c{mZ5_#~xO?Wo9ck)!b2~gf`Otj%R(|lpip<6XZ;yQSG_s+jrz~p8 z-gB;7y<_z3$ZrFG=~LU=(ictseZ^F`f7d48<%tW=?_Az9m~~PCwFftf#mC zkDoJC)W@1VXVb<=*BD!kM-Z1n3Cy=9A|kb|I191FRRadAf-wxw3YAZ zR&7Y%E@WpO8WwWXGV|_FKWSaD)H}WHm*@xE&lN!}w_hJ0+THz0(S&P#vvsQU3<(=%6!npa&{xhq?P>)t<~k^vR7fvlI)w3ib9O}DdPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00EjwL_t(IPnA>Gs=`nZJl|zEHWYioE}~*D zsQ6$7@j>7H;JKL*eFzb*!njFx&t!IXW5VGuEXzV55P;9;QzRmh2tuI{JRXnW^?LRE z9a$R;1|fp$^@{ubj@#{~_9*dL4ehABKO2!{KKI z&1UnZfOF-DepNsMPS9`^o6Sa}au$9=DwWdMKOS&Va=DzHb3fn&x3t}EzxIG0ESF1U zvspXme!vN~K+mLrJH1}7Q7Vmi`i>58Wkv?3h04WnJsV%yWLJ+Y`0rs zHk*lfJRWQB`9YD0_xu(!OiU&d#p!gaUGH|gDx_iTx!>=j*Xv<894f~pH0*;+ sG=zSTkZtjrZ>3CL6RdsL5SC@(55YB7Ik9^q4gdfE07*qoM6N<$f_Sj#zyJUM literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid/right.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid/right.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a5b2664638ec8d9cb7db5394d541f394fe092c GIT binary patch literal 1445 zcmaJ>du$VR96uh;%7#H)2y6k)8!97f@7?u|6}-d?*uVJi9v?Q2q>8GRvF1~pg3G)B+DiaVNl}qT3Ymv$t8Ec*Z1@JetzG_ zty@qsZ~VBdaR2~}w->QaZJZE)b)&WKd-Xn}HcU|q%hXc2LJf0@05H7l5kR}2TOv3G zj$i)P8KD3G#z>;8Of7S~OnYU&fs5N1BL0Ae27rROkpSmiCa9oCSRzVh==Zkc5Ge9y z$W1yBN5Crh#G zWoGE1s4~X_&?+keNE(cKFN&gIK4m~j6ONI2AcmkMj8HI&=n<4g5gJ3lMApHXZc*apa4@n1Tx znCc$oV_Pj`c3=ih6zHt!p%+1Z(uGkR*^`T%0soKETLulfib_Rg!B{h{Vh zck7-Ud-VMLE+4Ub!>tcX{*lUzRo^%G2)1*3W<&C6Umk?TCe zSEt9m5Hq0mMFXL>s;tSm=dH2X=k7i**Ou(P-6)6+i(gtfX9pMBkPfez`*hm2nv>5R z{PEpFX2aPlN1DDlu(73j>zk)~>bq|CUF+x%^@ZA`+~HVz z51I{}nz+VY>+`KUd>P$Va&r8d{E3H{;_V+U+&W=L&D4SJMXN>uTc&t7?aZ_N7XNYD M3rpDjmc`Zo0Dzqk;s5{u literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid/top.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid/top.png new file mode 100644 index 0000000000000000000000000000000000000000..0d782d2d0ac7509b77189a1c8380300bef279955 GIT binary patch literal 1411 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 L%Kf^l_0WF+is-VS diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_crafting_front_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/grid_crafting_front_connected_glow.png.mcmeta deleted file mode 100644 index eea6c1fe1..000000000 --- a/src/main/resources/assets/refinedstorage/textures/blocks/grid_crafting_front_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/grid_fluid_front.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_front.png deleted file mode 100755 index 41862b21d30789b8d8cf766513c236620b71bbcb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1352 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 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_front_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_front_connected.png deleted file mode 100755 index 0c2eae411e9fa305459ad998ffcf9174dab1b804..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15498 zcmeI3eNYtV9miKEGodhYY`MF= z+%DW9q2r`FVigl~6k_kEuIJa7BY?yTIn?upEmnFxYBQBh7+fqS<6%UBBjzPY!#5Zu1u zFW)30NY+#GZwc~?!z&QP^h>^`UaEI)Ff)R;fMx|3R}k|0ff_+9#UVeu9+|265y)0Y^-6nv@j+XEw*J^LS|s#_ULk7zzq8h9pT%k*R<*7MQW zW#T#h)_^Arnq_d#!+AkFB49wK1mJHLBtdKz(li;b4ns`Uu*AF50F-Oerg0%YO`2R2 zNej=Z$WU7V6sObt{QwW9KkcCerd58f3d#m53Rs>syRDK8ngU+DCOq||;nOK(z z(~&xYW9cFz$q*JitxaN9MVm^|gt0`Yx0g_MquxWP=4|-n2>9s6LxG|UBsK<1Ay$f?`NfX8qF0!b|RcPX9L(CdVUtmpf z0ltl69Ra}`UNC+-Aae5LwW6`v8((2js^RHx<`?#fa!@*Z3E?p6wPo_7mKsVOcCA5M zSYj{|g{5T{d_iiWKfv4)sb&|BQ^c7hl$@c|gmVl7^r#CbNjWb{LZBV0kUJ!AA=TWg z^GjnD9)6L;;@rS$H`9!~IoU)SP?v!~Wr;3FGUSFLf)ub9Hvtx;r*9+J%=v6!w=M$v zG^W+nfZbZBHycQdFq#Rl3L;ivReBRqa7#ftz?C$Cg=UK!50$aqLSwgwj|0u>I^M?$ zK`}q(IzKJFJ=0A4nmE>m#}Z=&$tf0G9y$*{f8-*i^9M9GI~Gm=c}<(`0geU}qec)s zi+P;nltjN0ZX88RoJ_h9Bej^;SVJ1jgx;(-#z@CaBFZEWr@->=_LxVy(ULtNWwHl2 z$5~pU7v%zLAs?18yM=(4mTbJ2ZsKsiugQWZ3L$0uJTTh@j}QRe;%qt#o~jtil1~D8 z?*Hpaz-T|;ym>f4^A;r-bBd4XijoP%EV3S5}}G{Vq~E} zFH_-l6e$I-YTzvqkH03)Ut;l{>uU}YPxLh#!**&TFb&06#ifV{7O1#j8j7)sOA!$) zP;tRD6k`>aA|hCz;(}=?#wspFM6f``1=CQBRa}aQV1bGYrlAibLorry zDI$UeDlV9YVyxm)L<9>|TrdsASjDA?2o|WgU>b_Cic1j@EKqU5G!$bMmm(rqpyGmQ zD8?!-MMSVb#Rbz)j8$BUh+u(=3#OqMtGE;q!2%T*OhYkNaVa8#1u8C>hGMMZQbYs` zR9r9(#aP9qhzJ&_xL_KJv5HF(5iC$~!88}8i`M;g3t_<9NaCc?*#K_Nf^kmiL9_v|m`QnCy?UgGj z{it#3x!*rI*}MAcwZ{7s|NX-uwr2WFZpDA5iaVxHcXf5;_Y&gzYu4-gj#aO|eRkl} zL(lKG9sKubOanBO9I@ZnWM#Ju^BtF#FQT+^HGi{m}HY_=|pr zJ!AC1S1+7jQN6yic<%azmAigu8~)(J!=a~k3}t;-e59?j0yRy&(>FA>EGOsT%lm_` zwCxB5W=GcTxH?|9y?6Y}{u4K;ZqZl&XN@c4ows`K{o~20J-LR-qeth?{kHY9Tfx?r znevy*O8;a!@jTk#-b42N=<35m7j@j1pI;vH2d;ej`1VV;8-M=C$A9J#| z-?F{p=Qof2;DTp2-=F82ob5NDOOff$+?Q%!m4qAQ;%(3^7hFa?+uNQkLPW> z_u9$66MtJ@iy>?FfBaExZ8zEb)(WP7Usvv~k+p9RjhUtn52Ei64(i@3r_Oy(_lDzG j!;Q6fvpd$#oLPcQ-FPFPZW$8fuZ1hhHc}@`H^2UWrh`Sp diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_front_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/grid_front_connected_glow.png.mcmeta deleted file mode 100644 index eea6c1fe1..000000000 --- a/src/main/resources/assets/refinedstorage/textures/blocks/grid_front_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/grid_pattern_front.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front.png deleted file mode 100755 index 11edb7e9d80682802d856fad52b1da3bab33519d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1373 zcmaJ>e@q)?7(PIekwH{+VJ6P=s&2Yn@2>5&y-N$Uz1DWK3|JF>7$eu-N4Y`o%JsS) zl`P7}0u0GE;+UFEU8V+g1eZ9JK}einmi=MW1cb#25;Ll;!{?Esjb^xPR^2t~9=SnH@Cra2f*b^> zFT#gG72t)|mP^2fAUTp4s8MVDFR&pwqUTdKdMy%#Xaup9YEeGa1XMH#!lGoyZeAG2 zP*JdB)wG}VM_r&%^d=RsCs`f{C7VKwfR&b@HjRY@5uoy@7HO7ZtY*j3ye!F-|h(uCxrLALX75G=iy4JBkYZMSw zASTC^5UfXoE(3 z&HxjQGeVHTjg*lD0&lTWAu_|W9^OKcPN#<^ttNw;qTFT&V`Vsx+rwDgCXdI-WUxLd zrt(q! zT`wPhI__jQ6bc*T^@G#f$z1eyTL~i%zpY|i;E-6R>$;pAd#3*yGc*x&91Q1;QaRes zhxY!x4cl3by!yw4Zga6*c3sX@o;$r=qsRkS=PtinS#aj4<-5O@@4m8g?8Fy)y|c`w zUr%s7OXCBDL$?YJX35yeJ^9;>k*WR%thXAzosOS8@9j7; j1Zs0VMZ3;VES>OH-7yRRL diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front_connected.png deleted file mode 100755 index e37ff7bc32d74a333003da77a759c662f966e212..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15475 zcmeI3eQXow9mkJoZ9_)0q%RAry2(34+f>;1;`f_lL?vzoe3HhL8B;JU(~duYqW+nqbSLq^Xn7G z=E)!Z^DH_3<$1op@AEvL=k5Nvr!{w>*ApZP-B>FWjw0Eue6uh;tVhd@iME4hk{{=iPzvs zUk1cVF@bB661k%WcPI^NT0Kn~rx@imMx9CPqbN#aw(2OOMNb=7XlRl$5~P)&NG(Y* z6v@z}CjG(fWgxOeIX~0va;KXE|JC3DS&lFS5sSriF}+TVwiA@qY9&aTplK~oXr=D3 z%*M50X<5o7l;mbU*U5sJQcHJ)Cz^Rl?2P(&AYWG4sICk2E7}a(0VY#3cn6uj(6>6XJ zWpg5((O?oZ=Og$a9|G-2fB{tyKqMf_q7)E|G?}eVLM+sLU z**1hFnGO5+bk7CQbHCqAQWle0>oxeTTADJLv=$4;YB}1#(LUN@p}p3OHIzQj+QmnO zE}nBo#ZYp?MA)drD~q=V&#d0;4og!_E`LUt-zTHnML8W7y~RM+C5LJ?lMXjoYj#@d z+!hlcIWINWA7E}vRde&_DeY`PIYX&A=L`mDsPh*|y&%bAv>U2WI;0#SYxvD`OEVQg zVS&W5+`w*USf6q@*(DZGSAalexh|(Nl!j7*0`Jr;wF;lmt$;{ceI0zW=~xYO_|d|<8&sk1I;7rg)k?^r0NWS zxoO4ieE~My&U1Dmlb9*UPq7io)CGmPGnXozJE57?F@FIldzx`Zc@`{;7Euf?WH|XL zxqju`co!@43Tcy;qP4W8g)%ZEAZ^Kz&YGl@c^)2-6a3v7k7Bc>ctFa04{(ojtjsRR z1=d17oR9H~(GV-!g%I1$6OnMcjmQ;3%Itl>IK`kC1>NH9dK*!w7|K#^0_E%m3yDo` z8Olb?E6dlnDu-6EGpRSzB=~>_5AaE+!qxey8*ZNpSLdhZGS`L$*-och%PWSml-~R&gN_!2%T*OamFKxR8iofr<;Jfs9pLNJOwe#Rbzq#wso(B3Pi} zf@vUQ6&Df_EKqU5G?1~13yBC8sJLJn$XLaNL<9>|Trdq}tl~lib0~xEhkceP`iVLQJj8$AnM6f``1=B#rx5ZVKd-0MFgSRbX;I+y>uXTS0Udhz> z>YF_n*0UVLw*3slZq9<=k1?#1#IWldF^qWz!>Yu+ZGUlNSjp-Jm!loQ>^7Ut_2%g5fqN>k_(a|FBV}0M`2_w( zV&JVrIaXd?URyd88@m>LbtiRhsk5~D=)UG*>(84y{yTd3;6V!(82s&_L!XZ>+Sb={ z;)H35v-;>%*pD}_+Az2df3LO_+tYmN^Y@RRT03>&$cys$_Nw!X&u(>o(#~xC?D64m zR5q+#wC%v`3-5kyGncd-bE! z|C#u;JTvXVkGHjTe7*mYvvgo!przyf{(YD3xO(z%&=G3ea%#)lH^#?zTv~qpe$DQy ztE>A0{zg|K_)6=(*Sf#hwB&;s>yV*y_wI|oIy?E{0dCFMS+e5qPnJ{Xz_2Do`#Y7F zPoL}>S^m%0Z}#sx%YWQp82iDh0|U(1gL?hsJAeG?jVpiB?l?UA+Ku|J&A$BH`^4di zW8uNOCZ_+O`SyF{k`p8Nm68>||Ndj~hqr6ncK!Rz-%jp)X#eVJ{}X+UF7HnNx(^-= zl~k=e`t**M{;~1cg`dpgj!K-?>m~oW#OST>T-l8(&LtkiUb-^=*UO2%-;F%r3l36~Gcz-; zL(*{X#87OYXUi7b;Q7ScFZ3n+$49QZ{&!z*?c_A}!#DR=OzSI-D6a)K)HS+ZuHCr( E|Fmm4OaK4? diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front_connected_glow.png.mcmeta deleted file mode 100644 index eea6c1fe1..000000000 --- a/src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front_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