From 06bfdf20530553625a65cb2d0579d77296cacfc3 Mon Sep 17 00:00:00 2001 From: bruno Date: Wed, 31 Jul 2024 17:21:56 +0200 Subject: [PATCH] Edit drive sizes Rename items --- assets/Module_PCB.aseprite | Bin 1928 -> 2057 bytes gradle.properties | 4 +- .../brn/serverstorage/ServerStorage.java | 30 +++------ .../brn/serverstorage/items/HardDrive.java | 12 ++-- .../brn/serverstorage/lib/ItemGroups.java | 57 ++++++++++++++++++ .../assets/serverstorage/lang/en_us.json | 19 +++--- .../models/item/diamond_drive.json | 2 +- .../models/item/diamond_head.json | 2 +- .../models/item/diamond_platter.json | 2 +- .../models/item/golden_drive.json | 2 +- .../models/item/golden_head.json | 2 +- .../models/item/golden_platter.json | 2 +- .../serverstorage/models/item/iron_drive.json | 2 +- .../serverstorage/models/item/iron_head.json | 2 +- .../models/item/iron_platter.json | 2 +- .../item/{cpu.json => material_cpu.json} | 2 +- ...oller.json => material_cpu_substrate.json} | 2 +- ...strate.json => material_drive_casing.json} | 2 +- .../item/material_drive_controller.json | 6 ++ .../{drive_casing.json => material_pcb.json} | 2 +- .../models/item/material_pcb_substrate.json | 6 ++ .../models/item/module_netherite_upgrade.json | 6 ++ .../models/item/netherite_drive.json | 2 +- .../models/item/netherite_head.json | 2 +- .../models/item/netherite_platter.json | 2 +- .../assets/serverstorage/models/item/pcb.json | 6 -- .../models/item/pcb_substrate.json | 6 -- .../textures/block/bus_connector_blank.png | Bin 552 -> 671 bytes .../textures/block/bus_connector_bus.png | Bin 570 -> 687 bytes .../block/bus_connector_inventory.png | Bin 568 -> 678 bytes .../textures/block/controller_back.png | Bin 611 -> 717 bytes .../textures/block/controller_bottom.png | Bin 619 -> 726 bytes .../textures/block/controller_front.png | Bin 628 -> 734 bytes .../textures/block/controller_left.png | Bin 615 -> 721 bytes .../textures/block/controller_right.png | Bin 614 -> 721 bytes .../textures/block/controller_top.png | Bin 614 -> 722 bytes .../textures/block/drive_container_front.png | Bin 540 -> 644 bytes .../textures/block/drive_container_side.png | Bin 581 -> 657 bytes .../block/inventory_interface_blank.png | Bin 656 -> 732 bytes .../block/inventory_interface_inventory.png | Bin 657 -> 722 bytes .../serverstorage/textures/item/cpu.png | Bin 379 -> 0 bytes .../textures/item/cpu_substrate.png | Bin 313 -> 0 bytes .../{drive_diamond.png => diamond_drive.png} | Bin 1260 -> 1260 bytes .../textures/item/diamond_drive_head.png | Bin 0 -> 422 bytes ..._diamond.png => diamond_drive_platter.png} | Bin 472 -> 472 bytes .../textures/item/drive_casing.png | Bin 322 -> 0 bytes .../textures/item/drive_controller.png | Bin 396 -> 0 bytes .../textures/item/drive_controller_head.png | Bin 122 -> 339 bytes .../item/drive_controller_spindle.png | Bin 132 -> 347 bytes .../item/{drive_gold.png => golden_drive.png} | Bin 1260 -> 1260 bytes .../{head_gold.png => golden_drive_head.png} | Bin 404 -> 404 bytes .../textures/item/golden_drive_platter.png | Bin 0 -> 435 bytes .../textures/item/head_diamond.png | Bin 422 -> 0 bytes .../serverstorage/textures/item/head_iron.png | Bin 350 -> 0 bytes .../textures/item/head_netherite.png | Bin 410 -> 0 bytes .../item/{drive_iron.png => iron_drive.png} | Bin 1260 -> 1260 bytes .../textures/item/iron_drive_head.png | Bin 0 -> 350 bytes .../textures/item/iron_drive_platter.png | Bin 0 -> 387 bytes .../textures/item/material_cpu.png | Bin 0 -> 379 bytes .../textures/item/material_cpu_substrate.png | Bin 0 -> 313 bytes .../textures/item/material_drive_casing.png | Bin 0 -> 322 bytes .../item/material_drive_controller.png | Bin 0 -> 396 bytes .../textures/item/material_pcb.png | Bin 0 -> 323 bytes .../textures/item/material_pcb_substrate.png | Bin 0 -> 313 bytes .../textures/item/module_bus.png | Bin 377 -> 377 bytes .../textures/item/module_configuration.png | Bin 421 -> 421 bytes .../textures/item/module_container.png | Bin 504 -> 504 bytes .../textures/item/module_display.png | Bin 380 -> 380 bytes .../textures/item/module_drive.png | Bin 415 -> 415 bytes .../textures/item/module_filtering.png | Bin 403 -> 403 bytes .../textures/item/module_inventory.png | Bin 571 -> 571 bytes .../item/module_netherite_upgrade.png | Bin 0 -> 375 bytes .../textures/item/module_pagination.png | Bin 394 -> 394 bytes .../textures/item/module_pcb.png | Bin 359 -> 359 bytes .../textures/item/module_transport.png | Bin 406 -> 406 bytes ...rive_netherite.png => netherite_drive.png} | Bin 1260 -> 1260 bytes .../textures/item/netherite_drive_head.png | Bin 0 -> 410 bytes ...herite.png => netherite_drive_platter.png} | Bin 466 -> 466 bytes .../serverstorage/textures/item/pcb.png | Bin 323 -> 0 bytes .../textures/item/pcb_substrate.png | Bin 313 -> 0 bytes .../textures/item/platter_gold.png | Bin 435 -> 0 bytes .../textures/item/platter_iron.png | Bin 387 -> 0 bytes .../serverstorage/recipe/bus_connector.json | 4 +- .../data/serverstorage/recipe/cpu.json | 4 +- .../serverstorage/recipe/cpu_substrate.json | 2 +- .../serverstorage/recipe/diamond_drive.json | 4 +- .../serverstorage/recipe/drive_casing.json | 2 +- .../serverstorage/recipe/drive_container.json | 4 +- .../recipe/drive_controller.json | 8 +-- .../serverstorage/recipe/golden_drive.json | 4 +- .../recipe/inventory_interface.json | 4 +- .../data/serverstorage/recipe/iron_drive.json | 4 +- .../data/serverstorage/recipe/module_bus.json | 4 +- .../recipe/module_configuration.json | 4 +- .../recipe/module_container.json | 4 +- .../serverstorage/recipe/module_display.json | 4 +- .../serverstorage/recipe/module_drive.json | 4 +- .../recipe/module_filtering.json | 4 +- .../recipe/module_inventory.json | 4 +- .../recipe/module_pagination.json | 4 +- .../data/serverstorage/recipe/module_pcb.json | 4 +- .../recipe/module_transport.json | 4 +- .../serverstorage/recipe/netherite_drive.json | 4 +- .../serverstorage/recipe/netherite_head.json | 24 ++++---- .../recipe/netherite_platter.json | 24 ++++---- .../recipe/netherite_upgrade.json | 24 ++++++++ .../data/serverstorage/recipe/pcb.json | 4 +- .../serverstorage/recipe/pcb_substrate.json | 2 +- .../data/serverstorage/recipe/storage.json | 4 +- 109 files changed, 213 insertions(+), 137 deletions(-) create mode 100644 src/main/java/systems/brn/serverstorage/lib/ItemGroups.java rename src/main/resources/assets/serverstorage/models/item/{cpu.json => material_cpu.json} (56%) rename src/main/resources/assets/serverstorage/models/item/{drive_controller.json => material_cpu_substrate.json} (51%) rename src/main/resources/assets/serverstorage/models/item/{cpu_substrate.json => material_drive_casing.json} (52%) create mode 100644 src/main/resources/assets/serverstorage/models/item/material_drive_controller.json rename src/main/resources/assets/serverstorage/models/item/{drive_casing.json => material_pcb.json} (56%) create mode 100644 src/main/resources/assets/serverstorage/models/item/material_pcb_substrate.json create mode 100644 src/main/resources/assets/serverstorage/models/item/module_netherite_upgrade.json delete mode 100644 src/main/resources/assets/serverstorage/models/item/pcb.json delete mode 100644 src/main/resources/assets/serverstorage/models/item/pcb_substrate.json delete mode 100644 src/main/resources/assets/serverstorage/textures/item/cpu.png delete mode 100644 src/main/resources/assets/serverstorage/textures/item/cpu_substrate.png rename src/main/resources/assets/serverstorage/textures/item/{drive_diamond.png => diamond_drive.png} (79%) create mode 100644 src/main/resources/assets/serverstorage/textures/item/diamond_drive_head.png rename src/main/resources/assets/serverstorage/textures/item/{platter_diamond.png => diamond_drive_platter.png} (60%) delete mode 100644 src/main/resources/assets/serverstorage/textures/item/drive_casing.png delete mode 100644 src/main/resources/assets/serverstorage/textures/item/drive_controller.png rename src/main/resources/assets/serverstorage/textures/item/{drive_gold.png => golden_drive.png} (79%) rename src/main/resources/assets/serverstorage/textures/item/{head_gold.png => golden_drive_head.png} (52%) create mode 100644 src/main/resources/assets/serverstorage/textures/item/golden_drive_platter.png delete mode 100644 src/main/resources/assets/serverstorage/textures/item/head_diamond.png delete mode 100644 src/main/resources/assets/serverstorage/textures/item/head_iron.png delete mode 100644 src/main/resources/assets/serverstorage/textures/item/head_netherite.png rename src/main/resources/assets/serverstorage/textures/item/{drive_iron.png => iron_drive.png} (79%) create mode 100644 src/main/resources/assets/serverstorage/textures/item/iron_drive_head.png create mode 100644 src/main/resources/assets/serverstorage/textures/item/iron_drive_platter.png create mode 100644 src/main/resources/assets/serverstorage/textures/item/material_cpu.png create mode 100644 src/main/resources/assets/serverstorage/textures/item/material_cpu_substrate.png create mode 100644 src/main/resources/assets/serverstorage/textures/item/material_drive_casing.png create mode 100644 src/main/resources/assets/serverstorage/textures/item/material_drive_controller.png create mode 100644 src/main/resources/assets/serverstorage/textures/item/material_pcb.png create mode 100644 src/main/resources/assets/serverstorage/textures/item/material_pcb_substrate.png create mode 100644 src/main/resources/assets/serverstorage/textures/item/module_netherite_upgrade.png rename src/main/resources/assets/serverstorage/textures/item/{drive_netherite.png => netherite_drive.png} (79%) create mode 100644 src/main/resources/assets/serverstorage/textures/item/netherite_drive_head.png rename src/main/resources/assets/serverstorage/textures/item/{platter_netherite.png => netherite_drive_platter.png} (55%) delete mode 100644 src/main/resources/assets/serverstorage/textures/item/pcb.png delete mode 100644 src/main/resources/assets/serverstorage/textures/item/pcb_substrate.png delete mode 100644 src/main/resources/assets/serverstorage/textures/item/platter_gold.png delete mode 100644 src/main/resources/assets/serverstorage/textures/item/platter_iron.png create mode 100644 src/main/resources/data/serverstorage/recipe/netherite_upgrade.json diff --git a/assets/Module_PCB.aseprite b/assets/Module_PCB.aseprite index b88154e415c98a1f5e261fcf994751b961d1dc13..be0103958aaecc0c92d121d7696c21c7682995c7 100644 GIT binary patch delta 114 zcmeC+?-XF?)u#{^fdm}plCPxI8 diff --git a/gradle.properties b/gradle.properties index 992e65b..2101c8a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,10 +8,10 @@ yarn_mappings=1.21+build.9 loader_version=0.16.0 # Fabric API -fabric_version=0.100.6+1.21 +fabric_version=0.100.8+1.21 # Mod Properties -mod_version=3.1.2 +mod_version=3.1.3 maven_group=systems.brn archives_base_name=Serverstorage diff --git a/src/main/java/systems/brn/serverstorage/ServerStorage.java b/src/main/java/systems/brn/serverstorage/ServerStorage.java index d8367d2..925b138 100644 --- a/src/main/java/systems/brn/serverstorage/ServerStorage.java +++ b/src/main/java/systems/brn/serverstorage/ServerStorage.java @@ -24,8 +24,9 @@ import java.util.Arrays; import java.util.List; public class ServerStorage implements ModInitializer { - public static final List moduleList = Arrays.asList("bus", "configuration", "container", "display", "drive", "filtering", "inventory", "pagination", "pcb", "transport"); + public static final List moduleList = Arrays.asList("bus", "configuration", "container", "display", "drive", "filtering", "inventory", "pagination", "pcb", "transport", "netherite_upgrade"); public static final List tiers = Arrays.asList("iron", "golden", "diamond", "netherite"); + public static final List materialList = Arrays.asList("pcb", "pcb_substrate", "cpu", "cpu_substrate", "drive_controller", "drive_casing"); public static final String MOD_ID = "serverstorage"; @@ -45,21 +46,16 @@ public class ServerStorage implements ModInitializer { public static BlockEntityType INVENTORY_INTERFACE_BLOCK_ENTITY; public static final GameRules.Key ServerStorage_Crafting_Enable = - GameRuleRegistry.register("serverstoragecraftingmodule", GameRules.Category.MISC, GameRuleFactory.createBooleanRule(true)); + GameRuleRegistry.register("serverstorage_crafting_module", GameRules.Category.MISC, GameRuleFactory.createBooleanRule(true)); public static final GameRules.Key ServerStorage_Terminal_Enable = - GameRuleRegistry.register("serverstorageterminalmodule", GameRules.Category.MISC, GameRuleFactory.createBooleanRule(true)); + GameRuleRegistry.register("serverstorage_terminal_module", GameRules.Category.MISC, GameRuleFactory.createBooleanRule(true)); public static final GameRules.Key ServerStorage_Interface_Enable = - GameRuleRegistry.register("serverstorageinterfacemodule", GameRules.Category.MISC, GameRuleFactory.createBooleanRule(true)); + GameRuleRegistry.register("serverstorage_interface_module", GameRules.Category.MISC, GameRuleFactory.createBooleanRule(true)); - public static Item DRIVE_CASING; - public static Item CPU; - public static Item CPU_SUBSTRATE; - public static Item DRIVE_CONTROLLER; - public static Item PCB; - public static Item PCB_SUBSTRATE; + public static List MATERIALS; public static List MODULES; public static List PLATTERS; public static List DRIVES; @@ -71,8 +67,7 @@ public class ServerStorage implements ModInitializer { } @Override - public void onInitialize() - { + public void onInitialize() { StorageInterfaceBlock.register(); SimpleBlockItem.register(STORAGE_INTERFACE_BLOCK); @@ -85,13 +80,7 @@ public class ServerStorage implements ModInitializer { InventoryInterfaceBlock.register(); SimpleBlockItem.register(INVENTORY_INTERFACE_BLOCK); - PCB = SimpleItem.register("pcb", ItemGroups.INGREDIENTS); - PCB_SUBSTRATE = SimpleItem.register("pcb_substrate", ItemGroups.INGREDIENTS); - CPU = SimpleItem.register("cpu", ItemGroups.INGREDIENTS); - CPU_SUBSTRATE = SimpleItem.register("cpu_substrate", ItemGroups.INGREDIENTS); - DRIVE_CONTROLLER = SimpleItem.register("drive_controller", ItemGroups.INGREDIENTS); - DRIVE_CASING = SimpleItem.register("drive_casing", ItemGroups.INGREDIENTS); - + MATERIALS = SimpleItem.register("material", materialList, false, ItemGroups.INGREDIENTS); MODULES = SimpleItem.register("module", moduleList, false, ItemGroups.INGREDIENTS); HEADS = SimpleItem.register("head", tiers, ItemGroups.INGREDIENTS); @@ -99,8 +88,7 @@ public class ServerStorage implements ModInitializer { DRIVES = HardDriveItem.register(tiers); - - + systems.brn.serverstorage.lib.ItemGroups.register(); PolymerResourcePackUtils.addModAssets(MOD_ID); PolymerResourcePackUtils.markAsRequired(); diff --git a/src/main/java/systems/brn/serverstorage/items/HardDrive.java b/src/main/java/systems/brn/serverstorage/items/HardDrive.java index 23afc9e..f2b81c9 100644 --- a/src/main/java/systems/brn/serverstorage/items/HardDrive.java +++ b/src/main/java/systems/brn/serverstorage/items/HardDrive.java @@ -34,29 +34,29 @@ public class HardDrive { public void setMaxItems() { String itemName = driveStack.getItem().getRegistryEntry().registryKey().getValue().getPath(); + switch (itemName) { case "iron_drive": tier = 0; + maxItems = 4096; break; case "golden_drive": tier = 1; + maxItems = 8192; break; case "diamond_drive": tier = 2; + maxItems = 32768; break; case "netherite_drive": tier = 3; + maxItems = 131072; break; default: tier = -1; + maxItems = 0; break; } - - maxItems = 0; - - if (tier >= 0) { - maxItems = (int) Math.pow(2, tier + 8); - } } public void updateData() { diff --git a/src/main/java/systems/brn/serverstorage/lib/ItemGroups.java b/src/main/java/systems/brn/serverstorage/lib/ItemGroups.java new file mode 100644 index 0000000..a167f64 --- /dev/null +++ b/src/main/java/systems/brn/serverstorage/lib/ItemGroups.java @@ -0,0 +1,57 @@ +package systems.brn.serverstorage.lib; +import eu.pb4.polymer.core.api.item.PolymerItemGroupUtils; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; + +import static systems.brn.serverstorage.ServerStorage.*; + +public class ItemGroups { + public static final ItemGroup BLOCKS_GROUP = PolymerItemGroupUtils.builder() + .icon(() -> new ItemStack(STORAGE_INTERFACE_BLOCK)) + .displayName(Text.translatable("serverstorage.groups.blocks")) + .entries(((context, entries) -> { + entries.add(STORAGE_INTERFACE_BLOCK); + entries.add(HARD_DRIVE_CONTAINER_BLOCK); + entries.add(BUS_CONNECTOR_BLOCK); + entries.add(INVENTORY_INTERFACE_BLOCK); + })) + .build(); + + public static final ItemGroup MATERIALS_GROUP = PolymerItemGroupUtils.builder() + .icon(() -> new ItemStack(MODULES.getFirst())) + .displayName(Text.translatable("serverstorage.groups.materials")) + .entries(((context, entries) -> { + for (Item module : MODULES) { + entries.add(module); + } + for (Item material : MATERIALS) { + entries.add(material); + } + int partLength = HEADS.size(); + if (partLength == PLATTERS.size()) { + for (int i = 0; i < PLATTERS.size(); i++) { + entries.add(PLATTERS.get(i)); + entries.add(HEADS.get(i)); + } + } + })) + .build(); + + public static final ItemGroup DRIVES_GROUP = PolymerItemGroupUtils.builder() + .icon(() -> new ItemStack(DRIVES.getFirst())) + .displayName(Text.translatable("serverstorage.groups.drives")) + .entries(((context, entries) -> { + for (Item drive : DRIVES) { + entries.add(drive); + } + })) + .build(); + + public static void register() { + PolymerItemGroupUtils.registerPolymerItemGroup(id("blocks"), BLOCKS_GROUP); + PolymerItemGroupUtils.registerPolymerItemGroup(id("drives"), DRIVES_GROUP); + PolymerItemGroupUtils.registerPolymerItemGroup(id("materials"), MATERIALS_GROUP); + } +} diff --git a/src/main/resources/assets/serverstorage/lang/en_us.json b/src/main/resources/assets/serverstorage/lang/en_us.json index b072505..edd2c5d 100644 --- a/src/main/resources/assets/serverstorage/lang/en_us.json +++ b/src/main/resources/assets/serverstorage/lang/en_us.json @@ -5,8 +5,6 @@ "block.serverstorage.drive_container": "Hard drive container", - "item.serverstorage.drive_casing": "Hard drive casing", - "block.serverstorage.bus_connector": "Storage network connector", "item.serverstorage.iron_drive": "Iron hard drive", @@ -34,14 +32,17 @@ "item.serverstorage.module_inventory": "Inventory module", "item.serverstorage.module_pagination": "Pagination module", "item.serverstorage.module_transport": "Transport module", + "item.serverstorage.module_netherite_upgrade": "Netherite upgrade module", + "item.serverstorage.module_pcb": "Module PCB", - "item.serverstorage.drive_controller": "Drive controller", - "item.serverstorage.cpu": "Central Processing Unit", - "item.serverstorage.cpu_substrate": "CPU substrate", - "item.serverstorage.pcb": "Printed Circuit Board", - "item.serverstorage.pcb_substrate": "PCB substrate", + "item.serverstorage.material_drive_casing": "Hard drive casing", + "item.serverstorage.material_drive_controller": "Drive controller", + "item.serverstorage.material_cpu": "Central Processing Unit", + "item.serverstorage.material_cpu_substrate": "CPU substrate", + "item.serverstorage.material_pcb": "Printed Circuit Board", + "item.serverstorage.material_pcb_substrate": "PCB substrate", "gui.serverstorage.store_all": "Store all items from inventory", @@ -57,5 +58,9 @@ "gui.serverstorage.direction_up": "Up", "gui.serverstorage.direction_down": "Down", + "serverstorage.groups.blocks" : "Serverstorage blocks", + "serverstorage.groups.materials" : "Serverstorage materials", + "serverstorage.groups.drives" : "Serverstorage drives", + "message.serverstorage.block_disabled": "This block was disabled in a gamerule, contact admins" } \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/diamond_drive.json b/src/main/resources/assets/serverstorage/models/item/diamond_drive.json index 4a1cd31..df3b23a 100644 --- a/src/main/resources/assets/serverstorage/models/item/diamond_drive.json +++ b/src/main/resources/assets/serverstorage/models/item/diamond_drive.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "serverstorage:item/drive_diamond" + "layer0": "serverstorage:item/diamond_drive" } } \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/diamond_head.json b/src/main/resources/assets/serverstorage/models/item/diamond_head.json index 338a0aa..8bf2f77 100644 --- a/src/main/resources/assets/serverstorage/models/item/diamond_head.json +++ b/src/main/resources/assets/serverstorage/models/item/diamond_head.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "serverstorage:item/head_diamond" + "layer0": "serverstorage:item/diamond_drive_head" } } \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/diamond_platter.json b/src/main/resources/assets/serverstorage/models/item/diamond_platter.json index 0435fe1..6c340a0 100644 --- a/src/main/resources/assets/serverstorage/models/item/diamond_platter.json +++ b/src/main/resources/assets/serverstorage/models/item/diamond_platter.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "serverstorage:item/platter_diamond" + "layer0": "serverstorage:item/diamond_drive_platter" } } \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/golden_drive.json b/src/main/resources/assets/serverstorage/models/item/golden_drive.json index ec6e287..9aea240 100644 --- a/src/main/resources/assets/serverstorage/models/item/golden_drive.json +++ b/src/main/resources/assets/serverstorage/models/item/golden_drive.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "serverstorage:item/drive_gold" + "layer0": "serverstorage:item/golden_drive" } } \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/golden_head.json b/src/main/resources/assets/serverstorage/models/item/golden_head.json index 3a39d0b..a5a60bb 100644 --- a/src/main/resources/assets/serverstorage/models/item/golden_head.json +++ b/src/main/resources/assets/serverstorage/models/item/golden_head.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "serverstorage:item/head_gold" + "layer0": "serverstorage:item/golden_drive_head" } } \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/golden_platter.json b/src/main/resources/assets/serverstorage/models/item/golden_platter.json index 138d33f..98750fb 100644 --- a/src/main/resources/assets/serverstorage/models/item/golden_platter.json +++ b/src/main/resources/assets/serverstorage/models/item/golden_platter.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "serverstorage:item/platter_gold" + "layer0": "serverstorage:item/golden_drive_platter" } } \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/iron_drive.json b/src/main/resources/assets/serverstorage/models/item/iron_drive.json index 6fab3ad..57ccfe8 100644 --- a/src/main/resources/assets/serverstorage/models/item/iron_drive.json +++ b/src/main/resources/assets/serverstorage/models/item/iron_drive.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "serverstorage:item/drive_iron" + "layer0": "serverstorage:item/iron_drive" } } \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/iron_head.json b/src/main/resources/assets/serverstorage/models/item/iron_head.json index 7e7c7ef..267a8ae 100644 --- a/src/main/resources/assets/serverstorage/models/item/iron_head.json +++ b/src/main/resources/assets/serverstorage/models/item/iron_head.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "serverstorage:item/head_iron" + "layer0": "serverstorage:item/iron_drive_head" } } \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/iron_platter.json b/src/main/resources/assets/serverstorage/models/item/iron_platter.json index 5db5a4c..c2fbd1e 100644 --- a/src/main/resources/assets/serverstorage/models/item/iron_platter.json +++ b/src/main/resources/assets/serverstorage/models/item/iron_platter.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "serverstorage:item/platter_iron" + "layer0": "serverstorage:item/iron_drive_platter" } } \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/cpu.json b/src/main/resources/assets/serverstorage/models/item/material_cpu.json similarity index 56% rename from src/main/resources/assets/serverstorage/models/item/cpu.json rename to src/main/resources/assets/serverstorage/models/item/material_cpu.json index a26ba02..8c6a72b 100644 --- a/src/main/resources/assets/serverstorage/models/item/cpu.json +++ b/src/main/resources/assets/serverstorage/models/item/material_cpu.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "serverstorage:item/cpu" + "layer0": "serverstorage:item/material_cpu" } } \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/drive_controller.json b/src/main/resources/assets/serverstorage/models/item/material_cpu_substrate.json similarity index 51% rename from src/main/resources/assets/serverstorage/models/item/drive_controller.json rename to src/main/resources/assets/serverstorage/models/item/material_cpu_substrate.json index 679ec93..600d8fd 100644 --- a/src/main/resources/assets/serverstorage/models/item/drive_controller.json +++ b/src/main/resources/assets/serverstorage/models/item/material_cpu_substrate.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "serverstorage:item/drive_controller" + "layer0": "serverstorage:item/material_cpu_substrate" } } \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/cpu_substrate.json b/src/main/resources/assets/serverstorage/models/item/material_drive_casing.json similarity index 52% rename from src/main/resources/assets/serverstorage/models/item/cpu_substrate.json rename to src/main/resources/assets/serverstorage/models/item/material_drive_casing.json index 33fc958..62b99e7 100644 --- a/src/main/resources/assets/serverstorage/models/item/cpu_substrate.json +++ b/src/main/resources/assets/serverstorage/models/item/material_drive_casing.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "serverstorage:item/cpu_substrate" + "layer0": "serverstorage:item/material_drive_casing" } } \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/material_drive_controller.json b/src/main/resources/assets/serverstorage/models/item/material_drive_controller.json new file mode 100644 index 0000000..f56b5ec --- /dev/null +++ b/src/main/resources/assets/serverstorage/models/item/material_drive_controller.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "serverstorage:item/material_drive_controller" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/drive_casing.json b/src/main/resources/assets/serverstorage/models/item/material_pcb.json similarity index 56% rename from src/main/resources/assets/serverstorage/models/item/drive_casing.json rename to src/main/resources/assets/serverstorage/models/item/material_pcb.json index b963cd8..c48b0ed 100644 --- a/src/main/resources/assets/serverstorage/models/item/drive_casing.json +++ b/src/main/resources/assets/serverstorage/models/item/material_pcb.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "serverstorage:item/drive_casing" + "layer0": "serverstorage:item/material_pcb" } } \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/material_pcb_substrate.json b/src/main/resources/assets/serverstorage/models/item/material_pcb_substrate.json new file mode 100644 index 0000000..f800b68 --- /dev/null +++ b/src/main/resources/assets/serverstorage/models/item/material_pcb_substrate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "serverstorage:item/material_pcb_substrate" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/module_netherite_upgrade.json b/src/main/resources/assets/serverstorage/models/item/module_netherite_upgrade.json new file mode 100644 index 0000000..1975e62 --- /dev/null +++ b/src/main/resources/assets/serverstorage/models/item/module_netherite_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "serverstorage:item/module_netherite_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/netherite_drive.json b/src/main/resources/assets/serverstorage/models/item/netherite_drive.json index 6a74a34..1e68d78 100644 --- a/src/main/resources/assets/serverstorage/models/item/netherite_drive.json +++ b/src/main/resources/assets/serverstorage/models/item/netherite_drive.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "serverstorage:item/drive_netherite" + "layer0": "serverstorage:item/netherite_drive" } } \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/netherite_head.json b/src/main/resources/assets/serverstorage/models/item/netherite_head.json index a2e1184..9c6fc09 100644 --- a/src/main/resources/assets/serverstorage/models/item/netherite_head.json +++ b/src/main/resources/assets/serverstorage/models/item/netherite_head.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "serverstorage:item/head_netherite" + "layer0": "serverstorage:item/netherite_drive_head" } } \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/netherite_platter.json b/src/main/resources/assets/serverstorage/models/item/netherite_platter.json index 7621bbc..45e50f3 100644 --- a/src/main/resources/assets/serverstorage/models/item/netherite_platter.json +++ b/src/main/resources/assets/serverstorage/models/item/netherite_platter.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "serverstorage:item/platter_netherite" + "layer0": "serverstorage:item/netherite_drive_platter" } } \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/pcb.json b/src/main/resources/assets/serverstorage/models/item/pcb.json deleted file mode 100644 index 63f7e7e..0000000 --- a/src/main/resources/assets/serverstorage/models/item/pcb.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "serverstorage:item/pcb" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/pcb_substrate.json b/src/main/resources/assets/serverstorage/models/item/pcb_substrate.json deleted file mode 100644 index 1e880ab..0000000 --- a/src/main/resources/assets/serverstorage/models/item/pcb_substrate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "serverstorage:item/pcb_substrate" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/textures/block/bus_connector_blank.png b/src/main/resources/assets/serverstorage/textures/block/bus_connector_blank.png index 8cb7499687786a0431fe2c0a3d5f052f226ca796..371b49dd6dff6a3c0f540bda33f47ce140d194c3 100644 GIT binary patch literal 671 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUZU@FPuN_?&cB{=l$_>f+?>z~9%$+w;!t%O_79Ff%p2a{2U|*N=bw{P^VYZF4h||NsBr$zCJR zz`($manM1_lQ95>H=O_808(d`fb+cm2E1 zz`$_C)5S4F;^sLhrb$^>clFo*|D)q#*Uszz-d@bm)MXUM z9b~>GQ8#O4*j%$~KTB_X(Qasao3QJ{gS|zG%Ow`w>F;khd>SJ^`J&9B7l*$@>&;WL zJ83evZq}yzfd_tmE~(mA&c2p&)0WJ}RT&KWPxi_HS8U=9lYIZ?c>42ay*&b{W#_83zvfiu8%y1~r?hm=X8l`k zNAm9&iEn9-pP0bFz@S><8c~vxSdwa$T$GwvlFDFYU}U0eV6JOq9%5)>WnyV%Y@%&o zU}azsQS%Ix7!VqA^HVa@D$z6;Sy&lbLNxF$nW+y-L~t8QGILXlOA>Pn;ChS=L6#Vs aSQ#5Y^fYy*Z)ad&VDNPHb6Mw<&;$T1rV+OQ delta 538 zcmbQwx`JhbWIYoD1H*)g8D)pcIY?na6t$y2Xu&BIrx)lBN zdBjpK7M9Z?|CXurCM?z9dL%tHcK+&TvwZ{}#T9(3kbho3Z)fq==gZxFFZUf!RuH(6 zW48SA$>*Od_r@J~Sa6}Vc4Gufv!j!W2miyYueMXYRE0WErfj;K*Xg=A(7|f1nw134 zvBw)TXFUjd=_a;Va@72>HPTpx}(@rkql$+Ho-FvLWiuLuMoZIWJzkd2DTSe&R z`|rE&@_91!A9oh94XF>)%KwqM={9PF-o>Y(4vv!}Rmd>np>umMlrz zeDbx?v+kT!i$H#Je)Z$6LhpPfec$Ezo;vh!Lu%xo&=~^3FTYlCB<2-Oci6J}s@=2C zmfnU^y%Ez^$G`smdymk9yLp@0gM=>4)Kt%A)@HgQR=WGH-}1xNfj+AeB|e-gw7nxf wvBhBPnN@5DIvM_WOpsQ5Vk3L}CnLYGnW^Q*l*6|e7#J8lUHx3vIVCg!0Q#Eo!vFvP diff --git a/src/main/resources/assets/serverstorage/textures/block/bus_connector_bus.png b/src/main/resources/assets/serverstorage/textures/block/bus_connector_bus.png index 11f49b0536f1de56688d25feefce666401327853..d472af3bc531fb5d35a04b90d9479a4fd7a6ce7b 100644 GIT binary patch delta 663 zcmdnRvYvH=LkS_y6l^O#>Lkk1LF9rsNh8GMBr3MTPuM!v- ztY$DUh!@P+6==i2z_22~C&bmx*4p0A#>Lsu#@f=_%EH0k*4fFy(ZSBd*wDh<^!&MF zk00Io^7-|H``2&YxNz~piMw~MT)%ei)ysz;-ao%_{rurWyWZEod-nIwmyaJ_eEss~ z__2LfmgX1EA9r_i2@3T0_3`rZba!=e^7iuJ;o*7u%+v>^Cb$(PnYpROC5gEOa6QI`AWMu* btc(pHdYU@ZdABn#Ffe$!`njxgN@xNAz*#7sn6_|I|slvzP(}+U{;%z5AY0SJw*ughb&Y?VguwKPhA~X|4%kWonwBr0FE5 zs_3s6!P(VR;eK@Y>SxyT1XTD=TAexb|Ga&%+wPNTCcd}xwlB-n6YIX4_q@caH1_z- z9J98>9yjIFn>+#)l$UfLeO_Q8!^2j+_g>LXmHOwOe-eJjNhm&q^Yg}?Or){~$`}cAobB%Vy-H(59 z;LB96)(!@7j(V0!CshJNQ)XU!C@*-;LW0L>p}bW}ANz4uUUJFXGHJJpr95c?1~toUw$$!r-sPfnaPz5` zj>dKke}A!B2fDVmRqd#>;B??DW@ete_Z-9L3Y*C%T>>9WPSWnpaAQ_n6L(KY?ya5O zy|%-O?iXK{SWKI|*L1dT9Ov?=wMFbD0v_qhYb>QB1Q)DZ5x4$&mgzligQY7&xZ-xM x`@A_=MbSrg^PvYHTp0>gKBV#lZOi@7Ah%D-QUZU@FPuN_?&cB{=l$_>f+?><-x$f@bt-@6UX<9 zii&!;yJ~1?`1<<3cz!>?-`B_6^Um$dCr=zOGc~?)`ShFDkAMCA_~h|zb2F3w|NmE= z(hz1~U|>x0c6Twox9w&&0|NtRfk$L90|Vb-5N14{zaoW!fq}im)7O>#1-m?-lHBcG z|L!v|Fr4soaSV~T?Am)X=#T+}YyPYynZmPrgR~Y-y0C$>E9(FM+ixruJ^y$nmZ7Q1 zD2^*AY)g`<*GjQovui(7cfS&2$i2Qd^OpMisoCaTiYMNF*dv|f_0&%4tYXi--u+A7 zXdZGr_VLHz8GqWC&dopexH3&FN?0ZH`H`PRGhHW|HcbDczHVo_z+A6>uRD6IN38Du zbC0)d+V--r`qh1ocV5S%cZoIM5P!0lH(_t+G3(zSZ|=xcWp2^c zGO@HWHqkaPure@+sCfoT69^5t`6-!cm1r7_EUXO8AR2zZd3g+!mf$v&Wag$8mn7yE i!1Wj#f-EsMu`)J*=xORq-_F3mz~JfX=d#Wzp$Py-^A}41 delta 554 zcmZ3+x`SncWIYoD1H*)g8D!p`7zvO%iJ^rw4_v4QiHz%KDkx&uq7W5U=5pma_e!BS}!`%nwv(I`h4buDm z>}!?z?6XyS+l0CVnDpywPMmpue`D|whJJh2KVSbkU)X75Yj;3W_59EjO`%@5RHo33=`$}~IH-SQy=r^AKtq|8tiZvk^(HSImui}S zw(Hu&Fx^8XLfdju(9)p9-93`>-nN208`x*pSnAEVV4f*bS$S^KvyTR)*7uE@qg# z`fBxCY379xE!K51;m@8)c?kp`UsI$U@WYA0TI7lAi=uhUGXF7Z{jr`jliT?N0|Ntt Mr>mdKI;Vst00=1ei~s-t diff --git a/src/main/resources/assets/serverstorage/textures/block/controller_back.png b/src/main/resources/assets/serverstorage/textures/block/controller_back.png index 941ecf9e5573214f483492d086969c0d1ed40960..db2d0125917baf8d6ccccce33af0b97e52e8e59b 100644 GIT binary patch delta 669 zcmaFNa+Y<1il;)dN02WALzNl>LqiJ#!!HH~hK3gm45bDP46hOx7_4S6Fo+k-*%fHR zz`(FQz$e7j&eq!A&c?;r(Z<@++RDPg-qzX4!O_8PVxn~Y^=s!|y?prL{qq~w&mTUt z>;1cDfB$^>_~FIZFK><}sftU_M{W{Nnljdo?UCnpkdDF$ehj`gnWZxqbQMi34V) z##b(%e)IbAub&^EJicvSZ)WoU|Nm0Adp8&u7#Neh-Cb;!XClBSEMj7FtC?+`ns~eV3+4plDoa@-+cxKhFhL4jv*44P0u_GYcgPHd&qAl!6SLw zMP>O;OBPqIOPdz`-oO6b%O}78*ETRHE(|==WTD9EEBHBQVz-mlUY+{zt4s<{cjg=9FAKt#J+`swUQTFH#jx_?+|L13$G+GwDzP-+R>)P@vXNINc_wA3l_3)^* zB9n#Q+hk5@#s^zB)=B&>tonR?*|LPtXMZgCmgjva+nti|`q{JJb+i6m_|Dr)Erq1;33=9kmp00i_>zopr0Fvn#KmY&$ delta 543 zcmX@h`j};ciY;Stkh>GZx^prw85kH?(j9#r85lP9bN@+XWnf_V6W|l#YG-S0Z)am` zW98!PXk%?@ZDrwLZ|m&j;N)mOF;}|&+SRkKUp@Np{`rmT=MNv+_5R(nzkj}b{P5z^ z#gkvZym|HV;iHE)j~?0c@WBl$OY^g5j$Al@+}+J3DA3>6$IHvp-POg(+sotfrBkEZUamF00A%Yhu`D?F4?>~KV=UxrVizb$vRm=hYzW@Gy_3`$+bNlkGn-@=>IACUK zeC6`#t5?q4yL&L%-eth!ywxxxcsfm%fnTdD#yepGs871mJc)B=-Xawt?x$V^C zAmVV5`AowECj+I#0F|Q}CKBS_D!wPqoZ@=*|Nm0C8}F+b3-&Z@(D-WM>1Gt>VD*we z83%yJVd)A~a{&#_pS7#EZDVV&B)uf6gCTE5MZ8crtH@*=}+$^|OQJx^`2 ziBFMS{6voN{{x-KjZvxfPnEk(dzojgX?~Y*NbL#ZyltA=s~4@Be={#HxkG3Ard3+v zl_xKqG-!H}x;x!9@cRD@pE%bKd{uV@b29fAet6gR((WE-or&lU{>#icum4I~*45Rn zb~E;hdXYP8v7?NwrAc=83z3v1f3|RRD*bcqI=;Q0yH!Ok;=x@<1_lNOPj**7mvv4F FO#lok35Eaw diff --git a/src/main/resources/assets/serverstorage/textures/block/controller_bottom.png b/src/main/resources/assets/serverstorage/textures/block/controller_bottom.png index c0d8a71001f8c088a02a59ffc5e54128b9ea8599..0a188a7441b03c2c506f0c7f0a0fdf1f30da3106 100644 GIT binary patch delta 678 zcmaFOa*cI@il;)dN02WALzNl>LqiJ#!!HH~hK3gm45bDP46hOx7_4S6Fo+k-*%fHR zz`(F8z$e7j&eq!A&c?;r(Z<@++RDPg-qzX4!O_8PVxn~Y^=s!|y?prL{qq~w&mTUt z>;1cDfB$^>_~FIZFK>3uUtO;=Jn%WKR-UHe|+2A%;f+7|6gsQFEB7LFeZ7syVzdH4UA-9VBjq9h%9Dc z;5!V$jK}j=q%bfru$OrHy0X7um*-QGyS?k*eFg@G2c9mDArhBO&%SkPR*-Ob815K2 zgX4^)bab<0T~5-v(A97LtzTVtWoN^41{VS4IZIT$jHf)52|5+Vs$bt4@;WPcJww3O z+*6CH0=iCS9XH6>Wp5+Lf9%$m6t8&bZQlKhjd|tF(q!ppFOSarJB#7wui4zO_WS-x zz0zeo+xqwZyxHG5-u29$z4sVzm0XmXSdz+MWME{XYhbQxWFBH@ zVr61!Wo)8tU|?ln5K;3i7)3*FeoAIqC9;MfLlY|_3oAo&h>qCVkBS%=7&PEklw{_n n7MCRE7Qi(b8-i>xHnB1`faq!JOyADHz`)??>gTe~DWM4fsqPj- delta 551 zcmcb{`kG~eiY;Stkh>GZx^prw85kH?(j9#r85lP9bN@+XWnf_VAK(+>YG-S0Z)am` zW98!PXk%?@ZDrwLZ|m&j;N)mOF;}|&+SRkKUp@Np{`rmT=MNv+_5R(nzkj}b{P5z^ z#gkvZym|HV;iHE)j~?0c@WBl$OY^g5j$Al@+}+J3DA3>6$IHvp-POg(+sotfrBkEU*>iuqm*%i}th^To`^kL|mD?VN|Z>y>im z13ApQ{W6%3<}u&DckS8JyDy&KfBNLksRHHzf8V#QEdTy~_3`$6(Zq7+_T^hQFP=Pc zz|7S6%H`8nubjDe_v)M1kAMCA_~h|zOA9ko6C-mollZP%&XW}wCF;L=x;Tbt1nZv7 zc4~4Ead^mmreT7Y!J@`W}4xxpcE(wTCT@k|k zbji)E*UQ^ZT7_-DF4P#2Uba7Xu5o%ol=yU!JF6F#*FOH~xS;3HN0+t@>+e6>nDI)W z;Qb?(%R2tuJj`YO4mAa77W$U;`eG6bP0l+XkKbtw&8 diff --git a/src/main/resources/assets/serverstorage/textures/block/controller_front.png b/src/main/resources/assets/serverstorage/textures/block/controller_front.png index c8e73b880571b1c6cf539e38725fb7592e39be50..ae42377541ad6a70226f45085198ebccf8b2b435 100644 GIT binary patch delta 667 zcmeyua*uU_il;)dN02WALzNl>LqiJ#!!HH~hK3gm45bDP46hOx7_4S6Fo+k-*%fHR zz`$@Iz$e7j&eq!A&c?;r(Z<@++RDPg-qzX4!O_8PVxn~Y^=s!|y?prL{qq~w&mTUt z>;1cDfB$^>_~FIZFK>j^;6YxVt`j^yu#0yI0DYpFDYT>(;Fo&+iBL`<^dme$m9@iKnkC`wMn?J|+1zd(U|?Ffcswba4!kxNO>+7~W(c;TC@*VZ+HAYD$(T&#qO> zikLN3^zZ-qqH}}KxBq@Q?>B>sfbyIrDqhA@9?ArrN@LY;4f&iEc%C6(YtE@fyMnt; zW*s%i*p>I*eC)ZPb>8D?Igei~zSJOn&`b5`^KixEtXCcWXeGZx^prw85kH?(j9#r85lP9bN@+XWnf@r4e$wZwX?Ohx3jUe zv2t;Cw6V6dwz6=rw{>=MaB{Stm@8d>?dsXruO5AP|NO@F^M?=ZdjIa(-#=eIet2=| z;>oXH-n@GG@X^DYN001z_~3?>rTN)2M=qQ{?(XIi6zK2kZCW7G|au_(Ra!*?6mt zw)Tqe^;6bd-DeSAJ(u^uN2WuIt~^kYJQ>0Ga>31@t5JE!cNlKML5Z@{K4*ZUNzV)AbM`2Mx? z=#xm6{MELqiJ#!!HH~hK3gm45bDP46hOx7_4S6Fo+k-*%fHR zz`(F8z$e7j&eq!A&c?;r(Z<@++RDPg-qzX4!O_8PVxn~Y^=s!|y?prL{qq~w&mTUt z>;1cDfB$^>_~FIZFK>sa<7KvaUIL40_GRb?+5t%`gnUD&11fE`|`;X z2h2>3uUtO;=Jn%WKR-UHe|+2A%;f+7{|x$T8W|WE7?Zr+U2HGp21YV4FmM)lL>4nJ z@ErzW#^d=bQWzK**h@TpUD;o-%kwG8ui1OflYxQZwx^3@h{R>nGjE-m3?v*LiknH~ zY|6w?O*~GFk)%AOQ>{sRU|35Rh2q@24qT*#d<)KW_DKS>@p!%1oJ6DM@tcbb3 zNMrt%v{iQuc-r!2KaWkG>-|0K153vP>;Ln)r5Y<2UX$;8yYltk%hD_hzTD(rpKRZI zuTZXW@g=)y76l9y+}GrHC(hyfCzQprB^e%`Iyxxbw63me4j zYA;-8ue8HBZ~Z$V^Avga`AZpN>b=#rOp3qXIxGAN1Lx+TDDPA0k(nPn;F^pL eLADs1SQ#5a^r-yHVP;@pVDNPHb6Mw<&;$T+jtrdu delta 547 zcmcb}`kZBgiY;Stkh>GZx^prw85kH?(j9#r85lP9bN@+XWnf_VAK(+>YG-S0Z)am` zW98!PXk%?@ZDrwLZ|m&j;N)mOF;}|&+SRkKUp@Np{`rmT=MNv+_5R(nzkj}b{P5z^ z#gkvZym|HV;iHE)j~?0c@WBl$OY^g5j$Al@+}+J3DA3>6$IHvp-POg(+sotfrBkEU*>iurso^ObVux2-I@GnfzLFdsj*@A|cK z9`3F${F+$q)v!FSV>wm8eE;6HXHW0Gcz*xslRE+azW@Gy_3`#Rn#X+S_T^hQFP=Pc zz|7S6%H`8nubjDe_v)M1kAMCA_~h|zOA9ko6C-molX=qIN|O~BCF(zVx;Tbt1nZtT z=+qP-;Bb*qPGO0F%|ru@NldM5%&t0|Ccc|DHU0XZpLzK1eC`7qWFE3^Jlr8Pu|o35 z<~;wv^QLpZ^)}v2Zj=ze7GS8i^6iUbS55ifojtL8@8>@X0>}TUh$u*{`hG*qKbPs9 z^Q1>P^K?I{vVEDz@H=Jwh6=su^`V^`R~ZSYWbYR}k?SP(Aa(X58~syRZM#<ITsCLCvsi39cTD7ao*Ik9UH#>A#Ct8DT`p+czU5uZ zynXxXMfS?6@Rpc;^<2Jfn#}91o?97Il>VEwa4`LMPnn+kk5R*3C0AqK4-WLqiJ#!!HH~hK3gm45bDP46hOx7_4S6Fo+k-*%fHR zz`(F8z$e7j&eq!A&c?;r(Z<@++RDPg-qzX4!O_8PVxn~Y^=s!|y?prL{qq~w&mTUt z>;1cDfB$^>_~FIZFK>3uUtO;=Jn%WKR-UHe|+2A%;f+7|KB;oVi*`07?Zr+U2HGp21YV4FmM)lL>4nJ z@ErzW#^d=bQWzK**h@TpUD;o-%kwG8ui1OflYxQZwx^3@h{R>nGZ&MZ6eJuT#ybXj zuox9jZ>icu%4h1(0PtPf78iy^HOwr|vR^x@ajRE-Iv6Y zX`eZCM4xRuGLQMdYV&s%tp;=M+%%W)IJ;)|m&aesEH=jqDP-4|J}!~`^}YU!GUM6S zT8Z{&#!b?XpJkmd^!`@(B{cIuZ+*hjNsoRnpYXXWOQCLBkf!5Loh((I6pj6vEt6RO zFN$gY$1G(h(Zk#;7{$QApjzS@QIe8al4_M)l$uzQ%3x$*WTIGZx^prw85kH?(j9#r85lP9bN@+XWnf_VAK(+>YG-S0Z)am` zW98!PXk%?@ZDrwLZ|m&j;N)mOF;}|&+SRkKUp@Np{`rmT=MNv+_5R(nzkj}b{P5z^ z#gkvZym|HV;iHE)j~?0c@WBl$OY^g5j$Al@+}+J3DA3>6$IHvp-POg(+sotfrBkEZUcj^$JV^V?RIVv=_3`$+SHp7W_T^hQFP=Pc zz|7S6%H`8nubjDe_v)M1kAMCA_~h|zOA9ko6C-molV#kNERz)&CF(zTx;Tbt1nZu; z?bPHT;&73fM`4LTkB5YaXQLDQOHv~v9smB{{^d|zymUjN^<|4NIvPJ+|tU!vvkbehS;UA{&mEcFndreM%CQ$udZC1LqiJ#!!HH~hK3gm45bDP46hOx7_4S6Fo+k-*%fHR zz`(FQz$e7j&eq!A&c?;r(Z<@++RDPg-qzX4!O_8PVxn~Y^=s!|y?prL{qq~w&mTUt z>;1cDfB$^>_~FIZFK>%x_y+4&*RlBSEMj7FtC?+`ns~eV3+4pl3%m;oF@YV!+lQ|#}J9jre_<&nhZo59&$6Y&F;xn znsoWjo^0nW0ovMC|G&Q~@%zjF;V%Q{5|z{3vqV%iH*;|v6W^M#fE_oyYzn{ia2y+Y>VOJ2r+Uo8)1+AJ0b zD={8la`d_3k>Vp)xEU%wiaj>yReW&tyX1vFYnfvPN40Ogox~LTTY6vH~5cH~E>tn^M2`NpIMv&#S{ecS$a&3-ii8c|^xrS9Z#hUD8gU zY<{avW&F&nGEJg?Z}pSM3=9maC9V-ADTyViR>?)Fi6yBFMg~SEx(4RDM&==gCRQev zR>mgU1_o9J1`##Sf>AW&=BH$)RibGy^0Tlqw1DVXeRGZx^prw85kH?(j9#r85lP9bN@+XWnf_V6W|l#YG-S0Z)am` zW98!PXk%?@ZDrwLZ|m&j;N)mOF;}|&+SRkKUp@Np{`rmT=MNv+_5R(nzkj}b{P5z^ z#gkvZym|HV;iHE)j~?0c@WBl$OY^g5j$Al@+}+J3DA3>6$IHvp-POg(+sotfrBkEU*zoOyQ!^Qi*nx2-G(a+r@F+jsriIS+T& z$8{|Cz3*MSS;hS9>D?F4?>~KV=S34sfWPm(8kT>5zxsH4o-by;bNlkGn-@=>IACUK zeC6`#t5?q4yL&L%-eth!ywxxxcsfm%fnMvZF871mJd%8G=Xawt?4RmU9 z5Ma2#Smx-X7;(`+V-nL;w&vI+S3*oqpYnS3ul(il@w`3bd-qxcWwH-vn1m_5oc+CGlAjIJLFZ}8 z;;l2LNo;m!`ZU?x+3tC(M!kWlFXy8i!H2~skH#$6By*Z!b!p$C6<+5GjSDqZZ0(ON zdNTD!lHCiH347L*|2Vb$_NpUO_O29ov-ZoDM`voMKR7J^e0Ry>mXiS!?dCG9$lmJq z=EK*&$v2MYg*hiz+T1v^dDGv*i^*X;R+;~F diff --git a/src/main/resources/assets/serverstorage/textures/block/drive_container_front.png b/src/main/resources/assets/serverstorage/textures/block/drive_container_front.png index 342f2aa1d8a0db47bcd72f0d6e055ecec410a781..3076c82ae477f9bf15b4c2261e399246ab0928b3 100644 GIT binary patch delta 558 zcmbQk(!x4H#Zw{KBgmJ5p-PQ`p`nF=;THn~L&FOOhEf9thF1v;3|2E37{m+a>=MaCESnm?+JB{o1*S^`gOj3=HPm8IB&= zV`XWcnU(eb-?uxrFP}KRf91-R7tSC5_~C`Ci__C5cV0Zd|K#!QE0<6I{PE%Bi34V) z#&2FfHa9c*|Ns9bj(sW&3=E7(-tI1XA(sW(C(AHO)U%g(`ns~eV3+4pl3%m;oF@YV z!){L(#}J9js%LLkH7f|PJlNQvq0!!Za9dK3;j|^0_y2#*O3Z(j^zWzGiVw$jtVj(t zU-M8mYw7NL5zk+m%yDMlkoaeR`6B-RmYIDkj#bV(-o5;&RW{3#vr1DG+A2a{@A|d$ zKquq8Jd@I@(}zOpcdRygd6u!9`GI!yr?l%`!$tIc*GksioWVR z+I`6T`6~XqjPlMb`v32o-~9dM8l@-m`nu*Aon$R4H(68bdaUKa{x!WF^}oN15jgR3=A9lx&I`xGB7Y)3h)VWwX?Ohx3jUe zv2t;Cw6V6dwz6=rw{>=MaB{Stm@8d>?dsXruO5AP|NO@F^M?=ZdjIa(nKNg;etGli z<-rTN)2M>4ar{{Q=S=l12xmrmWjb;;4e?$X7RCywtwclPMY zl`F4bJ9qrpz63UXJh^rA;`11L)d;k7^ zefs3imCL7p*8li$^27l%Q{#7UpT2qh_}9;mmKJ9B?_D!BF)}wZIW}oi2m=EHXMsm# zF#`kNVGw3Kp1&f6fq~(&r;B5VMzHGH-0&s`0oDhJvtwIW8bufC-sM=z5WjJ&xc1af z|NpCI&e8uquXuhj+kqtW6RmeQ=djDZYpT8d{g0!7TaiS6y-+{nv6uhvdX~!D_NdEz zNuHG&`AcM_4aah0#-qlaDhmQQel1*1$_sywoXXS->GD{At5&C_77k7?Z#{$ zyuz-fZLF@2FVqkcx@>oJL&KxTn>U}mCvb-KMccCVoJY5_+I!FX(|rA4?V85;|8M)$ z?Tr?1YQ1-@WHQ(3V}I0?jbfUc-^F)pu-GqN9a+t&c1=d0>)TUh1_lNOPgg&ebxsLQ E0N`W&t^fc4 diff --git a/src/main/resources/assets/serverstorage/textures/block/drive_container_side.png b/src/main/resources/assets/serverstorage/textures/block/drive_container_side.png index f6be0e078494bb23128172b0978c83aaff078a82..f641dd816432953265cfaab854bce403eb8ea5c5 100644 GIT binary patch delta 609 zcmX@gGLdzHil;)dN02WALzNl>LqiJ#!!HH~hK3gm45bDP46hOx7_4S6Fo+k-*%fHR zz`)QR;1l9%XKQV5XXE1RXk%?@ZDrwLZ|m&j;OJmCF;Tky>XkFEUp@Np{`rmT=MNv+ z_4dt^zkj}b{P5!Imp4a`?6I;mzi|HelgGF3+`jzt$A|y_|L@(i<>`|?QS{zOL*q*yZ_@q`g|UHT3q(b?+9ITJ$`LESWXkfMG^uZ{3{yRT`h$ zOjWk0bJdC3+Eiy9sG1dU?!n8y&0SI+^Vi*p;QOxXv`doVV(fNCWjDKydaWJS%euWJ zG{xdM81{9~;}1D$eOxGe17ov(xBJ;YchtGdbU!JVJl*tP-JQ8JLh`uqRL;kno5Uw= z$V--3r*nPIg1(-(R{7@|m4%!+CzV#c(I^hs=bZj4+-OWxfv4a{|o%tH)KtV}Gej7_u+46Fu=?_(*$fN}8gMI0GILXlOA>Pn;ChS=L6#VsSQ#5a^r-yH T;bmrEU|{fc^>bP0l+XkKYpC`& delta 512 zcmbQpdX!~?iY;Stkh>GZx^prw85kH?(j9#r85lP9bN@+XWnf^q7vK}(YG-S0Z)am` zW98!PXk%?@ZDrwLZ|m&j;N)mOF;}|&+SRkKUp@Np{`rmT=MNv+_5R(nzkj}b{P5z^ z#gkvZym|HV;iHE)j~?0c@WBl$OY^g5j$Al@{K@0nZ{Iw*eCgExf8XxhzI^-EB}WIl zt5?qa{PE$|&5Qs4|KGc3%kyXVP8{EV?(ETLPw#&J_U`_@YuB%x`~UyP@nid3U7W65 zKK=B`olhTMzR-Ps|K*DZZ(cvXclYY)Q-}Wj{d(r~;gcs0n3)>Cd;9d)&ySWCW~L@a z=4K}6E{Wcn_*SC+gQtsQh(<8$!EUD}0}+M`+_@`EByLx3xe~L@%+t8H956exuJdtFf8j&+#3wTvnr2tLWZSOfS-Bx9`GncdCAS~-sV_a= zb*ib#v-Z*(CI7qjA-PQo)o*?+cbq;ueeKi=$AniZ;@axHo@czg>UnRJGs|AxQhIga z*I%btD(3d>4%XUo=6t)^u>kj%WjEVd1t;x&TF3kK_Y(UpQctH`4x1vD(xu8=SpHf$ z`1Oy=4ePf&db6Ww|J=Y&h9?+~_lPXAoL?8CclaIC=Qy(%l{LXd9W1vGGu_-T-lD_( fU(woF|9@eMoUFeZw-W;c1A`~KtDnm{r-UW|?X(!A diff --git a/src/main/resources/assets/serverstorage/textures/block/inventory_interface_blank.png b/src/main/resources/assets/serverstorage/textures/block/inventory_interface_blank.png index 5af3722549dca6865ac1f46331224355f0e97b05..01e997386858c708ea4be688863370a9da211734 100644 GIT binary patch delta 667 zcmbQhdWUs_il;)dN02WALzNl>LqiJ#!!HH~hK3gm45bDP46hOx7_4S6Fo+k-*%fHR zz`(FKz$e7j&eq!A&c?;r(Z<@++RDPg-qzX4!O_8PVxlzj^=s!Q){EAE{qpAcv3*vS z<`>Q%cXx9M3iS8&@$&L?cXe^{_VSRh%_wM|_VdSw=IQI6KDl$^`2L2;%L-ej-?@Fc zdHQM(ch`)X{<6+FwG$R!xqP~)b>@rb_ussJ9N_O;(LFD}X{wL6XHNa3Cy#HRJaNFx z)Y#n2__PX-2t$DS^ZArhB)PrP+%G7w?7z|FjD_M69D9)882-L%gxTaudc z{(n?yom>M?QP>pG^Q$;#iv+J|nRC@ky8Cn5#d8c1o8Oe&wNdc8y(WdxZ;g3>{q0`< zg|{l#dOe8BeYrA!Yt=G=iH+5Q|E7Lp|LFF+L7Oe%W5@d`ekDeZD|wm>{;d(Zc;Tpx z7Q>H@ef$5oN6pTD!}VY-&#%e*gj642FXpR}%)f6k=eUdW0cTFXnGP%8sq&S)sWaN) z{WSmKto$E(=g;*vFES2VY&w14w#QBu4+^)`i(TX}oh9bmz&ZP#Y;tPkpG_;7zq3CU zlF<5J;kk%`fkCyzHKHUXu_VN_wnFlfN7D9OxCEiOsSEr4q>HU!yXY+_|> X2+^eSFNc|dfq}u()z4*}Q$iB}w>Js0 delta 608 zcmcb^I)Qb9iY;Stkh>GZx^prw85kH?(j9#r85lP9bN@+XWnf^G3h)VWwX?Ohx3jUe zv2t;Cw6V6dwz6=rw{>=MaB{Stm@8d>?dsXruO5AP|NO@F^M?=ZdjIa(-#=eIet2=| z;>oXH-n@GG@X^DYN001z_~3?>rTN)2M=qQ{?(XIi6zK2kyYao2RdHb9H|H?B0pv`_G*{>gnOuFnL*F%k(?9FE>wL zef-$I>-E>pdAPe~)by8i&Z(WS`2M|XS1z9}@0wTCI`h-Vm(QNweewMM()6lP34nJ@ErzW#^d=bQW)wP82)>@IEH8hvmWepYH|=^ zIKZy6VA+FBN{KT%RJHaha9lbSV)9wbc-NU<|Ld`%)w4;n#fik z)3A%H-8$J9$H`-gj+=yp^4+PpThnW9KI&5QJIegNbYu15$XUK0ZBv*z-!!!C2>o;HxH{iieZGCK_oj&FwM@G% zxFck{qeLqiJ#!!HH~hK3gm45bDP46hOx7_4S6Fo+k-*%fHR zz`(FQz$e7j&eq!A&c?;r(Z<@++RDPg-qzX4!O_8PVxnCAtCtTyynlY<`uW3$cD;Z1 z?C+m1A3wbK`sK~>WBaTu%`cok?(XIi6zK2kEQzo?{RwuifGQR|HV|9@BZ%s+MV;F;5h>n1LJ@%(=C^i=`=zQ2Bc^zrt*bNjNH zsqvM|r{BDO{N(X%b2F3w_5c6hKfs#Hz`($m)a34n&t!yqX#GzM|8aZOdc1^S`o|$?p2v#Ps&DZURU9hxWQB39X<0 z-+pYMTJZeP-9M_bFU@@IqPcG_*imm1RU0d9t3Q)fDt&ElpwF3A#;2S;SM63+IlnnS zC~|{+siwGXe5hCz0|SFRdP{kVo554k%5tku7SC(k$H%riIs_^m9dGo zfq|8QK}5~7U=$6x`6-!cm1r7_EUXN@Eg?F1m(0{>U|`UITTzmkn_66wm|FnXWNZks c#n{Bk*bt&emdKI;Vst0M2C;W&i*H delta 586 zcmcb_I+1mPiY;Stkh>GZx^prw85kH?(j9#r85lP9bN@+XWnf^G4e$wZwX?Ohx3jUe zv2t;Cw6V6dwz6=rw{>=MaB{Stm@8NR`qiTk@1Nhee*W;GUGLvL`}^n1#}6+qT|D{q z%bQm(A3l0`^XQR14S3Co;iKEe$vusPw&2Xe*fu{JH_p@{{Q>dJbhJwzi-{d zrB|<<`StVT%NGw$o;Xm^J@4P&uRh+MrJZxiyXKa3%)WE`@~xW}%}kB2Tt5Bg_2Vax zZ(CZJnVJ}xo0&*)*BzKF%P3L**VDx@L?hVrY_wC8g9yU~ZXN|Tp`Hv0kxWaavqu*! zca4}iHFH{6Sj6vmx4$K31q>{KN}Cof?it-8(|F6X>`xAj)f%DH7XLKU)R{8l_}Z_`sP*Z4re(^5`OcD_RTmnjVu_0PV3 zytD7ZX73)~V1{W=a%CjKkA3C!I=qgfz}oBMJG+yc*=4@RNG{rS{zIWr?JV2mTWj0| z_VzrJ5nrFr{lu^~Tp=RrWBu*&bf%ggcT42@mxf)L*y69waC7UI34WW_XCBqdI?3gA zI4LRkyw^0>xaDHZy;Jsww`g?zaX!_!;}@$)jk)R}=3j|Z7#J8BJYD@<);T3K0Ra1F BCinmV diff --git a/src/main/resources/assets/serverstorage/textures/item/cpu.png b/src/main/resources/assets/serverstorage/textures/item/cpu.png deleted file mode 100644 index 39b2fdb6769996e50d3384befae5401104ffec4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 379 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdmwiJ%W507^>757#dm_7=AG@ zFf_biU???UV0e|lz+g3lfkC`r&aOZk1_lP90G|+71_p-TpUfB-7>sNz{>$SG3=Hfgp1!W^FW6c5gbX!IRbMkOFqnF} zIEHXsPfkckNf8kcNJwxnm~x<@(J|nr1V;~xq=W)bh@iOm3XTrNjsykohgbMEGaW8t zFuTsrZ1JQ{n}LBrwZt`|BqgyV)hf9tHL)a>!N|bKMAyJv*T5viz}yOiOtlRRtPBj8 zmon@?(U6;;l9^VCTSL*09V`qC3>t77N-}d(i%Sx73y}2~nphcHSeaNtEGcvUvVehs Ofx*+&&t;ucLK6T6#AOQr diff --git a/src/main/resources/assets/serverstorage/textures/item/cpu_substrate.png b/src/main/resources/assets/serverstorage/textures/item/cpu_substrate.png deleted file mode 100644 index f407003771eb2d5d3ee2e437877d90837aba183c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 313 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRdMrH;E236Z!B?bltg=CK)Uj~LMH3o);76yi2 z3=9knFBlj~4Hy_+B``2p&0t^Zr-eX{3U@!6Xb!C6S&cY{Ts9~!5nt_3V$J50zgyVX0f&woC1A_qr44a{{7OhOFItw6|B+rYrez<_xv!wwV;x%nxXX_dG& z6#dx2!oa|w0k@$fGdH!kBr&%DS&yNKm7#@|i6z96GWRbF7#J8BJYD@<);T3K0RZ#8 BO<4c{ diff --git a/src/main/resources/assets/serverstorage/textures/item/drive_diamond.png b/src/main/resources/assets/serverstorage/textures/item/diamond_drive.png similarity index 79% rename from src/main/resources/assets/serverstorage/textures/item/drive_diamond.png rename to src/main/resources/assets/serverstorage/textures/item/diamond_drive.png index 46a2f712a9716ca1ae73f79b64a14cdddabaa8b5..dc2900c7677d2f01df04dd685c855b25c53fd996 100644 GIT binary patch delta 99 zcmaFE`G#}DK}HUFK4nJ#m4~u7pJdcy5;ZapF*LC pjG?8KfeA$B+Rv|klWke#MU4$XdW=o23=APMuA3R|O)g}q1_0j89a#VX delta 99 zcmaFE`G#}DK}HT1J|RO5Q`Og-PcrH;i5i%M7?@jukg2wTft7&)^HPQ#lX+NVFlCB< f>|mK}%OVewF*LCmM diff --git a/src/main/resources/assets/serverstorage/textures/item/diamond_drive_head.png b/src/main/resources/assets/serverstorage/textures/item/diamond_drive_head.png new file mode 100644 index 0000000000000000000000000000000000000000..c023055b231a3ac884970ce86e174ef28e11d38c GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdmwiJ%W507^>757#dm_7=AG@ zFf_biU???UV0e|lz+g3lfkC`r&aOZk1_lO|0G|+71_lPNw>SU)|9|!Ww}ro7$V{9i zwQ9M-(XE0-RU&c0IuCCA|NsA#XL>aQ0|R48kY6x^!?PP{AWo9Ey9>Ac^&+3>t77N-}d(i%Sx73*dT;4MCO|n_3wdLiD(9 TX1K?|z`)??>gTe~DWM4fc@ThA literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/serverstorage/textures/item/platter_diamond.png b/src/main/resources/assets/serverstorage/textures/item/diamond_drive_platter.png similarity index 60% rename from src/main/resources/assets/serverstorage/textures/item/platter_diamond.png rename to src/main/resources/assets/serverstorage/textures/item/diamond_drive_platter.png index a66c301b2ad1d01b9125ccd0d153ce6b8915f797..20cbbfc670c9f65b7fef5e98146227c74328f28a 100644 GIT binary patch delta 127 zcmcb?e1mzyd=7a&Wu|KjCSRPme6^dAd5EEjm5HU5v8lF!ft7*5Kkm2B85kH;OI#yL zQW8s2t#b2IGSey1_n=8 KKbLh*2~7aPSt2X| diff --git a/src/main/resources/assets/serverstorage/textures/item/drive_casing.png b/src/main/resources/assets/serverstorage/textures/item/drive_casing.png deleted file mode 100644 index 004db470f9ac5afeaeacdb35132767257ce25ffa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 322 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)RqFqH)P1v4;|O+IS@;w5>z zyDT7sn8Z%e}n^c@HQE9F8e*{yKfD zMB~;?k@8EM=3Qx;Kkbo>gRuEJfd)Ue)+63Kxb2-{JKi2kpCVH_FT?WZ{$9(h2TWda zoU+$Wf0AQhU{Eb_jVMV;EJ?LWE=o--No6oHFf!3KFxNFO2{ACY0wGgv0|P4q1Lma+ zJ5V&_=BH$)RpQoA^kWAL0|SEw+=i0O+|=Td#M}a8J%%P$h89*PmJmzI+`lXU1&*hy KpUXO@geCxSCtphd diff --git a/src/main/resources/assets/serverstorage/textures/item/drive_controller.png b/src/main/resources/assets/serverstorage/textures/item/drive_controller.png deleted file mode 100644 index 8c15ff980899987a0b99077244ecb0417ad9ad1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 396 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdmwiJ%W507^>757#dm_7=AG@ zFf_biU???UV0e|lz+g3lfkC`r&aOZk1_lPv0G|+71_p+pHip@2x4%0)>-Q%!jv&VW z|NjT2-q^*!z`$4%#1v?9$kfDaD>T3oD z24_zf#}JO|$pS4*Y>aFM2`q*)L>BOv*8UO$Q diff --git a/src/main/resources/assets/serverstorage/textures/item/drive_controller_head.png b/src/main/resources/assets/serverstorage/textures/item/drive_controller_head.png index 7e8d20495aba201dce896d3707061c3b7b923b6d..6301c09ff97f731ccda659d6af216f2f56a04c85 100644 GIT binary patch literal 339 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRdCT0c(hNQXTpBNYz6p}rHd>I(3)EF2VS{N99 zF)%PRykKA`HDF+PmB7GYHG_dcykO3*KpO@I2F?JV5LX5UhS_Vk|NsC0PaaDc0|NtN zNswPKgTu2MX&_FLx4R2d8h1?!0|NtliKnkC`wMn?K4nJ#m4~t!7#PGnT^vI=t|uo5 z@Fpf4aBE>=%ww8v#_;e9kMNdl!W9e*45}rr5hW>!C8<`)MX8A;sSHL2Mkcxj=DJ4a zA%-SaCYDylrrHJuRt5(DxZgfU(U6;;l9^VCroqtC%D@Do;o8ryehdr@8gLs*GILXl mOA>Pn;ChS=L6#VsS{WEZ^tf(jxW~Z2z~JfX=d#Wzp$P!WELv;; delta 104 zcmcc2R5d{&iGz)SfkFQB|3n4`2FBtbcPEB*=VV?oFff>Sx;Tbd^d_eqU`ktm_n-Xi zimVOl%DW_l&03cn|>EFPZ4o-;!j7+9Bc%WOIK@eBh41B0il KpUXO@geCw1H6tAW diff --git a/src/main/resources/assets/serverstorage/textures/item/drive_controller_spindle.png b/src/main/resources/assets/serverstorage/textures/item/drive_controller_spindle.png index 4dfd17a5f5ebd6831c79c7521a0b7b3e044e1964..27775ce5a2a048ac202b9ede2000a8a42aa2f562 100644 GIT binary patch literal 347 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRdCT0c(hNQXTpBNYz6p}rHd>I(3)EF2VS{N99 zF)%PRykKA`HDF+PmB7GYHG_dcykO3*KpO@I2F?JV5LX5UhS_Vk|NsC0PaaDc0|NtN zNswPKgTu2MX&_FLx4R2d8h1?!0|NtliKnkC`wMn?K4nJ#m4~t!7#QR{T^vI=t|uo5 z@FpfW2=pvm$S0sA!cid1QM!VSfx*a~PulWYOdJCPgKCLuL`h0wNvc(HQEFmIDua=M zk%_K>xvr6Uh@pv?lCYhFnGH9xvXdLz$gw0x)Fm&-c6bk7rU(B4cKHwcwQtnY!Hamg#M#g3Z*#u#ksF|D$wKs&N VxRm4U7#J8BJYD@<);T3K0RT{sBjo@9 diff --git a/src/main/resources/assets/serverstorage/textures/item/drive_gold.png b/src/main/resources/assets/serverstorage/textures/item/golden_drive.png similarity index 79% rename from src/main/resources/assets/serverstorage/textures/item/drive_gold.png rename to src/main/resources/assets/serverstorage/textures/item/golden_drive.png index 0d6611d5805a92735ed4729cea60a9df195a3b5d..57d13dffeae1a59cda20d3a99aca629174dcf476 100644 GIT binary patch delta 99 zcmaFE`G#}DK}HUFK4nJ#m4~u7pJdcy5;ZapF*LC pjG?8KfeA$B+Rv|klWke#MU4$XdW=o23=APMuA3R|O)g}q1_0j89a#VX delta 99 zcmaFE`G#}DK}HT1J|RO5Q`Og-PcrH;i5i%M7?@jukg2wTft7&)^HPQ#lX+NVFlCB< f>|mK}%OVewF*LCmM diff --git a/src/main/resources/assets/serverstorage/textures/item/head_gold.png b/src/main/resources/assets/serverstorage/textures/item/golden_drive_head.png similarity index 52% rename from src/main/resources/assets/serverstorage/textures/item/head_gold.png rename to src/main/resources/assets/serverstorage/textures/item/golden_drive_head.png index 7d2b2bfefa2ac5e83e9256e5e4c3b19ee34b8337..8c4bb9080b2f4fc7a90c146219cd5d6774699d78 100644 GIT binary patch delta 154 zcmbQjJcW6}G!A(_Wk&y%hq5QmE2uXz4>2^cGO@HWHq|yTure_C$Nly>0|SFRc?MtW?ChKk%5tku7SBOM1!HFm4OLF!?mAZ{TLV+G~gOaGILXlOA>Pn;ChS= fL6#VsS{WEZ^tf(jxW~Z2z~IU5>gTe~DWM4f81pQ= delta 154 zcmbQjJcW6}G!7O%AwvyQ)z=f}71SG;gcz7xfsm=Tfq|8Q0rOIZ9SjT%swJ)wB`Jv| zsaCo9DVb@N3`PbUYe(YdjU|`UIYbeRgO)V}-%q>9HV`yS!Xkley39+Qi U{mTLd1_lOCc2_@_bxsLQ0LbMk761SM diff --git a/src/main/resources/assets/serverstorage/textures/item/golden_drive_platter.png b/src/main/resources/assets/serverstorage/textures/item/golden_drive_platter.png new file mode 100644 index 0000000000000000000000000000000000000000..4ae7e77b63bb2dba6b96d3e17b35c29931d2b96d GIT binary patch literal 435 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdmwiJ%W507^>757#dm_7=AG@ zFf_biU???UV0e|lz+g3lfkC`r&aOZk1_lO+0G|+71_p+|U*msW^ZNhy!TAfO0vvbT!DM#*=-YUM+a9Ndt=)lFId8v<<})qAz^U4c}d9Ud)jXtYxvr6Uh@pv< ziKUgXskVWEm4U%O?zhiTH00)|WTsW3X)v_3GJt9*==%o>J`K1HC7HRY#U+Wk1#msa fh9FCfO|1-!AeNLwOF1(zFfe$!`njxgN@xNAizko> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/serverstorage/textures/item/head_diamond.png b/src/main/resources/assets/serverstorage/textures/item/head_diamond.png deleted file mode 100644 index 7c6cc214f7513e989bdec8471d48e254e6b80e7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 422 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdmwiJ%W507^>757#dm_7=AG@ zFf_biU???UV0e|lz+g3lfkC`r&aOZk1_lO|0G|+71_lPNw>SU)|9|!Ww}ro7$V{9i zwQ9M-(XE0-RU&c0IuCCA|NsA#XL>aQ0|R48kY6x^!?PP{AWo9Ey9>Ac^&V^&{$()z00b$Xq zQw~0~XjE*Zzd2|GVXNttgC^|J|at2)HmS9M@&-r%J z(iUe11_sp<*NBpo#FA92By(1_lNOPgg&e IbxsLQ0Na3luK)l5 diff --git a/src/main/resources/assets/serverstorage/textures/item/head_iron.png b/src/main/resources/assets/serverstorage/textures/item/head_iron.png deleted file mode 100644 index 66a8ac176b50fdca590634ad3ae6f40f360716b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 350 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)RqFqH)P1v4;|O+IS@;w5>z zyD?@9e>=L<8=T%L1{^+L)-cU3ue&lB@E{ZU)buyAp9H>2j<&t4Im zRn8h-D{p;Z)nxmXIZKso;h9{W-)AfKbv$6}t5kRVbSqqpfq_A_#5JNMC9x#cD!C{% zu_Tqj$iT=%*T7uYz$C=L+zNzDwG9lc3=Ei;GVDOnkei>9nO2EgL(z{NEDQ_`8gLs* nGILXlOA>Pnko6dvSQ%PanOH(BDRcj_02FYZu6{1-oD!M757#dm_7=AG@ zFf_biU???UV0e|lz+g3lfkC`r&aOZk1_lPX0G|+71_p+x@TlU#VjCkPYfEb%M`vG8 zUk_IgLrty!|NrN)PMOKTz`$4%h3nQ9vtSQ!{FFJ;()q9HdwB{QuOw}zr0J6ISP u7&PEElw{_n7MCRE79i^}G_f+YurjfPSW@QxWdQ>N1B0ilpUXO@geCyZba7As diff --git a/src/main/resources/assets/serverstorage/textures/item/drive_iron.png b/src/main/resources/assets/serverstorage/textures/item/iron_drive.png similarity index 79% rename from src/main/resources/assets/serverstorage/textures/item/drive_iron.png rename to src/main/resources/assets/serverstorage/textures/item/iron_drive.png index 653cc42088490b1163313418fb224c475f8c1768..9d49fd85d83eb70a191f094a27aee46909d31f6b 100644 GIT binary patch delta 99 zcmaFE`G#}DK}HUFK4nJ#m4~u7pJdcy5;ZapF*LC pjG?8KfeA$B+Rv|klWke#MU4$XdW=o23=APMuA3R|O)g}q1_0j89a#VX delta 99 zcmaFE`G#}DK}HT1J|RO5Q`Og-PcrH;i5i%M7?@jukg2wTft7&)^HPQ#lX+NVFlCB< f>|mK}%OVewF*LCmM diff --git a/src/main/resources/assets/serverstorage/textures/item/iron_drive_head.png b/src/main/resources/assets/serverstorage/textures/item/iron_drive_head.png new file mode 100644 index 0000000000000000000000000000000000000000..b5b1c0d65d7006bc117c2ff5770041db6de3aaa8 GIT binary patch literal 350 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)RqFqH)P1v4;|O+IS@;w5>z zyD@-`UoFza{3zNnF9 z+?LSPm$K~z+p|U%-;?^&&KG8!xjg3@>xGnw?y7R`o+svS`lGgbB ztDH5wR^Ix+s>${%bCxRG!ZW!#zt2|e>v+J{SE=s!=~lQH0|SFRdP{k zVo554k%5tku7SC(k$H%riIs_^m9eR|fq|8Q!9VV|&rvkw=BH$)RibGyw6roXfoQn) y^Q#{N1A_+KhLX(O)Z&uF+yb~BV?&T7#->&Vh7dijn;Gtb0?yOb&t;ucLK6TfVQz zyD9OJ}Y=e`UI05~oSWT}#;)EiW!q_cOcrZ+bp=rdpr2 zT!LhR)Yj0lqNEIo%z`&qd;u=wsl30>zm0XmXSdz+MWME{XYhbQx zWFBH@Vr61!Wo)W#U|?ln@Q?c~s)pSBl+3hBG!2H9Rt8WF1%3a1F)%P_z-=hW%uOvW jNz5&P>oGP2Sz>HzWncucq$FC(85Fvnu6{1-oD!M757#dm_7=AG@ zFf_biU???UV0e|lz+g3lfkC`r&aOZk1_lP90G|+71_p-TpUfB-7>sNz{>$SG3=Hfgp1!W^FWBYzlo|b39?E85U@-M` zaSY+Oo}7@7k|H7?kdWYDFy%l)qhr8L3635XNeKm>5J7SA6&xLk9SI8F53lfTW;$HP zV0N9K+2To^HUk5LYKdz^NlIc#s#S7PYGO$$gOP!eiLQaUu910&p^24=rIoR%wt<0_ zfx$oSx6e^DZr-eX{3U@!6Xb!C6SF3+dT=)dw%HUk3#kEe@c2*>s01O;9O1_lEL#^bA6`#_eL zxJHzuB$lLFB^RY8mZUNm85o)98kp-EnTHsfSeaN_8JlVw7+4t?{NsN697RKJeoAIq zC7K39ODh8th=yxFzxpvSFlfMSD9OxCEiOsSEr9DWHUwE>Y-(j-2+`xZnE~Vh22WQ% Jmvv4FO#ou$PyYY_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/serverstorage/textures/item/material_drive_casing.png b/src/main/resources/assets/serverstorage/textures/item/material_drive_casing.png new file mode 100644 index 0000000000000000000000000000000000000000..38fc6921b53b33ca4321fe758cb8c4a9325df7c0 GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)RqFqH)P1v4;|O+IS@;w5>z zyDr{B`

v)BITDh&AZYxf7&A%2VwJd0u6p_tw+3faN9e@cDy~7K1HT<8c~vxSdwa$T$GwvlFDFYU}U0eV6JOq9%5)>WnyV%Y^rTwU}a$N zkNfR&6b-rgDVb@NXc`PHtqe>c8m|5P>c_yqpaHj`Br`X)xFj*R0ItW_5M+t5sg;2t VM33uchI^pE@pScbS?83{1ONxGVetR} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/serverstorage/textures/item/material_drive_controller.png b/src/main/resources/assets/serverstorage/textures/item/material_drive_controller.png new file mode 100644 index 0000000000000000000000000000000000000000..0b9994ec1119d2b6dedee512d355d415d5122959 GIT binary patch literal 396 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdmwiJ%W507^>757#dm_7=AG@ zFf_biU???UV0e|lz+g3lfkC`r&aOZk1_lPv0G|+71_p+pHip@2x4%0)>-Q%!jv&VW z|NjT2-q^*!z`$4%#1-m?-GNb>>L)i=r z49=b|jv*Y^lLcCs*cjOi5?Bmph%DeyRpn^*^z>w$$~fIgqb-}ANln7pQ&3SUgNLn& zr%6pwapAgiCwK$}1s&bp9T}E(aLT^#XV73^U{Eb_jVMV;EJ?LWE=o--No6oHFf!3K zFxNFQ4>2^cGO@HWHq|yTure_C$Nly>iiX_$l+3hBG!2H9Rt6>z4cC5t^I(3)EF2VS{N99 zF)%PRykKA`HDF+PmB7GYHG_dcykO3*KpO@I2F?JV5Z9nK296-c|NsBT2nOF_U|?WO z@^*J&O5?6cVPIfjFY)wsWq-jg&!^0EZNcP=3=9myo-U3d9M_W*7#J^JxFB$fQ-FaX zt^%xt1EHO5?FDRe}Hj literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/serverstorage/textures/item/material_pcb_substrate.png b/src/main/resources/assets/serverstorage/textures/item/material_pcb_substrate.png new file mode 100644 index 0000000000000000000000000000000000000000..d4d912e9e54f75e65630effa4429563fb9d0259e GIT binary patch literal 313 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRdMrH;E236Z!B?bltg=CK)Uj~LMH3o);76yi2 z3=9knFBlj~4Hy_+B``2p&0t^&pIuU7k;w>Dq$H7a15BcsyMkLpZJ{Cn)eTFfbS}Fdkpk+6S_{ z#5JNMC9x#cD!C{%u_Tqj$iT=%*T7uY$UMZ*#LC3d%Ggxfz`)AD;2-zf=O`L-^HVa@ zD$z6;T3Q)EH5Byy19?INZbM0CZfbE!Vr~IkkFg=h5@S;<10#qfCDBsO3=9kmp00i_ I>zopr04EJlPXGV_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/serverstorage/textures/item/module_bus.png b/src/main/resources/assets/serverstorage/textures/item/module_bus.png index 5ece7444ed3638b188b78403ce5fcb6ccf7c7b3b..632821262e76ae71ff087bdb7c5e15e2513f8e48 100644 GIT binary patch delta 104 zcmey#^pk1A1P*yVWk&y%hq5Qmh!!<64>2^cGO@HWHq|yTure_C$Nl#CWDZ6dsEnbd tl>tN1B0ilpUXO@geCyNn;WqJ diff --git a/src/main/resources/assets/serverstorage/textures/item/module_configuration.png b/src/main/resources/assets/serverstorage/textures/item/module_configuration.png index 93d50251873546459a0bb6bf312eaf77d71eafe0..bdaff11ca4fc7b0e3dc53f902ef4997ec862150b 100644 GIT binary patch delta 127 zcmZ3=yp(yuG!A(_Wk&y%hq5QmYjiU*4>2^cGO@HWHq|yTure_C$Nly>0|SFRc?MtW?ChKk%5tku7SBOM1!HFl>t;kLEpb$lT#Vx6^#u+Mj4x085ly0a^1{u RkAZ=K!PC{xWt~$(69APtBUYe(YeGoXRM#XkZdzXkuk(VP#?oF{;e{%K`=l1_n=8 KKbLh*2~7Z?o+4lX diff --git a/src/main/resources/assets/serverstorage/textures/item/module_container.png b/src/main/resources/assets/serverstorage/textures/item/module_container.png index 7539aa0fcbf2f3e5f96a2a938a4d3656bbdd79c2..eeba943e47b67ba0a50440b13a46fb54e3c4df0e 100644 GIT binary patch delta 127 zcmeyt{DXPI84h_qWk&y%hq5PLndfF?9%5)>WnyV%Y^rTwU}a$NkNfR&1_lPz64!{5 zl*E!$tK9sQ%(O}dBLgE7T?2Dnhz3JTD+8#8g1&#hChuUBS2Q*R8D(s0Wnc&~%5^it RJq88_22WQ%mvv4FO#m>LCT#!! delta 127 zcmeyt{DXPI84eacAwvyQ)z=fR%yTm^2{ACY0wGgv0|P4q1Lma+I~W)kR7+eVN>UO_ zQmu0HQ!>*k8H@~!Omq#*buly){n)`Wc?YAsqJc?>p^25Dg_VgV#Hcd&FAEqL7#KWV L{an^LB{Ts5JNzT! diff --git a/src/main/resources/assets/serverstorage/textures/item/module_display.png b/src/main/resources/assets/serverstorage/textures/item/module_display.png index 6de010bb71816c9137a8ee24b366776ac8a71970..2c0fd90b07d0fca372932d4eb2e72e1a58160676 100644 GIT binary patch delta 104 zcmeyv^oMD}WDa>gWk&y%hq5QmjutgC4>2^cGO@HWHq|yTure_C$Nl#CWNttxN delta 104 zcmeyv^oMD}WDXWSAwvyQ)z=eeM~fPmgcz7xfsm=Tfq|8Q0rOIZ9h12kWiVxme(YeG mY{Mw8XkZdzXkuk(VP#?o(NpIBWdQ>N1B0ilpUXO@geCyTVjIH% diff --git a/src/main/resources/assets/serverstorage/textures/item/module_drive.png b/src/main/resources/assets/serverstorage/textures/item/module_drive.png index cdb95037ccd2ba7a9dd50b421f4343b06640d400..b550f5f0b45d4520d718d8ec032b6ddf3adc194d 100644 GIT binary patch delta 104 zcmbQwJfC^OG!A(_Wk&y%hq5Qms}?mf4>2^cGO@HWHq|yTure_C$Nl#CWIaY1sEnbd tl>tN1B0ilpUXO@geCy8tsA`n diff --git a/src/main/resources/assets/serverstorage/textures/item/module_filtering.png b/src/main/resources/assets/serverstorage/textures/item/module_filtering.png index ddc328d50c40e6f725f79a7e2d51e3c48adef416..9829e29cd9a3ce6f7886a3c6aaaa678b19a43ea1 100644 GIT binary patch delta 154 zcmbQtJehgIWDa>gWk&y%hq5QmE~+;&4>2^cGO@HWHq|yTure_C$Nly>0|SFRc?MtW?ChKk%5tku7SBOM1!HFl>t;kLEpb$3=9k!a1AAyxv9k^iMa)EJ;sJ0 eON>pe3=AQbxNc^+$H2hA;K}al=d#Wzp$PyCi!7S} delta 154 zcmbQtJehgIWDXWSA)}2pC4m!X7u6e>gcz7xfsmQDfq|8QfswD2Dgy(9YKdz^NlIc# zs#R`&N@iLmgOP!eiLQaUE`|nYfkiVJ7#K9*8cH&AQ;SOya|@957@AlaT3DGHKrGQO U-T0P)fq}u3-PO-!ol`;+0C~142LJ#7 diff --git a/src/main/resources/assets/serverstorage/textures/item/module_inventory.png b/src/main/resources/assets/serverstorage/textures/item/module_inventory.png index ddda6960de553d1c66a4b3440ceb70720a9feaac..0b02122174f53e04e853246ae94a48a347ce25a1 100644 GIT binary patch delta 106 zcmdnZvYTZCD=EP8RZp?4MBR0O|1+JA$nXlGu&ffU|{fc^>bP0l+XkKXiXlY delta 106 zcmdnZvYTZCD757#dm_7=AG@ zFf_biU???UV0e|lz+g3lfkC`r&aOZk1_lQH0G|-opf(1MAjbdy|1&T!7};3rPJe%z zfq{WB$=lt9DUG`(g@J*Ay~NYkmHh>~JfAY7|H?zz3=9m8o-U3d9M_W*8W`Oi6;)MT z9U0f~II5~TayWYk9!UriF*7q02}(!^5-KY+3}G^y5*yPqWrAx$)`MLW&NyyoVq=gt z9IV`^n!2(iRazu^HLkvxt=>~3=9kmp00i_>zopr05+fTFnGH9xvXK^7 diff --git a/src/main/resources/assets/serverstorage/textures/item/module_pcb.png b/src/main/resources/assets/serverstorage/textures/item/module_pcb.png index 4579d12f15ccc7def50f33fabb8de38fadf9665b..601d8f34dc71a7c6b65917e057ca75e5d82b1d49 100644 GIT binary patch delta 127 zcmaFP^qgrzFNZvzGSjsMlP^x3>f>f)9%5)>WnyV%Y^rTwU}a$NkNfR&1_lPz64!{5 zl*E!$tK9sQ%(O}dBLgE7T?2Dnhz3JTD+8#8g1&#hCaW{bD;gVuj50R0GBAV~<+_>S R9s>gdgQu&X%Q~loCIJ5UC7u8P delta 127 zcmaFP^qgrzF9!>skkLk)lE8^mecTL8LJZ8UK*&tnz`)ADz{pohm4SglwZt`|BqgyV z)hahXB{Qv(!N|bKMAyJv7ej-yz@nLx)fwd#4NO7|O{@$ptV|6cM(LMse9OSVz~JfX K=d#Wzp$PznnjusG diff --git a/src/main/resources/assets/serverstorage/textures/item/module_transport.png b/src/main/resources/assets/serverstorage/textures/item/module_transport.png index d0bc70bc37a0ad0d215aaa2094cad54bcfac2402..9a148f36c6662c689a9b7fa4f271b458ecf06e83 100644 GIT binary patch delta 127 zcmbQnJdJt6WDa>gWu|KjCSRO5yVT9dJjBq%%EZ#j*i_rVz{n+ diff --git a/src/main/resources/assets/serverstorage/textures/item/drive_netherite.png b/src/main/resources/assets/serverstorage/textures/item/netherite_drive.png similarity index 79% rename from src/main/resources/assets/serverstorage/textures/item/drive_netherite.png rename to src/main/resources/assets/serverstorage/textures/item/netherite_drive.png index 1dd1d53d8cf691ccb9c468ec9f8e9dd8f289e0da..561bce1b6001fedb47ecd16a7f4dfaa20a18b648 100644 GIT binary patch delta 99 zcmaFE`G#}DK}HUFK4nJ#m4~u7pJdcy5;ZapF*LC pjG?8KfeA$B+Rv|klWke#MU4$XdW=o23=APMuA3R|O)g}q1_0j89a#VX delta 99 zcmaFE`G#}DK}HT1J|RO5Q`Og-PcrH;i5i%M7?@jukg2wTft7&)^HPQ#lX+NVFlCB< f>|mK}%OVewF*LCmM diff --git a/src/main/resources/assets/serverstorage/textures/item/netherite_drive_head.png b/src/main/resources/assets/serverstorage/textures/item/netherite_drive_head.png new file mode 100644 index 0000000000000000000000000000000000000000..5b9e888124352f47769a539b1e94e1ce51ef8638 GIT binary patch literal 410 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdmwiJ%W507^>757#dm_7=AG@ zFf_biU???UV0e|lz+g3lfkC`r&aOZk1_lPX0G|+71_p+x@TlU#VjCkPYfEb%M`vG8 zUk_IgLrty!|NrN)PMOKTz`$4%&jPoDI*&9qtZ3jcEq4&zC}F_BFr$QnBmLj6P6h@B)e_f;l9a@f zRIB8o)Wnih1|tI_6I}yyT_f`lLlY|#ODkhjZ36=<1A~9uZ=a)R$jwj5OshoGU}$M& z0M$^?_YV|G8gLs*GILXlOA>Pn;ChS=L6#VsS{WEZEOFh;aF2n3fx*+&&t;ucLK6U8 C{Bzp? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/serverstorage/textures/item/platter_netherite.png b/src/main/resources/assets/serverstorage/textures/item/netherite_drive_platter.png similarity index 55% rename from src/main/resources/assets/serverstorage/textures/item/platter_netherite.png rename to src/main/resources/assets/serverstorage/textures/item/netherite_drive_platter.png index 14bb2d42888598d9819495a97b28b26f7901346a..dbab3baaf25b30c14874edc8b0f9786ea465eb0f 100644 GIT binary patch delta 130 zcmcb_e2IC&91eLtWu|KjCSRPmWQC}ad5EEjm5HU5v8lF!ft7*5Kkm2BCnqw>ghFHt zEv*coG6jAAelajGXq31{l%ynFVdQ&MBb@0Ja$>&;S4c delta 130 zcmcb_e2IC&91a#fA)}2pC4m!{tPnLY2{ACY0wFVP0|P4q10!E4)yavBGNBkU&H{^O zGB7Y`l(I(3)EF2VS{N99 zF)%PRykKA`HDF+PmB7GYHG_dcykO3*KpO@I2F?JV5Z9nK296-c|NsBT2nOF_U|?WO z@^*J&O5?6cVPIfjFY)wsWq-lW!Y5?3(WWGjfq_BT)5S4_<9c!e1LMUD7X(gm3NSE) zT;}Hv`ubxs0|SFRdP{kVo554k%5tku7SC(fk}vgxfKYRX&V?=85kJ( zN~xk~$jwj5OsmAL!C7F@Oa=x94Y&;@nYpROC5gEO$a)M-tPCxzObsBG=$CGM%fP_E N;OXk;vd$@?2>=x`QQ-gp diff --git a/src/main/resources/assets/serverstorage/textures/item/pcb_substrate.png b/src/main/resources/assets/serverstorage/textures/item/pcb_substrate.png deleted file mode 100644 index 8b28f39c73f19487bef60a992c91001f4e889073..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 313 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRdMrH;E236Z!B?bltg=CK)Uj~LMH3o);76yi2 z3=9knFBlj~4Hy_+B``2p&0t^&pIuorO=xXroO@AOiyfkEe@c2*>s01O;9O1_lEL#^bA6`#_eL zxJHzuB$lLFB^RY8mZUNm85o)98kp-En1mRZTY-?7wt<0_fq{{)lq!mb-29Zxv`X9> zoCOxmWME*>fZI@#nVVW%l9*e7tjEyA%Fx2f)Bs|Me(A=y3=9kmp00i_>zopr00nkT At^fc4 diff --git a/src/main/resources/assets/serverstorage/textures/item/platter_gold.png b/src/main/resources/assets/serverstorage/textures/item/platter_gold.png deleted file mode 100644 index f080efa1767b429183cdca75da5b874edfeb2abc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 435 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdmwiJ%W507^>757#dm_7=AG@ zFf_biU???UV0e|lz+g3lfkC`r&aOZk1_lO+0G|+71_p+|U*msW^ZNhy!TGr(F@)o~s_$*y0}32ArHqXh44L8zeh+x`5-uP4>#lL*cf)DhA_j*pX0t^< zI$Kv*NtStwD{!woyKTbl=-`TDZ*2SH1xq-y{JJD6Bn)mhFA4d4Py3C7Ew7dI((bP_ zI-dM_{{7o$#xEA!TdI$m9%Nu(P%UwdC`m~yNwrEYN=+p^25Dg_WrR X#1j3|jc*wk7#KWV{an^LB{Ts50mO`F diff --git a/src/main/resources/assets/serverstorage/textures/item/platter_iron.png b/src/main/resources/assets/serverstorage/textures/item/platter_iron.png deleted file mode 100644 index 59f321a235b486abf0aa6fbe3056fdb7e9e358f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 387 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)RqFqH)P1v4;|O+IS@;w5>z zyDCDyVuS^$A;xy^FYbpDp<;8{Ser6Z{P0#1fRO{20 zOOQ;E+8SC`l+@#PG$y}1#I^hF$)Ya{)}G7UUlYDYbnCj1(2&0wx!do|^Zxw(#G-{K z@>&{qChc>(s;(P;_%GAns}9zgO>xf|7#LJbTq844a{{7 zOhOFItw6|3+rYrez`)2?N)<&zZhlH;S|x4`&H{^OGB7Y`z-=hW%uOvWNz5%k)?;X5 bWoTh#Y5=iBzjWhUQ0RKP`njxgN@xNAf7pT4 diff --git a/src/main/resources/data/serverstorage/recipe/bus_connector.json b/src/main/resources/data/serverstorage/recipe/bus_connector.json index 6b9c65d..a309a11 100644 --- a/src/main/resources/data/serverstorage/recipe/bus_connector.json +++ b/src/main/resources/data/serverstorage/recipe/bus_connector.json @@ -8,13 +8,13 @@ ], "key": { "C": { - "item": "serverstorage:cpu" + "item": "serverstorage:material_cpu" }, "G": { "item": "minecraft:gold_nugget" }, "P": { - "item": "serverstorage:pcb" + "item": "serverstorage:material_pcb" }, "R": { "item": "minecraft:redstone_block" diff --git a/src/main/resources/data/serverstorage/recipe/cpu.json b/src/main/resources/data/serverstorage/recipe/cpu.json index d754ee8..451890d 100644 --- a/src/main/resources/data/serverstorage/recipe/cpu.json +++ b/src/main/resources/data/serverstorage/recipe/cpu.json @@ -14,11 +14,11 @@ "item": "minecraft:amethyst_shard" }, "S": { - "item": "serverstorage:cpu_substrate" + "item": "serverstorage:material_cpu_substrate" } }, "result": { - "id": "serverstorage:cpu", + "id": "serverstorage:material_cpu", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/serverstorage/recipe/cpu_substrate.json b/src/main/resources/data/serverstorage/recipe/cpu_substrate.json index 2dfbf72..e75bf65 100644 --- a/src/main/resources/data/serverstorage/recipe/cpu_substrate.json +++ b/src/main/resources/data/serverstorage/recipe/cpu_substrate.json @@ -15,7 +15,7 @@ } }, "result": { - "id": "serverstorage:cpu_substrate", + "id": "serverstorage:material_cpu_substrate", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/serverstorage/recipe/diamond_drive.json b/src/main/resources/data/serverstorage/recipe/diamond_drive.json index c809698..4f0cef3 100644 --- a/src/main/resources/data/serverstorage/recipe/diamond_drive.json +++ b/src/main/resources/data/serverstorage/recipe/diamond_drive.json @@ -14,10 +14,10 @@ "item": "serverstorage:diamond_platter" }, "C": { - "item": "serverstorage:drive_casing" + "item": "serverstorage:material_drive_casing" }, "X": { - "item": "serverstorage:drive_controller" + "item": "serverstorage:material_drive_controller" } }, "result": { diff --git a/src/main/resources/data/serverstorage/recipe/drive_casing.json b/src/main/resources/data/serverstorage/recipe/drive_casing.json index 0e5ff38..7b5cdc1 100644 --- a/src/main/resources/data/serverstorage/recipe/drive_casing.json +++ b/src/main/resources/data/serverstorage/recipe/drive_casing.json @@ -18,7 +18,7 @@ } }, "result": { - "id": "serverstorage:drive_casing", + "id": "serverstorage:material_drive_casing", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/serverstorage/recipe/drive_container.json b/src/main/resources/data/serverstorage/recipe/drive_container.json index ca29769..ef58952 100644 --- a/src/main/resources/data/serverstorage/recipe/drive_container.json +++ b/src/main/resources/data/serverstorage/recipe/drive_container.json @@ -8,10 +8,10 @@ ], "key": { "C": { - "item": "serverstorage:cpu" + "item": "serverstorage:material_cpu" }, "P": { - "item": "serverstorage:pcb" + "item": "serverstorage:material_pcb" }, "R": { "item": "minecraft:redstone_block" diff --git a/src/main/resources/data/serverstorage/recipe/drive_controller.json b/src/main/resources/data/serverstorage/recipe/drive_controller.json index a7e994a..76a8d4f 100644 --- a/src/main/resources/data/serverstorage/recipe/drive_controller.json +++ b/src/main/resources/data/serverstorage/recipe/drive_controller.json @@ -11,17 +11,17 @@ "item": "minecraft:gold_ingot" }, "X": { - "item": "serverstorage:drive_casing" + "item": "serverstorage:material_drive_casing" }, "C": { - "item": "serverstorage:cpu" + "item": "serverstorage:material_cpu" }, "S": { - "item": "serverstorage:pcb_substrate" + "item": "serverstorage:material_pcb_substrate" } }, "result": { - "id": "serverstorage:drive_controller", + "id": "serverstorage:material_drive_controller", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/serverstorage/recipe/golden_drive.json b/src/main/resources/data/serverstorage/recipe/golden_drive.json index 0bc4b53..6031bd0 100644 --- a/src/main/resources/data/serverstorage/recipe/golden_drive.json +++ b/src/main/resources/data/serverstorage/recipe/golden_drive.json @@ -14,10 +14,10 @@ "item": "serverstorage:golden_platter" }, "C": { - "item": "serverstorage:drive_casing" + "item": "serverstorage:material_drive_casing" }, "X": { - "item": "serverstorage:drive_controller" + "item": "serverstorage:material_drive_controller" } }, "result": { diff --git a/src/main/resources/data/serverstorage/recipe/inventory_interface.json b/src/main/resources/data/serverstorage/recipe/inventory_interface.json index 949d9d4..545c8dc 100644 --- a/src/main/resources/data/serverstorage/recipe/inventory_interface.json +++ b/src/main/resources/data/serverstorage/recipe/inventory_interface.json @@ -8,10 +8,10 @@ ], "key": { "P": { - "item": "serverstorage:pcb" + "item": "serverstorage:material_pcb" }, "U": { - "item": "serverstorage:cpu" + "item": "serverstorage:material_cpu" }, "C": { "item": "serverstorage:module_container" diff --git a/src/main/resources/data/serverstorage/recipe/iron_drive.json b/src/main/resources/data/serverstorage/recipe/iron_drive.json index a9a1324..d80f19a 100644 --- a/src/main/resources/data/serverstorage/recipe/iron_drive.json +++ b/src/main/resources/data/serverstorage/recipe/iron_drive.json @@ -14,10 +14,10 @@ "item": "serverstorage:iron_platter" }, "C": { - "item": "serverstorage:drive_casing" + "item": "serverstorage:material_drive_casing" }, "X": { - "item": "serverstorage:drive_controller" + "item": "serverstorage:material_drive_controller" } }, "result": { diff --git a/src/main/resources/data/serverstorage/recipe/module_bus.json b/src/main/resources/data/serverstorage/recipe/module_bus.json index 5d02929..bd066a7 100644 --- a/src/main/resources/data/serverstorage/recipe/module_bus.json +++ b/src/main/resources/data/serverstorage/recipe/module_bus.json @@ -11,10 +11,10 @@ "item": "minecraft:gold_nugget" }, "C": { - "item": "serverstorage:cpu" + "item": "serverstorage:material_cpu" }, "S": { - "item": "serverstorage:pcb_substrate" + "item": "serverstorage:material_pcb_substrate" }, "I": { "item": "minecraft:iron_ingot" diff --git a/src/main/resources/data/serverstorage/recipe/module_configuration.json b/src/main/resources/data/serverstorage/recipe/module_configuration.json index bceb293..97db703 100644 --- a/src/main/resources/data/serverstorage/recipe/module_configuration.json +++ b/src/main/resources/data/serverstorage/recipe/module_configuration.json @@ -11,10 +11,10 @@ "item": "minecraft:gold_nugget" }, "C": { - "item": "serverstorage:cpu" + "item": "serverstorage:material_cpu" }, "S": { - "item": "serverstorage:pcb_substrate" + "item": "serverstorage:material_pcb_substrate" }, "I": { "item": "minecraft:iron_ingot" diff --git a/src/main/resources/data/serverstorage/recipe/module_container.json b/src/main/resources/data/serverstorage/recipe/module_container.json index d5defb7..a1078aa 100644 --- a/src/main/resources/data/serverstorage/recipe/module_container.json +++ b/src/main/resources/data/serverstorage/recipe/module_container.json @@ -11,10 +11,10 @@ "item": "minecraft:gold_nugget" }, "C": { - "item": "serverstorage:cpu" + "item": "serverstorage:material_cpu" }, "S": { - "item": "serverstorage:pcb_substrate" + "item": "serverstorage:material_pcb_substrate" }, "H": { "item": "minecraft:chest" diff --git a/src/main/resources/data/serverstorage/recipe/module_display.json b/src/main/resources/data/serverstorage/recipe/module_display.json index 10c42c5..f54ceb9 100644 --- a/src/main/resources/data/serverstorage/recipe/module_display.json +++ b/src/main/resources/data/serverstorage/recipe/module_display.json @@ -11,10 +11,10 @@ "item": "minecraft:gold_nugget" }, "C": { - "item": "serverstorage:cpu" + "item": "serverstorage:material_cpu" }, "S": { - "item": "serverstorage:pcb_substrate" + "item": "serverstorage:material_pcb_substrate" }, "D": { "item": "minecraft:gray_stained_glass" diff --git a/src/main/resources/data/serverstorage/recipe/module_drive.json b/src/main/resources/data/serverstorage/recipe/module_drive.json index db67d1f..4b28ba3 100644 --- a/src/main/resources/data/serverstorage/recipe/module_drive.json +++ b/src/main/resources/data/serverstorage/recipe/module_drive.json @@ -14,10 +14,10 @@ "item": "minecraft:gold_ingot" }, "C": { - "item": "serverstorage:cpu" + "item": "serverstorage:material_cpu" }, "S": { - "item": "serverstorage:pcb_substrate" + "item": "serverstorage:material_pcb_substrate" } }, "result": { diff --git a/src/main/resources/data/serverstorage/recipe/module_filtering.json b/src/main/resources/data/serverstorage/recipe/module_filtering.json index 8994d46..9d3b702 100644 --- a/src/main/resources/data/serverstorage/recipe/module_filtering.json +++ b/src/main/resources/data/serverstorage/recipe/module_filtering.json @@ -11,10 +11,10 @@ "item": "minecraft:gold_nugget" }, "C": { - "item": "serverstorage:cpu" + "item": "serverstorage:material_cpu" }, "S": { - "item": "serverstorage:pcb_substrate" + "item": "serverstorage:material_pcb_substrate" }, "L": { "item": "minecraft:glass" diff --git a/src/main/resources/data/serverstorage/recipe/module_inventory.json b/src/main/resources/data/serverstorage/recipe/module_inventory.json index 3fe7c3f..909b004 100644 --- a/src/main/resources/data/serverstorage/recipe/module_inventory.json +++ b/src/main/resources/data/serverstorage/recipe/module_inventory.json @@ -11,10 +11,10 @@ "item": "minecraft:gold_nugget" }, "C": { - "item": "serverstorage:cpu" + "item": "serverstorage:material_cpu" }, "S": { - "item": "serverstorage:pcb_substrate" + "item": "serverstorage:material_pcb_substrate" }, "H": { "item": "minecraft:chest" diff --git a/src/main/resources/data/serverstorage/recipe/module_pagination.json b/src/main/resources/data/serverstorage/recipe/module_pagination.json index 6f08576..13521d6 100644 --- a/src/main/resources/data/serverstorage/recipe/module_pagination.json +++ b/src/main/resources/data/serverstorage/recipe/module_pagination.json @@ -11,10 +11,10 @@ "item": "minecraft:gold_nugget" }, "C": { - "item": "serverstorage:cpu" + "item": "serverstorage:material_cpu" }, "S": { - "item": "serverstorage:pcb_substrate" + "item": "serverstorage:material_pcb_substrate" }, "I": { "item": "minecraft:iron_ingot" diff --git a/src/main/resources/data/serverstorage/recipe/module_pcb.json b/src/main/resources/data/serverstorage/recipe/module_pcb.json index f193f49..2ebb5cd 100644 --- a/src/main/resources/data/serverstorage/recipe/module_pcb.json +++ b/src/main/resources/data/serverstorage/recipe/module_pcb.json @@ -11,10 +11,10 @@ "item": "minecraft:gold_nugget" }, "C": { - "item": "serverstorage:cpu" + "item": "serverstorage:material_cpu" }, "S": { - "item": "serverstorage:pcb_substrate" + "item": "serverstorage:material_pcb_substrate" } }, "result": { diff --git a/src/main/resources/data/serverstorage/recipe/module_transport.json b/src/main/resources/data/serverstorage/recipe/module_transport.json index 6318df3..d5322a4 100644 --- a/src/main/resources/data/serverstorage/recipe/module_transport.json +++ b/src/main/resources/data/serverstorage/recipe/module_transport.json @@ -11,10 +11,10 @@ "item": "minecraft:gold_nugget" }, "C": { - "item": "serverstorage:cpu" + "item": "serverstorage:material_cpu" }, "S": { - "item": "serverstorage:pcb_substrate" + "item": "serverstorage:material_pcb_substrate" }, "H": { "item": "minecraft:hopper" diff --git a/src/main/resources/data/serverstorage/recipe/netherite_drive.json b/src/main/resources/data/serverstorage/recipe/netherite_drive.json index b17a8fe..601333d 100644 --- a/src/main/resources/data/serverstorage/recipe/netherite_drive.json +++ b/src/main/resources/data/serverstorage/recipe/netherite_drive.json @@ -14,10 +14,10 @@ "item": "serverstorage:netherite_platter" }, "C": { - "item": "serverstorage:drive_casing" + "item": "serverstorage:material_drive_casing" }, "X": { - "item": "serverstorage:drive_controller" + "item": "serverstorage:material_drive_controller" } }, "result": { diff --git a/src/main/resources/data/serverstorage/recipe/netherite_head.json b/src/main/resources/data/serverstorage/recipe/netherite_head.json index 2921319..9017702 100644 --- a/src/main/resources/data/serverstorage/recipe/netherite_head.json +++ b/src/main/resources/data/serverstorage/recipe/netherite_head.json @@ -1,18 +1,16 @@ { - "type": "minecraft:crafting_shaped", - "category": "misc", - "pattern": [ - "# ", - "## ", - " ##" - ], - "key": { - "#": { - "item": "minecraft:netherite_ingot" - } + "type": "minecraft:smithing_transform", + "addition": { + "item": "minecraft:netherite_ingot" + }, + "base": { + "item": "serverstorage:diamond_head" }, "result": { - "id": "serverstorage:netherite_head", - "count": 1 + "count": 1, + "id": "serverstorage:netherite_head" + }, + "template": { + "item": "serverstorage:module_netherite_upgrade" } } \ No newline at end of file diff --git a/src/main/resources/data/serverstorage/recipe/netherite_platter.json b/src/main/resources/data/serverstorage/recipe/netherite_platter.json index e21c7fa..56fb1c2 100644 --- a/src/main/resources/data/serverstorage/recipe/netherite_platter.json +++ b/src/main/resources/data/serverstorage/recipe/netherite_platter.json @@ -1,18 +1,16 @@ { - "type": "minecraft:crafting_shaped", - "category": "misc", - "pattern": [ - "###", - "# #", - "###" - ], - "key": { - "#": { - "item": "minecraft:netherite_ingot" - } + "type": "minecraft:smithing_transform", + "addition": { + "item": "minecraft:netherite_ingot" + }, + "base": { + "item": "serverstorage:diamond_platter" }, "result": { - "id": "serverstorage:netherite_platter", - "count": 1 + "count": 1, + "id": "serverstorage:netherite_platter" + }, + "template": { + "item": "serverstorage:module_netherite_upgrade" } } \ No newline at end of file diff --git a/src/main/resources/data/serverstorage/recipe/netherite_upgrade.json b/src/main/resources/data/serverstorage/recipe/netherite_upgrade.json new file mode 100644 index 0000000..4e1c8b6 --- /dev/null +++ b/src/main/resources/data/serverstorage/recipe/netherite_upgrade.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "SLS", + "LCL", + "SLS" + ], + "key": { + "C": { + "item": "serverstorage:material_cpu" + }, + "S": { + "item": "serverstorage:material_pcb_substrate" + }, + "L": { + "item": "minecraft:glass" + } + }, + "result": { + "id": "serverstorage:module_netherite_upgrade", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/serverstorage/recipe/pcb.json b/src/main/resources/data/serverstorage/recipe/pcb.json index a049966..ec57ff0 100644 --- a/src/main/resources/data/serverstorage/recipe/pcb.json +++ b/src/main/resources/data/serverstorage/recipe/pcb.json @@ -11,11 +11,11 @@ "item": "minecraft:lime_dye" }, "P": { - "item": "serverstorage:pcb_substrate" + "item": "serverstorage:material_pcb_substrate" } }, "result": { - "id": "serverstorage:pcb", + "id": "serverstorage:material_pcb", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/serverstorage/recipe/pcb_substrate.json b/src/main/resources/data/serverstorage/recipe/pcb_substrate.json index f076c73..ebeef7b 100644 --- a/src/main/resources/data/serverstorage/recipe/pcb_substrate.json +++ b/src/main/resources/data/serverstorage/recipe/pcb_substrate.json @@ -15,7 +15,7 @@ } }, "result": { - "id": "serverstorage:pcb_substrate", + "id": "serverstorage:material_pcb_substrate", "count": 1 } } \ No newline at end of file diff --git a/src/main/resources/data/serverstorage/recipe/storage.json b/src/main/resources/data/serverstorage/recipe/storage.json index ce50af5..6ef3691 100644 --- a/src/main/resources/data/serverstorage/recipe/storage.json +++ b/src/main/resources/data/serverstorage/recipe/storage.json @@ -29,10 +29,10 @@ "item": "serverstorage:module_inventory" }, "X": { - "item": "serverstorage:cpu" + "item": "serverstorage:material_cpu" }, "O": { - "item": "serverstorage:pcb" + "item": "serverstorage:material_pcb" } }, "result": {