mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-04-21 10:13:19 +00:00
Code Issues Releases Wiki Activity

Add tags for disks and floppies

Browse Source 
Fixes #2158
This commit is contained in:
Jonathan Coates 2025-03-20 19:16:16 +00:00
parent 0e1e8a72d3
commit 09ad6c1905
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
8 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
projects/common-api/src/main/java/dan200/computercraft/api/ComputerCraftTags.java
View File

@ -26,6 +26,20 @@ public class ComputerCraftTags {
public static final TagKey<Item> WIRED_MODEM = make("wired_modem");
public static final TagKey<Item> MONITOR = make("monitor");
/**
* Floppy disks. Both the read/write version, and treasure disks.
*
* @since 1.116.0
*/
public static final TagKey<Item> DISKS = make("disks");
/**
* All pocket computers.
*
* @since 1.116.0
*/
public static final TagKey<Item> POCKET_COMPUTERS = make("pocket_computers");
/**
* Items which can be {@linkplain Item#use(Level, Player, InteractionHand) used} when calling
* {@code turtle.place()}.

2
projects/common/src/datagen/java/dan200/computercraft/data/LanguageProvider.java
View File

@ -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");

2
projects/common/src/datagen/java/dan200/computercraft/data/TagProvider.java
View File

@ -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(),

2
projects/common/src/generated/resources/assets/computercraft/lang/en_us.json generated
View File

@ -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)",

1
projects/fabric/src/generated/resources/data/computercraft/tags/items/disks.json generated Normal file
View File

@ -0,0 +1 @@
{"replace": false, "values": ["computercraft:disk", "computercraft:treasure_disk"]}

1
projects/fabric/src/generated/resources/data/computercraft/tags/items/pocket_computers.json generated Normal file
View File

@ -0,0 +1 @@
{"replace": false, "values": ["computercraft:pocket_computer_normal", "computercraft:pocket_computer_advanced"]}

1
projects/forge/src/generated/resources/data/computercraft/tags/items/disks.json generated Normal file
View File

@ -0,0 +1 @@
{"values": ["computercraft:disk", "computercraft:treasure_disk"]}

1
projects/forge/src/generated/resources/data/computercraft/tags/items/pocket_computers.json generated Normal file
View File

@ -0,0 +1 @@
{"values": ["computercraft:pocket_computer_normal", "computercraft:pocket_computer_advanced"]}