From 4109b81afceb1fa3bc91185302f5463acfa18ba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sun, 18 Jul 2021 02:59:32 +0200 Subject: [PATCH] Renamed buildroot flash and disk identifier. --- src/main/java/li/cil/oc2/common/item/Items.java | 4 ++-- .../{flash_memory_custom.json => flash_memory_buildroot.json} | 0 .../{hard_drive_custom.json => hard_drive_buildroot.json} | 0 .../{hard_drive_custom.json => flash_memory_buildroot.json} | 4 ++-- .../{flash_memory_custom.json => hard_drive_buildroot.json} | 4 ++-- src/main/resources/data/oc2/recipes/computer.json | 2 +- .../{flash_memory_custom.json => flash_memory_buildroot.json} | 2 +- .../{hard_drive_custom.json => hard_drive_buildroot.json} | 2 +- .../resources/data/oc2/tags/items/device_needs_reboot.json | 4 ++-- .../resources/data/oc2/tags/items/devices/flash_memory.json | 2 +- .../resources/data/oc2/tags/items/devices/hard_drive.json | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) rename src/main/resources/assets/oc2/models/item/{flash_memory_custom.json => flash_memory_buildroot.json} (100%) rename src/main/resources/assets/oc2/models/item/{hard_drive_custom.json => hard_drive_buildroot.json} (100%) rename src/main/resources/data/oc2/advancements/recipes/oc2.common/{hard_drive_custom.json => flash_memory_buildroot.json} (89%) rename src/main/resources/data/oc2/advancements/recipes/oc2.common/{flash_memory_custom.json => hard_drive_buildroot.json} (89%) rename src/main/resources/data/oc2/recipes/{flash_memory_custom.json => flash_memory_buildroot.json} (78%) rename src/main/resources/data/oc2/recipes/{hard_drive_custom.json => hard_drive_buildroot.json} (80%) 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 ef040221..59ddd815 100644 --- a/src/main/java/li/cil/oc2/common/item/Items.java +++ b/src/main/java/li/cil/oc2/common/item/Items.java @@ -51,12 +51,12 @@ public final class Items { new HardDriveItem(4 * Constants.MEGABYTE, DyeColor.GREEN)); public static final RegistryObject HARD_DRIVE_LARGE = register("hard_drive_large", () -> new HardDriveItem(8 * Constants.MEGABYTE, DyeColor.CYAN)); - public static final RegistryObject HARD_DRIVE_CUSTOM = register("hard_drive_custom", () -> + public static final RegistryObject HARD_DRIVE_CUSTOM = register("hard_drive_buildroot", () -> new HardDriveWithExternalDataItem(BlockDeviceDataRegistration.BUILDROOT.getId(), DyeColor.BROWN)); public static final RegistryObject FLASH_MEMORY = register("flash_memory", () -> new FlashMemoryItem(4 * Constants.KILOBYTE)); - public static final RegistryObject FLASH_MEMORY_CUSTOM = register("flash_memory_custom", () -> + public static final RegistryObject FLASH_MEMORY_CUSTOM = register("flash_memory_buildroot", () -> new FlashMemoryWithExternalDataItem(Firmwares.BUILDROOT.getId())); public static final RegistryObject FLOPPY = register("floppy", () -> diff --git a/src/main/resources/assets/oc2/models/item/flash_memory_custom.json b/src/main/resources/assets/oc2/models/item/flash_memory_buildroot.json similarity index 100% rename from src/main/resources/assets/oc2/models/item/flash_memory_custom.json rename to src/main/resources/assets/oc2/models/item/flash_memory_buildroot.json diff --git a/src/main/resources/assets/oc2/models/item/hard_drive_custom.json b/src/main/resources/assets/oc2/models/item/hard_drive_buildroot.json similarity index 100% rename from src/main/resources/assets/oc2/models/item/hard_drive_custom.json rename to src/main/resources/assets/oc2/models/item/hard_drive_buildroot.json diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_custom.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/flash_memory_buildroot.json similarity index 89% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_custom.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/flash_memory_buildroot.json index 65896550..042c5cc9 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_custom.json +++ b/src/main/resources/data/oc2/advancements/recipes/oc2.common/flash_memory_buildroot.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:hard_drive_custom" + "oc2:flash_memory_buildroot" ] }, "criteria": { @@ -29,7 +29,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:hard_drive_custom" + "recipe": "oc2:flash_memory_buildroot" } } }, diff --git a/src/main/resources/data/oc2/advancements/recipes/oc2.common/flash_memory_custom.json b/src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_buildroot.json similarity index 89% rename from src/main/resources/data/oc2/advancements/recipes/oc2.common/flash_memory_custom.json rename to src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_buildroot.json index ca8c688c..7fd469fa 100644 --- a/src/main/resources/data/oc2/advancements/recipes/oc2.common/flash_memory_custom.json +++ b/src/main/resources/data/oc2/advancements/recipes/oc2.common/hard_drive_buildroot.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "oc2:flash_memory_custom" + "oc2:hard_drive_buildroot" ] }, "criteria": { @@ -29,7 +29,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "oc2:flash_memory_custom" + "recipe": "oc2:hard_drive_buildroot" } } }, diff --git a/src/main/resources/data/oc2/recipes/computer.json b/src/main/resources/data/oc2/recipes/computer.json index 261e853d..6fa58f48 100644 --- a/src/main/resources/data/oc2/recipes/computer.json +++ b/src/main/resources/data/oc2/recipes/computer.json @@ -32,7 +32,7 @@ { "Slot": 0, "Count": 1, - "id": "oc2:flash_memory_custom" + "id": "oc2:flash_memory_buildroot" } ] } diff --git a/src/main/resources/data/oc2/recipes/flash_memory_custom.json b/src/main/resources/data/oc2/recipes/flash_memory_buildroot.json similarity index 78% rename from src/main/resources/data/oc2/recipes/flash_memory_custom.json rename to src/main/resources/data/oc2/recipes/flash_memory_buildroot.json index a3c33379..1276113a 100644 --- a/src/main/resources/data/oc2/recipes/flash_memory_custom.json +++ b/src/main/resources/data/oc2/recipes/flash_memory_buildroot.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "oc2:flash_memory_custom" + "item": "oc2:flash_memory_buildroot" } } \ No newline at end of file diff --git a/src/main/resources/data/oc2/recipes/hard_drive_custom.json b/src/main/resources/data/oc2/recipes/hard_drive_buildroot.json similarity index 80% rename from src/main/resources/data/oc2/recipes/hard_drive_custom.json rename to src/main/resources/data/oc2/recipes/hard_drive_buildroot.json index b25f7e6c..409b9e0e 100644 --- a/src/main/resources/data/oc2/recipes/hard_drive_custom.json +++ b/src/main/resources/data/oc2/recipes/hard_drive_buildroot.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "oc2:hard_drive_custom" + "item": "oc2:hard_drive_buildroot" } } \ No newline at end of file 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 1c0f0d5c..6555864a 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 @@ -7,9 +7,9 @@ "oc2:hard_drive_small", "oc2:hard_drive_medium", "oc2:hard_drive_large", - "oc2:hard_drive_custom", + "oc2:hard_drive_buildroot", "oc2:flash_memory", - "oc2:flash_memory_custom", + "oc2:flash_memory_buildroot", "oc2:network_interface_card", "oc2:disk_drive" ] diff --git a/src/main/resources/data/oc2/tags/items/devices/flash_memory.json b/src/main/resources/data/oc2/tags/items/devices/flash_memory.json index da08945c..dca85eac 100644 --- a/src/main/resources/data/oc2/tags/items/devices/flash_memory.json +++ b/src/main/resources/data/oc2/tags/items/devices/flash_memory.json @@ -2,6 +2,6 @@ "replace": false, "values": [ "oc2:flash_memory", - "oc2:flash_memory_custom" + "oc2:flash_memory_buildroot" ] } \ No newline at end of file diff --git a/src/main/resources/data/oc2/tags/items/devices/hard_drive.json b/src/main/resources/data/oc2/tags/items/devices/hard_drive.json index 929b9fdc..d3b98db4 100644 --- a/src/main/resources/data/oc2/tags/items/devices/hard_drive.json +++ b/src/main/resources/data/oc2/tags/items/devices/hard_drive.json @@ -4,6 +4,6 @@ "oc2:hard_drive_small", "oc2:hard_drive_medium", "oc2:hard_drive_large", - "oc2:hard_drive_custom" + "oc2:hard_drive_buildroot" ] } \ No newline at end of file