Removed unimplemented block.

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";
 
     ///////////////////////////////////////////////////////////////////
 

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);
 
     ///////////////////////////////////////////////////////////////////
 

src/main/java/li/cil/oc2/common/block/ScreenBlock.java

@@ -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);
-    }
-}

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);
 
     ///////////////////////////////////////////////////////////////////
 

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)

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

src/main/resources/assets/oc2/blockstates/screen.json

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

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.",

src/main/resources/assets/oc2/models/item/screen.json

@@ -1,3 +0,0 @@
-{
-  "parent": "oc2:block/screen"
-}

src/main/resources/data/oc2/loot_tables/blocks/screen.json

@@ -1,19 +0,0 @@
-{
-  "type": "minecraft:block",
-  "pools": [
-    {
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "minecraft:item",
-          "name": "oc2:screen"
-        }
-      ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
-    }
-  ]
-}