From 0ec9f14e599f4c3023e0edfd93cc501ec2fc1352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Sun, 10 Jan 2021 11:14:36 +0100
Subject: [PATCH] Removed unimplemented block.

---
 .../java/li/cil/oc2/common/Constants.java     |   1 -
 .../java/li/cil/oc2/common/block/Blocks.java  |   1 -
 .../li/cil/oc2/common/block/ScreenBlock.java  |  33 ------------------
 .../java/li/cil/oc2/common/item/Items.java    |   1 -
 .../java/li/cil/oc2/data/BlockStates.java     |   1 -
 src/main/java/li/cil/oc2/data/LootTables.java |   1 -
 .../assets/oc2/blockstates/screen.json        |  19 ----------
 src/main/resources/assets/oc2/lang/en_us.json |   8 ++++-
 .../assets/oc2/models/block/screen.json       |   1 -
 .../assets/oc2/models/item/screen.json        |   3 --
 .../textures/blocks/screen/screen_atlas0.png  | Bin 3661 -> 0 bytes
 .../textures/blocks/screen/screen_atlas1.png  | Bin 1326 -> 0 bytes
 .../textures/blocks/screen/screen_down.png    | Bin 592 -> 0 bytes
 .../textures/blocks/screen/screen_east.png    | Bin 650 -> 0 bytes
 .../textures/blocks/screen/screen_north.png   | Bin 425 -> 0 bytes
 .../textures/blocks/screen/screen_south.png   | Bin 635 -> 0 bytes
 .../oc2/textures/blocks/screen/screen_up.png  | Bin 557 -> 0 bytes
 .../textures/blocks/screen/screen_west.png    | Bin 617 -> 0 bytes
 .../data/oc2/loot_tables/blocks/screen.json   |  19 ----------
 19 files changed, 7 insertions(+), 81 deletions(-)
 delete mode 100644 src/main/java/li/cil/oc2/common/block/ScreenBlock.java
 delete mode 100644 src/main/resources/assets/oc2/blockstates/screen.json
 delete mode 100644 src/main/resources/assets/oc2/models/block/screen.json
 delete mode 100644 src/main/resources/assets/oc2/models/item/screen.json
 delete mode 100644 src/main/resources/assets/oc2/textures/blocks/screen/screen_atlas0.png
 delete mode 100644 src/main/resources/assets/oc2/textures/blocks/screen/screen_atlas1.png
 delete mode 100644 src/main/resources/assets/oc2/textures/blocks/screen/screen_down.png
 delete mode 100644 src/main/resources/assets/oc2/textures/blocks/screen/screen_east.png
 delete mode 100644 src/main/resources/assets/oc2/textures/blocks/screen/screen_north.png
 delete mode 100644 src/main/resources/assets/oc2/textures/blocks/screen/screen_south.png
 delete mode 100644 src/main/resources/assets/oc2/textures/blocks/screen/screen_up.png
 delete mode 100644 src/main/resources/assets/oc2/textures/blocks/screen/screen_west.png
 delete mode 100644 src/main/resources/data/oc2/loot_tables/blocks/screen.json

diff --git a/src/main/java/li/cil/oc2/common/Constants.java b/src/main/java/li/cil/oc2/common/Constants.java
index c7f056c8..f97ccf5d 100644
--- a/src/main/java/li/cil/oc2/common/Constants.java
+++ b/src/main/java/li/cil/oc2/common/Constants.java
@@ -18,7 +18,6 @@ public final class Constants {
     public static final String BUS_CABLE_BLOCK_NAME = "bus_cable";
     public static final String NETWORK_CONNECTOR_BLOCK_NAME = "network_connector";
     public static final String REDSTONE_INTERFACE_BLOCK_NAME = "redstone_interface";
-    public static final String SCREEN_BLOCK_NAME = "screen";
 
     ///////////////////////////////////////////////////////////////////
 
diff --git a/src/main/java/li/cil/oc2/common/block/Blocks.java b/src/main/java/li/cil/oc2/common/block/Blocks.java
index c50e0657..df8806b8 100644
--- a/src/main/java/li/cil/oc2/common/block/Blocks.java
+++ b/src/main/java/li/cil/oc2/common/block/Blocks.java
@@ -17,7 +17,6 @@ public final class Blocks {
     public static final RegistryObject<BusCableBlock> BUS_CABLE_BLOCK = BLOCKS.register(Constants.BUS_CABLE_BLOCK_NAME, BusCableBlock::new);
     public static final RegistryObject<NetworkConnectorBlock> NETWORK_CONNECTOR_BLOCK = BLOCKS.register(Constants.NETWORK_CONNECTOR_BLOCK_NAME, NetworkConnectorBlock::new);
     public static final RegistryObject<RedstoneInterfaceBlock> REDSTONE_INTERFACE_BLOCK = BLOCKS.register(Constants.REDSTONE_INTERFACE_BLOCK_NAME, RedstoneInterfaceBlock::new);
-    public static final RegistryObject<ScreenBlock> SCREEN_BLOCK = BLOCKS.register(Constants.SCREEN_BLOCK_NAME, ScreenBlock::new);
 
     ///////////////////////////////////////////////////////////////////
 
diff --git a/src/main/java/li/cil/oc2/common/block/ScreenBlock.java b/src/main/java/li/cil/oc2/common/block/ScreenBlock.java
deleted file mode 100644
index 91024c13..00000000
--- a/src/main/java/li/cil/oc2/common/block/ScreenBlock.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package li.cil.oc2.common.block;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.HorizontalBlock;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.material.Material;
-import net.minecraft.item.BlockItemUseContext;
-import net.minecraft.state.StateContainer;
-import net.minecraft.util.Direction;
-
-public final class ScreenBlock extends HorizontalBlock {
-    public ScreenBlock() {
-        super(Properties
-                .create(Material.IRON)
-                .sound(SoundType.METAL)
-                .hardnessAndResistance(1.5f, 6.0f));
-        setDefaultState(getStateContainer().getBaseState().with(HORIZONTAL_FACING, Direction.NORTH));
-    }
-
-    @Override
-    public BlockState getStateForPlacement(final BlockItemUseContext context) {
-        return super.getDefaultState().with(HORIZONTAL_FACING, context.getPlacementHorizontalFacing().getOpposite());
-    }
-
-    ///////////////////////////////////////////////////////////////////
-
-    @Override
-    protected void fillStateContainer(final StateContainer.Builder<Block, BlockState> builder) {
-        super.fillStateContainer(builder);
-        builder.add(HORIZONTAL_FACING);
-    }
-}
diff --git a/src/main/java/li/cil/oc2/common/item/Items.java b/src/main/java/li/cil/oc2/common/item/Items.java
index 65eeac3d..13f01972 100644
--- a/src/main/java/li/cil/oc2/common/item/Items.java
+++ b/src/main/java/li/cil/oc2/common/item/Items.java
@@ -22,7 +22,6 @@ public final class Items {
     public static final RegistryObject<Item> BUS_CABLE_ITEM = register(Constants.BUS_CABLE_BLOCK_NAME, Blocks.BUS_CABLE_BLOCK);
     public static final RegistryObject<Item> NETWORK_CONNECTOR_ITEM = register(Constants.NETWORK_CONNECTOR_BLOCK_NAME, Blocks.NETWORK_CONNECTOR_BLOCK);
     public static final RegistryObject<Item> REDSTONE_INTERFACE_ITEM = register(Constants.REDSTONE_INTERFACE_BLOCK_NAME, Blocks.REDSTONE_INTERFACE_BLOCK);
-    public static final RegistryObject<Item> SCREEN_ITEM = register(Constants.SCREEN_BLOCK_NAME, Blocks.SCREEN_BLOCK);
 
     ///////////////////////////////////////////////////////////////////
 
diff --git a/src/main/java/li/cil/oc2/data/BlockStates.java b/src/main/java/li/cil/oc2/data/BlockStates.java
index 327f37e4..34a68269 100644
--- a/src/main/java/li/cil/oc2/data/BlockStates.java
+++ b/src/main/java/li/cil/oc2/data/BlockStates.java
@@ -22,7 +22,6 @@ public class BlockStates extends BlockStateProvider {
     protected void registerStatesAndModels() {
         horizontalBlock(Blocks.COMPUTER_BLOCK, Items.COMPUTER_ITEM);
         horizontalBlock(Blocks.REDSTONE_INTERFACE_BLOCK, Items.REDSTONE_INTERFACE_ITEM);
-        horizontalBlock(Blocks.SCREEN_BLOCK, Items.SCREEN_ITEM);
         horizontalFaceBlock(Blocks.NETWORK_CONNECTOR_BLOCK, Items.NETWORK_CONNECTOR_ITEM)
                 .transforms()
                 .transform(ModelBuilder.Perspective.GUI)
diff --git a/src/main/java/li/cil/oc2/data/LootTables.java b/src/main/java/li/cil/oc2/data/LootTables.java
index 5c5321d9..15120f23 100644
--- a/src/main/java/li/cil/oc2/data/LootTables.java
+++ b/src/main/java/li/cil/oc2/data/LootTables.java
@@ -44,7 +44,6 @@ public final class LootTables extends LootTableProvider {
         protected void addTables() {
             registerDropSelfLootTable(Blocks.BUS_CABLE_BLOCK.get());
             registerDropSelfLootTable(Blocks.REDSTONE_INTERFACE_BLOCK.get());
-            registerDropSelfLootTable(Blocks.SCREEN_BLOCK.get());
             registerDropSelfLootTable(Blocks.NETWORK_CONNECTOR_BLOCK.get());
 
             registerLootTable(Blocks.COMPUTER_BLOCK.get(), ModBlockLootTables::droppingWithInventory);
diff --git a/src/main/resources/assets/oc2/blockstates/screen.json b/src/main/resources/assets/oc2/blockstates/screen.json
deleted file mode 100644
index db3bc0fc..00000000
--- a/src/main/resources/assets/oc2/blockstates/screen.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "variants": {
-    "facing=north": {
-      "model": "oc2:block/screen"
-    },
-    "facing=south": {
-      "model": "oc2:block/screen",
-      "y": 180
-    },
-    "facing=west": {
-      "model": "oc2:block/screen",
-      "y": 270
-    },
-    "facing=east": {
-      "model": "oc2:block/screen",
-      "y": 90
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/oc2/lang/en_us.json b/src/main/resources/assets/oc2/lang/en_us.json
index f894bed2..da7680c2 100644
--- a/src/main/resources/assets/oc2/lang/en_us.json
+++ b/src/main/resources/assets/oc2/lang/en_us.json
@@ -5,7 +5,6 @@
   "block.oc2.bus_cable": "Bus Cable",
   "block.oc2.network_connector": "Network Connector",
   "block.oc2.redstone_interface": "Redstone Interface",
-  "block.oc2.screen": "Screen",
 
   "item.oc2.wrench": "Scrench",
   "item.oc2.bus_interface": "Bus Interface",
@@ -16,11 +15,18 @@
   "item.oc2.redstone_interface_card": "Redstone Interface Card",
   "item.oc2.network_interface_card": "Network Interface Card",
 
+  "config.oc2.maxAllocatedMemory": "Maximum allocated memory",
+  "config.oc2.maxMemorySize:": "Maximum memory device size",
+  "config.oc2.maxHardDriveSize": "Maximum hard drive device size",
+  "config.oc2.maxFlashMemorySize:": "Maximum flash memory device size",
+  "config.oc2.computerEnergyPerTick": "Energy/tick used by computers",
+
   "gui.oc2.computer.boot_error.unknown": "Unknown Error",
   "gui.oc2.computer.boot_error.no_memory": "Insufficient Memory",
   "gui.oc2.computer.bus_state.incomplete": "Bus Incomplete",
   "gui.oc2.computer.bus_state.too_complex": "Bus Too Complex",
   "gui.oc2.computer.bus_state.multiple_controllers": "Multiple Bus Controllers",
+  "gui.oc2.computer.error.not_enough_energy": "Not Enough Energy",
 
   "gui.oc2.computer.capture_input.capt": "Capture Input",
   "gui.oc2.computer.capture_input.desc": "When enabled, as long as the mouse cursor is hovering the terminal contents, all input will be captured, including the escape key.",
diff --git a/src/main/resources/assets/oc2/models/block/screen.json b/src/main/resources/assets/oc2/models/block/screen.json
deleted file mode 100644
index 6c6a2efc..00000000
--- a/src/main/resources/assets/oc2/models/block/screen.json
+++ /dev/null
@@ -1 +0,0 @@
-{"parent":"block/block","textures":{"east":"oc2:blocks/screen/screen_east","west":"oc2:blocks/screen/screen_west","down":"oc2:blocks/screen/screen_down","south":"oc2:blocks/screen/screen_south","north":"oc2:blocks/screen/screen_north","up":"oc2:blocks/screen/screen_up","atlas0":"oc2:blocks/screen/screen_atlas0","particle":"#north"},"elements":[{"from":[0,0,10],"to":[16,1,16],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"west","cullface":"west"},"down":{"texture":"down","cullface":"down"},"north":{"texture":"atlas0","uv":[0.0,0.0,4.0,0.25]},"south":{"texture":"south","cullface":"south"}}},{"from":[0,0,6],"to":[6,1,10],"faces":{"east":{"texture":"atlas0","uv":[15.0,15.75,16.0,16.0]},"west":{"texture":"west","cullface":"west"},"down":{"texture":"down","cullface":"down"},"north":{"texture":"north"},"south":{"texture":"south"}}},{"from":[10,0,6],"to":[16,1,10],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"atlas0","uv":[11.0,15.25,12.0,15.5]},"down":{"texture":"down","cullface":"down"},"north":{"texture":"north"},"south":{"texture":"south"}}},{"from":[0,0,0],"to":[16,1,6],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"west","cullface":"west"},"down":{"texture":"down","cullface":"down"},"north":{"texture":"north","cullface":"north"},"south":{"texture":"atlas0","uv":[0.0,0.25,4.0,0.5]}}},{"from":[0,1,0],"to":[16,2,16],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"west","cullface":"west"},"up":{"texture":"atlas0","uv":[0.0,0.5,4.0,4.5]},"down":{"texture":"down"},"north":{"texture":"north","cullface":"north"},"south":{"texture":"south","cullface":"south"}}},{"from":[0,2,14],"to":[16,6,16],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"west","cullface":"west"},"up":{"texture":"atlas0","uv":[0.0,4.5,4.0,5.0]},"north":{"texture":"atlas0","uv":[0.0,5.0,4.0,6.0]},"south":{"texture":"south","cullface":"south"}}},{"from":[1,2,2],"to":[15,6,14],"faces":{"east":{"texture":"east"},"west":{"texture":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"north":{"texture":"north"},"south":{"texture":"south"}}},{"from":[0,2,1],"to":[16,3,2],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"west","cullface":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"north":{"texture":"north"},"south":{"texture":"atlas0","uv":[0.0,6.0,4.0,6.25]}}},{"from":[0,2,0],"to":[2,3,1],"faces":{"east":{"texture":"atlas0","uv":[15.5,15.5,15.75,15.75]},"west":{"texture":"west","cullface":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"north":{"texture":"north","cullface":"north"}}},{"from":[4,2,0],"to":[16,3,1],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"atlas0","uv":[15.75,15.5,16.0,15.75]},"up":{"texture":"up"},"down":{"texture":"down"},"north":{"texture":"north","cullface":"north"}}},{"from":[0,3,0],"to":[16,4,2],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"west","cullface":"west"},"up":{"texture":"atlas0","uv":[0.0,6.25,4.0,6.75]},"down":{"texture":"atlas0","uv":[0.0,6.75,4.0,7.25]},"north":{"texture":"north","cullface":"north"},"south":{"texture":"atlas0","uv":[0.0,7.25,4.0,7.5]}}},{"from":[0,4,1],"to":[16,6,2],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"west","cullface":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"north":{"texture":"north"},"south":{"texture":"atlas0","uv":[0.0,7.5,4.0,8.0]}}},{"from":[0,4,0],"to":[1,15,1],"faces":{"east":{"texture":"atlas0","uv":[8.0,0.5,8.25,3.25]},"west":{"texture":"west","cullface":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"north":{"texture":"north","cullface":"north"}}},{"from":[15,4,0],"to":[16,15,1],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"atlas0","uv":[8.25,0.5,8.5,3.25]},"up":{"texture":"up"},"down":{"texture":"down"},"north":{"texture":"north","cullface":"north"}}},{"from":[0,6,15],"to":[2,7,16],"faces":{"east":{"texture":"atlas0","uv":[14.0,15.25,14.25,15.5]},"west":{"texture":"west","cullface":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"south":{"texture":"south","cullface":"south"}}},{"from":[5,6,15],"to":[6,7,16],"faces":{"east":{"texture":"atlas0","uv":[14.25,15.25,14.5,15.5]},"west":{"texture":"atlas0","uv":[14.5,15.25,14.75,15.5]},"up":{"texture":"up"},"down":{"texture":"down"},"south":{"texture":"south","cullface":"south"}}},{"from":[10,6,15],"to":[11,7,16],"faces":{"east":{"texture":"atlas0","uv":[14.75,15.25,15.0,15.5]},"west":{"texture":"atlas0","uv":[15.0,15.25,15.25,15.5]},"up":{"texture":"up"},"down":{"texture":"down"},"south":{"texture":"south","cullface":"south"}}},{"from":[14,6,15],"to":[16,7,16],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"atlas0","uv":[15.25,15.25,15.5,15.5]},"up":{"texture":"up"},"down":{"texture":"down"},"south":{"texture":"south","cullface":"south"}}},{"from":[0,6,1],"to":[16,7,15],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"west","cullface":"west"},"up":{"texture":"atlas0","uv":[0.0,8.0,4.0,11.5]},"down":{"texture":"atlas0","uv":[0.0,11.5,4.0,15.0]},"north":{"texture":"north"},"south":{"texture":"south"}}},{"from":[0,7,15],"to":[6,8,16],"faces":{"east":{"texture":"atlas0","uv":[15.5,15.25,15.75,15.5]},"west":{"texture":"west","cullface":"west"},"up":{"texture":"atlas0","uv":[12.0,15.75,13.5,16.0]},"down":{"texture":"atlas0","uv":[13.5,15.75,15.0,16.0]},"south":{"texture":"south","cullface":"south"}}},{"from":[10,7,15],"to":[16,8,16],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"atlas0","uv":[15.75,15.25,16.0,15.5]},"up":{"texture":"atlas0","uv":[8.0,15.5,9.5,15.75]},"down":{"texture":"atlas0","uv":[9.5,15.5,11.0,15.75]},"south":{"texture":"south","cullface":"south"}}},{"from":[0,7,8],"to":[16,11,15],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"west","cullface":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"north":{"texture":"atlas0","uv":[0.0,15.0,4.0,16.0]},"south":{"texture":"south"}}},{"from":[1,7,7],"to":[15,14,8],"faces":{"east":{"texture":"east"},"west":{"texture":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"north":{"texture":"north"},"south":{"texture":"south"}}},{"from":[0,7,6],"to":[16,14,7],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"west","cullface":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"north":{"texture":"atlas0","uv":[4.0,11.5,8.0,13.25]},"south":{"texture":"atlas0","uv":[4.0,13.25,8.0,15.0]}}},{"from":[1,7,5],"to":[15,14,6],"faces":{"east":{"texture":"east"},"west":{"texture":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"north":{"texture":"north"},"south":{"texture":"south"}}},{"from":[0,7,4],"to":[16,14,5],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"west","cullface":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"north":{"texture":"atlas0","uv":[8.0,13.25,12.0,15.0]},"south":{"texture":"atlas0","uv":[12.0,13.25,16.0,15.0]}}},{"from":[1,7,3],"to":[15,14,4],"faces":{"east":{"texture":"east"},"west":{"texture":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"north":{"texture":"north"},"south":{"texture":"south"}}},{"from":[0,7,1],"to":[16,14,3],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"west","cullface":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"north":{"texture":"north"},"south":{"texture":"atlas0","uv":[8.0,11.5,12.0,13.25]}}},{"from":[0,8,15],"to":[2,9,16],"faces":{"east":{"texture":"atlas0","uv":[8.0,15.0,8.25,15.25]},"west":{"texture":"west","cullface":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"south":{"texture":"south","cullface":"south"}}},{"from":[5,8,15],"to":[6,9,16],"faces":{"east":{"texture":"atlas0","uv":[8.25,15.0,8.5,15.25]},"west":{"texture":"atlas0","uv":[8.5,15.0,8.75,15.25]},"up":{"texture":"up"},"down":{"texture":"down"},"south":{"texture":"south","cullface":"south"}}},{"from":[10,8,15],"to":[11,9,16],"faces":{"east":{"texture":"atlas0","uv":[8.75,15.0,9.0,15.25]},"west":{"texture":"atlas0","uv":[9.0,15.0,9.25,15.25]},"up":{"texture":"up"},"down":{"texture":"down"},"south":{"texture":"south","cullface":"south"}}},{"from":[14,8,15],"to":[16,9,16],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"atlas0","uv":[9.25,15.0,9.5,15.25]},"up":{"texture":"up"},"down":{"texture":"down"},"south":{"texture":"south","cullface":"south"}}},{"from":[0,9,15],"to":[6,10,16],"faces":{"east":{"texture":"atlas0","uv":[9.5,15.0,9.75,15.25]},"west":{"texture":"west","cullface":"west"},"up":{"texture":"atlas0","uv":[11.0,15.5,12.5,15.75]},"down":{"texture":"atlas0","uv":[12.5,15.5,14.0,15.75]},"south":{"texture":"south","cullface":"south"}}},{"from":[10,9,15],"to":[16,10,16],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"atlas0","uv":[9.75,15.0,10.0,15.25]},"up":{"texture":"atlas0","uv":[14.0,15.5,15.5,15.75]},"down":{"texture":"atlas0","uv":[8.0,15.25,9.5,15.5]},"south":{"texture":"south","cullface":"south"}}},{"from":[0,10,15],"to":[2,11,16],"faces":{"east":{"texture":"atlas0","uv":[10.0,15.0,10.25,15.25]},"west":{"texture":"west","cullface":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"south":{"texture":"south","cullface":"south"}}},{"from":[5,10,15],"to":[11,11,16],"faces":{"east":{"texture":"atlas0","uv":[10.25,15.0,10.5,15.25]},"west":{"texture":"atlas0","uv":[10.5,15.0,10.75,15.25]},"down":{"texture":"atlas0","uv":[9.5,15.25,11.0,15.5]},"south":{"texture":"south","cullface":"south"}}},{"from":[14,10,15],"to":[16,11,16],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"atlas0","uv":[10.75,15.0,11.0,15.25]},"up":{"texture":"up"},"down":{"texture":"down"},"south":{"texture":"south","cullface":"south"}}},{"from":[0,11,8],"to":[16,12,16],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"west","cullface":"west"},"up":{"texture":"atlas0","uv":[4.0,8.0,8.0,10.0]},"down":{"texture":"atlas0","uv":[8.0,8.0,12.0,10.0]},"north":{"texture":"atlas0","uv":[4.0,15.0,8.0,15.25]},"south":{"texture":"south","cullface":"south"}}},{"from":[0,12,15],"to":[2,13,16],"faces":{"east":{"texture":"atlas0","uv":[11.0,15.0,11.25,15.25]},"west":{"texture":"west","cullface":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"south":{"texture":"south","cullface":"south"}}},{"from":[14,12,15],"to":[16,13,16],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"atlas0","uv":[11.25,15.0,11.5,15.25]},"up":{"texture":"up"},"down":{"texture":"down"},"south":{"texture":"south","cullface":"south"}}},{"from":[0,12,8],"to":[16,13,15],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"west","cullface":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"north":{"texture":"atlas0","uv":[4.0,15.25,8.0,15.5]},"south":{"texture":"south"}}},{"from":[0,13,8],"to":[16,14,16],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"west","cullface":"west"},"down":{"texture":"atlas0","uv":[12.0,8.0,16.0,10.0]},"north":{"texture":"atlas0","uv":[4.0,15.5,8.0,15.75]},"south":{"texture":"south","cullface":"south"}}},{"from":[0,14,1],"to":[16,15,16],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"west","cullface":"west"},"up":{"texture":"up"},"down":{"texture":"atlas0","uv":[4.0,0.5,8.0,4.25]},"north":{"texture":"north"},"south":{"texture":"south","cullface":"south"}}},{"from":[0,15,10],"to":[16,16,16],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"west","cullface":"west"},"up":{"texture":"up","cullface":"up"},"north":{"texture":"atlas0","uv":[4.0,15.75,8.0,16.0]},"south":{"texture":"south","cullface":"south"}}},{"from":[0,15,6],"to":[6,16,10],"faces":{"east":{"texture":"atlas0","uv":[12.0,15.25,13.0,15.5]},"west":{"texture":"west","cullface":"west"},"up":{"texture":"up","cullface":"up"},"north":{"texture":"north"},"south":{"texture":"south"}}},{"from":[10,15,6],"to":[16,16,10],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"atlas0","uv":[13.0,15.25,14.0,15.5]},"up":{"texture":"up","cullface":"up"},"north":{"texture":"north"},"south":{"texture":"south"}}},{"from":[0,15,0],"to":[16,16,6],"faces":{"east":{"texture":"east","cullface":"east"},"west":{"texture":"west","cullface":"west"},"up":{"texture":"up","cullface":"up"},"down":{"texture":"atlas0","uv":[12.0,11.5,16.0,13.0]},"north":{"texture":"north","cullface":"north"},"south":{"texture":"atlas0","uv":[8.0,15.75,12.0,16.0]}}}]}
\ No newline at end of file
diff --git a/src/main/resources/assets/oc2/models/item/screen.json b/src/main/resources/assets/oc2/models/item/screen.json
deleted file mode 100644
index 55789501..00000000
--- a/src/main/resources/assets/oc2/models/item/screen.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "parent": "oc2:block/screen"
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/oc2/textures/blocks/screen/screen_atlas0.png b/src/main/resources/assets/oc2/textures/blocks/screen/screen_atlas0.png
deleted file mode 100644
index 5fe39fe268e99649c5de8a80d6691edc9dd29677..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3661
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

diff --git a/src/main/resources/assets/oc2/textures/blocks/screen/screen_atlas1.png b/src/main/resources/assets/oc2/textures/blocks/screen/screen_atlas1.png
deleted file mode 100644
index 72fff11d555529ba7dbef5892302a76a714858d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1326
zcmV+}1=0G6P)<h;3K|Lk000e1NJLTq002M$002M;0ssI2B@5<>000E_Nkl<ZcwX&V
zS#MiK6z&hP?@ivQ@AXac0@%K`;Q>U;61F&rvoz2ps(7Gw_KhOJGZN~Og{G-Y;U6F&
z8c3Ri#;qe~QG_C1Q2$9k-_JgpPQ~-ggFju3jz>OM-#6!+nKMq#b#!!mf2HU6m$&fL
zE4g|le^ALCR`Q2G=W83;+Jjv6e)gb}e|kTAbF3R*K4%-gyWG>++4<FH!FaEK{gdSN
zPlIc{{`klKwU0cES9?9oW9DkF@4D{dXqWD994EiN-5CM=Iuyu^t6+aUtNR<r(Zf8r
zk}>HDX)2-ZI1a|Ye+qSf<3Qen8QF^rF2BHuV5tD4kh;<;drp!)Y>ayr3OIb2rvQPP
z{bWx8!0u{B_cspgo3ij~HIu!Bf-{d-(z?HKJlhCKPS##Xi$Nt(3fZ>{;lTPo_OkFq
zJRaX&wXX)AZe)cnb6ps7(p4&9$HE#wkHD2?p1dk19)SY3mhG#7g9o`+1&}U-AO^6t
zY+nSb>&*y|x&}?jUw7?`z~X2C>f_A@&cFOY;>-6FS3dM$M2~mr!uhd_uZ>+i4-L~r
zU-vf-H|jCbBkbP`F+N$(?yhCFSJIDHGT3vrm(!bfQdoFAGsPr=p!*v~bv<-m-h7xg
zEL_ge#`xzQ`%>u1y-;`yd*Lkxv1y@z{gwcMx^KElKw`1jquVLn-#DH{+o&o)7^}9u
z0?;A5%JxsLs!a{C2!GtNPXKO->cR_eVNV0>G5+?$>$<;j%nb)%d3JX8PYWj}C#R>U
z$H&Joj*gD%^?I#Vt5&NJaHB7w`x^(6XJMpkZ!O$eO`})aS<7JDUddql-@2QAbn8vz
z{pRh|??1j#>PtX_?r$6rFh3kDjCRcp1v7)m*<x~Pz@HvW;@HAC+3!ycBq#cPurC)p
z2w=77Z!w7Z;iS}nRDu*SQlAw}yIk<uHR*3L2=oymApY|HLr@ZTp>m&RT?8}%Tz(0K
z#DQW;eV!Zr2BW{lAW*?%EQ_sC7aREc^Mo568v0ud0ugYOq*ukr+B1IuY@__9{uYB^
z1W1=-CX)%n5MwHp5*bYa7Diw$+J%})6NQ58&vxFyC_$is6ykUEw;062NaIE(Sp-19
zzkBauOsCUMYY(M>QlU}A)(Iddf&!RD5J2{lNHz+X8)_b8WKXU%Vy#n*!2FFUh2mB<
z6cpenDI}2cr5%sX0o~s?WE&L$u5u=*`GXPdknV3B*o8=1m7($`bx9%J-#Adj$Rc#3
zI1nHP-RSI4fIf73(4Xx0CJJ7;-<ulr%Y_7bQZ#eAzi~hSsH3BvA8w2gfGZBz<Cz%n
zri<vMJ!DR)&}gSi7G7wUE;V~0rhdHDO-Kz${=}k_Sob#$Y3779!H*O`1EZZ0=vGOS
zx28ulAf0r7<3J6NF>fl8LNv%*QfP9($|9x!8N(LPP)Gy_8zX=e;@V3~m(6CM*Dhd$
z28Kf7fIGhKZyeH%I<4QR!5i%VtG>r}T7m!pQ`V*ssWT3_T#m~xDI^+j!0G<Ru@qhE
z83g`hA_1W!RfCNJzKQ;gNtRzDEgw1BxC=1?DsTD78P%|{h;NSd2t}urMcVR<JyQ&H
zf8)S5>MDO95L=y;y=bOrUk!jI?lj+i(H*s=0qmvGhP~MMxi^VUX?7?%KN8>pd)KPl
ka2sv3(MB6>v|$`C0H6aJt=1nWTmS$707*qoM6N<$f;u{O?*IS*

diff --git a/src/main/resources/assets/oc2/textures/blocks/screen/screen_down.png b/src/main/resources/assets/oc2/textures/blocks/screen/screen_down.png
deleted file mode 100644
index 291c835d8f6fb2bdbd9bca0f2cdb79ddda19de52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 592
zcmV-W0<ZmvP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0006PNkl<ZcwRk{
z+j7!S6oz>c2;3A*Lh3+sKu4dWKyCFEYzdT>B(393r5uB_R|-Yjadf5!kaAG#llkqW
zvS(*!WoNDRuYavSl1L=t@pvp2<BUe57@U$M#ex+YQm}B~jPR;$YtGL4eldOUN-O8p
zazQO^DwRUo&MVa|Ex2FD!F%%*=LiXEJKE)udU>pVJyHiX<@2Gu?B&=4N7xsx%&%|n
zwdz*-5usYtaD6y?Hfx)Ujx}wWlcsUsw&va3ykpHe<}csEVZV?jyFdVx??o3^W85%q
z>iW$G{rW_oG|Xw!oOi87*BrSD1w$_aik%mgkdoamC3}0x?%OqgcMaprPK{3uU`HO@
z0t5m;7`n==V_lzYd@QAOUEc_nVHo{V>b9=W+SaE7nNB>GL}%_>#<XSK)pdV2nayS&
ze!S!)5~y**1bOM_>{S33bh*7dH9){Mlga$~{(=BL;R7)kf*`si0`khBCQlj$=wV63
zgjE4}TL;{vq)IU@NE5(xMy?76y4kmr)Qw+nPn_rFC#2^W87nK&SYJF*)l@Js=_Wl5
z+xoL9E*Ie(ivI`4<Z1KY^XE%nbap0&#Z0V8LuYVY{_f?j-U;D|03M`4f~#Y2)C*S`
zI5N}4Z|DeaLq{HY3erGMqNGrKhua!Bq14#+rb@3X!sZ?o2_bo}1M#io9Y|POX*-nq
eYDs~-S^ogh{R@1N2XyHG0000<MNUMnLSTYtco7T$

diff --git a/src/main/resources/assets/oc2/textures/blocks/screen/screen_east.png b/src/main/resources/assets/oc2/textures/blocks/screen/screen_east.png
deleted file mode 100644
index 65295ee2e3ad3ab960fcd6bfc461f06fcf8374f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 650
zcmV;50(Jd~P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0006}Nkl<ZcwS|W
z=~Gf+7{&QFWI!=KaAg<ScP<~zKqXoxThu@(Bgt|`qnf5HG#5ZcOM$^O*P^T_voc!M
zvN9K>{*q>z>0GZiQ$6$CbI*J3`OSM7TrPLl&ivyG3k$hBLwn>5yjqXTf^In!dzIE&
z*>$)4nyUm0Pb+eiDIi!U|1oX-K5g9?w`@#Ua#JLHy+fRxBz;Z^!jqNa%}Ej%1>i0K
z*$MLJdJqfp*JgWel03annw_xtoYLHs6#y^*)Gu*3oK{!K+L-0rh<R;{Tpcy9-m$EV
zm{CG_qC&JjPS!gl&?~hvl&Kpo9V`AkY+4>RejPD?xox7=TOnQ<HG9fM%SmHhxe&?a
z>SB}`1qB5cj!2dg#!pGp$1Poo8<&$NR2O0fC_cGtg2kBO;!!EejQsrk^Hq}fL;A(I
z;oYDf3$qY6)a>TNxb4CZF@xJCL?LikLIHT14~aAV+BdiKnSR~to4U*ZR9{`n$FZi2
z|8~$&U0O6B)wEP?0l1;*p!ii(_o7exETW!|>Yn#%;9o|ybU4?eK>~m7fQZdzGgvH^
zf3F}B5Tv_Rvk~=^5VcRk>e+~9u2)MZU=jgg<9;E^6wu%l3^fZLb*Ub7DAV2Qhn=d&
zU1}WR(;>}FrxM3livYE4;8bPNKvPkwO>sA<0CO*>NVO~P-%uh+wNYlKL)CYd@HzMt
zz+^H#b|T!s3;TJIGX%D$kqG-Kg%36GXan`y36vRmd3o+VyzMRHd2NKp#`D++_&+&9
kS}B0}_kjODp@%;H1`D<w+$=XF>i_@%07*qoM6N<$f_eHU;s5{u

diff --git a/src/main/resources/assets/oc2/textures/blocks/screen/screen_north.png b/src/main/resources/assets/oc2/textures/blocks/screen/screen_north.png
deleted file mode 100644
index 59c51792746c9c56bfb5d0cf905b5d66cfd253a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 425
zcmV;a0apHrP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0004SNkl<ZcwTjm
z-A=+l5QX~$ws6Nkl#7-k5TWuGSfdnzrY1(AU`&8QBnB@G2DHkRKSW;w(I@n5mu@zw
zC)>$4Gw1A9NT<`XET>W_*%Jc@E3~w-p@8PTRhl)6)AOR+)&Z!P&>@?+whjXc-~$DI
zDHsg$EJ+fQ>%fDpZ#XtYSFo*rY1S&C#~qtS&q{^uv{_oeaC^EV`4UBuXBwk0IV<9J
zA(2S1K)`$FPhkZc2_%!rv6W{F(H9@4?TuA{nY=Kz3e3l}<%wMZzCO;!<8dJti(NHx
z=tb}EsgIAb@aQN<0?}yHsckbK@8$!jj+w>nB+#pBy=vB}WxIzOVKdwJ8PGS$0Xua+
z&^5L9QD*7ttH<)!y!`3ze$UHGcX#!Ks(*|!i=m3zt!gj}kx1n7AoDU%--hb5qwuis
z;B}xjPVVZ~1U8t3P$+b<uhP>ol(wOC46ij*yF%FBQ@{i&3d|%B4u@&w;lJSzP{@b3
TpB7*(00000NkvXXu0mjfcJ#v+

diff --git a/src/main/resources/assets/oc2/textures/blocks/screen/screen_south.png b/src/main/resources/assets/oc2/textures/blocks/screen/screen_south.png
deleted file mode 100644
index 4ff209e5019300190e51ffa396103a440c05cc72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 635
zcmV->0)+jEP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0006)Nkl<ZcwS|W
zOHUJF6o%(-^b%Te(aTI{rWb3a_u>W!EyYqy6l)2+pv7W=V5qG^Lg@v978KD)D~S-O
zkOGO9xbecu>Ow=P8g{Py7rryovhn16?>yf*=l#wQXZUDsZ9U6}z)<ih2rMXpPcCA}
zg!FS^eKw-cMGXKUg<>Y8n;p_+xfvaX3A};($?nDDEoXhp2|d|q|NW}H&cm;Y>*uyp
zxWeDu5H*bW=+S;Q=A!}eJ|^yGZ}l<A*d;pdXGVO?sGrS-c>^|N!uq2PM}4~;dc5U2
z+Qc5$kC*m3uRJ@zGlN>WTu#6=J*bU(sbQ}s>ecKQ*u6Y^Ft6RqGu0deK<j2Njqbf5
z%WZ%u9bmqcthJI2TFtTcW;h&<ojImfwtZW-*Gks=L4JcwCQDso!frCsLxnwLCBs;)
z*1zAoY&IJ_m03FECXqwk>Zt*`rKN?yNe(cdSIr+*+CHtCH>N3!!t>{A2Xu2rbNJNq
zai#6>nPuuK(=gn*LSOGx1v-?$F7<kvvNXeNHkVUmpi_w!bmB6F-{B02e(L#@`u*~S
zHxEo}Np<NiSx!+e(p(XY`n#g(?L$+-PfDdy0_S!gxt1g`y}w|5y?7qL<szpC3r3;7
zI;p}~!w~nWA5W-ubB1cch+Z{+4!Sqb0hFs0j87(27~>3Lv3S^{TpHu@(YUghP!`9a
ziX~oASsriHW4$VgL_&x}q8mL*c%TutBI;=*IMS^^T>znr*SQVwi23**PD8{8;2*OG
V1YumUL|^~_002ovPDHLkV1igyD@gzV

diff --git a/src/main/resources/assets/oc2/textures/blocks/screen/screen_up.png b/src/main/resources/assets/oc2/textures/blocks/screen/screen_up.png
deleted file mode 100644
index edd97e1f4b11373339596c72e43013c179e50efa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0005>Nkl<ZcwSAC
zS#sJy6h&DH5PpJOmgEo61YSrG$XNt~#E>k&4j2%ig2Wrh7l{qQ*s`fil@;XAYsu*r
zr07z2b?d$R?tMcld$iK&bS9Jef8ji~zLG1&e*gBY>uH^;-mU4airTJf%{Qlks|8in
zuc(2m_Pn#+g^rs50PWPYpNsM?a-L_-E-F8S_T$vqjI4*ydYtgb!TRUsoS--hK-<-x
zrS~?($=;0Y^|i%$KeE3K!PuC7Ey|smE&vFHJ)Sxk)<g4dV1BtWzJ3tjYGAFdO{lhG
z>uKg7Zx28;fbCcWp8LwQk)Jk{N&WS#seBAhB%5F+Nh*<IlUzJ;?#DJ!qn1)E77fEN
z<>I-#GLQ$q@2W%>Iry%|do@6h6*U#S<Im@XLILEYo+pX`Ob?RSK~>{Tez$!SJq5WE
z%&eg-FAYpc0<f3Vs+_`rB(e<ac>?2#o`hj}StN(Q>jtUr8K~DTDiH&Qg@1w*8FP|!
z)XY;T>aiv1+9Bz#r^_l)K6^8?-~oBtr?Tc<--H>{OB^6+pEO)Q=H(}efn9#0Ym`BF
zhZb!WjjPJWNl6-=|2{9llXQ@YkQdrtdWqYZet$ZQ2J`gpLPr$?0urGR!cMIzyqHK&
v=VbDFo-T$jm&;}4=w^@B@sKC?<izbC@uU_jvW#Zy00000NkvXXu0mjf*h&k5

diff --git a/src/main/resources/assets/oc2/textures/blocks/screen/screen_west.png b/src/main/resources/assets/oc2/textures/blocks/screen/screen_west.png
deleted file mode 100644
index e1aac275f25cf7ea70c8c08f9cdebab32a9ce587..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 617
zcmV-v0+#)WP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0006oNkl<ZcwS|V
z`%h9~9LCST!Tr(?fQJs`1>tbVek;T%t<~I2QNc7PvDv!m4{1Tm3qs&!fLRu1<z};*
zc7ZNaDXV2*)<06~hn|;1&e^-?`|R^R@Ao-}+E+Ysxm+fb!8zV@WW~chQJ8CO6~Xq(
z0Z%zJ*h<9lK#>PqD|VO^P(@To+q)Yy-yb--8?-+j)`0VAJHqYxnyop<_Ppcgql2iG
z3PEorBCHnX?8MXdu44?!zrI~Z;degxXDbB28kR``)qL7<wqCP2Ydhm+z@0~#&3pFz
zeFq#NypVQW^^}u>R4VOj(tf^U^&U~fJKW5t87pdE?%KZ2+CJX4Y!n6PJFPAKp}$F+
zOIg}nbS`Nop0fDd`#(%uH)d?>33D!KSxcC3?QcGSuTx^N_)?>0Eot^R%id3!;O{0)
zEr-k2Qx=4)2@|fX2?7@zH4=%0!kj<JWaDh}Ayp>Mwm9ibjP=yg*>PhwZhSKVX8~^~
zcNb1EFK@A#m~kaycoj2(SE7dHh~Y()eH}9*2QQBq0w>fWk%+>8rmv`<jp`wEo`(rw
zi6kQgo{s2KmuY`JO$tJx(0`mB?^Pk?v^b<&8rCn~)IAxhUK*~(6+Cr;#u}DMq06m8
zVc~{uAykDo=y9kDT=F2%M6U{KrGl?c84W1Ie&uM70v-tvMT-jeC^#NFr|fjA1Ofqt
zX|Gl6$m{y&P69rcvZGE3=R!W8Pw{sh9*?&N{?Gpc6wDoVp(`!X00000NkvXXu0mjf
Dm%ACy

diff --git a/src/main/resources/data/oc2/loot_tables/blocks/screen.json b/src/main/resources/data/oc2/loot_tables/blocks/screen.json
deleted file mode 100644
index 819ae953..00000000
--- a/src/main/resources/data/oc2/loot_tables/blocks/screen.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "type": "minecraft:block",
-  "pools": [
-    {
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "minecraft:item",
-          "name": "oc2:screen"
-        }
-      ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file