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 BUS_CABLE_BLOCK = BLOCKS.register(Constants.BUS_CABLE_BLOCK_NAME, BusCableBlock::new); public static final RegistryObject NETWORK_CONNECTOR_BLOCK = BLOCKS.register(Constants.NETWORK_CONNECTOR_BLOCK_NAME, NetworkConnectorBlock::new); public static final RegistryObject REDSTONE_INTERFACE_BLOCK = BLOCKS.register(Constants.REDSTONE_INTERFACE_BLOCK_NAME, RedstoneInterfaceBlock::new); - public static final RegistryObject 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 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 BUS_CABLE_ITEM = register(Constants.BUS_CABLE_BLOCK_NAME, Blocks.BUS_CABLE_BLOCK); public static final RegistryObject NETWORK_CONNECTOR_ITEM = register(Constants.NETWORK_CONNECTOR_BLOCK_NAME, Blocks.NETWORK_CONNECTOR_BLOCK); public static final RegistryObject REDSTONE_INTERFACE_ITEM = register(Constants.REDSTONE_INTERFACE_BLOCK_NAME, Blocks.REDSTONE_INTERFACE_BLOCK); - public static final RegistryObject 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 5fe39fe2..00000000 Binary files a/src/main/resources/assets/oc2/textures/blocks/screen/screen_atlas0.png and /dev/null differ 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 72fff11d..00000000 Binary files a/src/main/resources/assets/oc2/textures/blocks/screen/screen_atlas1.png and /dev/null differ 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 291c835d..00000000 Binary files a/src/main/resources/assets/oc2/textures/blocks/screen/screen_down.png and /dev/null differ 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 65295ee2..00000000 Binary files a/src/main/resources/assets/oc2/textures/blocks/screen/screen_east.png and /dev/null differ 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 59c51792..00000000 Binary files a/src/main/resources/assets/oc2/textures/blocks/screen/screen_north.png and /dev/null differ 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 4ff209e5..00000000 Binary files a/src/main/resources/assets/oc2/textures/blocks/screen/screen_south.png and /dev/null differ 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 edd97e1f..00000000 Binary files a/src/main/resources/assets/oc2/textures/blocks/screen/screen_up.png and /dev/null differ 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 e1aac275..00000000 Binary files a/src/main/resources/assets/oc2/textures/blocks/screen/screen_west.png and /dev/null differ 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