From ee340763175cd2781395e4b586a323ebe20efa7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Tue, 19 Jan 2021 02:10:42 +0100 Subject: [PATCH] Renamed block and item texture directories to match naming of vanilla ones. --- .../ComputerTileEntityRenderer.java | 6 ++-- .../li/cil/oc2/data/ModItemModelProvider.java | 26 +++++++++--------- .../assets/oc2/models/block/cable_base.json | 2 +- .../models/item/block_operations_module.json | 2 +- .../assets/oc2/models/item/flash_memory.json | 2 +- .../assets/oc2/models/item/hard_drive.json | 2 +- .../assets/oc2/models/item/hard_drive2.json | 2 +- .../assets/oc2/models/item/hard_drive3.json | 2 +- .../item/inventory_operations_module.json | 2 +- .../assets/oc2/models/item/memory.json | 2 +- .../assets/oc2/models/item/memory2.json | 2 +- .../assets/oc2/models/item/memory3.json | 2 +- .../assets/oc2/models/item/network_cable.json | 2 +- .../models/item/network_interface_card.json | 2 +- .../models/item/redstone_interface_card.json | 2 +- .../assets/oc2/models/item/wrench.json | 2 +- .../cable_base/cable_base_atlas0.png | Bin .../cable_link/cable_link_atlas0.png | Bin .../block/cable_plug/cable_plug_atlas0.png | Bin 0 -> 818 bytes .../cable_straight/cable_straight_atlas0.png | Bin .../cable_support/cable_support_atlas0.png | Bin .../block/computer/computer_atlas0.png | Bin 0 -> 1565 bytes .../computer/computer_atlas1.png | Bin .../computer/computer_atlas2.png | Bin .../computer/computer_atlas3.png | Bin .../computer/computer_atlas4.png | Bin .../computer/computer_overlay_power.png | Bin .../computer/computer_overlay_status.png | Bin .../computer/computer_overlay_terminal.png | Bin .../network_connector_atlas0.png | Bin 0 -> 841 bytes .../block/network_hub/network_hub_atlas0.png | Bin 0 -> 1676 bytes .../network_hub/network_hub_atlas1.png | Bin .../network_hub/network_hub_atlas2.png | Bin .../network_hub/network_hub_atlas3.png | Bin .../redstone_interface_atlas0.png | Bin 0 -> 1902 bytes .../redstone_interface_atlas1.png | Bin 0 -> 1911 bytes .../redstone_interface_atlas2.png | Bin .../redstone_interface_atlas3.png | Bin .../redstone_interface_atlas4.png | Bin .../block_operations_module.png | Bin .../textures/{items => item}/flash_memory.png | Bin .../textures/{items => item}/hard_drive1.png | Bin .../textures/{items => item}/hard_drive2.png | Bin .../textures/{items => item}/hard_drive3.png | Bin .../inventory_operations_module.png | Bin .../oc2/textures/{items => item}/memory1.png | Bin .../oc2/textures/{items => item}/memory2.png | Bin .../oc2/textures/{items => item}/memory3.png | Bin .../{items => item}/network_cable.png | Bin .../network_interface_card.png | Bin .../redstone_interface_card.png | Bin .../oc2/textures/{items => item}/wrench.png | Bin 52 files changed, 30 insertions(+), 30 deletions(-) rename src/main/resources/assets/oc2/textures/{blocks => block}/cable_base/cable_base_atlas0.png (100%) rename src/main/resources/assets/oc2/textures/{blocks => block}/cable_link/cable_link_atlas0.png (100%) create mode 100644 src/main/resources/assets/oc2/textures/block/cable_plug/cable_plug_atlas0.png rename src/main/resources/assets/oc2/textures/{blocks => block}/cable_straight/cable_straight_atlas0.png (100%) rename src/main/resources/assets/oc2/textures/{blocks => block}/cable_support/cable_support_atlas0.png (100%) create mode 100644 src/main/resources/assets/oc2/textures/block/computer/computer_atlas0.png rename src/main/resources/assets/oc2/textures/{blocks => block}/computer/computer_atlas1.png (100%) rename src/main/resources/assets/oc2/textures/{blocks => block}/computer/computer_atlas2.png (100%) rename src/main/resources/assets/oc2/textures/{blocks => block}/computer/computer_atlas3.png (100%) rename src/main/resources/assets/oc2/textures/{blocks => block}/computer/computer_atlas4.png (100%) rename src/main/resources/assets/oc2/textures/{blocks => block}/computer/computer_overlay_power.png (100%) rename src/main/resources/assets/oc2/textures/{blocks => block}/computer/computer_overlay_status.png (100%) rename src/main/resources/assets/oc2/textures/{blocks => block}/computer/computer_overlay_terminal.png (100%) create mode 100644 src/main/resources/assets/oc2/textures/block/network_connector/network_connector_atlas0.png create mode 100644 src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas0.png rename src/main/resources/assets/oc2/textures/{blocks => block}/network_hub/network_hub_atlas1.png (100%) rename src/main/resources/assets/oc2/textures/{blocks => block}/network_hub/network_hub_atlas2.png (100%) rename src/main/resources/assets/oc2/textures/{blocks => block}/network_hub/network_hub_atlas3.png (100%) create mode 100644 src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas0.png create mode 100644 src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas1.png rename src/main/resources/assets/oc2/textures/{blocks => block}/redstone_interface/redstone_interface_atlas2.png (100%) rename src/main/resources/assets/oc2/textures/{blocks => block}/redstone_interface/redstone_interface_atlas3.png (100%) rename src/main/resources/assets/oc2/textures/{blocks => block}/redstone_interface/redstone_interface_atlas4.png (100%) rename src/main/resources/assets/oc2/textures/{items => item}/block_operations_module.png (100%) rename src/main/resources/assets/oc2/textures/{items => item}/flash_memory.png (100%) rename src/main/resources/assets/oc2/textures/{items => item}/hard_drive1.png (100%) rename src/main/resources/assets/oc2/textures/{items => item}/hard_drive2.png (100%) rename src/main/resources/assets/oc2/textures/{items => item}/hard_drive3.png (100%) rename src/main/resources/assets/oc2/textures/{items => item}/inventory_operations_module.png (100%) rename src/main/resources/assets/oc2/textures/{items => item}/memory1.png (100%) rename src/main/resources/assets/oc2/textures/{items => item}/memory2.png (100%) rename src/main/resources/assets/oc2/textures/{items => item}/memory3.png (100%) rename src/main/resources/assets/oc2/textures/{items => item}/network_cable.png (100%) rename src/main/resources/assets/oc2/textures/{items => item}/network_interface_card.png (100%) rename src/main/resources/assets/oc2/textures/{items => item}/redstone_interface_card.png (100%) rename src/main/resources/assets/oc2/textures/{items => item}/wrench.png (100%) diff --git a/src/main/java/li/cil/oc2/client/renderer/tileentity/ComputerTileEntityRenderer.java b/src/main/java/li/cil/oc2/client/renderer/tileentity/ComputerTileEntityRenderer.java index 4520575d..8a56ff8e 100644 --- a/src/main/java/li/cil/oc2/client/renderer/tileentity/ComputerTileEntityRenderer.java +++ b/src/main/java/li/cil/oc2/client/renderer/tileentity/ComputerTileEntityRenderer.java @@ -27,9 +27,9 @@ import net.minecraft.util.text.Style; import java.util.List; public final class ComputerTileEntityRenderer extends TileEntityRenderer { - public static final ResourceLocation OVERLAY_POWER_LOCATION = new ResourceLocation(API.MOD_ID, "blocks/computer/computer_overlay_power"); - public static final ResourceLocation OVERLAY_STATUS_LOCATION = new ResourceLocation(API.MOD_ID, "blocks/computer/computer_overlay_status"); - public static final ResourceLocation OVERLAY_TERMINAL_LOCATION = new ResourceLocation(API.MOD_ID, "blocks/computer/computer_overlay_terminal"); + public static final ResourceLocation OVERLAY_POWER_LOCATION = new ResourceLocation(API.MOD_ID, "block/computer/computer_overlay_power"); + public static final ResourceLocation OVERLAY_STATUS_LOCATION = new ResourceLocation(API.MOD_ID, "block/computer/computer_overlay_status"); + public static final ResourceLocation OVERLAY_TERMINAL_LOCATION = new ResourceLocation(API.MOD_ID, "block/computer/computer_overlay_terminal"); private static final RenderMaterial TEXTURE_POWER = new RenderMaterial(PlayerContainer.LOCATION_BLOCKS_TEXTURE, OVERLAY_POWER_LOCATION); private static final RenderMaterial TEXTURE_STATUS = new RenderMaterial(PlayerContainer.LOCATION_BLOCKS_TEXTURE, OVERLAY_STATUS_LOCATION); diff --git a/src/main/java/li/cil/oc2/data/ModItemModelProvider.java b/src/main/java/li/cil/oc2/data/ModItemModelProvider.java index 03dae8a3..b5bdc564 100644 --- a/src/main/java/li/cil/oc2/data/ModItemModelProvider.java +++ b/src/main/java/li/cil/oc2/data/ModItemModelProvider.java @@ -19,34 +19,34 @@ public final class ModItemModelProvider extends ItemModelProvider { @Override protected void registerModels() { - simple(Items.WRENCH_ITEM, "items/wrench"); + simple(Items.WRENCH_ITEM, "item/wrench"); - simple(Items.NETWORK_CABLE_ITEM, "items/network_cable"); + simple(Items.NETWORK_CABLE_ITEM, "item/network_cable"); - simple(Items.MEMORY_ITEM, "items/memory1") + simple(Items.MEMORY_ITEM, "item/memory1") .override() .predicate(CustomItemModelProperties.CAPACITY_PROPERTY, 4 * Constants.MEGABYTE) - .model(simple(Items.MEMORY_ITEM, "items/memory2", "2")) + .model(simple(Items.MEMORY_ITEM, "item/memory2", "2")) .end() .override() .predicate(CustomItemModelProperties.CAPACITY_PROPERTY, 8 * Constants.MEGABYTE) - .model(simple(Items.MEMORY_ITEM, "items/memory3", "3")) + .model(simple(Items.MEMORY_ITEM, "item/memory3", "3")) .end(); - simple(Items.HARD_DRIVE_ITEM, "items/hard_drive1") + simple(Items.HARD_DRIVE_ITEM, "item/hard_drive1") .override() .predicate(CustomItemModelProperties.CAPACITY_PROPERTY, 4 * Constants.MEGABYTE) - .model(simple(Items.HARD_DRIVE_ITEM, "items/hard_drive2", "2")) + .model(simple(Items.HARD_DRIVE_ITEM, "item/hard_drive2", "2")) .end() .override() .predicate(CustomItemModelProperties.CAPACITY_PROPERTY, 8 * Constants.MEGABYTE) - .model(simple(Items.HARD_DRIVE_ITEM, "items/hard_drive3", "3")) + .model(simple(Items.HARD_DRIVE_ITEM, "item/hard_drive3", "3")) .end(); - simple(Items.FLASH_MEMORY_ITEM, "items/flash_memory"); - simple(Items.REDSTONE_INTERFACE_CARD_ITEM, "items/redstone_interface_card"); - simple(Items.NETWORK_INTERFACE_CARD_ITEM, "items/network_interface_card"); + simple(Items.FLASH_MEMORY_ITEM, "item/flash_memory"); + simple(Items.REDSTONE_INTERFACE_CARD_ITEM, "item/redstone_interface_card"); + simple(Items.NETWORK_INTERFACE_CARD_ITEM, "item/network_interface_card"); - simple(Items.INVENTORY_OPERATIONS_MODULE, "items/inventory_operations_module"); - simple(Items.BLOCK_OPERATIONS_MODULE, "items/block_operations_module"); + simple(Items.INVENTORY_OPERATIONS_MODULE, "item/inventory_operations_module"); + simple(Items.BLOCK_OPERATIONS_MODULE, "item/block_operations_module"); withExistingParent(Constants.ROBOT_ENTITY_NAME, "template_shulker_box"); } diff --git a/src/main/resources/assets/oc2/models/block/cable_base.json b/src/main/resources/assets/oc2/models/block/cable_base.json index ca7d46e8..6f7bec4b 100644 --- a/src/main/resources/assets/oc2/models/block/cable_base.json +++ b/src/main/resources/assets/oc2/models/block/cable_base.json @@ -1 +1 @@ -{"parent":"block/block","loader":"oc2:bus_cable","textures":{"east":"oc2:blocks/cable_base/cable_base_east","west":"oc2:blocks/cable_base/cable_base_west","down":"oc2:blocks/cable_base/cable_base_down","north":"oc2:blocks/cable_base/cable_base_north","south":"oc2:blocks/cable_base/cable_base_south","up":"oc2:blocks/cable_base/cable_base_up","particle":"#north"},"elements":[{"from":[6,5,6],"to":[10,6,10],"faces":{"east":{"texture":"east"},"west":{"texture":"west"},"down":{"texture":"down"},"north":{"texture":"north"},"south":{"texture":"south"}}},{"from":[6,6,10],"to":[10,10,11],"faces":{"east":{"texture":"east"},"west":{"texture":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"south":{"texture":"south"}}},{"from":[5,6,6],"to":[11,10,10],"faces":{"east":{"texture":"east"},"west":{"texture":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"north":{"texture":"north"},"south":{"texture":"south"}}},{"from":[6,6,5],"to":[10,10,6],"faces":{"east":{"texture":"east"},"west":{"texture":"west"},"up":{"texture":"up"},"down":{"texture":"down"},"north":{"texture":"north"}}},{"from":[6,10,6],"to":[10,11,10],"faces":{"east":{"texture":"east"},"west":{"texture":"west"},"up":{"texture":"up"},"north":{"texture":"north"},"south":{"texture":"south"}}}]} \ No newline at end of file +{"parent":"block/block","textures":{"atlas0":"oc2:block/cable_base/cable_base_atlas0","particle":"#north"},"elements":[{"from":[6,5,6],"to":[10,6,10],"faces":{"east":{"texture":"atlas0","uv":[0.0,8.0,2.0,8.5]},"west":{"texture":"atlas0","uv":[0.0,8.5,2.0,9.0]},"down":{"texture":"atlas0","uv":[0.0,9.0,2.0,11.0]},"north":{"texture":"atlas0","uv":[0.0,11.0,2.0,11.5]},"south":{"texture":"atlas0","uv":[0.0,11.5,2.0,12.0]}}},{"from":[6,6,10],"to":[10,10,11],"faces":{"east":{"texture":"atlas0","uv":[3.0,0.0,3.5,2.0]},"west":{"texture":"atlas0","uv":[3.5,0.0,4.0,2.0]},"up":{"texture":"atlas0","uv":[0.0,12.0,2.0,12.5]},"down":{"texture":"atlas0","uv":[0.0,12.5,2.0,13.0]},"south":{"texture":"atlas0","uv":[0.0,13.0,2.0,15.0]}}},{"from":[5,6,6],"to":[11,10,10],"faces":{"east":{"texture":"atlas0","uv":[2.0,13.0,4.0,15.0]},"west":{"texture":"atlas0","uv":[4.0,13.0,6.0,15.0]},"up":{"texture":"atlas0","uv":[0.0,0.0,3.0,2.0]},"down":{"texture":"atlas0","uv":[0.0,2.0,3.0,4.0]},"north":{"texture":"atlas0","uv":[0.0,4.0,3.0,6.0]},"south":{"texture":"atlas0","uv":[0.0,6.0,3.0,8.0]}}},{"from":[6,6,5],"to":[10,10,6],"faces":{"east":{"texture":"atlas0","uv":[4.0,0.0,4.5,2.0]},"west":{"texture":"atlas0","uv":[4.5,0.0,5.0,2.0]},"up":{"texture":"atlas0","uv":[0.0,15.0,2.0,15.5]},"down":{"texture":"atlas0","uv":[0.0,15.5,2.0,16.0]},"north":{"texture":"atlas0","uv":[6.0,13.0,8.0,15.0]}}},{"from":[6,10,6],"to":[10,11,10],"faces":{"east":{"texture":"atlas0","uv":[2.0,15.5,4.0,16.0]},"west":{"texture":"atlas0","uv":[4.0,15.5,6.0,16.0]},"up":{"texture":"atlas0","uv":[8.0,13.0,10.0,15.0]},"north":{"texture":"atlas0","uv":[6.0,15.5,8.0,16.0]},"south":{"texture":"atlas0","uv":[8.0,15.5,10.0,16.0]}}}]} \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/block_operations_module.json b/src/main/resources/assets/oc2/models/item/block_operations_module.json index 372625c5..44620c01 100644 --- a/src/main/resources/assets/oc2/models/item/block_operations_module.json +++ b/src/main/resources/assets/oc2/models/item/block_operations_module.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "oc2:items/block_operations_module" + "layer0": "oc2:item/block_operations_module" } } \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/flash_memory.json b/src/main/resources/assets/oc2/models/item/flash_memory.json index 93f76253..be7545b2 100644 --- a/src/main/resources/assets/oc2/models/item/flash_memory.json +++ b/src/main/resources/assets/oc2/models/item/flash_memory.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "oc2:items/flash_memory" + "layer0": "oc2:item/flash_memory" } } \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/hard_drive.json b/src/main/resources/assets/oc2/models/item/hard_drive.json index bd25ae5a..91c512ab 100644 --- a/src/main/resources/assets/oc2/models/item/hard_drive.json +++ b/src/main/resources/assets/oc2/models/item/hard_drive.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "oc2:items/hard_drive1" + "layer0": "oc2:item/hard_drive1" }, "overrides": [ { diff --git a/src/main/resources/assets/oc2/models/item/hard_drive2.json b/src/main/resources/assets/oc2/models/item/hard_drive2.json index 6785edc1..39ce7a99 100644 --- a/src/main/resources/assets/oc2/models/item/hard_drive2.json +++ b/src/main/resources/assets/oc2/models/item/hard_drive2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "oc2:items/hard_drive2" + "layer0": "oc2:item/hard_drive2" } } \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/hard_drive3.json b/src/main/resources/assets/oc2/models/item/hard_drive3.json index 1bee5b8a..2bc764f6 100644 --- a/src/main/resources/assets/oc2/models/item/hard_drive3.json +++ b/src/main/resources/assets/oc2/models/item/hard_drive3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "oc2:items/hard_drive3" + "layer0": "oc2:item/hard_drive3" } } \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/inventory_operations_module.json b/src/main/resources/assets/oc2/models/item/inventory_operations_module.json index 1a452801..5b3112b9 100644 --- a/src/main/resources/assets/oc2/models/item/inventory_operations_module.json +++ b/src/main/resources/assets/oc2/models/item/inventory_operations_module.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "oc2:items/inventory_operations_module" + "layer0": "oc2:item/inventory_operations_module" } } \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/memory.json b/src/main/resources/assets/oc2/models/item/memory.json index daf5fd3b..14e614b8 100644 --- a/src/main/resources/assets/oc2/models/item/memory.json +++ b/src/main/resources/assets/oc2/models/item/memory.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "oc2:items/memory1" + "layer0": "oc2:item/memory1" }, "overrides": [ { diff --git a/src/main/resources/assets/oc2/models/item/memory2.json b/src/main/resources/assets/oc2/models/item/memory2.json index 0fcaf687..b5a8c531 100644 --- a/src/main/resources/assets/oc2/models/item/memory2.json +++ b/src/main/resources/assets/oc2/models/item/memory2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "oc2:items/memory2" + "layer0": "oc2:item/memory2" } } \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/memory3.json b/src/main/resources/assets/oc2/models/item/memory3.json index ca86ec29..d5c68e56 100644 --- a/src/main/resources/assets/oc2/models/item/memory3.json +++ b/src/main/resources/assets/oc2/models/item/memory3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "oc2:items/memory3" + "layer0": "oc2:item/memory3" } } \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/network_cable.json b/src/main/resources/assets/oc2/models/item/network_cable.json index 71b0cfc9..4f40fd55 100644 --- a/src/main/resources/assets/oc2/models/item/network_cable.json +++ b/src/main/resources/assets/oc2/models/item/network_cable.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "oc2:items/network_cable" + "layer0": "oc2:item/network_cable" } } \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/network_interface_card.json b/src/main/resources/assets/oc2/models/item/network_interface_card.json index 2c99f043..2f20da9a 100644 --- a/src/main/resources/assets/oc2/models/item/network_interface_card.json +++ b/src/main/resources/assets/oc2/models/item/network_interface_card.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "oc2:items/network_interface_card" + "layer0": "oc2:item/network_interface_card" } } \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/redstone_interface_card.json b/src/main/resources/assets/oc2/models/item/redstone_interface_card.json index 4ae881f8..4cca21ac 100644 --- a/src/main/resources/assets/oc2/models/item/redstone_interface_card.json +++ b/src/main/resources/assets/oc2/models/item/redstone_interface_card.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "oc2:items/redstone_interface_card" + "layer0": "oc2:item/redstone_interface_card" } } \ No newline at end of file diff --git a/src/main/resources/assets/oc2/models/item/wrench.json b/src/main/resources/assets/oc2/models/item/wrench.json index 96381e1a..237a39fb 100644 --- a/src/main/resources/assets/oc2/models/item/wrench.json +++ b/src/main/resources/assets/oc2/models/item/wrench.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "oc2:items/wrench" + "layer0": "oc2:item/wrench" } } \ No newline at end of file diff --git a/src/main/resources/assets/oc2/textures/blocks/cable_base/cable_base_atlas0.png b/src/main/resources/assets/oc2/textures/block/cable_base/cable_base_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2/textures/blocks/cable_base/cable_base_atlas0.png rename to src/main/resources/assets/oc2/textures/block/cable_base/cable_base_atlas0.png diff --git a/src/main/resources/assets/oc2/textures/blocks/cable_link/cable_link_atlas0.png b/src/main/resources/assets/oc2/textures/block/cable_link/cable_link_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2/textures/blocks/cable_link/cable_link_atlas0.png rename to src/main/resources/assets/oc2/textures/block/cable_link/cable_link_atlas0.png diff --git a/src/main/resources/assets/oc2/textures/block/cable_plug/cable_plug_atlas0.png b/src/main/resources/assets/oc2/textures/block/cable_plug/cable_plug_atlas0.png new file mode 100644 index 0000000000000000000000000000000000000000..a2bb5acf2557b203580f0b6af9d5e2a132387f27 GIT binary patch literal 818 zcmV-21I_%2P)Pz&ZQor?tRkT$a z$?-31G>d2de`a>QOQBk=#`n|F{mfaPx|?o%cQ(8`t5hn5ynw*|{yvO*dwZ1>IOTHL zjLVE#tv30zpaSo<*ShXbJ}#2`si=Y^N&fs=<5W}NnDbwRo?P2Pei8fo$10BFrvc{t z7Xi`u!<@vun;y^T{R|&EGcGeEJDp>7o4Xm887!&2Y6n5k@Arcg*38Xwk(I!*E$qEs z58Ir3c?!^t*2a&wVB5GGKhGA?@zzZ@48tgjhAG_5X_oEy9Qd-_D<5_=V8`KW$g=_^ zu<@k=K$o1{D*(GGSX*t)xXgeqSPz3u!scntTmD7ZT}Gu+$&Aa4@)mN&=_AjK%M2K! zn{jkIv6r3Z!V9lQgR3NG0SzjETIw+4GK2N(uVWr-)@m+V{mUUwo&uHhhOy?ZoDg{~ zuRvCq+&SZ9kD3v$1Ql@7am;m7h~DWI?RJ}*Xj#BN*>h#J1GTaf zTZBzs4JyzAR3MubB?P2Pq}ja)i^Zb97?e^l6bo-}8OhM()!>~pL^}SzT(SWHco7gw zre?$|q3=sTuQ=~$5v$6vv77E%){v&-9F0#7M@_Ny#5zo@uU|sX^Iph_e~jT4N?_r! zajkjlv7QO1$wV1w-u4&JK>YK;CK} z$@ty*V~gZAM&M-GK8TLtbsR?o-bRX7NM*h_0<9s?F_6?_HL<`I54*mTX%4T2+DRdd wwr%r^SccL)vf+`Xk}$G42#-XD3b@<<0z7>I9$bqSLjV8(07*qoM6N<$f-WkIYybcN literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oc2/textures/blocks/cable_straight/cable_straight_atlas0.png b/src/main/resources/assets/oc2/textures/block/cable_straight/cable_straight_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2/textures/blocks/cable_straight/cable_straight_atlas0.png rename to src/main/resources/assets/oc2/textures/block/cable_straight/cable_straight_atlas0.png diff --git a/src/main/resources/assets/oc2/textures/blocks/cable_support/cable_support_atlas0.png b/src/main/resources/assets/oc2/textures/block/cable_support/cable_support_atlas0.png similarity index 100% rename from src/main/resources/assets/oc2/textures/blocks/cable_support/cable_support_atlas0.png rename to src/main/resources/assets/oc2/textures/block/cable_support/cable_support_atlas0.png diff --git a/src/main/resources/assets/oc2/textures/block/computer/computer_atlas0.png b/src/main/resources/assets/oc2/textures/block/computer/computer_atlas0.png new file mode 100644 index 0000000000000000000000000000000000000000..f130ec778e093ebfdc655a0d7064791fe1cda8e2 GIT binary patch literal 1565 zcmV+&2IBdNP)KQ9%VkKtNVe)S1kTlbKgYB~_{1B@d81LMk;?$$fG&ua#e) z{`f*nPIWc^)AZ@>^y$yx_xpW5AKdHp`c}(pmgnEg?RFy!RC0%hhiz&xxNB~yRGE?1BODK7C6#vhuY0Zx8*NoTrO99z9<%pn$SAe z{NNP8_LP2l<6uKl(S9fO^d|NA`rzRyvA9p(FXM}QK>YR&i||nA5(g+Fq(pd9(=5em z-L9MR)SI{JAW!%Q50A;^BY~Un#X1z5FA~NFN%#)a*b228dIv7EUL>I|Z9qvJ_@VAp zCi(DmuzaK@p{vVq=Q7xChOU~}jnC#d*tsrz2=!GpQPy6&1SOzr&*L+fnK#;eZ2{KM=qIur|$8^ zo!sZ`A~w5);`7`6$t*e^?~fd9m9(gL9WW z9qiCJkzSj*@X~>2ZD8qE<@);dUt323?#Y#_qOkkZIS#l{`UehKUBsSeoVZ`&md6}r z>M`aFW-jp;*k8_~%wMPx8b?&J?%s~c-iiaJm>HaHIIlx+udM*P_Fq0T>^y5p*oJ(@ zf(|jj`o9heEq7azOU9GlcA%0Kta3xTB_eq-rj-GHBk`CJnd)W?KZFU0o4C3}0+|fT zSw@?VIWyxJb}dRNu><67%hcn!U@qJrg!{v9e*OI2=Ras!I@p_+A*fBEUF2B}SF4Nc z*uBLR0B%W28GCD*SUx!6>p^5V!uq$r{T?+BkUn;rnc**IctebXAOHOF(_dfY+0GZ@ z029I1g*;upErw_YnHINq7ML$k@SE>}l(Zz?@6Pd zjwTLD!KPlXbGTNk;q&zL6#mO6&(ELS)BEpd%O9Aj{F~3`^%$HP9=RFehB>j@Fd6e9 zIM;kYxKc3# zEOMpxEu4xa5MAppYb0YaR)(lHH6K0fIfr{o*A;t)by zS~w&ABm*3{jDxVT8#EN^UK=hzu{baXL_ZzdsvRTb2nV-Ljx=3p>$EERoi4zgk$~iq zIT<*v1Uts=RR^-{c6x@o@W9CtcCju+KZvrGzf{Lk?ygRW{`P4VHI)Ab{d;sj)fI{I P00000NkvXXu0mjfuWiUD+14V#KHrN;Kkna`8-+?7%!OEq)sy8GkyVE zJc%P<0&bRn1V2#=!T!;WRF4qGthNtfsCBUn8+^Hsf|hZ7t_!OKa5KsfH1|F-$_d1%gw`#$-Ac!lQ>_a#A+B^z`bd>5fBeQUpiKHm%gZ3-aC zNCrc%({9Ew$RtU4!M?UFl>&hc^Php`BuSP$Z+^rmYa@8ZkT93mi%)8B2qoFkcoEf5 z4_~QAuW@kk#|zdt*r9PD0wxD9zaUBpeV_2Q0hp4ok|}+Os;$oupby3?8jK$GtZ!8@ zft$dplk=^g(yx_! zbTNUl>fQjO#{zi8e0jx;fEH6Ln=%dU{UPUz-y6yte-V4)D=U6yN&YZkT5tFl?e`g4 T)Ciug00000NkvXXu0mjf65WI? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas0.png b/src/main/resources/assets/oc2/textures/block/network_hub/network_hub_atlas0.png new file mode 100644 index 0000000000000000000000000000000000000000..6ff55190e2f58e852bddebaf941179903868e0a3 GIT binary patch literal 1676 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_atlas2.png b/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas2.png similarity index 100% rename from src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_atlas2.png rename to src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas2.png diff --git a/src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_atlas3.png b/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas3.png similarity index 100% rename from src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_atlas3.png rename to src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas3.png diff --git a/src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_atlas4.png b/src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas4.png similarity index 100% rename from src/main/resources/assets/oc2/textures/blocks/redstone_interface/redstone_interface_atlas4.png rename to src/main/resources/assets/oc2/textures/block/redstone_interface/redstone_interface_atlas4.png diff --git a/src/main/resources/assets/oc2/textures/items/block_operations_module.png b/src/main/resources/assets/oc2/textures/item/block_operations_module.png similarity index 100% rename from src/main/resources/assets/oc2/textures/items/block_operations_module.png rename to src/main/resources/assets/oc2/textures/item/block_operations_module.png diff --git a/src/main/resources/assets/oc2/textures/items/flash_memory.png b/src/main/resources/assets/oc2/textures/item/flash_memory.png similarity index 100% rename from src/main/resources/assets/oc2/textures/items/flash_memory.png rename to src/main/resources/assets/oc2/textures/item/flash_memory.png diff --git a/src/main/resources/assets/oc2/textures/items/hard_drive1.png b/src/main/resources/assets/oc2/textures/item/hard_drive1.png similarity index 100% rename from src/main/resources/assets/oc2/textures/items/hard_drive1.png rename to src/main/resources/assets/oc2/textures/item/hard_drive1.png diff --git a/src/main/resources/assets/oc2/textures/items/hard_drive2.png b/src/main/resources/assets/oc2/textures/item/hard_drive2.png similarity index 100% rename from src/main/resources/assets/oc2/textures/items/hard_drive2.png rename to src/main/resources/assets/oc2/textures/item/hard_drive2.png diff --git a/src/main/resources/assets/oc2/textures/items/hard_drive3.png b/src/main/resources/assets/oc2/textures/item/hard_drive3.png similarity index 100% rename from src/main/resources/assets/oc2/textures/items/hard_drive3.png rename to src/main/resources/assets/oc2/textures/item/hard_drive3.png diff --git a/src/main/resources/assets/oc2/textures/items/inventory_operations_module.png b/src/main/resources/assets/oc2/textures/item/inventory_operations_module.png similarity index 100% rename from src/main/resources/assets/oc2/textures/items/inventory_operations_module.png rename to src/main/resources/assets/oc2/textures/item/inventory_operations_module.png diff --git a/src/main/resources/assets/oc2/textures/items/memory1.png b/src/main/resources/assets/oc2/textures/item/memory1.png similarity index 100% rename from src/main/resources/assets/oc2/textures/items/memory1.png rename to src/main/resources/assets/oc2/textures/item/memory1.png diff --git a/src/main/resources/assets/oc2/textures/items/memory2.png b/src/main/resources/assets/oc2/textures/item/memory2.png similarity index 100% rename from src/main/resources/assets/oc2/textures/items/memory2.png rename to src/main/resources/assets/oc2/textures/item/memory2.png diff --git a/src/main/resources/assets/oc2/textures/items/memory3.png b/src/main/resources/assets/oc2/textures/item/memory3.png similarity index 100% rename from src/main/resources/assets/oc2/textures/items/memory3.png rename to src/main/resources/assets/oc2/textures/item/memory3.png diff --git a/src/main/resources/assets/oc2/textures/items/network_cable.png b/src/main/resources/assets/oc2/textures/item/network_cable.png similarity index 100% rename from src/main/resources/assets/oc2/textures/items/network_cable.png rename to src/main/resources/assets/oc2/textures/item/network_cable.png diff --git a/src/main/resources/assets/oc2/textures/items/network_interface_card.png b/src/main/resources/assets/oc2/textures/item/network_interface_card.png similarity index 100% rename from src/main/resources/assets/oc2/textures/items/network_interface_card.png rename to src/main/resources/assets/oc2/textures/item/network_interface_card.png diff --git a/src/main/resources/assets/oc2/textures/items/redstone_interface_card.png b/src/main/resources/assets/oc2/textures/item/redstone_interface_card.png similarity index 100% rename from src/main/resources/assets/oc2/textures/items/redstone_interface_card.png rename to src/main/resources/assets/oc2/textures/item/redstone_interface_card.png diff --git a/src/main/resources/assets/oc2/textures/items/wrench.png b/src/main/resources/assets/oc2/textures/item/wrench.png similarity index 100% rename from src/main/resources/assets/oc2/textures/items/wrench.png rename to src/main/resources/assets/oc2/textures/item/wrench.png