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?01zrLFfuSOqyRAjC{9$2XZ$y@QI#tfD98d*p*V3v0yD$a z|C-@gn|srP$k zp;^%dv_iGMCAn?&|Bp#2TVMRT_;h1pis^}86OVG<z8cYpqwf9GqY7>+C0ZL&%+E_iu-d7sSRCA;QN`rv%6U;p2QtBSAN z6Kh_wPp>N}E?62qLuQj4n?}P@=A^I23m8-W8kFw1apej>1Jg9Q)$yb)6Omc+5PL# 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 zcmV;W0b2fvP)Px#icm~cMLs<{KR!G}LqR+{IXgNyKtDZ0LO?-4J~T5iI5#!V&c@^7+Vu15;NRET z*wE3?$lcu3)zr-E>f-S4=h)ZJ!@|1l?BxCY^zrcM_4Mq;#JoB=H_*?=)63}R-|Xw-$;iOW%fmJ`GdDIg0M-A4{1nXq007BJ zL_t&-l|9VSZi6rkKvA;<0tq;_p)@08?IM-6>-_(}H)+#$pN}p;124w5ool+@^mc&G zhjGG4Ec0?&M*y>&Q=FDpk-*CqEM&jye-T@7QRl#yHRAOhRSabH^$(z^0bo(t#*jiH zMQq^a6^~y~qapx&RMC47F1x0hEVwnS@#j+LvCj_Nx$-CDQRq`g|UHT3q(b?+9ITJ$`LESWXkfMG^uZ{3{yRT`h$OjWk0bJdC3+Eiy9 zsG1dU?!n8y&0SI+^Vi*p;QOxXv`doVV(fNCWjDJHtsU0Oy1gVc#o{>__I1zW4>@Ul zTqt`3W3zs@``JHt)Va%aKPi_y-Sl7Gow+kY^0@F+&c~aZ#3yaYOO{xtbA8T&zMi;N z`R5vyg`7Djl~%pcC=S@?oc=4^Xj$f~_{-`Z^{jD18Vr$lwShiUEpd$~Nl7e8wMs5Z z1yT$~21X{j2Ijg(<{^eARwkBK#wOYZ237_J5jD?1(T~uOo1c=IR*9y;$im9d0-|B{ w)F8Z_WGlw{_n7MCRE7Qpow8-gq`1|ma<9+iJNprpp&>FVdQ&MBb@06+`}umAu6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/serverstorage/textures/item/diamond_antenna.png b/src/main/resources/assets/serverstorage/textures/item/diamond_antenna.png new file mode 100644 index 0000000000000000000000000000000000000000..c8f3e4dcba5d3676d2f6b3ab83d5ee71ba2960bf GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~{s5m4S0HVB z?tJ~b_s72f`2YWZZxfpqP>8i8$S;@y$p0^MK@DV*lc$Sgh{V+1zS~?31{_YN-~Zp= z!@V)|i@`y5elJFQsV7CQ(VsN(qzfh%Jv_5DNnzy!W$*A^YyzH@s~MBdh8e{tGkF|m UXzZIW1acpPr>mdKI;Vst0Jgh3iU0rr 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!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~{s5m4S0H_P zp5mudSwEle`Tzg_8OEvJKq1zWAirP+ApgJ21vQXKPM$7~Are!2`)+eF7;re5e*b@e z5BJ8zopr0HIntVE_OC 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!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~{s5m4S0G(f zRJ3BniW@g>{Qv)7b+r^XP>8i8$S;@y$p0^MK@DV*lc$Sgh{V+1zS~?31{_YN-~Zp= z!@V)|i@`y5elJFQsV7CQ(VsN(qzfh%Jv_5DNnzy!W$*A^YyzH@s~MBdh8e{tGkF|m UXzZIW1acpPr>mdKI;Vst02UoOD*ylh literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/serverstorage/textures/item/module_antenna.png b/src/main/resources/assets/serverstorage/textures/item/module_antenna.png new file mode 100644 index 0000000000000000000000000000000000000000..282d79594b2637de1357891e9dd436eb9f367acf GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~(Ey(iS0D`p zMmCllL5!JMSwU?KzdxDr&tLiwD9T;dryeLxLI7dVy?lwIrAUo sax)z`$gxUOa?Ksrq)EI=ybpdhOBcm4&Hfy@wi{%lr>mdKI;Vst0NNf$P5=M^ 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!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~p#Yx{S0D`p zMmCllL5x9d48K2_bvylv0}8Q~1o;Is{0D)m$_M{|B0-)mjv*3Lb9)2%4k++Az2y47 z|5L`@D=zVW4v0HB7CN(}E?Su~QB6*Gs#nP3*24mMCNqOq+`4t-;t%&ydE0Z(Zp~Q4 o|3dhQ&_9M7tQQWweth=`_XbvGc{QPLl^{2Gy85}Sb4q9e0C}!P7XSbN literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/serverstorage/textures/item/module_radio.png b/src/main/resources/assets/serverstorage/textures/item/module_radio.png new file mode 100644 index 0000000000000000000000000000000000000000..c7562718a137a465e4d9ddd844c0962a9d9f6303 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~(Ey(iS0D`p zMmCllL5x9d48K2_Fep-(4pvZtpgxxQ(iv5M_v1k=I})kWF{F*BKtt_sO8>`7R7G_>aE+&SEv nzw`caz3|aSB1Z9!rS(UK=j)lhzj$O6f*j%L>gTe~DWM4fR_8=E 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!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~{s5m4SCE{l zvW2mMtG#twW1T#w^aG#}Ye|q_FvEW!kh!1+GRfW3#W6%;YHwdO*8v3{mhTgP&yUPK zk~QIygI(DSRmOil9vopVp7SogI?W)qN$&7z`JQ8Le2U&SN_lJ>CTsNmN;lh=H>0MP ZEp`*b;_I73CIgLR@O1TaS?83{1ONg!IZ*%r 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!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1H_z5t&PSD>J? zwV98Ly|1f-pPQqP3{(tP)vD2qdpFMl_{Q2`2 zE?l^L`SO)3SFT>Ydj0zKn>TOXx^?UJ?b~(}q!zyJLC^Y`!H|NsAA<>LPU43VgkAirP+AfGm%@z5H7pe;8%T^vIs zrpBJi4sHsNV0rM?t3oq4IB4+|qe;nW$2c9G3>U88IrU}F|Ns3iewTgh;>*g?8;^)y z3%S<*w_f+U)znL0L!NC|q4k`1!L7$W={=>pV&~2@R}YYTzjfQU$Gg_f{L7?b7i%kI z^>|;8$^PH9DvnD0Kc`t2x&-=syZ+^*Wy7u+$McV$Pj~G6#uD~(#*_NYM84y)z)a*=6?nHk-^i|&t;ucLK6V2E`ap_ literal 0 HcmV?d00001 diff --git a/src/main/resources/data/serverstorage/recipe/diamond_antenna.json b/src/main/resources/data/serverstorage/recipe/diamond_antenna.json new file mode 100644 index 0000000..e87582e --- /dev/null +++ b/src/main/resources/data/serverstorage/recipe/diamond_antenna.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + " ##", + "## ", + "# " + ], + "key": { + "#": { + "item": "minecraft:diamond" + } + }, + "result": { + "id": "serverstorage:diamond_antenna", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/serverstorage/recipe/golden_antenna.json b/src/main/resources/data/serverstorage/recipe/golden_antenna.json new file mode 100644 index 0000000..c4746b4 --- /dev/null +++ b/src/main/resources/data/serverstorage/recipe/golden_antenna.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + " ##", + "## ", + "# " + ], + "key": { + "#": { + "item": "minecraft:gold_ingot" + } + }, + "result": { + "id": "serverstorage:golden_antenna", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/serverstorage/recipe/iron_antenna.json b/src/main/resources/data/serverstorage/recipe/iron_antenna.json new file mode 100644 index 0000000..b8b5951 --- /dev/null +++ b/src/main/resources/data/serverstorage/recipe/iron_antenna.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + " ##", + "## ", + "# " + ], + "key": { + "#": { + "item": "minecraft:iron_ingot" + } + }, + "result": { + "id": "serverstorage:iron_antenna", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/serverstorage/recipe/module_antenna.json b/src/main/resources/data/serverstorage/recipe/module_antenna.json new file mode 100644 index 0000000..2366a0d --- /dev/null +++ b/src/main/resources/data/serverstorage/recipe/module_antenna.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "RIR", + "SCS", + "GGG" + ], + "key": { + "G": { + "item": "minecraft:gold_nugget" + }, + "R": { + "item": "minecraft:iron_ingot" + }, + "I": { + "item": "minecraft:gold_ingot" + }, + "C": { + "item": "serverstorage:material_cpu" + }, + "S": { + "item": "serverstorage:material_pcb_substrate" + } + }, + "result": { + "id": "serverstorage:module_antenna", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/serverstorage/recipe/module_antenna_connector.json b/src/main/resources/data/serverstorage/recipe/module_antenna_connector.json new file mode 100644 index 0000000..7215754 --- /dev/null +++ b/src/main/resources/data/serverstorage/recipe/module_antenna_connector.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "RGR", + "SCS", + "GGG" + ], + "key": { + "G": { + "item": "minecraft:gold_nugget" + }, + "R": { + "item": "minecraft:iron_ingot" + }, + "C": { + "item": "serverstorage:material_cpu" + }, + "S": { + "item": "serverstorage:material_pcb_substrate" + } + }, + "result": { + "id": "serverstorage:module_antenna_connector", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/serverstorage/recipe/module_modem.json b/src/main/resources/data/serverstorage/recipe/module_modem.json new file mode 100644 index 0000000..429c856 --- /dev/null +++ b/src/main/resources/data/serverstorage/recipe/module_modem.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "ICI", + "SCS", + "GGG" + ], + "key": { + "G": { + "item": "minecraft:gold_nugget" + }, + "I": { + "item": "minecraft:gold_ingot" + }, + "C": { + "item": "serverstorage:material_cpu" + }, + "S": { + "item": "serverstorage:material_pcb_substrate" + } + }, + "result": { + "id": "serverstorage:module_modem", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/serverstorage/recipe/module_radio.json b/src/main/resources/data/serverstorage/recipe/module_radio.json new file mode 100644 index 0000000..d510a1b --- /dev/null +++ b/src/main/resources/data/serverstorage/recipe/module_radio.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "CIC", + "SCS", + "GGG" + ], + "key": { + "G": { + "item": "minecraft:gold_nugget" + }, + "I": { + "item": "minecraft:gold_ingot" + }, + "C": { + "item": "serverstorage:material_cpu" + }, + "S": { + "item": "serverstorage:material_pcb_substrate" + } + }, + "result": { + "id": "serverstorage:module_radio", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/serverstorage/recipe/netherite_antenna.json b/src/main/resources/data/serverstorage/recipe/netherite_antenna.json new file mode 100644 index 0000000..2d0687a --- /dev/null +++ b/src/main/resources/data/serverstorage/recipe/netherite_antenna.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:smithing_transform", + "addition": { + "item": "minecraft:netherite_ingot" + }, + "base": { + "item": "serverstorage:diamond_antenna" + }, + "result": { + "count": 1, + "id": "serverstorage:netherite_antenna" + }, + "template": { + "item": "serverstorage:module_netherite_upgrade" + } +} \ No newline at end of file diff --git a/src/main/resources/data/serverstorage/recipe/radio_interface.json b/src/main/resources/data/serverstorage/recipe/radio_interface.json new file mode 100644 index 0000000..a647549 --- /dev/null +++ b/src/main/resources/data/serverstorage/recipe/radio_interface.json @@ -0,0 +1,39 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "CBH", + "MUG", + "MPF" + ], + "key": { + "P": { + "item": "serverstorage:material_pcb" + }, + "U": { + "item": "serverstorage:material_cpu" + }, + "C": { + "item": "serverstorage:module_radio" + }, + "B": { + "item": "serverstorage:module_bus" + }, + "H": { + "item": "serverstorage:module_antenna_connector" + }, + "M": { + "item": "serverstorage:module_modem" + }, + "G": { + "item": "serverstorage:module_configuration" + }, + "F": { + "item": "serverstorage:module_pagination" + } + }, + "result": { + "id": "serverstorage:radio_interface", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/serverstorage/recipe/wireless_terminal.json b/src/main/resources/data/serverstorage/recipe/wireless_terminal.json new file mode 100644 index 0000000..28f2d89 --- /dev/null +++ b/src/main/resources/data/serverstorage/recipe/wireless_terminal.json @@ -0,0 +1,39 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "AHM", + "CGF", + "UMP" + ], + "key": { + "P": { + "item": "serverstorage:material_pcb" + }, + "U": { + "item": "serverstorage:material_cpu" + }, + "A": { + "item": "serverstorage:module_antenna" + }, + "C": { + "item": "serverstorage:module_radio" + }, + "H": { + "item": "serverstorage:module_antenna_connector" + }, + "M": { + "item": "serverstorage:module_modem" + }, + "G": { + "item": "serverstorage:module_configuration" + }, + "F": { + "item": "serverstorage:module_pagination" + } + }, + "result": { + "id": "serverstorage:wireless_terminal", + "count": 1 + } +} \ No newline at end of file