From 09ad6c19055f076c7c2b57a5d66ae3c73315558f Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Thu, 20 Mar 2025 19:16:16 +0000 Subject: [PATCH] Add tags for disks and floppies Fixes #2158 --- .../computercraft/api/ComputerCraftTags.java | 14 ++++++++++++++ .../computercraft/data/LanguageProvider.java | 2 ++ .../dan200/computercraft/data/TagProvider.java | 2 ++ .../resources/assets/computercraft/lang/en_us.json | 2 ++ .../data/computercraft/tags/items/disks.json | 1 + .../computercraft/tags/items/pocket_computers.json | 1 + .../data/computercraft/tags/items/disks.json | 1 + .../computercraft/tags/items/pocket_computers.json | 1 + 8 files changed, 24 insertions(+) create mode 100644 projects/fabric/src/generated/resources/data/computercraft/tags/items/disks.json create mode 100644 projects/fabric/src/generated/resources/data/computercraft/tags/items/pocket_computers.json create mode 100644 projects/forge/src/generated/resources/data/computercraft/tags/items/disks.json create mode 100644 projects/forge/src/generated/resources/data/computercraft/tags/items/pocket_computers.json diff --git a/projects/common-api/src/main/java/dan200/computercraft/api/ComputerCraftTags.java b/projects/common-api/src/main/java/dan200/computercraft/api/ComputerCraftTags.java index 54f741f75..f8d446dc8 100644 --- a/projects/common-api/src/main/java/dan200/computercraft/api/ComputerCraftTags.java +++ b/projects/common-api/src/main/java/dan200/computercraft/api/ComputerCraftTags.java @@ -26,6 +26,20 @@ public class ComputerCraftTags { public static final TagKey WIRED_MODEM = make("wired_modem"); public static final TagKey MONITOR = make("monitor"); + /** + * Floppy disks. Both the read/write version, and treasure disks. + * + * @since 1.116.0 + */ + public static final TagKey DISKS = make("disks"); + + /** + * All pocket computers. + * + * @since 1.116.0 + */ + public static final TagKey POCKET_COMPUTERS = make("pocket_computers"); + /** * Items which can be {@linkplain Item#use(Level, Player, InteractionHand) used} when calling * {@code turtle.place()}. diff --git a/projects/common/src/datagen/java/dan200/computercraft/data/LanguageProvider.java b/projects/common/src/datagen/java/dan200/computercraft/data/LanguageProvider.java index 09713d21a..920f87870 100644 --- a/projects/common/src/datagen/java/dan200/computercraft/data/LanguageProvider.java +++ b/projects/common/src/datagen/java/dan200/computercraft/data/LanguageProvider.java @@ -106,6 +106,8 @@ public final class LanguageProvider implements DataProvider { add(ComputerCraftTags.Items.TURTLE, "Turtles"); add(ComputerCraftTags.Items.WIRED_MODEM, "Wired modems"); add(ComputerCraftTags.Items.MONITOR, "Monitors"); + add(ComputerCraftTags.Items.DISKS, "Disks"); + add(ComputerCraftTags.Items.POCKET_COMPUTERS, "Pocket Computers"); // Turtle/pocket upgrades add("upgrade.minecraft.diamond_sword.adjective", "Melee"); diff --git a/projects/common/src/datagen/java/dan200/computercraft/data/TagProvider.java b/projects/common/src/datagen/java/dan200/computercraft/data/TagProvider.java index 4250f6a64..cc685011c 100644 --- a/projects/common/src/datagen/java/dan200/computercraft/data/TagProvider.java +++ b/projects/common/src/datagen/java/dan200/computercraft/data/TagProvider.java @@ -98,6 +98,8 @@ class TagProvider { tags.copy(ComputerCraftTags.Blocks.TURTLE, ComputerCraftTags.Items.TURTLE); tags.tag(ComputerCraftTags.Items.WIRED_MODEM).add(ModRegistry.Items.WIRED_MODEM.get(), ModRegistry.Items.WIRED_MODEM_FULL.get()); tags.copy(ComputerCraftTags.Blocks.MONITOR, ComputerCraftTags.Items.MONITOR); + tags.tag(ComputerCraftTags.Items.DISKS).add(ModRegistry.Items.DISK.get(), ModRegistry.Items.TREASURE_DISK.get()); + tags.tag(ComputerCraftTags.Items.POCKET_COMPUTERS).add(ModRegistry.Items.POCKET_COMPUTER_NORMAL.get(), ModRegistry.Items.POCKET_COMPUTER_ADVANCED.get()); tags.tag(ItemTags.PIGLIN_LOVED).add( ModRegistry.Items.COMPUTER_ADVANCED.get(), ModRegistry.Items.TURTLE_ADVANCED.get(), diff --git a/projects/common/src/generated/resources/assets/computercraft/lang/en_us.json b/projects/common/src/generated/resources/assets/computercraft/lang/en_us.json index 3b9807e28..ae3198632 100644 --- a/projects/common/src/generated/resources/assets/computercraft/lang/en_us.json +++ b/projects/common/src/generated/resources/assets/computercraft/lang/en_us.json @@ -205,7 +205,9 @@ "item.computercraft.treasure_disk": "Floppy Disk", "itemGroup.computercraft": "ComputerCraft", "tag.item.computercraft.computer": "Computers", + "tag.item.computercraft.disks": "Disks", "tag.item.computercraft.monitor": "Monitors", + "tag.item.computercraft.pocket_computers": "Pocket Computers", "tag.item.computercraft.turtle": "Turtles", "tag.item.computercraft.wired_modem": "Wired modems", "tracking_field.computercraft.avg": "%s (avg)", diff --git a/projects/fabric/src/generated/resources/data/computercraft/tags/items/disks.json b/projects/fabric/src/generated/resources/data/computercraft/tags/items/disks.json new file mode 100644 index 000000000..9fccc54a4 --- /dev/null +++ b/projects/fabric/src/generated/resources/data/computercraft/tags/items/disks.json @@ -0,0 +1 @@ +{"replace": false, "values": ["computercraft:disk", "computercraft:treasure_disk"]} diff --git a/projects/fabric/src/generated/resources/data/computercraft/tags/items/pocket_computers.json b/projects/fabric/src/generated/resources/data/computercraft/tags/items/pocket_computers.json new file mode 100644 index 000000000..c27e4d8e2 --- /dev/null +++ b/projects/fabric/src/generated/resources/data/computercraft/tags/items/pocket_computers.json @@ -0,0 +1 @@ +{"replace": false, "values": ["computercraft:pocket_computer_normal", "computercraft:pocket_computer_advanced"]} diff --git a/projects/forge/src/generated/resources/data/computercraft/tags/items/disks.json b/projects/forge/src/generated/resources/data/computercraft/tags/items/disks.json new file mode 100644 index 000000000..cb77a4bc2 --- /dev/null +++ b/projects/forge/src/generated/resources/data/computercraft/tags/items/disks.json @@ -0,0 +1 @@ +{"values": ["computercraft:disk", "computercraft:treasure_disk"]} diff --git a/projects/forge/src/generated/resources/data/computercraft/tags/items/pocket_computers.json b/projects/forge/src/generated/resources/data/computercraft/tags/items/pocket_computers.json new file mode 100644 index 000000000..86a8222c3 --- /dev/null +++ b/projects/forge/src/generated/resources/data/computercraft/tags/items/pocket_computers.json @@ -0,0 +1 @@ +{"values": ["computercraft:pocket_computer_normal", "computercraft:pocket_computer_advanced"]}