From 1c7da6835bbf98c02d1908501b16adac6022cf68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Fri, 4 Feb 2022 10:23:09 +0100 Subject: [PATCH] Sorted some things. --- src/main/java/li/cil/oc2/common/block/Blocks.java | 2 +- .../cil/oc2/common/blockentity/BlockEntities.java | 8 ++++---- src/main/java/li/cil/oc2/common/item/Items.java | 2 +- .../li/cil/oc2/data/ModBlockStateProvider.java | 8 ++++---- .../java/li/cil/oc2/data/ModItemTagsProvider.java | 12 ++++++------ .../java/li/cil/oc2/data/ModLootTableProvider.java | 9 ++++----- .../data/oc2/tags/items/device_needs_reboot.json | 14 +++++++------- 7 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/main/java/li/cil/oc2/common/block/Blocks.java b/src/main/java/li/cil/oc2/common/block/Blocks.java index 5bfa2fff..36e39ffb 100644 --- a/src/main/java/li/cil/oc2/common/block/Blocks.java +++ b/src/main/java/li/cil/oc2/common/block/Blocks.java @@ -20,8 +20,8 @@ public final class Blocks { public static final RegistryObject DISK_DRIVE = BLOCKS.register("disk_drive", DiskDriveBlock::new); public static final RegistryObject NETWORK_CONNECTOR = BLOCKS.register("network_connector", NetworkConnectorBlock::new); public static final RegistryObject NETWORK_HUB = BLOCKS.register("network_hub", NetworkHubBlock::new); - public static final RegistryObject REDSTONE_INTERFACE = BLOCKS.register("redstone_interface", RedstoneInterfaceBlock::new); public static final RegistryObject PROJECTOR = BLOCKS.register("projector", ProjectorBlock::new); + public static final RegistryObject REDSTONE_INTERFACE = BLOCKS.register("redstone_interface", RedstoneInterfaceBlock::new); /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/li/cil/oc2/common/blockentity/BlockEntities.java b/src/main/java/li/cil/oc2/common/blockentity/BlockEntities.java index efc4fa3d..7762318e 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/BlockEntities.java +++ b/src/main/java/li/cil/oc2/common/blockentity/BlockEntities.java @@ -16,15 +16,15 @@ public final class BlockEntities { /////////////////////////////////////////////////////////////////// - public static final RegistryObject> REDSTONE_INTERFACE = register(Blocks.REDSTONE_INTERFACE, RedstoneInterfaceBlockEntity::new); public static final RegistryObject> BUS_CABLE = register(Blocks.BUS_CABLE, BusCableBlockEntity::new); + public static final RegistryObject> CHARGER = register(Blocks.CHARGER, ChargerBlockEntity::new); public static final RegistryObject> COMPUTER = register(Blocks.COMPUTER, ComputerBlockEntity::new); + public static final RegistryObject> CREATIVE_ENERGY = register(Blocks.CREATIVE_ENERGY, CreativeEnergyBlockEntity::new); + public static final RegistryObject> DISK_DRIVE = register(Blocks.DISK_DRIVE, DiskDriveBlockEntity::new); public static final RegistryObject> NETWORK_CONNECTOR = register(Blocks.NETWORK_CONNECTOR, NetworkConnectorBlockEntity::new); public static final RegistryObject> NETWORK_HUB = register(Blocks.NETWORK_HUB, NetworkHubBlockEntity::new); - public static final RegistryObject> DISK_DRIVE = register(Blocks.DISK_DRIVE, DiskDriveBlockEntity::new); - public static final RegistryObject> CHARGER = register(Blocks.CHARGER, ChargerBlockEntity::new); - public static final RegistryObject> CREATIVE_ENERGY = register(Blocks.CREATIVE_ENERGY, CreativeEnergyBlockEntity::new); public static final RegistryObject> PROJECTOR = register(Blocks.PROJECTOR, ProjectorBlockEntity::new); + public static final RegistryObject> REDSTONE_INTERFACE = register(Blocks.REDSTONE_INTERFACE, RedstoneInterfaceBlockEntity::new); /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/li/cil/oc2/common/item/Items.java b/src/main/java/li/cil/oc2/common/item/Items.java index 5a276d22..d181c245 100644 --- a/src/main/java/li/cil/oc2/common/item/Items.java +++ b/src/main/java/li/cil/oc2/common/item/Items.java @@ -30,8 +30,8 @@ public final class Items { public static final RegistryObject DISK_DRIVE = register(Blocks.DISK_DRIVE); public static final RegistryObject NETWORK_CONNECTOR = register(Blocks.NETWORK_CONNECTOR); public static final RegistryObject NETWORK_HUB = register(Blocks.NETWORK_HUB); - public static final RegistryObject REDSTONE_INTERFACE = register(Blocks.REDSTONE_INTERFACE); public static final RegistryObject PROJECTOR = register(Blocks.PROJECTOR); + public static final RegistryObject REDSTONE_INTERFACE = register(Blocks.REDSTONE_INTERFACE); /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/li/cil/oc2/data/ModBlockStateProvider.java b/src/main/java/li/cil/oc2/data/ModBlockStateProvider.java index f6e6614b..0acb2cbb 100644 --- a/src/main/java/li/cil/oc2/data/ModBlockStateProvider.java +++ b/src/main/java/li/cil/oc2/data/ModBlockStateProvider.java @@ -34,8 +34,10 @@ public final class ModBlockStateProvider extends BlockStateProvider { @Override protected void registerStatesAndModels() { + horizontalBlock(Blocks.CHARGER, Items.CHARGER, CHARGER_MODEL); horizontalBlock(Blocks.COMPUTER, Items.COMPUTER, COMPUTER_MODEL); - horizontalBlock(Blocks.REDSTONE_INTERFACE, Items.REDSTONE_INTERFACE, REDSTONE_INTERFACE_MODEL); + simpleBlock(Blocks.CREATIVE_ENERGY, Items.CREATIVE_ENERGY); + horizontalBlock(Blocks.DISK_DRIVE, Items.DISK_DRIVE, DISK_DRIVE_MODEL); horizontalFaceBlock(Blocks.NETWORK_CONNECTOR, Items.NETWORK_CONNECTOR, NETWORK_CONNECTOR_MODEL) .transforms() .transform(ModelBuilder.Perspective.GUI) @@ -50,10 +52,8 @@ public final class ModBlockStateProvider extends BlockStateProvider { .end() .end(); horizontalBlock(Blocks.NETWORK_HUB, Items.NETWORK_HUB, NETWORK_HUB_MODEL); - horizontalBlock(Blocks.DISK_DRIVE, Items.DISK_DRIVE, DISK_DRIVE_MODEL); - horizontalBlock(Blocks.CHARGER, Items.CHARGER, CHARGER_MODEL); - simpleBlock(Blocks.CREATIVE_ENERGY, Items.CREATIVE_ENERGY); horizontalBlock(Blocks.PROJECTOR, Items.PROJECTOR, PROJECTOR_MODEL); + horizontalBlock(Blocks.REDSTONE_INTERFACE, Items.REDSTONE_INTERFACE, REDSTONE_INTERFACE_MODEL); registerCableStates(); } diff --git a/src/main/java/li/cil/oc2/data/ModItemTagsProvider.java b/src/main/java/li/cil/oc2/data/ModItemTagsProvider.java index 63ef2460..bf70f65b 100644 --- a/src/main/java/li/cil/oc2/data/ModItemTagsProvider.java +++ b/src/main/java/li/cil/oc2/data/ModItemTagsProvider.java @@ -71,17 +71,17 @@ public final class ModItemTagsProvider extends ItemTagsProvider { tag(WRENCHES).add(Items.WRENCH.get()); tag(DEVICE_NEEDS_REBOOT).add( - Items.MEMORY_SMALL.get(), - Items.MEMORY_MEDIUM.get(), - Items.MEMORY_LARGE.get(), + Items.DISK_DRIVE.get(), + Items.FLASH_MEMORY.get(), + Items.FLASH_MEMORY_CUSTOM.get(), Items.HARD_DRIVE_SMALL.get(), Items.HARD_DRIVE_MEDIUM.get(), Items.HARD_DRIVE_LARGE.get(), Items.HARD_DRIVE_CUSTOM.get(), - Items.FLASH_MEMORY.get(), - Items.FLASH_MEMORY_CUSTOM.get(), + Items.MEMORY_SMALL.get(), + Items.MEMORY_MEDIUM.get(), + Items.MEMORY_LARGE.get(), Items.NETWORK_INTERFACE_CARD.get(), - Items.DISK_DRIVE.get(), Items.NETWORK_TUNNEL_CARD.get(), Items.NETWORK_TUNNEL_MODULE.get(), Items.PROJECTOR.get() diff --git a/src/main/java/li/cil/oc2/data/ModLootTableProvider.java b/src/main/java/li/cil/oc2/data/ModLootTableProvider.java index 9e6284ee..ed4f9621 100644 --- a/src/main/java/li/cil/oc2/data/ModLootTableProvider.java +++ b/src/main/java/li/cil/oc2/data/ModLootTableProvider.java @@ -51,14 +51,13 @@ public final class ModLootTableProvider extends LootTableProvider { public static final class ModBlockLootTables extends BlockLoot { @Override protected void addTables() { - dropSelf(Blocks.REDSTONE_INTERFACE.get()); + dropSelf(Blocks.CHARGER.get()); + add(Blocks.COMPUTER.get(), ModBlockLootTables::droppingWithInventory); + dropSelf(Blocks.DISK_DRIVE.get()); dropSelf(Blocks.NETWORK_CONNECTOR.get()); dropSelf(Blocks.NETWORK_HUB.get()); - dropSelf(Blocks.DISK_DRIVE.get()); - dropSelf(Blocks.CHARGER.get()); dropSelf(Blocks.PROJECTOR.get()); - - add(Blocks.COMPUTER.get(), ModBlockLootTables::droppingWithInventory); + dropSelf(Blocks.REDSTONE_INTERFACE.get()); } @Override diff --git a/src/main/resources/data/oc2/tags/items/device_needs_reboot.json b/src/main/resources/data/oc2/tags/items/device_needs_reboot.json index 6de20b67..1ba8efb3 100644 --- a/src/main/resources/data/oc2/tags/items/device_needs_reboot.json +++ b/src/main/resources/data/oc2/tags/items/device_needs_reboot.json @@ -1,19 +1,19 @@ { "replace": false, "values": [ - "oc2:memory_small", - "oc2:memory_medium", - "oc2:memory_large", + "oc2:disk_drive", + "oc2:flash_memory", + "oc2:flash_memory_buildroot", "oc2:hard_drive_small", "oc2:hard_drive_medium", "oc2:hard_drive_large", "oc2:hard_drive_buildroot", - "oc2:flash_memory", - "oc2:flash_memory_buildroot", + "oc2:memory_small", + "oc2:memory_medium", + "oc2:memory_large", "oc2:network_interface_card", - "oc2:disk_drive", "oc2:network_tunnel_card", "oc2:network_tunnel_module", "oc2:projector" ] -} \ No newline at end of file +}