From fdfd11e4a8fdf8ca635740780ac50415487b49dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Tue, 27 Oct 2020 15:53:46 +0100 Subject: [PATCH] Some placeholder blocks. --- src/main/java/li/cil/oc2/Constants.java | 2 ++ src/main/java/li/cil/oc2/OpenComputers.java | 6 ++++ .../tile/ComputerTileEntityRenderer.java | 2 +- .../cil/oc2/common/block/ComputerBlock.java | 27 +++++------------ .../common/block/RedstoneInterfaceBlock.java | 28 ++++++++++++++++++ .../li/cil/oc2/common/block/ScreenBlock.java | 28 ++++++++++++++++++ .../java/li/cil/oc2/data/BlockStates.java | 13 ++++++-- .../oc2/blockstates/redstone_interface.json | 19 ++++++++++++ .../assets/oc2/blockstates/screen.json | 19 ++++++++++++ .../oc2/models/block/redstone_interface.json | 1 + .../assets/oc2/models/block/screen.json | 1 + .../oc2/models/item/redstone_interface.json | 3 ++ .../assets/oc2/models/item/screen.json | 3 ++ .../blocks/computer/computer_atlas0.png | Bin 229 -> 384 bytes .../blocks/computer/computer_down.png | Bin 318 -> 433 bytes .../blocks/computer/computer_east.png | Bin 288 -> 386 bytes .../blocks/computer/computer_north.png | Bin 281 -> 352 bytes .../blocks/computer/computer_south.png | Bin 324 -> 441 bytes .../textures/blocks/computer/computer_up.png | Bin 253 -> 335 bytes .../blocks/computer/computer_west.png | Bin 308 -> 392 bytes .../redstone_interface_atlas0.png | Bin 0 -> 302 bytes .../redstone_interface_atlas1.png | Bin 0 -> 223 bytes .../redstone_interface_down.png | Bin 0 -> 323 bytes .../redstone_interface_east.png | Bin 0 -> 424 bytes .../redstone_interface_north.png | Bin 0 -> 415 bytes .../redstone_interface_south.png | Bin 0 -> 436 bytes .../redstone_interface_up.png | Bin 0 -> 343 bytes .../redstone_interface_west.png | Bin 0 -> 425 bytes .../textures/blocks/screen/screen_atlas0.png | Bin 0 -> 379 bytes .../textures/blocks/screen/screen_atlas1.png | Bin 0 -> 256 bytes .../textures/blocks/screen/screen_down.png | Bin 0 -> 323 bytes .../textures/blocks/screen/screen_east.png | Bin 0 -> 411 bytes .../textures/blocks/screen/screen_north.png | Bin 0 -> 354 bytes .../textures/blocks/screen/screen_south.png | Bin 0 -> 420 bytes .../oc2/textures/blocks/screen/screen_up.png | Bin 0 -> 340 bytes .../textures/blocks/screen/screen_west.png | Bin 0 -> 423 bytes 36 files changed, 128 insertions(+), 24 deletions(-) create mode 100644 src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java create mode 100644 src/main/java/li/cil/oc2/common/block/ScreenBlock.java create mode 100644 src/main/resources/assets/oc2/blockstates/redstone_interface.json create mode 100644 src/main/resources/assets/oc2/blockstates/screen.json create mode 100644 src/main/resources/assets/oc2/models/block/redstone_interface.json create mode 100644 src/main/resources/assets/oc2/models/block/screen.json create mode 100644 src/main/resources/assets/oc2/models/item/redstone_interface.json create mode 100644 src/main/resources/assets/oc2/models/item/screen.json create mode 100644 src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_atlas0.png create mode 100644 src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_atlas1.png create mode 100644 src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_down.png create mode 100644 src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_east.png create mode 100644 src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_north.png create mode 100644 src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_south.png create mode 100644 src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_up.png create mode 100644 src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_west.png create mode 100644 src/main/resources/assets/oc2/textures/blocks/screen/screen_atlas0.png create mode 100644 src/main/resources/assets/oc2/textures/blocks/screen/screen_atlas1.png create mode 100644 src/main/resources/assets/oc2/textures/blocks/screen/screen_down.png create mode 100644 src/main/resources/assets/oc2/textures/blocks/screen/screen_east.png create mode 100644 src/main/resources/assets/oc2/textures/blocks/screen/screen_north.png create mode 100644 src/main/resources/assets/oc2/textures/blocks/screen/screen_south.png create mode 100644 src/main/resources/assets/oc2/textures/blocks/screen/screen_up.png create mode 100644 src/main/resources/assets/oc2/textures/blocks/screen/screen_west.png diff --git a/src/main/java/li/cil/oc2/Constants.java b/src/main/java/li/cil/oc2/Constants.java index 776c904d..b3c7d520 100644 --- a/src/main/java/li/cil/oc2/Constants.java +++ b/src/main/java/li/cil/oc2/Constants.java @@ -2,4 +2,6 @@ package li.cil.oc2; public final class Constants { public static final String COMPUTER_BLOCK_NAME = "computer"; + 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/OpenComputers.java b/src/main/java/li/cil/oc2/OpenComputers.java index 11c35e87..98406101 100644 --- a/src/main/java/li/cil/oc2/OpenComputers.java +++ b/src/main/java/li/cil/oc2/OpenComputers.java @@ -4,6 +4,8 @@ import li.cil.oc2.api.API; import li.cil.oc2.client.ClientSetup; import li.cil.oc2.common.CommonSetup; import li.cil.oc2.common.block.ComputerBlock; +import li.cil.oc2.common.block.RedstoneInterfaceBlock; +import li.cil.oc2.common.block.ScreenBlock; import li.cil.oc2.common.container.ComputerContainer; import li.cil.oc2.common.item.RISCVTesterItem; import li.cil.oc2.common.tile.ComputerTileEntity; @@ -34,10 +36,14 @@ public final class OpenComputers { public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, API.MOD_ID); public static final RegistryObject COMPUTER_BLOCK = BLOCKS.register(Constants.COMPUTER_BLOCK_NAME, ComputerBlock::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); public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, API.MOD_ID); public static final RegistryObject RISCV_TESTER = ITEMS.register("riscv_tester", RISCVTesterItem::new); public static final RegistryObject COMPUTER_ITEM = ITEMS.register(Constants.COMPUTER_BLOCK_NAME, () -> new BlockItem(COMPUTER_BLOCK.get(), new Item.Properties().group(ITEM_GROUP))); + public static final RegistryObject REDSTONE_INTERFACE_ITEM = ITEMS.register(Constants.REDSTONE_INTERFACE_BLOCK_NAME, () -> new BlockItem(REDSTONE_INTERFACE_BLOCK.get(), new Item.Properties().group(ITEM_GROUP))); + public static final RegistryObject SCREEN_ITEM = ITEMS.register(Constants.SCREEN_BLOCK_NAME, () -> new BlockItem(SCREEN_BLOCK.get(), new Item.Properties().group(ITEM_GROUP))); public static final DeferredRegister> TILES = DeferredRegister.create(ForgeRegistries.TILE_ENTITIES, API.MOD_ID); public static final RegistryObject> COMPUTER_TILE_ENTITY = TILES.register(Constants.COMPUTER_BLOCK_NAME, () -> TileEntityType.Builder.create(ComputerTileEntity::new, COMPUTER_BLOCK.get()).build(null)); diff --git a/src/main/java/li/cil/oc2/client/render/tile/ComputerTileEntityRenderer.java b/src/main/java/li/cil/oc2/client/render/tile/ComputerTileEntityRenderer.java index 65a874ed..6d401a0b 100644 --- a/src/main/java/li/cil/oc2/client/render/tile/ComputerTileEntityRenderer.java +++ b/src/main/java/li/cil/oc2/client/render/tile/ComputerTileEntityRenderer.java @@ -47,7 +47,7 @@ public final class ComputerTileEntityRenderer extends TileEntityRenderer builder) { super.fillStateContainer(builder); - builder.add(FACING); + builder.add(HORIZONTAL_FACING); } @Override public BlockState getStateForPlacement(final BlockItemUseContext context) { - return super.getDefaultState().with(FACING, context.getPlacementHorizontalFacing().getOpposite()); - } - - @Override - public BlockState rotate(final BlockState state, final IWorld world, final BlockPos pos, final Rotation direction) { - return state.with(FACING, direction.rotate(state.get(FACING))); - } - - @SuppressWarnings("deprecation") - @Override - public BlockState mirror(final BlockState state, final Mirror mirrorIn) { - return state.rotate(mirrorIn.toRotation(state.get(FACING))); + return super.getDefaultState().with(HORIZONTAL_FACING, context.getPlacementHorizontalFacing().getOpposite()); } @Override diff --git a/src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java b/src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java new file mode 100644 index 00000000..5af6237a --- /dev/null +++ b/src/main/java/li/cil/oc2/common/block/RedstoneInterfaceBlock.java @@ -0,0 +1,28 @@ +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 RedstoneInterfaceBlock extends HorizontalBlock { + public RedstoneInterfaceBlock() { + super(Properties.create(Material.IRON).sound(SoundType.METAL)); + setDefaultState(getStateContainer().getBaseState().with(HORIZONTAL_FACING, Direction.NORTH)); + } + + @Override + protected void fillStateContainer(final StateContainer.Builder builder) { + super.fillStateContainer(builder); + builder.add(HORIZONTAL_FACING); + } + + @Override + public BlockState getStateForPlacement(final BlockItemUseContext context) { + return super.getDefaultState().with(HORIZONTAL_FACING, context.getPlacementHorizontalFacing().getOpposite()); + } +} diff --git a/src/main/java/li/cil/oc2/common/block/ScreenBlock.java b/src/main/java/li/cil/oc2/common/block/ScreenBlock.java new file mode 100644 index 00000000..5b37301f --- /dev/null +++ b/src/main/java/li/cil/oc2/common/block/ScreenBlock.java @@ -0,0 +1,28 @@ +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)); + setDefaultState(getStateContainer().getBaseState().with(HORIZONTAL_FACING, Direction.NORTH)); + } + + @Override + protected void fillStateContainer(final StateContainer.Builder builder) { + super.fillStateContainer(builder); + builder.add(HORIZONTAL_FACING); + } + + @Override + public BlockState getStateForPlacement(final BlockItemUseContext context) { + return super.getDefaultState().with(HORIZONTAL_FACING, context.getPlacementHorizontalFacing().getOpposite()); + } +} diff --git a/src/main/java/li/cil/oc2/data/BlockStates.java b/src/main/java/li/cil/oc2/data/BlockStates.java index 1de5e9a9..4555f0d6 100644 --- a/src/main/java/li/cil/oc2/data/BlockStates.java +++ b/src/main/java/li/cil/oc2/data/BlockStates.java @@ -2,9 +2,12 @@ package li.cil.oc2.data; import li.cil.oc2.OpenComputers; import li.cil.oc2.api.API; +import net.minecraft.block.Block; import net.minecraft.data.DataGenerator; +import net.minecraft.item.Item; import net.minecraftforge.client.model.generators.BlockStateProvider; import net.minecraftforge.client.model.generators.ExistingFileHelper; +import net.minecraftforge.fml.RegistryObject; public class BlockStates extends BlockStateProvider { public BlockStates(final DataGenerator generator, final ExistingFileHelper existingFileHelper) { @@ -13,9 +16,13 @@ public class BlockStates extends BlockStateProvider { @Override protected void registerStatesAndModels() { - horizontalBlock(OpenComputers.COMPUTER_BLOCK.get(), models().getBuilder(OpenComputers.COMPUTER_BLOCK.getId().getPath())); + horizontalBlock(OpenComputers.COMPUTER_BLOCK, OpenComputers.COMPUTER_ITEM); + horizontalBlock(OpenComputers.REDSTONE_INTERFACE_BLOCK, OpenComputers.REDSTONE_INTERFACE_ITEM); + horizontalBlock(OpenComputers.SCREEN_BLOCK, OpenComputers.SCREEN_ITEM); + } - itemModels().getBuilder(OpenComputers.COMPUTER_ITEM.getId().getPath()) - .parent(models().getExistingFile(OpenComputers.COMPUTER_BLOCK.getId())); + private void horizontalBlock(final RegistryObject block, final RegistryObject item) { + horizontalBlock(block.get(), models().getBuilder(block.getId().getPath())); + itemModels().getBuilder(item.getId().getPath()).parent(models().getExistingFile(block.getId())); } } diff --git a/src/main/resources/assets/oc2/blockstates/redstone_interface.json b/src/main/resources/assets/oc2/blockstates/redstone_interface.json new file mode 100644 index 00000000..021f72da --- /dev/null +++ b/src/main/resources/assets/oc2/blockstates/redstone_interface.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "oc2:block/redstone_interface" + }, + "facing=south": { + "model": "oc2:block/redstone_interface", + "y": 180 + }, + "facing=west": { + "model": "oc2:block/redstone_interface", + "y": 270 + }, + "facing=east": { + "model": "oc2:block/redstone_interface", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/blockstates/screen.json b/src/main/resources/assets/oc2/blockstates/screen.json new file mode 100644 index 00000000..db3bc0fc --- /dev/null +++ b/src/main/resources/assets/oc2/blockstates/screen.json @@ -0,0 +1,19 @@ +{ + "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/models/block/redstone_interface.json b/src/main/resources/assets/oc2/models/block/redstone_interface.json new file mode 100644 index 00000000..d7bcb458 --- /dev/null +++ b/src/main/resources/assets/oc2/models/block/redstone_interface.json @@ -0,0 +1 @@ +{"parent":"block/block","textures":{"west":"oc2:blocks/redstone_interface/redstone_interface_west","down":"oc2:blocks/redstone_interface/redstone_interface_down","south":"oc2:blocks/redstone_interface/redstone_interface_south","east":"oc2:blocks/redstone_interface/redstone_interface_east","north":"oc2:blocks/redstone_interface/redstone_interface_north","up":"oc2:blocks/redstone_interface/redstone_interface_up","atlas0":"oc2:blocks/redstone_interface/redstone_interface_atlas0","atlas1":"oc2:blocks/redstone_interface/redstone_interface_atlas1","particle":"#north"},"elements":[{"from":[0,8,13],"to":[1,11,13],"faces":{"north":{"texture":"atlas1","cullface":"west","uv":[6,0,7,3]}}},{"from":[0,8,3],"to":[1,8,13],"faces":{"up":{"texture":"atlas1","cullface":"west","uv":[0,0,1,10]}}},{"from":[0,2,12],"to":[1,6,12],"faces":{"north":{"texture":"atlas0","cullface":"west","uv":[8,11,9,15]}}},{"from":[0,2,4],"to":[1,2,12],"faces":{"up":{"texture":"atlas1","cullface":"west","uv":[4,0,5,8]}}},{"from":[0,6,4],"to":[1,6,12],"faces":{"down":{"texture":"atlas1","cullface":"west","uv":[2,0,3,8]}}},{"from":[0,2,4],"to":[1,6,4],"faces":{"south":{"texture":"atlas0","cullface":"west","uv":[4,11,5,15]}}},{"from":[0,11,3],"to":[1,11,13],"faces":{"down":{"texture":"atlas0","cullface":"west","uv":[0,5,1,15]}}},{"from":[0,8,3],"to":[1,11,3],"faces":{"south":{"texture":"atlas0","cullface":"west","uv":[12,11,13,14]}}},{"from":[2,0,14],"to":[14,1,14],"faces":{"north":{"texture":"atlas0","cullface":"down","uv":[0,3,12,4]}}},{"from":[2,0,2],"to":[2,1,14],"faces":{"east":{"texture":"atlas0","cullface":"down","uv":[0,2,12,3]}}},{"from":[14,0,2],"to":[14,1,14],"faces":{"west":{"texture":"atlas0","cullface":"down","uv":[0,0,12,1]}}},{"from":[2,0,2],"to":[14,1,2],"faces":{"south":{"texture":"atlas0","cullface":"down","uv":[0,1,12,2]}}},{"from":[3,8,15],"to":[3,11,16],"faces":{"east":{"texture":"atlas0","cullface":"south","uv":[14,11,15,14]}}},{"from":[4,2,15],"to":[4,6,16],"faces":{"east":{"texture":"atlas0","cullface":"south","uv":[6,11,7,15]}}},{"from":[12,2,15],"to":[12,6,16],"faces":{"west":{"texture":"atlas0","cullface":"south","uv":[2,11,3,15]}}},{"from":[4,6,15],"to":[12,6,16],"faces":{"down":{"texture":"atlas0","cullface":"south","uv":[2,7,10,8]}}},{"from":[4,2,15],"to":[12,2,16],"faces":{"up":{"texture":"atlas0","cullface":"south","uv":[2,9,10,10]}}},{"from":[13,8,15],"to":[13,11,16],"faces":{"west":{"texture":"atlas0","cullface":"south","uv":[10,11,11,14]}}},{"from":[3,11,15],"to":[13,11,16],"faces":{"down":{"texture":"atlas0","cullface":"south","uv":[0,4,10,5]}}},{"from":[3,8,15],"to":[13,8,16],"faces":{"up":{"texture":"atlas0","cullface":"south","uv":[2,5,12,6]}}},{"from":[15,11,3],"to":[16,11,13],"faces":{"down":{"texture":"atlas0","cullface":"east","uv":[1,5,2,15]}}},{"from":[15,2,4],"to":[16,6,4],"faces":{"south":{"texture":"atlas0","cullface":"east","uv":[5,11,6,15]}}},{"from":[15,8,3],"to":[16,8,13],"faces":{"up":{"texture":"atlas1","cullface":"east","uv":[1,0,2,10]}}},{"from":[15,8,3],"to":[16,11,3],"faces":{"south":{"texture":"atlas0","cullface":"east","uv":[13,11,14,14]}}},{"from":[15,8,13],"to":[16,11,13],"faces":{"north":{"texture":"atlas1","cullface":"east","uv":[7,0,8,3]}}},{"from":[15,2,12],"to":[16,6,12],"faces":{"north":{"texture":"atlas0","cullface":"east","uv":[9,11,10,15]}}},{"from":[15,2,4],"to":[16,2,12],"faces":{"up":{"texture":"atlas1","cullface":"east","uv":[5,0,6,8]}}},{"from":[15,6,4],"to":[16,6,12],"faces":{"down":{"texture":"atlas1","cullface":"east","uv":[3,0,4,8]}}},{"from":[3,11,0],"to":[13,11,1],"faces":{"down":{"texture":"atlas0","cullface":"north","uv":[0,15,10,16]}}},{"from":[3,8,0],"to":[3,11,1],"faces":{"east":{"texture":"atlas0","cullface":"north","uv":[15,11,16,14]}}},{"from":[13,8,0],"to":[13,11,1],"faces":{"west":{"texture":"atlas0","cullface":"north","uv":[11,11,12,14]}}},{"from":[12,2,0],"to":[12,6,1],"faces":{"west":{"texture":"atlas0","cullface":"north","uv":[3,11,4,15]}}},{"from":[4,2,0],"to":[4,6,1],"faces":{"east":{"texture":"atlas0","cullface":"north","uv":[7,11,8,15]}}},{"from":[4,6,0],"to":[12,6,1],"faces":{"down":{"texture":"atlas0","cullface":"north","uv":[2,8,10,9]}}},{"from":[4,2,0],"to":[12,2,1],"faces":{"up":{"texture":"atlas0","cullface":"north","uv":[2,10,10,11]}}},{"from":[3,8,0],"to":[13,8,1],"faces":{"up":{"texture":"atlas0","cullface":"north","uv":[2,6,12,7]}}},{"from":[0,11,0],"to":[0,16,16],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[0,8,13],"to":[0,11,16],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[0,8,0],"to":[0,11,3],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[0,0,0],"to":[0,8,4],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[0,0,12],"to":[0,8,16],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[0,0,4],"to":[0,2,12],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[0,6,4],"to":[0,8,12],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[1,2,4],"to":[1,6,12],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[1,8,3],"to":[1,11,13],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[2,0,14],"to":[16,0,16],"faces":{"down":{"texture":"down","cullface":"down"}}},{"from":[14,0,0],"to":[16,0,14],"faces":{"down":{"texture":"down","cullface":"down"}}},{"from":[0,0,0],"to":[14,0,2],"faces":{"down":{"texture":"down","cullface":"down"}}},{"from":[0,0,2],"to":[2,0,16],"faces":{"down":{"texture":"down","cullface":"down"}}},{"from":[2,1,2],"to":[14,1,14],"faces":{"down":{"texture":"down","cullface":"down"}}},{"from":[0,11,16],"to":[16,16,16],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[12,0,16],"to":[16,8,16],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[13,8,16],"to":[16,11,16],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[0,8,16],"to":[3,11,16],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[0,0,16],"to":[4,8,16],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[4,0,16],"to":[12,2,16],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[4,6,16],"to":[12,8,16],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[4,2,15],"to":[12,6,15],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[3,8,15],"to":[13,11,15],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[16,11,0],"to":[16,16,16],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[16,0,0],"to":[16,8,4],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[16,8,0],"to":[16,11,3],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[16,8,13],"to":[16,11,16],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[16,0,12],"to":[16,8,16],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[16,0,4],"to":[16,2,12],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[16,6,4],"to":[16,8,12],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[15,2,4],"to":[15,6,12],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[15,8,3],"to":[15,11,13],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[0,11,0],"to":[16,16,0],"faces":{"north":{"texture":"north","cullface":"north"}}},{"from":[0,8,0],"to":[3,11,0],"faces":{"north":{"texture":"north","cullface":"north"}}},{"from":[13,8,0],"to":[16,11,0],"faces":{"north":{"texture":"north","cullface":"north"}}},{"from":[12,0,0],"to":[16,8,0],"faces":{"north":{"texture":"north","cullface":"north"}}},{"from":[0,0,0],"to":[4,8,0],"faces":{"north":{"texture":"north","cullface":"north"}}},{"from":[4,0,0],"to":[12,2,0],"faces":{"north":{"texture":"north","cullface":"north"}}},{"from":[4,6,0],"to":[12,8,0],"faces":{"north":{"texture":"north","cullface":"north"}}},{"from":[4,2,1],"to":[12,6,1],"faces":{"north":{"texture":"north","cullface":"north"}}},{"from":[3,8,1],"to":[13,11,1],"faces":{"north":{"texture":"north","cullface":"north"}}},{"from":[0,16,0],"to":[16,16,16],"faces":{"up":{"texture":"up","cullface":"up"}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/block/screen.json b/src/main/resources/assets/oc2/models/block/screen.json new file mode 100644 index 00000000..79df36cc --- /dev/null +++ b/src/main/resources/assets/oc2/models/block/screen.json @@ -0,0 +1 @@ +{"parent":"block/block","textures":{"west":"oc2:blocks/screen/screen_west","down":"oc2:blocks/screen/screen_down","south":"oc2:blocks/screen/screen_south","east":"oc2:blocks/screen/screen_east","north":"oc2:blocks/screen/screen_north","up":"oc2:blocks/screen/screen_up","atlas0":"oc2:blocks/screen/screen_atlas0","atlas1":"oc2:blocks/screen/screen_atlas1","particle":"#north"},"elements":[{"from":[0,7,6],"to":[1,14,6],"faces":{"north":{"texture":"atlas1","cullface":"west","uv":[12,0,13,7]}}},{"from":[0,7,4],"to":[1,14,4],"faces":{"north":{"texture":"atlas1","cullface":"west","uv":[14,0,15,7]}}},{"from":[0,7,7],"to":[1,7,8],"faces":{"up":{"texture":"atlas0","cullface":"west","uv":[15,14,16,15]}}},{"from":[0,7,5],"to":[1,7,6],"faces":{"up":{"texture":"atlas0","cullface":"west","uv":[4,13,5,14]}}},{"from":[0,7,3],"to":[1,7,4],"faces":{"up":{"texture":"atlas0","cullface":"west","uv":[6,13,7,14]}}},{"from":[0,7,8],"to":[1,14,8],"faces":{"north":{"texture":"atlas1","cullface":"west","uv":[10,0,11,7]}}},{"from":[0,2,2],"to":[1,2,14],"faces":{"up":{"texture":"atlas1","cullface":"west","uv":[0,0,1,12]}}},{"from":[0,2,14],"to":[1,6,14],"faces":{"north":{"texture":"atlas1","cullface":"west","uv":[8,7,9,11]}}},{"from":[0,6,2],"to":[1,6,14],"faces":{"down":{"texture":"atlas0","cullface":"west","uv":[0,3,1,15]}}},{"from":[0,2,2],"to":[1,6,2],"faces":{"south":{"texture":"atlas1","cullface":"west","uv":[5,7,6,11]}}},{"from":[0,14,7],"to":[1,14,8],"faces":{"down":{"texture":"atlas0","cullface":"west","uv":[5,14,6,15]}}},{"from":[0,7,7],"to":[1,14,7],"faces":{"south":{"texture":"atlas1","cullface":"west","uv":[4,0,5,7]}}},{"from":[0,14,5],"to":[1,14,6],"faces":{"down":{"texture":"atlas0","cullface":"west","uv":[7,14,8,15]}}},{"from":[0,7,5],"to":[1,14,5],"faces":{"south":{"texture":"atlas1","cullface":"west","uv":[6,0,7,7]}}},{"from":[0,14,3],"to":[1,14,4],"faces":{"down":{"texture":"atlas0","cullface":"west","uv":[9,14,10,15]}}},{"from":[0,7,3],"to":[1,14,3],"faces":{"south":{"texture":"atlas1","cullface":"west","uv":[8,0,9,7]}}},{"from":[2,0,14],"to":[14,1,14],"faces":{"north":{"texture":"atlas0","cullface":"down","uv":[2,7,14,8]}}},{"from":[2,0,2],"to":[2,1,14],"faces":{"east":{"texture":"atlas0","cullface":"down","uv":[2,6,14,7]}}},{"from":[14,0,2],"to":[14,1,14],"faces":{"west":{"texture":"atlas0","cullface":"down","uv":[0,2,12,3]}}},{"from":[2,0,2],"to":[14,1,2],"faces":{"south":{"texture":"atlas0","cullface":"down","uv":[2,5,14,6]}}},{"from":[2,8,15],"to":[2,9,16],"faces":{"east":{"texture":"atlas0","cullface":"south","uv":[12,14,13,15]}}},{"from":[2,10,15],"to":[2,11,16],"faces":{"east":{"texture":"atlas0","cullface":"south","uv":[13,14,14,15]}}},{"from":[2,12,15],"to":[2,13,16],"faces":{"east":{"texture":"atlas0","cullface":"south","uv":[14,14,15,15]}}},{"from":[4,2,15],"to":[4,6,16],"faces":{"east":{"texture":"atlas1","cullface":"south","uv":[7,7,8,11]}}},{"from":[12,2,15],"to":[12,6,16],"faces":{"west":{"texture":"atlas1","cullface":"south","uv":[4,7,5,11]}}},{"from":[4,6,15],"to":[12,6,16],"faces":{"down":{"texture":"atlas0","cullface":"south","uv":[2,11,10,12]}}},{"from":[4,2,15],"to":[12,2,16],"faces":{"up":{"texture":"atlas0","cullface":"south","uv":[2,12,10,13]}}},{"from":[14,8,15],"to":[14,9,16],"faces":{"west":{"texture":"atlas0","cullface":"south","uv":[2,14,3,15]}}},{"from":[2,9,15],"to":[14,9,16],"faces":{"down":{"texture":"atlas0","cullface":"south","uv":[0,15,12,16]}}},{"from":[2,8,15],"to":[14,8,16],"faces":{"up":{"texture":"atlas0","cullface":"south","uv":[2,8,14,9]}}},{"from":[14,10,15],"to":[14,11,16],"faces":{"west":{"texture":"atlas0","cullface":"south","uv":[3,14,4,15]}}},{"from":[2,11,15],"to":[14,11,16],"faces":{"down":{"texture":"atlas0","cullface":"south","uv":[2,3,14,4]}}},{"from":[2,10,15],"to":[14,10,16],"faces":{"up":{"texture":"atlas0","cullface":"south","uv":[2,9,14,10]}}},{"from":[14,12,15],"to":[14,13,16],"faces":{"west":{"texture":"atlas0","cullface":"south","uv":[4,14,5,15]}}},{"from":[2,13,15],"to":[14,13,16],"faces":{"down":{"texture":"atlas0","cullface":"south","uv":[2,4,14,5]}}},{"from":[2,12,15],"to":[14,12,16],"faces":{"up":{"texture":"atlas0","cullface":"south","uv":[2,10,14,11]}}},{"from":[15,7,5],"to":[16,14,5],"faces":{"south":{"texture":"atlas1","cullface":"east","uv":[7,0,8,7]}}},{"from":[15,7,4],"to":[16,14,4],"faces":{"north":{"texture":"atlas1","cullface":"east","uv":[15,0,16,7]}}},{"from":[15,7,7],"to":[16,14,7],"faces":{"south":{"texture":"atlas1","cullface":"east","uv":[5,0,6,7]}}},{"from":[15,7,6],"to":[16,14,6],"faces":{"north":{"texture":"atlas1","cullface":"east","uv":[13,0,14,7]}}},{"from":[15,6,2],"to":[16,6,14],"faces":{"down":{"texture":"atlas0","cullface":"east","uv":[1,3,2,15]}}},{"from":[15,7,3],"to":[16,14,3],"faces":{"south":{"texture":"atlas1","cullface":"east","uv":[9,0,10,7]}}},{"from":[15,14,7],"to":[16,14,8],"faces":{"down":{"texture":"atlas0","cullface":"east","uv":[6,14,7,15]}}},{"from":[15,14,5],"to":[16,14,6],"faces":{"down":{"texture":"atlas0","cullface":"east","uv":[8,14,9,15]}}},{"from":[15,14,3],"to":[16,14,4],"faces":{"down":{"texture":"atlas0","cullface":"east","uv":[10,14,11,15]}}},{"from":[15,7,8],"to":[16,14,8],"faces":{"north":{"texture":"atlas1","cullface":"east","uv":[11,0,12,7]}}},{"from":[15,7,7],"to":[16,7,8],"faces":{"up":{"texture":"atlas0","cullface":"east","uv":[3,13,4,14]}}},{"from":[15,7,5],"to":[16,7,6],"faces":{"up":{"texture":"atlas0","cullface":"east","uv":[5,13,6,14]}}},{"from":[15,7,3],"to":[16,7,4],"faces":{"up":{"texture":"atlas0","cullface":"east","uv":[7,13,8,14]}}},{"from":[15,2,2],"to":[16,6,2],"faces":{"south":{"texture":"atlas1","cullface":"east","uv":[6,7,7,11]}}},{"from":[15,2,2],"to":[16,2,14],"faces":{"up":{"texture":"atlas1","cullface":"east","uv":[1,0,2,12]}}},{"from":[15,2,14],"to":[16,6,14],"faces":{"north":{"texture":"atlas1","cullface":"east","uv":[9,7,10,11]}}},{"from":[2,3,0],"to":[4,3,1],"faces":{"down":{"texture":"atlas0","cullface":"north","uv":[12,15,14,16]}}},{"from":[4,2,0],"to":[4,3,1],"faces":{"west":{"texture":"atlas0","cullface":"north","uv":[2,13,3,14]}}},{"from":[15,4,0],"to":[15,15,1],"faces":{"west":{"texture":"atlas1","cullface":"north","uv":[2,0,3,11]}}},{"from":[1,15,0],"to":[15,15,1],"faces":{"down":{"texture":"atlas0","cullface":"north","uv":[0,0,14,1]}}},{"from":[1,4,0],"to":[1,15,1],"faces":{"east":{"texture":"atlas1","cullface":"north","uv":[3,0,4,11]}}},{"from":[2,2,0],"to":[2,3,1],"faces":{"east":{"texture":"atlas0","cullface":"north","uv":[11,14,12,15]}}},{"from":[2,2,0],"to":[4,2,1],"faces":{"up":{"texture":"atlas0","cullface":"north","uv":[14,15,16,16]}}},{"from":[1,4,0],"to":[15,4,1],"faces":{"up":{"texture":"atlas0","cullface":"north","uv":[0,1,14,2]}}},{"from":[0,7,6],"to":[0,14,7],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[0,7,4],"to":[0,14,5],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[0,6,3],"to":[0,7,8],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[0,6,8],"to":[0,16,16],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[0,14,3],"to":[0,16,8],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[0,6,0],"to":[0,16,3],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[0,0,0],"to":[0,2,14],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[0,2,0],"to":[0,6,2],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[0,0,14],"to":[0,6,16],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[1,2,2],"to":[1,6,14],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[1,7,7],"to":[1,14,8],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[1,7,5],"to":[1,14,6],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[1,7,3],"to":[1,14,4],"faces":{"west":{"texture":"west","cullface":"west"}}},{"from":[2,0,14],"to":[16,0,16],"faces":{"down":{"texture":"down","cullface":"down"}}},{"from":[14,0,0],"to":[16,0,14],"faces":{"down":{"texture":"down","cullface":"down"}}},{"from":[0,0,0],"to":[14,0,2],"faces":{"down":{"texture":"down","cullface":"down"}}},{"from":[0,0,2],"to":[2,0,16],"faces":{"down":{"texture":"down","cullface":"down"}}},{"from":[2,1,2],"to":[14,1,14],"faces":{"down":{"texture":"down","cullface":"down"}}},{"from":[0,13,16],"to":[16,16,16],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[2,11,16],"to":[14,12,16],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[2,9,16],"to":[14,10,16],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[14,8,16],"to":[16,13,16],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[0,8,16],"to":[2,13,16],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[12,0,16],"to":[16,8,16],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[0,0,16],"to":[4,8,16],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[4,0,16],"to":[12,2,16],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[4,6,16],"to":[12,8,16],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[4,2,15],"to":[12,6,15],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[2,8,15],"to":[14,9,15],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[2,10,15],"to":[14,11,15],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[2,12,15],"to":[14,13,15],"faces":{"south":{"texture":"south","cullface":"south"}}},{"from":[16,7,4],"to":[16,14,5],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[16,7,6],"to":[16,14,7],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[16,6,0],"to":[16,16,3],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[16,14,3],"to":[16,16,8],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[16,6,8],"to":[16,16,16],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[16,6,3],"to":[16,7,8],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[16,0,0],"to":[16,6,2],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[16,0,2],"to":[16,2,16],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[16,2,14],"to":[16,6,16],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[15,2,2],"to":[15,6,14],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[15,7,7],"to":[15,14,8],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[15,7,5],"to":[15,14,6],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[15,7,3],"to":[15,14,4],"faces":{"east":{"texture":"east","cullface":"east"}}},{"from":[2,3,0],"to":[4,4,0],"faces":{"north":{"texture":"north","cullface":"north"}}},{"from":[4,0,0],"to":[16,4,0],"faces":{"north":{"texture":"north","cullface":"north"}}},{"from":[2,0,0],"to":[4,2,0],"faces":{"north":{"texture":"north","cullface":"north"}}},{"from":[15,4,0],"to":[16,16,0],"faces":{"north":{"texture":"north","cullface":"north"}}},{"from":[0,15,0],"to":[15,16,0],"faces":{"north":{"texture":"north","cullface":"north"}}},{"from":[0,4,0],"to":[1,15,0],"faces":{"north":{"texture":"north","cullface":"north"}}},{"from":[0,0,0],"to":[2,4,0],"faces":{"north":{"texture":"north","cullface":"north"}}},{"from":[2,2,1],"to":[4,3,1],"faces":{"north":{"texture":"north","cullface":"north"}}},{"from":[1,4,1],"to":[15,15,1],"faces":{"north":{"texture":"north","cullface":"north"}}},{"from":[0,16,0],"to":[16,16,16],"faces":{"up":{"texture":"up","cullface":"up"}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/redstone_interface.json b/src/main/resources/assets/oc2/models/item/redstone_interface.json new file mode 100644 index 00000000..63064536 --- /dev/null +++ b/src/main/resources/assets/oc2/models/item/redstone_interface.json @@ -0,0 +1,3 @@ +{ + "parent": "oc2:block/redstone_interface" +} \ 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 new file mode 100644 index 00000000..55789501 --- /dev/null +++ b/src/main/resources/assets/oc2/models/item/screen.json @@ -0,0 +1,3 @@ +{ + "parent": "oc2:block/screen" +} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/textures/blocks/computer/computer_atlas0.png b/src/main/resources/assets/oc2/textures/blocks/computer/computer_atlas0.png index d232b50b9c76dd524a5526f05734b7c283a2703c..7b35b45a64d615aecb1813763acfa58fafeef50d 100644 GIT binary patch delta 358 zcmV-s0h#{g0e}OLBYy!$Nkl z5ua@G3&GRS>-9LBtt3eht=H=xMbk9Diu?U8f$%T@>dj`eT7Ru(vl+V>+M+fO1Nm|G zVzEFynM~@s{#MkA+wE3W6@jc4YEt6t`FuVajRu23S(ex9RaOZE`Lv`s%jI%9o%+7- zdEVDQd7eKX+C~aTK4BPgJccw)_xru6(_o;SHn|1VO*wHx&l& z3Ul`bhr@wh(qB}nL{{VRn0v_0)M+RMPt=XWMs9S&)M<*MU{3JJ2r(L_!hl|!PA5Hl zcqm%8+wF8Z1g08jI0H+Yu<;(Qq7Rf+0_hUXWqnip0S*0l04?p+DgXcg07*qoM6N<$ Ef73OJYEJ_l`>u&3!Afzaz3Mz;g&opG(Ddpim+D-im(=`Re@`T zEOjR_cp9icC){x{SMKXWBMdIKu2s&gGmP0;P1YISXog3~ibF(Q8C^d_2N-o5i*Z8jUnactXu*I11Ia5Pr@p3mnn41M2sUDvj4UDw|l7){e$E*G92 zkH<7kN`MshmqwoFpBhP$L{SvSF?N<^Je|+y`~6OSCAi&g!heRb-|s&(wi$-TNsFQ&*ztJ8K$&S^lx2w%4Sr}!U|AN0rfC|6AI-Piync|VL zR#ioE8LP^`wy)PKUP#PNYNG~OpX?hk1Zb)U1l$RmCq}9vr?D990XFO7f@Z-uj%Wx# zQU=gyaD4pJ9!`z|Ha9w7tDHBWM7iX}Sg_E30E4Z;+7JlTo7n&W002ovPDHLkV1jO* Bww?e0 delta 291 zcmV+;0o?wv1HJ-~B!2}-L_t(|UR{z~5`!QNMY|Q~{#S;I{1@#phoaLvVaE zB8Wy3M6#hMQV>S)XbBS>N5Bpzu#kfneN>hJW zU?kd>?ipx_j@^Sb?T07CPB^v%4I0r@z$feT8hT+QAN$=BW7*{y+wdlOO91b^C8C{S za$CxVonhR;1WYatz@&7=ZpoIe3eLdWOSOQvn-X}XF*F>!@lnV5{6W0BI&>~=B-p^j p8ULb+P#-hQK^(o>Q<+a=P`(u9109pQGLirQ002ovPDHLkV1h;@hY$b& diff --git a/src/main/resources/assets/oc2/textures/blocks/computer/computer_east.png b/src/main/resources/assets/oc2/textures/blocks/computer/computer_east.png index 836474c68ae01b0e4fcb8564552e8e9925ee972f..e83f5652b6b7c5563611b981be65cc3858c905e0 100644 GIT binary patch delta 360 zcmV-u0hj)u0)hjOBYy!&NklD ziD0{NAubejA&4=(?_Dzucp%sNX6DYQUMx`*y;|s@@M7qx3O{Yz-tYJJ2^O2Cx!rCw z7*^PUH+Pf%?x+J#wOuVEOnEy_w?FMpQ{jDkC#&v1`F)E$Ac zD7#LllevKR;cy6o00zp5z!G+_csw4>1vK{iy#%1X?~7*=pt#%ZpbFo1yY+jpP3=E9 zW&*#K&1M7r>0kxGi$Tl;>blOdY`tE;S;ph>yG1-&d7f8Q<$0dMw_2?bfR08Z4hg70 z%d(u$=NNbdv|-k1nl6{iBuTXX8V-k0_@emG`V*O=C}y)6#!SF<-Nj-tnM`mLLvb7< zAevav;=o`qP>$n#cVLZp{DF|I60000e-V*$jvJI**L7JI5sDi;Sj$^Dd#4>N(H|YOErGkMPOVh7 z3HVvyQi=Z}gFvGGr%nHo@YDjFC#hY0h|#?(tcqZ$pTycRomjy0qC;x z4rKtGh`sKr9=h*)DxL*h*S!kN*&2r7GSWQH61dtLA|2#duT=(QsgC$kM1<%3j`$#8 zglU@U8QSt`jN{1KV>qgh91npG9p&>f*IAV`skfvHJ-@*H)%=t{U`I>!f>T6300000 LNkvXXu0mjfx@vfk diff --git a/src/main/resources/assets/oc2/textures/blocks/computer/computer_north.png b/src/main/resources/assets/oc2/textures/blocks/computer/computer_north.png index 8e73e3b408f971d951b4659bb7e9ccd8ab94867b..5ed30472edba8cb491c20b2502699fa55bc921b2 100644 GIT binary patch delta 326 zcmV-M0lEH}0^kCWBYy!WNklK>!WIP>cv~1>8q^HqQ=! Y0d=J02K0z3VE_OC07*qoM6N<$g3Wf3?*IS* delta 254 zcmVD7SR8?IygkIj{p+t(M zAOmmwFDER^l2V%IIT@S)uGnhz!@#DLl5<|y6|!wxIl!T>fP!7X2fLjxO;gWfj3}!B z^-wWDSCst;cw;QIQh{5_m?!Yjw^#HsxL31Q2Mw)?>#mvu(|7nqJkX2Xp$gog#~{-T zv{PGBG|EU}B@0pKB5ekSCJGu8@$9leq3b%ta)B+DCR|NnfRch>Ow zhR0i@?hY<+ho0zpkv4-mK4bVD+3tpVOl^qh$+MyO50#4nk!-n`AOHXW07*qoM6N<$ Ef-InRtN;K2 diff --git a/src/main/resources/assets/oc2/textures/blocks/computer/computer_south.png b/src/main/resources/assets/oc2/textures/blocks/computer/computer_south.png index 2a27093b7a17d250911b818c90faf57f4f44490b..5f7dc2e20134228eecb8695a91f1483e0b44d65d 100644 GIT binary patch delta 415 zcmV;Q0bu^b0=WZ_B!7TOL_t(|UUiS#YQjJmg!39kjWIrhRU>MQ=u5Sw@8yl67Db2w z4^)I$&JT?Du=_<#L&h<2Yy>M*tIM3bDiCaNn@o?c|I^B4G;Pz{-@o-EPAT zsLf`xTCFw@NL?%zOQlkwP+$Xs*m}K&HN!BL%jIY^nog%*0^{)*2R|WTJg`_S?u8%- z=JRh(Iz+lxRt zorbxl1sLCGGzjRr9u{bS{za$Ld2(8<7ED;v1tO8ie;DFP{{YblQ4q%Sa_s;B002ov JPDHLkV1m#CR|5KH@GzTOJ~l zHg=rS#27;eZQBCKj)R2*VU8NmaU7)-<(%^mz6O^Ynn2=qJ}R#4^eLsY0R$6h9LKKf z$kGH%)1+eG_Y`TUBZ+SqhTeiI6mp_)*|Wj5Xn;~=D5zO1=zsViXM+^tXG$8~!4#00000NkvXXu0mjfvg(T8 diff --git a/src/main/resources/assets/oc2/textures/blocks/computer/computer_up.png b/src/main/resources/assets/oc2/textures/blocks/computer/computer_up.png index 83e6392e19d4d6d4e1c70d917d09b33a94c4f367..30ba28fed8d1f58aa83c4000255b7c7bcd9bfc39 100644 GIT binary patch delta 309 zcmV-50m}aU0nY-EBYy!FNkle={`%*U@VxJPp69l0%d!l^Fpgu_bxMfyJn#E{T^F=Zfb=*H`I#|r z&MDC$G)#$~U|rXk*iGn}Ms4w<3%*O|vXBne3p2p~#(Tzx_&KXKL_GP3%ah8z>T~G5N7K2-GUkLgL{K_d2X6$`(9C8Ld)vvsvcDsh95OvbgR`0Yly~I{FG%`RTX@{-%Eqr?N-$g z4dWBm1!j8&*z@v~H94mX3>28-8jI8DO%S&u8cGqmbu$k|bG{MNyRJUxtU|vTVo)L0~eOz`Ec#4(CUs5gZwGyWLKw z1EbsRHe#_@jK^aFgjJ)_NDR_6old9UHPER6D@I{maQ=e+yCabC7n*e?876Pw4FCWD M07*qoM6N<$f?c_)_y7O^ delta 282 zcmV+#0pn8jEiFr1 zyG~M?5JGpO%Gn;Hc1gv$R zlvPR6i1rBl%6Be}^w3x~oq1IPF+}x}9tXM+;~l*u*AxeSa(~cS#dbUn!HRneDo88` z@~a2U2Oo`G&*ISgC@&?!+qR8348zAjGLGXkP1=D9p$O!#?>mt*cw)Oog5x-fKs_M9 z*Uo+xzp!JRQ<_O2tm~T9Lu+GQmW4PNV7OJ^_YzPNgwlgPIB!}YPX^6Ek@~M5e4v`( gd)eKurhV`SAQP)hEOZSPv;Y7A07*qoM6N<$f(?#+r~m)} diff --git a/src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_atlas0.png b/src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_atlas0.png new file mode 100644 index 0000000000000000000000000000000000000000..ac62dbbed81d08e80780163d9af54efe3f39db15 GIT binary patch literal 302 zcmV+}0nz@6P)NklwzsBPQcF6+8-B2UW3Hh5-n z`UZJmUWAzO>Kkk|A7QXB9YYWVXX0dWB(&C!lo2%|6e8t_d*6l%thPVqM2?Q(LQK=t z_kC4WMNy<_dL@i8j+EgU=6Qypu4@>ei{tp80Tq^I8HS;0nzAgjEHeZWU#<3`QDGd% zuItbhJgAfBITBy3Xa*F)-!;*;?Q;h?Z%M%MH$&<2Adv8uY*ZMA@Nm<27u-N`AoRZL zuK`^pNpd5wA5NkuLi7g!A;FU%qCIXhAbhn_9|3bj1dYjp2LJ#707*qoM6N<$g1b?B A3jhEB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_atlas1.png b/src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_atlas1.png new file mode 100644 index 0000000000000000000000000000000000000000..c78856e416673686ca9e8910366606403fd73be1 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|%RF5iLn`9lp7Z8vHV|n|G+)$v z@?W`70JO>)hu%+j3*WXQs?wAm$`< zeB=Ayn{+OlEDZB1{4T&LcK)+Wa>==sExXz4G`g5dIT*JZwsC**D(KuAmTk+!EY4zD zCvjY`^#1qU+eMBB6Q1wS3j3^P6$<9{vMdV^Oa4)LM11FYZre7F zW8e2(*ELP^_8@87b{Gb>)^$CO!wHbW&hwlkzwx@E-@-dD%R+R5d7i}u$+f0@@Z^0=hm`;T literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_east.png b/src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_east.png new file mode 100644 index 0000000000000000000000000000000000000000..dab939846da5a163beb3219b72b743e2cdf119d9 GIT binary patch literal 424 zcmV;Z0ayNsP)6omIR5+&O7-fRLIYhSJHd$mn1`4Lnw3xc46?Tr^AZ322Bh%uerquYQ38NWR{ zb5?ezWZU+=5-}XCftZ}(r!33!`CQ(JhDA}FPA39{8Ft`IyGhmE_Ek8d|NjEcw1WWB zIRc8w0!GKyV z*6X!Z5z5-DM~cb9x6*30f`45_69}vUHCb3J7NgN&7$WWhAe z;cyrP0UkxD-EO0x-B-dD1!}b#GYn&J71n6Re~6-ph8nP4zJQLYbPHOB65tP`ZFm1`ADFlZB$^N|5cEK}crYI1peLiUHPh?FxUteys=KRt zVEumIFbrMS4GARxtk4pxAwyHw_2qIopU)82>$ScCL&X3LB7l#S0=-GBCb)~FK>?&O z0^d87roU1K@k^)E398rY=@Lq)3~k9KUN{^MSO>O^@;Rr1{^2|t3{YrcJ06d)v2M3p zRTU1*IIkE(O)YCL#mu(BdpUs>HW7ezyWJx8ZCPKY`C*!$vZkD4LX077yWI{fUf66l znx;W$|8PGf8|!pBWmy(QQA!jN4_XNkXt&$z^?I>btX8WR3DdtWP0IiP002ov JPDHLkV1gRruIK;& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_south.png b/src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_south.png new file mode 100644 index 0000000000000000000000000000000000000000..202d50dd038f8f62f16d2e03c7df2ca092dc272b GIT binary patch literal 436 zcmV;l0ZaagP)_Hk+ntHX02Gu+pZ05>lf@ppM7m`FxgqI-N@TH((|RLCM*_2dmAhayT4#01A_! z5JL%9nU@*)3>ib0KM7~Q-^*dZjerz#wratKBL9c&c8h!LIG?T?Q5sXKIB^`#t_$04 zx4Ud8iUR!ZI5{B&At9xO5U7B^g)j^w&vU*3YO~qsy56&Gd@r{BWLZ5*p2wsMH5!e;m%wy79SjDO$;9{lK)@GJ8iwI;IGfFQpjN9f#`^s}xYcTn$MwwTgA!ZWoN+t$^owU|c-`j1R*Q22Im=0O^mvNRp&fiJ}M$GtmSp emCApjq<;XE5mvQ%GALL>Puq6d6r& zz}(P8))I*5GjYVP>zXTIuBEQ)q+tYUTOci3auqa z>AL=O$AhlbYWf|bnJYeV94AQvU$56V!{u^G?hp+#$D9V}^D`hnFHhw|&ZPkw0`ziE zk`I4LGGbHJYV~|R(<5Z@QzPUN7#nT+!tr>7J<|*<>$_}wWZS-FF{dz`PA6DZDwX|y zPxQmG4oXq)rYYjhFhsb9f$eZOz^Ys>Z?{{NYnqN>Pz2Dg^*Vxj%UTS(-7XFA+iW(( z5as`n&#~QJ_{^|guUD%TLO2I4E77G=NfnF5#bPm=&ERgg`-GBmzD$^9^RyYl4zd`=*L?G=KS;ab5 TRnW?v00000NkvXXu0mjfAxFRl literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..3c93fb2faf3a8f05927937abcb954bd9863e1a2c GIT binary patch literal 379 zcmV->0fhdEP)pE6v90dw;@Pr~4URc_15`>lSB9q=D$8}xX zwq3yy)Q6FByWK9A%kg+DiXu(ZBuU~p{t?13WXUEW5?VpiG>^yQ&)`>JUzbGNRONI! zae&@VG4H};GEoO?foLl@91h&ur7CZNDeDDUmQi$7RdrogPt>o4ZnG8Sc^*a4`Ft+R zl9y3o`GifD8iM`?8p1R7`#oZ{nShTar2dP*d@j{nmNg!a&6kkSm&6-PfojZbwJ$fc zy^#KN8g=yeUO-#JsH z>E>)U(-8`S0NG}<8Rm8HH8k7z{Z9c+r^I0hJkOg>r-ZOf>c|{y9jC#BV=0?LIQo9S Z{{!9!b8A`okZu3~002ovPDHLkV1nGXt4ja? literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..6406795e6dd45375a9c878b73688936b5533dc4f GIT binary patch literal 256 zcmV+b0ssDqP)!ZP!p{nC`My6@x#xKY}^pMLEi`29cBijIM4Gq4z0B@=AF$<9{vMdV^Oa4)LM11FYZre7F zW8e2(*ELP^_8@87b{Gb>)^$CO!wHbW&hwlkzwx@E-@-dD%R+R5d7i}u$+f0@@Z^0=hm`;T literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..198c0bc0c9b5a3ff697846a5ba734c1c7464ecc6 GIT binary patch literal 411 zcmV;M0c8G(P)uSP45JvYk5+$bg{hz?9s0qgV4-qe53f}Pw`a=*kJ-cJJrGAj($z*1BRUan#eE!o! z9O72Qg^HgfNuJMV@)jvR9*_I|E<&?n2k)|5BAfR6J#suA@zd!B=k#1I zhd@4vOs7*Mj$=5R%^?3opTM{6c54Tq=Xr24nFuLDikr;_DxSq+;r$66a5x;o!C=5^ zzu$+_rU$-FxC4ySNQK~57}Epe@wm}wbh};HY&Ki1R=eHqbUNY)#7Co1Hk(yEoJ(sI zML`hM>-8uN#V`zEU_#q#px5hFDwT4%3~RNTuv)Dm&{k;E1Fq|`?8}51kwT$REEXXZ zq*N+VgzcL4O=RcX94XSaT8eq zJAY}KCd|0w4jw2Gw!qF8hG7sc@jTCFQX^p;N8HXChSB#uAs)v&{|YN$d%-l#wr%Nx zzr>cw*mWJ?{e`A!C`a{jh+csVOxJZz)3my-G4sdY6OOIXGO)d%s%lkLlw)bO058iD zx9^2K&*2!%<`hLqlEm}8AP8L7^?jcNoP=Qr$M)mv z?fvr=0Wc>?()SZZQ3Q|Un2vz=f-K9#+3@V}7ry81f7ylSI{*Lx07*qoM6N<$f+sqk Av;Y7A literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..533f01d0864dbfbf64a204d954de7ee1bb47a108 GIT binary patch literal 420 zcmV;V0bBlwP)2$XRgBP?`X$91rA zhki${#M`m~?3m4F5#fu#f*rJ!Q!bYUK0L$oJh0<9^?IGT(P$_}YcLpqvw_iQ)a&(z z!=Y{44#6fUjX=NOACJfBK&e!cQo61SuGMP3|B8f^?_ke+k@Ag9ztia;fUqbQi#XS8 zHo@pU6D-RDqqGQE-)glG&@?R_!1Tvobi3W0({8uH2n&r+C=~t^IsFTWnsRdtmQ2zB O0000N9P)ew zHdG=+<}6K91!5Y1nkG*mGGXJ07IJ`*Ct}f@6<}z~L!bfIlwr&44t!K@HPssnCOAY8s zkLf>784RroK})-EAII$Yk{As5hUx5QOJ7Br34H{|lJ)1Uy!wztCvZjmCJzGy2Pj>^IXwvb&W~RCiZ(kMcb4BgG%> zx~`W(G=0S{j^iXr;MeOF8$6%SB!y_0K4u-DhA)>3YYvA4Yp&NTT28qJ2-fKU1p(^Q z=_FRV=kr-E%R1I)Hsv_Z5wJc^TM__D}`oisYgO|%Cyjrb+GEm)!zJ`~6-A_;>*0 z(P#t@hr^5o7(`%uU-&kd&*vOL2xp*VB)U*2sC+)p?q09g>2%;PgKoEr?)UrB5iyxe zFzY}RMeTOG*=z(u)PC=!NB+Zdc9t)R>{EVMx#-y)ewwmqOs|K zWm#-0l}eu}DwPUcE|+2YB4BKoRW6tF4Oqk0Fadb1J-Yl|KAZv`2&K~g%lNi RdOiRE002ovPDHLkV1nI*!ovUn literal 0 HcmV?d00001