From 2c40d3ae3f0f869e720f58da7f3024010f0311a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Ryb=C3=A1rsky?= Date: Fri, 16 Aug 2024 19:57:52 +0200 Subject: [PATCH] Finish wireless terminals --- assets/Module_PCB.aseprite | Bin 2057 -> 2673 bytes .../brn/serverstorage/ServerStorage.java | 2 +- .../serverstorage/blocks/ConnectedBlock.java | 43 +++++++++++++++++- .../blocks/HardDriveContainerBlock.java | 14 +++--- .../blocks/InventoryInterfaceBlock.java | 16 +++---- .../blocks/RadioInterfaceBlock.java | 14 +++--- .../blocks/StorageInterfaceBlock.java | 13 +++--- .../blockstates/bus_connector.json | 32 ------------- .../blockstates/drive_container.json | 27 ----------- .../blockstates/inventory_interface.json | 32 ------------- .../serverstorage/blockstates/storage.json | 26 ----------- .../assets/serverstorage/lang/en_us.json | 4 ++ .../models/block/bus_connector_blank.json | 6 --- .../models/block/bus_connector_bus_blank.json | 6 --- .../models/block/bus_connector_bus_down.json | 11 ----- .../models/block/bus_connector_bus_east.json | 11 ----- .../models/block/bus_connector_bus_north.json | 11 ----- .../models/block/bus_connector_bus_south.json | 11 ----- .../models/block/bus_connector_bus_up.json | 11 ----- .../models/block/bus_connector_bus_west.json | 11 ----- .../block/bus_connector_inventory_blank.json | 6 --- .../models/block/drive_container.json | 8 +++- .../block/inventory_interface_blank.json | 6 --- .../inventory_interface_inventory_down.json | 11 ----- .../inventory_interface_inventory_east.json | 11 ----- .../inventory_interface_inventory_north.json | 11 ----- .../inventory_interface_inventory_south.json | 11 ----- .../inventory_interface_inventory_up.json | 11 ----- .../inventory_interface_inventory_west.json | 11 ----- .../models/block/radio_interface.json | 11 +++++ .../models/item/bus_connector.json | 2 +- .../models/item/diamond_antenna.json | 6 +++ .../models/item/golden_antenna.json | 6 +++ .../models/item/iron_antenna.json | 6 +++ .../models/item/module_antenna.json | 6 +++ .../models/item/module_antenna_connector.json | 6 +++ .../models/item/module_modem.json | 6 +++ .../models/item/module_radio.json | 6 +++ .../models/item/netherite_antenna.json | 6 +++ .../models/item/radio_interface.json | 3 ++ .../models/item/wireless_terminal.json | 6 +++ .../textures/block/radio_interface_front.png | Bin 0 -> 421 bytes .../textures/block/radio_interface_side.png | Bin 0 -> 657 bytes .../textures/item/diamond_antenna.png | Bin 0 -> 180 bytes .../textures/item/golden_antenna.png | Bin 0 -> 180 bytes .../textures/item/iron_antenna.png | Bin 0 -> 180 bytes .../textures/item/module_antenna.png | Bin 0 -> 186 bytes .../item/module_antenna_connector.png | Bin 0 -> 204 bytes .../textures/item/module_modem.png | Bin 0 -> 200 bytes .../textures/item/module_radio.png | Bin 0 -> 201 bytes .../textures/item/netherite_antenna.png | Bin 0 -> 185 bytes .../textures/item/wireless_terminal.png | Bin 0 -> 670 bytes .../serverstorage/recipe/diamond_antenna.json | 18 ++++++++ .../serverstorage/recipe/golden_antenna.json | 18 ++++++++ .../serverstorage/recipe/iron_antenna.json | 18 ++++++++ .../serverstorage/recipe/module_antenna.json | 30 ++++++++++++ .../recipe/module_antenna_connector.json | 27 +++++++++++ .../serverstorage/recipe/module_modem.json | 27 +++++++++++ .../serverstorage/recipe/module_radio.json | 27 +++++++++++ .../recipe/netherite_antenna.json | 16 +++++++ .../serverstorage/recipe/radio_interface.json | 39 ++++++++++++++++ .../recipe/wireless_terminal.json | 39 ++++++++++++++++ 62 files changed, 408 insertions(+), 308 deletions(-) delete mode 100644 src/main/resources/assets/serverstorage/blockstates/bus_connector.json delete mode 100644 src/main/resources/assets/serverstorage/blockstates/drive_container.json delete mode 100644 src/main/resources/assets/serverstorage/blockstates/inventory_interface.json delete mode 100644 src/main/resources/assets/serverstorage/blockstates/storage.json delete mode 100644 src/main/resources/assets/serverstorage/models/block/bus_connector_blank.json delete mode 100644 src/main/resources/assets/serverstorage/models/block/bus_connector_bus_blank.json delete mode 100644 src/main/resources/assets/serverstorage/models/block/bus_connector_bus_down.json delete mode 100644 src/main/resources/assets/serverstorage/models/block/bus_connector_bus_east.json delete mode 100644 src/main/resources/assets/serverstorage/models/block/bus_connector_bus_north.json delete mode 100644 src/main/resources/assets/serverstorage/models/block/bus_connector_bus_south.json delete mode 100644 src/main/resources/assets/serverstorage/models/block/bus_connector_bus_up.json delete mode 100644 src/main/resources/assets/serverstorage/models/block/bus_connector_bus_west.json delete mode 100644 src/main/resources/assets/serverstorage/models/block/bus_connector_inventory_blank.json delete mode 100644 src/main/resources/assets/serverstorage/models/block/inventory_interface_blank.json delete mode 100644 src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_down.json delete mode 100644 src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_east.json delete mode 100644 src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_north.json delete mode 100644 src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_south.json delete mode 100644 src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_up.json delete mode 100644 src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_west.json create mode 100644 src/main/resources/assets/serverstorage/models/block/radio_interface.json create mode 100644 src/main/resources/assets/serverstorage/models/item/diamond_antenna.json create mode 100644 src/main/resources/assets/serverstorage/models/item/golden_antenna.json create mode 100644 src/main/resources/assets/serverstorage/models/item/iron_antenna.json create mode 100644 src/main/resources/assets/serverstorage/models/item/module_antenna.json create mode 100644 src/main/resources/assets/serverstorage/models/item/module_antenna_connector.json create mode 100644 src/main/resources/assets/serverstorage/models/item/module_modem.json create mode 100644 src/main/resources/assets/serverstorage/models/item/module_radio.json create mode 100644 src/main/resources/assets/serverstorage/models/item/netherite_antenna.json create mode 100644 src/main/resources/assets/serverstorage/models/item/radio_interface.json create mode 100644 src/main/resources/assets/serverstorage/models/item/wireless_terminal.json create mode 100644 src/main/resources/assets/serverstorage/textures/block/radio_interface_front.png create mode 100644 src/main/resources/assets/serverstorage/textures/block/radio_interface_side.png create mode 100644 src/main/resources/assets/serverstorage/textures/item/diamond_antenna.png create mode 100644 src/main/resources/assets/serverstorage/textures/item/golden_antenna.png create mode 100644 src/main/resources/assets/serverstorage/textures/item/iron_antenna.png create mode 100644 src/main/resources/assets/serverstorage/textures/item/module_antenna.png create mode 100644 src/main/resources/assets/serverstorage/textures/item/module_antenna_connector.png create mode 100644 src/main/resources/assets/serverstorage/textures/item/module_modem.png create mode 100644 src/main/resources/assets/serverstorage/textures/item/module_radio.png create mode 100644 src/main/resources/assets/serverstorage/textures/item/netherite_antenna.png create mode 100644 src/main/resources/assets/serverstorage/textures/item/wireless_terminal.png create mode 100644 src/main/resources/data/serverstorage/recipe/diamond_antenna.json create mode 100644 src/main/resources/data/serverstorage/recipe/golden_antenna.json create mode 100644 src/main/resources/data/serverstorage/recipe/iron_antenna.json create mode 100644 src/main/resources/data/serverstorage/recipe/module_antenna.json create mode 100644 src/main/resources/data/serverstorage/recipe/module_antenna_connector.json create mode 100644 src/main/resources/data/serverstorage/recipe/module_modem.json create mode 100644 src/main/resources/data/serverstorage/recipe/module_radio.json create mode 100644 src/main/resources/data/serverstorage/recipe/netherite_antenna.json create mode 100644 src/main/resources/data/serverstorage/recipe/radio_interface.json create mode 100644 src/main/resources/data/serverstorage/recipe/wireless_terminal.json diff --git a/assets/Module_PCB.aseprite b/assets/Module_PCB.aseprite index be0103958aaecc0c92d121d7696c21c7682995c7..f4651386f614b8b7da7e12a48b88c1d1be4a9c86 100644 GIT binary patch delta 573 zcmeAa_$Z=S$i=|$U@1R?0D}O70s|uh149Y}GEkhT7|-}`VxuZoE&~Gt3rL0H#0?3| z3|Iee7GV6zCfLBh!0_uMBUl?qd%CVZOvuS<>#plla1-H~ymY^In1OZ4t8@ougTEWLwD$Y@{$+?t zz27qn&5Ewc28^opEy-=G|9?zM+4|zw#itt+Q%q0%ns}7+CU5fNB74KK$Cvs~^WM1f z;IcoD+7kKscYk~_HZVvyy5xoVrj0HKnF+) zd3>4pbjcULE`B|9r|&e+jDPp%pZRybMvCFMg54&o6yt)I$CvlX{9UqZ{-h7i*ZTGU zUAU_Fx;?SxCHwTclH!7;;WK15$+2lPEM-pmYP^6k<*z~MjvH65@G~$?lWSds;vi-Q zhDnnR80Cxp|DJsFzk-4DR=YH;!cF+AsWYc%<18AdpkOR2(?IY*`({uT49<0NMTP&;S4c delta 65 zcmew;(kY moduleList = Arrays.asList("bus", "configuration", "container", "display", "drive", "filtering", "inventory", "pagination", "pcb", "transport", "netherite_upgrade"); + public static final List moduleList = Arrays.asList("bus", "configuration", "container", "display", "drive", "filtering", "inventory", "pagination", "pcb", "transport", "antenna", "radio", "antenna_connector", "modem", "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"); diff --git a/src/main/java/systems/brn/serverstorage/blocks/ConnectedBlock.java b/src/main/java/systems/brn/serverstorage/blocks/ConnectedBlock.java index ced3d9e..be3d562 100644 --- a/src/main/java/systems/brn/serverstorage/blocks/ConnectedBlock.java +++ b/src/main/java/systems/brn/serverstorage/blocks/ConnectedBlock.java @@ -1,5 +1,8 @@ package systems.brn.serverstorage.blocks; +import eu.pb4.polymer.blocks.api.BlockModelType; +import eu.pb4.polymer.blocks.api.PolymerBlockModel; +import eu.pb4.polymer.blocks.api.PolymerBlockResourceUtils; import eu.pb4.polymer.core.api.block.SimplePolymerBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -9,11 +12,14 @@ import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.state.StateManager; import net.minecraft.state.property.EnumProperty; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; import systems.brn.serverstorage.lib.ConnectionType; +import java.util.HashMap; + public class ConnectedBlock extends SimplePolymerBlock { public static final EnumProperty NORTH = EnumProperty.of("north", ConnectionType.class); @@ -23,6 +29,39 @@ public class ConnectedBlock extends SimplePolymerBlock { public static final EnumProperty UP = EnumProperty.of("up", ConnectionType.class); public static final EnumProperty DOWN = EnumProperty.of("down", ConnectionType.class); + // Function to get Y-axis rotation for North, South, East, and West directions + public static int getRotationFromDirection(Direction direction) { + if (direction == Direction.EAST) { + return 90; + } else if (direction == Direction.SOUTH) { + return 180; + } else if (direction == Direction.WEST) { + return 270; + } else { + return 0; + } + } + + // Function to get X-axis rotation for Up and Down directions + public static int getXRotationFromDirection(Direction direction) { + if (direction == Direction.UP) { + return 270; + } else if (direction == Direction.DOWN) { + return 90; + } else { + return 0; + } + } + + public static HashMap generateRotations(Identifier identifier) { + Identifier modelIdentifier = identifier.withPath("block/" + identifier.getPath()); + HashMap rotations = new HashMap<>(); + for (Direction direction : Direction.values()) { + rotations.put(direction, PolymerBlockResourceUtils.requestBlock(BlockModelType.FULL_BLOCK, PolymerBlockModel.of(modelIdentifier, getXRotationFromDirection(direction), getRotationFromDirection(direction)))); + } + return rotations; + } + public void setDefaultState() { setDefaultState(getStateManager().getDefaultState() .with(NORTH, ConnectionType.NONE) @@ -66,9 +105,9 @@ public class ConnectedBlock extends SimplePolymerBlock { BlockEntity blockEntity = world.getBlockEntity(neighborPos); boolean isConnectedToInventory = blockEntity instanceof Inventory; ConnectionType connectionType = ConnectionType.NONE; - if (isConnectedToBus){ + if (isConnectedToBus) { connectionType = ConnectionType.BUS; - } else if (isConnectedToInventory){ + } else if (isConnectedToInventory) { connectionType = ConnectionType.INVENTORY; } diff --git a/src/main/java/systems/brn/serverstorage/blocks/HardDriveContainerBlock.java b/src/main/java/systems/brn/serverstorage/blocks/HardDriveContainerBlock.java index d76c7bf..a74e8a2 100644 --- a/src/main/java/systems/brn/serverstorage/blocks/HardDriveContainerBlock.java +++ b/src/main/java/systems/brn/serverstorage/blocks/HardDriveContainerBlock.java @@ -1,8 +1,5 @@ package systems.brn.serverstorage.blocks; -import eu.pb4.polymer.blocks.api.BlockModelType; -import eu.pb4.polymer.blocks.api.PolymerBlockModel; -import eu.pb4.polymer.blocks.api.PolymerBlockResourceUtils; import eu.pb4.polymer.blocks.api.PolymerTexturedBlock; import eu.pb4.polymer.core.api.block.PolymerBlockUtils; import net.fabricmc.fabric.api.event.player.UseBlockCallback; @@ -27,24 +24,26 @@ import org.jetbrains.annotations.Nullable; import systems.brn.serverstorage.blockentities.HardDriveContainerBlockEntity; import systems.brn.serverstorage.lib.StorageNetwork; +import java.util.HashMap; + import static systems.brn.serverstorage.ServerStorage.*; public class HardDriveContainerBlock extends ConnectedBlock implements PolymerTexturedBlock, BlockEntityProvider { final Identifier identifier; public static final DirectionProperty FACING = FacingBlock.FACING; - private final BlockState polymerBlockState; + private final HashMap rotations; public HardDriveContainerBlock(AbstractBlock.Settings settings, Identifier identifier) { super(settings, Blocks.NOTE_BLOCK); this.identifier = identifier; this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH)); - this.polymerBlockState = PolymerBlockResourceUtils.requestBlock(BlockModelType.FULL_BLOCK, PolymerBlockModel.of(identifier.withPath("block/" + identifier.getPath()))); + this.rotations = generateRotations(identifier); } @Override public BlockState getPlacementState(ItemPlacementContext ctx) { - return this.getDefaultState().with(FACING, ctx.getHorizontalPlayerFacing().getOpposite()); + return this.getDefaultState().with(FACING, ctx.getPlayerLookDirection().getOpposite()); } @Override @@ -55,7 +54,8 @@ public class HardDriveContainerBlock extends ConnectedBlock implements PolymerTe @Override public BlockState getPolymerBlockState(BlockState state) { - return this.polymerBlockState; + Direction direction = state.get(FACING); + return rotations.get(direction); } public static void register() { diff --git a/src/main/java/systems/brn/serverstorage/blocks/InventoryInterfaceBlock.java b/src/main/java/systems/brn/serverstorage/blocks/InventoryInterfaceBlock.java index 6f1672c..62eac80 100644 --- a/src/main/java/systems/brn/serverstorage/blocks/InventoryInterfaceBlock.java +++ b/src/main/java/systems/brn/serverstorage/blocks/InventoryInterfaceBlock.java @@ -1,8 +1,5 @@ package systems.brn.serverstorage.blocks; -import eu.pb4.polymer.blocks.api.BlockModelType; -import eu.pb4.polymer.blocks.api.PolymerBlockModel; -import eu.pb4.polymer.blocks.api.PolymerBlockResourceUtils; import eu.pb4.polymer.blocks.api.PolymerTexturedBlock; import eu.pb4.polymer.core.api.block.PolymerBlockUtils; import eu.pb4.sgui.api.elements.GuiElementBuilder; @@ -35,24 +32,26 @@ import systems.brn.serverstorage.lib.PagedGui; import systems.brn.serverstorage.screens.SearchScreen; import systems.brn.serverstorage.screens.SettingsScreen; +import java.util.HashMap; + import static systems.brn.serverstorage.ServerStorage.*; import static systems.brn.serverstorage.lib.PagedGui.*; public class InventoryInterfaceBlock extends ConnectedBlock implements PolymerTexturedBlock, BlockEntityProvider { final Identifier identifier; public static final DirectionProperty FACING = FacingBlock.FACING; - private final BlockState polymerBlockState; + private final HashMap rotations; public InventoryInterfaceBlock(Settings settings, Identifier identifier) { super(settings, Blocks.NOTE_BLOCK); this.identifier = identifier; this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH)); - this.polymerBlockState = PolymerBlockResourceUtils.requestBlock(BlockModelType.FULL_BLOCK, PolymerBlockModel.of(identifier.withPath("block/" + identifier.getPath()))); + this.rotations = generateRotations(identifier); } @Override public BlockState getPlacementState(ItemPlacementContext ctx) { - return this.getDefaultState().with(FACING, ctx.getHorizontalPlayerFacing().getOpposite()); + return this.getDefaultState().with(FACING, ctx.getPlayerLookDirection().getOpposite()); } @Override @@ -63,7 +62,8 @@ public class InventoryInterfaceBlock extends ConnectedBlock implements PolymerTe @Override public BlockState getPolymerBlockState(BlockState state) { - return this.polymerBlockState; + Direction direction = state.get(FACING); + return rotations.get(direction); } public static void register() { @@ -150,7 +150,7 @@ public class InventoryInterfaceBlock extends ConnectedBlock implements PolymerTe Block block = state.getBlock(); if (block instanceof InventoryInterfaceBlock) { - if (!world.getGameRules().getBoolean(ServerStorage_Interface_Enable)){ + if (!world.getGameRules().getBoolean(ServerStorage_Interface_Enable)) { playerEntity.sendMessage(Text.translatable("message.serverstorage.block_disabled"), true); return ActionResult.PASS; } diff --git a/src/main/java/systems/brn/serverstorage/blocks/RadioInterfaceBlock.java b/src/main/java/systems/brn/serverstorage/blocks/RadioInterfaceBlock.java index f9fbfab..5ee39da 100644 --- a/src/main/java/systems/brn/serverstorage/blocks/RadioInterfaceBlock.java +++ b/src/main/java/systems/brn/serverstorage/blocks/RadioInterfaceBlock.java @@ -1,8 +1,5 @@ package systems.brn.serverstorage.blocks; -import eu.pb4.polymer.blocks.api.BlockModelType; -import eu.pb4.polymer.blocks.api.PolymerBlockModel; -import eu.pb4.polymer.blocks.api.PolymerBlockResourceUtils; import eu.pb4.polymer.blocks.api.PolymerTexturedBlock; import eu.pb4.polymer.core.api.block.PolymerBlockUtils; import net.fabricmc.fabric.api.event.player.UseBlockCallback; @@ -34,6 +31,7 @@ import systems.brn.serverstorage.lib.WirelessTerminalComponents; import systems.brn.serverstorage.screens.RadioBlockPlayerMangementScreen; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.UUID; @@ -43,18 +41,19 @@ import static systems.brn.serverstorage.lib.Util.removePosition; public class RadioInterfaceBlock extends ConnectedBlock implements PolymerTexturedBlock, BlockEntityProvider { final Identifier identifier; public static final DirectionProperty FACING = FacingBlock.FACING; - private final BlockState polymerBlockState; + private final HashMap rotations; public RadioInterfaceBlock(Settings settings, Identifier identifier) { super(settings, Blocks.NOTE_BLOCK); this.identifier = identifier; this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH)); - this.polymerBlockState = PolymerBlockResourceUtils.requestBlock(BlockModelType.FULL_BLOCK, PolymerBlockModel.of(identifier.withPath("block/" + identifier.getPath()))); + this.rotations = generateRotations(identifier); + } @Override public BlockState getPlacementState(ItemPlacementContext ctx) { - return this.getDefaultState().with(FACING, ctx.getHorizontalPlayerFacing().getOpposite()); + return this.getDefaultState().with(FACING, ctx.getPlayerLookDirection().getOpposite()); } @Override @@ -65,7 +64,8 @@ public class RadioInterfaceBlock extends ConnectedBlock implements PolymerTextur @Override public BlockState getPolymerBlockState(BlockState state) { - return this.polymerBlockState; + Direction direction = state.get(FACING); + return rotations.get(direction); } public static void register() { diff --git a/src/main/java/systems/brn/serverstorage/blocks/StorageInterfaceBlock.java b/src/main/java/systems/brn/serverstorage/blocks/StorageInterfaceBlock.java index d537b7e..c0353af 100644 --- a/src/main/java/systems/brn/serverstorage/blocks/StorageInterfaceBlock.java +++ b/src/main/java/systems/brn/serverstorage/blocks/StorageInterfaceBlock.java @@ -1,8 +1,5 @@ package systems.brn.serverstorage.blocks; -import eu.pb4.polymer.blocks.api.BlockModelType; -import eu.pb4.polymer.blocks.api.PolymerBlockModel; -import eu.pb4.polymer.blocks.api.PolymerBlockResourceUtils; import eu.pb4.polymer.blocks.api.PolymerTexturedBlock; import eu.pb4.polymer.core.api.block.PolymerBlockUtils; import net.fabricmc.fabric.api.event.player.UseBlockCallback; @@ -33,6 +30,7 @@ import org.jetbrains.annotations.Nullable; import systems.brn.serverstorage.blockentities.StorageInterfaceBlockEntity; import systems.brn.serverstorage.screens.StorageScreen; +import java.util.HashMap; import java.util.List; import static systems.brn.serverstorage.ServerStorage.*; @@ -41,18 +39,18 @@ import static systems.brn.serverstorage.lib.Util.generateBookContent; public class StorageInterfaceBlock extends ConnectedBlock implements PolymerTexturedBlock, BlockEntityProvider { final Identifier identifier; public static final DirectionProperty FACING = FacingBlock.FACING; - private final BlockState polymerBlockState; + private final HashMap rotations; public StorageInterfaceBlock(Settings settings, Identifier identifier) { super(settings, Blocks.NOTE_BLOCK); this.identifier = identifier; this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH)); - this.polymerBlockState = PolymerBlockResourceUtils.requestBlock(BlockModelType.FULL_BLOCK, PolymerBlockModel.of(identifier.withPath("block/" + identifier.getPath()))); + this.rotations = generateRotations(identifier); } @Override public BlockState getPlacementState(ItemPlacementContext ctx) { - return this.getDefaultState().with(FACING, ctx.getHorizontalPlayerFacing().getOpposite()); + return this.getDefaultState().with(FACING, ctx.getPlayerLookDirection().getOpposite()); } @Override @@ -63,7 +61,8 @@ public class StorageInterfaceBlock extends ConnectedBlock implements PolymerText @Override public BlockState getPolymerBlockState(BlockState state) { - return this.polymerBlockState; + Direction direction = state.get(FACING); + return rotations.get(direction); } public static void register() { diff --git a/src/main/resources/assets/serverstorage/blockstates/bus_connector.json b/src/main/resources/assets/serverstorage/blockstates/bus_connector.json deleted file mode 100644 index 52ea263..0000000 --- a/src/main/resources/assets/serverstorage/blockstates/bus_connector.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "multipart": [ - { - "when": { "north": "none", "south": "none", "west": "none", "east": "none", "up": "none", "down": "none" }, - "apply": { "model": "serverstorage:block/bus_connector_blank" } - }, - { - "when": { "north": "bus" }, - "apply": { "model": "serverstorage:block/bus_connector_bus_north" } - }, - { - "when": { "south": "bus" }, - "apply": { "model": "serverstorage:block/bus_connector_bus_south" } - }, - { - "when": { "west": "bus" }, - "apply": { "model": "serverstorage:block/bus_connector_bus_west" } - }, - { - "when": { "east": "bus" }, - "apply": { "model": "serverstorage:block/bus_connector_bus_east" } - }, - { - "when": { "up": "bus" }, - "apply": { "model": "serverstorage:block/bus_connector_bus_up" } - }, - { - "when": { "down": "bus" }, - "apply": { "model": "serverstorage:block/bus_connector_bus_down" } - } - ] -} diff --git a/src/main/resources/assets/serverstorage/blockstates/drive_container.json b/src/main/resources/assets/serverstorage/blockstates/drive_container.json deleted file mode 100644 index b7cc7ad..0000000 --- a/src/main/resources/assets/serverstorage/blockstates/drive_container.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "variants": { - "facing=down": { - "model": "serverstorage:block/drive_container", - "x": 180 - }, - "facing=east": { - "model": "serverstorage:block/drive_container", - "y": 90 - }, - "facing=north": { - "model": "serverstorage:block/drive_container" - }, - "facing=south": { - "model": "serverstorage:block/drive_container", - "y": 180 - }, - "facing=up": { - "model": "serverstorage:block/drive_container", - "x": 90 - }, - "facing=west": { - "model": "serverstorage:block/drive_container", - "y": 270 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/blockstates/inventory_interface.json b/src/main/resources/assets/serverstorage/blockstates/inventory_interface.json deleted file mode 100644 index d0cded5..0000000 --- a/src/main/resources/assets/serverstorage/blockstates/inventory_interface.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "multipart": [ - { - "when": { "north": "none", "south": "none", "west": "none", "east": "none", "up": "none", "down": "none" }, - "apply": { "model": "serverstorage:block/inventory_interface_blank" } - }, - { - "when": { "north": "inventory" }, - "apply": { "model": "serverstorage:block/inventory_interface_inventory_north" } - }, - { - "when": { "south": "inventory" }, - "apply": { "model": "serverstorage:block/inventory_interface_inventory_south" } - }, - { - "when": { "west": "inventory" }, - "apply": { "model": "serverstorage:block/inventory_interface_inventory_west" } - }, - { - "when": { "east": "inventory" }, - "apply": { "model": "serverstorage:block/inventory_interface_inventory_east" } - }, - { - "when": { "up": "inventory" }, - "apply": { "model": "serverstorage:block/inventory_interface_inventory_up" } - }, - { - "when": { "down": "inventory" }, - "apply": { "model": "serverstorage:block/inventory_interface_inventory_down" } - } - ] -} diff --git a/src/main/resources/assets/serverstorage/blockstates/storage.json b/src/main/resources/assets/serverstorage/blockstates/storage.json deleted file mode 100644 index 671916b..0000000 --- a/src/main/resources/assets/serverstorage/blockstates/storage.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "variants": { - "facing=down": { - "model": "serverstorage:block/storage", - "x": 180 - }, - "facing=east": { - "model": "serverstorage:block/storage", - "y": 90 - }, - "facing=north": { - "model": "serverstorage:block/storage" - }, - "facing=south": { - "model": "serverstorage:block/storage", - "y": 180 - }, - "facing=up": { - "model": "serverstorage:block/storage" - }, - "facing=west": { - "model": "serverstorage:block/storage", - "y": 270 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/lang/en_us.json b/src/main/resources/assets/serverstorage/lang/en_us.json index be1c13a..69263c5 100644 --- a/src/main/resources/assets/serverstorage/lang/en_us.json +++ b/src/main/resources/assets/serverstorage/lang/en_us.json @@ -34,6 +34,10 @@ "item.serverstorage.module_inventory": "Inventory Module", "item.serverstorage.module_pagination": "Pagination Module", "item.serverstorage.module_transport": "Transport Module", + "item.serverstorage.module_antenna": "Antenna Module", + "item.serverstorage.module_radio": "Radio Module", + "item.serverstorage.module_antenna_connector": "Antenna Connector Module", + "item.serverstorage.module_modem": "MoDem Module", "item.serverstorage.module_netherite_upgrade": "Netherite Upgrade Module", diff --git a/src/main/resources/assets/serverstorage/models/block/bus_connector_blank.json b/src/main/resources/assets/serverstorage/models/block/bus_connector_blank.json deleted file mode 100644 index ef03a84..0000000 --- a/src/main/resources/assets/serverstorage/models/block/bus_connector_blank.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "serverstorage:block/bus_connector_blank" - } -} diff --git a/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_blank.json b/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_blank.json deleted file mode 100644 index ef03a84..0000000 --- a/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_blank.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "serverstorage:block/bus_connector_blank" - } -} diff --git a/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_down.json b/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_down.json deleted file mode 100644 index b457aa3..0000000 --- a/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_down.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "serverstorage:block/bus_connector_bus", - "up": "serverstorage:block/bus_connector_blank", - "north": "serverstorage:block/bus_connector_blank", - "south": "serverstorage:block/bus_connector_blank", - "west": "serverstorage:block/bus_connector_blank", - "east": "serverstorage:block/bus_connector_blank" - } -} diff --git a/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_east.json b/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_east.json deleted file mode 100644 index 6df909b..0000000 --- a/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_east.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "serverstorage:block/bus_connector_blank", - "up": "serverstorage:block/bus_connector_blank", - "north": "serverstorage:block/bus_connector_blank", - "south": "serverstorage:block/bus_connector_blank", - "west": "serverstorage:block/bus_connector_blank", - "east": "serverstorage:block/bus_connector_bus" - } -} diff --git a/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_north.json b/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_north.json deleted file mode 100644 index 5a72c76..0000000 --- a/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_north.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "serverstorage:block/bus_connector_blank", - "up": "serverstorage:block/bus_connector_blank", - "north": "serverstorage:block/bus_connector_bus", - "south": "serverstorage:block/bus_connector_blank", - "west": "serverstorage:block/bus_connector_blank", - "east": "serverstorage:block/bus_connector_blank" - } -} diff --git a/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_south.json b/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_south.json deleted file mode 100644 index e99a59c..0000000 --- a/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_south.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "serverstorage:block/bus_connector_blank", - "up": "serverstorage:block/bus_connector_blank", - "north": "serverstorage:block/bus_connector_blank", - "south": "serverstorage:block/bus_connector_bus", - "west": "serverstorage:block/bus_connector_blank", - "east": "serverstorage:block/bus_connector_blank" - } -} diff --git a/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_up.json b/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_up.json deleted file mode 100644 index 09434d2..0000000 --- a/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_up.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "serverstorage:block/bus_connector_blank", - "up": "serverstorage:block/bus_connector_bus", - "north": "serverstorage:block/bus_connector_blank", - "south": "serverstorage:block/bus_connector_blank", - "west": "serverstorage:block/bus_connector_blank", - "east": "serverstorage:block/bus_connector_blank" - } -} diff --git a/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_west.json b/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_west.json deleted file mode 100644 index 028dc60..0000000 --- a/src/main/resources/assets/serverstorage/models/block/bus_connector_bus_west.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "serverstorage:block/bus_connector_blank", - "up": "serverstorage:block/bus_connector_blank", - "north": "serverstorage:block/bus_connector_blank", - "south": "serverstorage:block/bus_connector_blank", - "west": "serverstorage:block/bus_connector_bus", - "east": "serverstorage:block/bus_connector_blank" - } -} diff --git a/src/main/resources/assets/serverstorage/models/block/bus_connector_inventory_blank.json b/src/main/resources/assets/serverstorage/models/block/bus_connector_inventory_blank.json deleted file mode 100644 index ef03a84..0000000 --- a/src/main/resources/assets/serverstorage/models/block/bus_connector_inventory_blank.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "serverstorage:block/bus_connector_blank" - } -} diff --git a/src/main/resources/assets/serverstorage/models/block/drive_container.json b/src/main/resources/assets/serverstorage/models/block/drive_container.json index 4492d8b..fd6789f 100644 --- a/src/main/resources/assets/serverstorage/models/block/drive_container.json +++ b/src/main/resources/assets/serverstorage/models/block/drive_container.json @@ -1,7 +1,11 @@ { - "parent": "block/orientable_vertical", + "parent": "block/orientable", "textures": { "front": "serverstorage:block/drive_container_front", - "side": "serverstorage:block/drive_container_side" + "side": "serverstorage:block/drive_container_side", + "top": "serverstorage:block/drive_container_side", + "east": "serverstorage:block/drive_container_side", + "south": "serverstorage:block/drive_container_side", + "west": "serverstorage:block/drive_container_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/block/inventory_interface_blank.json b/src/main/resources/assets/serverstorage/models/block/inventory_interface_blank.json deleted file mode 100644 index 30ac750..0000000 --- a/src/main/resources/assets/serverstorage/models/block/inventory_interface_blank.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "serverstorage:block/inventory_interface_blank" - } -} diff --git a/src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_down.json b/src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_down.json deleted file mode 100644 index 46090d1..0000000 --- a/src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_down.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "serverstorage:block/inventory_interface_inventory", - "up": "serverstorage:block/inventory_interface_blank", - "north": "serverstorage:block/inventory_interface_blank", - "south": "serverstorage:block/inventory_interface_blank", - "west": "serverstorage:block/inventory_interface_blank", - "east": "serverstorage:block/inventory_interface_blank" - } -} diff --git a/src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_east.json b/src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_east.json deleted file mode 100644 index 01b8957..0000000 --- a/src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_east.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "serverstorage:block/inventory_interface_blank", - "up": "serverstorage:block/inventory_interface_blank", - "north": "serverstorage:block/inventory_interface_blank", - "south": "serverstorage:block/inventory_interface_blank", - "west": "serverstorage:block/inventory_interface_blank", - "east": "serverstorage:block/inventory_interface_inventory" - } -} diff --git a/src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_north.json b/src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_north.json deleted file mode 100644 index 55ecafd..0000000 --- a/src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_north.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "serverstorage:block/inventory_interface_blank", - "up": "serverstorage:block/inventory_interface_blank", - "north": "serverstorage:block/inventory_interface_inventory", - "south": "serverstorage:block/inventory_interface_blank", - "west": "serverstorage:block/inventory_interface_blank", - "east": "serverstorage:block/inventory_interface_blank" - } -} diff --git a/src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_south.json b/src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_south.json deleted file mode 100644 index b5eb707..0000000 --- a/src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_south.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "serverstorage:block/inventory_interface_blank", - "up": "serverstorage:block/inventory_interface_blank", - "north": "serverstorage:block/inventory_interface_blank", - "south": "serverstorage:block/inventory_interface_inventory", - "west": "serverstorage:block/inventory_interface_blank", - "east": "serverstorage:block/inventory_interface_blank" - } -} diff --git a/src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_up.json b/src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_up.json deleted file mode 100644 index a06da33..0000000 --- a/src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_up.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "serverstorage:block/inventory_interface_blank", - "up": "serverstorage:block/inventory_interface_inventory", - "north": "serverstorage:block/inventory_interface_blank", - "south": "serverstorage:block/inventory_interface_blank", - "west": "serverstorage:block/inventory_interface_blank", - "east": "serverstorage:block/inventory_interface_blank" - } -} diff --git a/src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_west.json b/src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_west.json deleted file mode 100644 index 9f3d17b..0000000 --- a/src/main/resources/assets/serverstorage/models/block/inventory_interface_inventory_west.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "down": "serverstorage:block/inventory_interface_blank", - "up": "serverstorage:block/inventory_interface_blank", - "north": "serverstorage:block/inventory_interface_blank", - "south": "serverstorage:block/inventory_interface_blank", - "west": "serverstorage:block/inventory_interface_inventory", - "east": "serverstorage:block/inventory_interface_blank" - } -} diff --git a/src/main/resources/assets/serverstorage/models/block/radio_interface.json b/src/main/resources/assets/serverstorage/models/block/radio_interface.json new file mode 100644 index 0000000..662bd66 --- /dev/null +++ b/src/main/resources/assets/serverstorage/models/block/radio_interface.json @@ -0,0 +1,11 @@ +{ + "parent": "block/orientable", + "textures": { + "front": "serverstorage:block/radio_interface_front", + "side": "serverstorage:block/radio_interface_side", + "top": "serverstorage:block/radio_interface_side", + "east": "serverstorage:block/radio_interface_side", + "south": "serverstorage:block/radio_interface_side", + "west": "serverstorage:block/radio_interface_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/bus_connector.json b/src/main/resources/assets/serverstorage/models/item/bus_connector.json index edfa5df..2ce4e99 100644 --- a/src/main/resources/assets/serverstorage/models/item/bus_connector.json +++ b/src/main/resources/assets/serverstorage/models/item/bus_connector.json @@ -1,3 +1,3 @@ { - "parent": "serverstorage:block/bus_connector_blank" + "parent": "serverstorage:block/bus_connector" } \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/diamond_antenna.json b/src/main/resources/assets/serverstorage/models/item/diamond_antenna.json new file mode 100644 index 0000000..3241f80 --- /dev/null +++ b/src/main/resources/assets/serverstorage/models/item/diamond_antenna.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "serverstorage:item/diamond_antenna" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/golden_antenna.json b/src/main/resources/assets/serverstorage/models/item/golden_antenna.json new file mode 100644 index 0000000..8d64f01 --- /dev/null +++ b/src/main/resources/assets/serverstorage/models/item/golden_antenna.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "serverstorage:item/golden_antenna" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/iron_antenna.json b/src/main/resources/assets/serverstorage/models/item/iron_antenna.json new file mode 100644 index 0000000..2c028aa --- /dev/null +++ b/src/main/resources/assets/serverstorage/models/item/iron_antenna.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "serverstorage:item/iron_antenna" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/module_antenna.json b/src/main/resources/assets/serverstorage/models/item/module_antenna.json new file mode 100644 index 0000000..f6a70c4 --- /dev/null +++ b/src/main/resources/assets/serverstorage/models/item/module_antenna.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "serverstorage:item/module_antenna" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/module_antenna_connector.json b/src/main/resources/assets/serverstorage/models/item/module_antenna_connector.json new file mode 100644 index 0000000..6e203db --- /dev/null +++ b/src/main/resources/assets/serverstorage/models/item/module_antenna_connector.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "serverstorage:item/module_antenna_connector" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/module_modem.json b/src/main/resources/assets/serverstorage/models/item/module_modem.json new file mode 100644 index 0000000..d1793a7 --- /dev/null +++ b/src/main/resources/assets/serverstorage/models/item/module_modem.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "serverstorage:item/module_modem" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/module_radio.json b/src/main/resources/assets/serverstorage/models/item/module_radio.json new file mode 100644 index 0000000..f0be149 --- /dev/null +++ b/src/main/resources/assets/serverstorage/models/item/module_radio.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "serverstorage:item/module_radio" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/netherite_antenna.json b/src/main/resources/assets/serverstorage/models/item/netherite_antenna.json new file mode 100644 index 0000000..e20cb6c --- /dev/null +++ b/src/main/resources/assets/serverstorage/models/item/netherite_antenna.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "serverstorage:item/netherite_antenna" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/radio_interface.json b/src/main/resources/assets/serverstorage/models/item/radio_interface.json new file mode 100644 index 0000000..fc05c3a --- /dev/null +++ b/src/main/resources/assets/serverstorage/models/item/radio_interface.json @@ -0,0 +1,3 @@ +{ + "parent": "serverstorage:block/radio_interface" +} \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/models/item/wireless_terminal.json b/src/main/resources/assets/serverstorage/models/item/wireless_terminal.json new file mode 100644 index 0000000..83a3bf0 --- /dev/null +++ b/src/main/resources/assets/serverstorage/models/item/wireless_terminal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "serverstorage:item/wireless_terminal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/serverstorage/textures/block/radio_interface_front.png b/src/main/resources/assets/serverstorage/textures/block/radio_interface_front.png new file mode 100644 index 0000000000000000000000000000000000000000..14f412230fa099e69ae75649355d75c540b5a2b9 GIT binary patch literal 421 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU2f2pMLTD{+rj2Po6k%=Ja7RQ)6>86Nan*oBxQM zWnf@9>FMGaA~DtW%*DKB10ILK%`8lu7TXq@D5tztn!5G%pa1*KGcT9T@7Hr+)<3pw zZuYKwU&7Sl=D|GHia~?bs?T-&wti(_gah$+(fJ=+p|u!~u>0J61_lNOPgg&ebxsLQ0J9v-TL1t6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/serverstorage/textures/block/radio_interface_side.png b/src/main/resources/assets/serverstorage/textures/block/radio_interface_side.png new file mode 100644 index 0000000000000000000000000000000000000000..f641dd816432953265cfaab854bce403eb8ea5c5 GIT binary patch literal 657 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUjODt4AN+KfiJP{NY2p z-oAPA_s^G)A6|U@^5*D~Jyw?H7tSAl^7!_h+n0a-`0)S#|Gj&*JbiNK#PR+A|Nn4x zak_H(^o!^B-@JZ&^2C8Nrw^N%8k?J${9EewjDdlHG0EHAMPYNcZ36=X180FpWHAE+ z-(e7DJf6QIg@J*Ay~NYkmHh>~JfD*Mn!V>d85kJOdAc};NL=PU%jnc>z{7ALq0xys zQ)ofSl%}xu*`NQvzx?|EW5|cJSIf4B-k!Pc-NI6fo+ptdv!)v`%&6?Go0Gpv<8zy- z%Jy`wI#FAj>Z}7*vjWaNc=@-vOUh&Zx;qhk-&LJ2RdP{kVo554k%5tku7SC(k$H%riIs_^m9dGofq|8QK}5|nQ1l}-eRQU1>!$d@_^AafZge`9dJ~F?hQAxvXi literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/serverstorage/textures/item/golden_antenna.png b/src/main/resources/assets/serverstorage/textures/item/golden_antenna.png new file mode 100644 index 0000000000000000000000000000000000000000..49e477eab5fb8745ce65c353857e5f9c00a098a8 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU5O5XXR?f eq_bg0@ySdc#~B*?<_m$`$KdJe=d#Wzp$Pz?T03C? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/serverstorage/textures/item/iron_antenna.png b/src/main/resources/assets/serverstorage/textures/item/iron_antenna.png new file mode 100644 index 0000000000000000000000000000000000000000..81c4a1078f5073f67e3d2e58d59a516e589785d7 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QU1>!$d@_^AafZge`9dJ~F?hQAxvXQUVOY4{YW?*1&@N{tuk(fI7 z{An%*1rC>sFCYH-ufAL<<QUhKSV$BhHe*0d3#TY!MIsm zxMHrsygBn9<#IC}ILNU|Q*zB6*Q80jO1uw#HcJ=9G0pxQxwac*qo=E%%Q~loCIH$V BM@|3$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/serverstorage/textures/item/module_modem.png b/src/main/resources/assets/serverstorage/textures/item/module_modem.png new file mode 100644 index 0000000000000000000000000000000000000000..294f584983ba13626a7794688be88e8029a57bbb GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUQUVOY4{YW?*3O_jGX#k(k=s z@5y(-fP*7{nzGzTd3cw`iUT;b{J=d#Wzp$Pz1=R`ID literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/serverstorage/textures/item/netherite_antenna.png b/src/main/resources/assets/serverstorage/textures/item/netherite_antenna.png new file mode 100644 index 0000000000000000000000000000000000000000..5c2c1f19a23a4f9b8a62e2bcf1c6fd85d40da0aa GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUIE{-7*Q+xZOxeh4s zuza8Rdwyi@k*o=q9PG+ws51WZ@!$w^@tk+@)oBK?O>&1%%l8~}<5TpuQOaZ6Fj=Gb iSGw80ycspUY_Xdd7GK{SGMRyafx*+&&t;ucLK6T2I5|-O literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/serverstorage/textures/item/wireless_terminal.png b/src/main/resources/assets/serverstorage/textures/item/wireless_terminal.png new file mode 100644 index 0000000000000000000000000000000000000000..55e0fa7cc77a5d9b5b34cb8d7425a16c15aa76e0 GIT binary patch literal 670 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUa)1b9aV`a}i!MhE-Fg!spX z2E>I0#)k(bLBh9pIWCP#;*#Du5DMx@0>rpHHRCdOnX#bzhR<)p;trY7X2CFZ9m z6=WnAW~LNnr50zWmE~pDmKG%E?T^nso?djUpyozf|BV&vpKsXqeC6i<$BrF4efsp- zvuDqrKY!uEh0B*OU%7JS>eZ{)uV24;^X9Evw{G9Qedo@d`}glZc<|ui!-tO^J$n53 z@zbYIpFMl_{Q2`2FJ8QS`SR7PSFc~ce*5GS8$U%q_# z`t|F#Z{NOu|Ni60k6*uj{r>&?&!0bk|Ni~||Nm7k{tpZc3{fRPe!&d?X$2Y&t?_4I zV7TGw;us<^HTG0?a8rN;%Y(OG6`H}pL5r^#O-fEX#_8x}xNrr}sV{r}|L=G4yX<2Z zUsjghctrGC$hG#r^}5%sre69Q@@&Hjt>?T8Zawx%?