From 62cc4ad407a4e21c1570fd9c91b1ccb5440d8899 Mon Sep 17 00:00:00 2001 From: wolfieboy09 <105564186+wolfieboy09@users.noreply.github.com> Date: Tue, 5 Nov 2024 11:29:07 -0500 Subject: [PATCH] New items and datagen for those items --- .../resources/assets/qstorage/lang/en_us.json | 6 +++++- .../qstorage/models/item/advanced_circuit.json | 6 ++++++ .../qstorage/models/item/basic_circuit.json | 6 ++++++ .../qstorage/models/item/elite_circuit.json | 6 ++++++ .../qstorage/models/item/ultimate_circuit.json | 6 ++++++ .../data/c/tags/item/circuits/advanced.json | 5 +++++ .../data/c/tags/item/circuits/basic.json | 5 +++++ .../data/c/tags/item/circuits/elite.json | 5 +++++ .../data/c/tags/item/circuits/ultimate.json | 5 +++++ .../qstorage/datagen/QSItemTagsProvider.java | 12 ++++++++++++ .../wolfieboy09/qstorage/registries/QSItems.java | 5 +++++ .../qstorage/registries/tags/QSItemTags.java | 15 +++++++++++++-- .../qstorage/textures/item/advanced_circuit.png | Bin 0 -> 279 bytes .../qstorage/textures/item/basic_circuit.png | Bin 0 -> 279 bytes .../qstorage/textures/item/elite_circuit.png | Bin 0 -> 279 bytes .../qstorage/textures/item/ultimate_circuit.png | Bin 0 -> 279 bytes 16 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 src/generated/resources/assets/qstorage/models/item/advanced_circuit.json create mode 100644 src/generated/resources/assets/qstorage/models/item/basic_circuit.json create mode 100644 src/generated/resources/assets/qstorage/models/item/elite_circuit.json create mode 100644 src/generated/resources/assets/qstorage/models/item/ultimate_circuit.json create mode 100644 src/generated/resources/data/c/tags/item/circuits/advanced.json create mode 100644 src/generated/resources/data/c/tags/item/circuits/basic.json create mode 100644 src/generated/resources/data/c/tags/item/circuits/elite.json create mode 100644 src/generated/resources/data/c/tags/item/circuits/ultimate.json create mode 100644 src/main/resources/assets/qstorage/textures/item/advanced_circuit.png create mode 100644 src/main/resources/assets/qstorage/textures/item/basic_circuit.png create mode 100644 src/main/resources/assets/qstorage/textures/item/elite_circuit.png create mode 100644 src/main/resources/assets/qstorage/textures/item/ultimate_circuit.png diff --git a/src/generated/resources/assets/qstorage/lang/en_us.json b/src/generated/resources/assets/qstorage/lang/en_us.json index c6d30c6..90b8c55 100644 --- a/src/generated/resources/assets/qstorage/lang/en_us.json +++ b/src/generated/resources/assets/qstorage/lang/en_us.json @@ -3,9 +3,12 @@ "block.qstorage.storage_matrix": "Storage Matrix", "creative_tab.qstorage.block_group": "QS Blocks", "creative_tab.qstorage.item_group": "QS Items", + "item.qstorage.advanced_circuit": "Advanced Circuit", "item.qstorage.advanced_storage_disk": "Advanced Storage Disk", + "item.qstorage.basic_circuit": "Basic Circuit", "item.qstorage.basic_storage_disk": "Basic Storage Disk", "item.qstorage.data_crystal": "Data Crystal", + "item.qstorage.elite_circuit": "Elite Circuit", "item.qstorage.item_port": "Item Port", "item.qstorage.multi_dimensional_storage_disk": "Multi Dimensional Storage Disk", "item.qstorage.quantum_storage_disk": "Quantum Storage Disk", @@ -13,5 +16,6 @@ "item.qstorage.steel_casing": "Steel Casing", "item.qstorage.steel_ingot": "Steel Ingot", "item.qstorage.steel_screw": "Steel Screw", - "item.qstorage.superior_storage_disk": "Superior Storage Disk" + "item.qstorage.superior_storage_disk": "Superior Storage Disk", + "item.qstorage.ultimate_circuit": "Ultimate Circuit" } \ No newline at end of file diff --git a/src/generated/resources/assets/qstorage/models/item/advanced_circuit.json b/src/generated/resources/assets/qstorage/models/item/advanced_circuit.json new file mode 100644 index 0000000..08f0cd0 --- /dev/null +++ b/src/generated/resources/assets/qstorage/models/item/advanced_circuit.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "qstorage:item/advanced_circuit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/qstorage/models/item/basic_circuit.json b/src/generated/resources/assets/qstorage/models/item/basic_circuit.json new file mode 100644 index 0000000..e80546f --- /dev/null +++ b/src/generated/resources/assets/qstorage/models/item/basic_circuit.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "qstorage:item/basic_circuit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/qstorage/models/item/elite_circuit.json b/src/generated/resources/assets/qstorage/models/item/elite_circuit.json new file mode 100644 index 0000000..c9c5ab4 --- /dev/null +++ b/src/generated/resources/assets/qstorage/models/item/elite_circuit.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "qstorage:item/elite_circuit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/qstorage/models/item/ultimate_circuit.json b/src/generated/resources/assets/qstorage/models/item/ultimate_circuit.json new file mode 100644 index 0000000..9afec4a --- /dev/null +++ b/src/generated/resources/assets/qstorage/models/item/ultimate_circuit.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "qstorage:item/ultimate_circuit" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/circuits/advanced.json b/src/generated/resources/data/c/tags/item/circuits/advanced.json new file mode 100644 index 0000000..3175f93 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/circuits/advanced.json @@ -0,0 +1,5 @@ +{ + "values": [ + "qstorage:advanced_circuit" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/circuits/basic.json b/src/generated/resources/data/c/tags/item/circuits/basic.json new file mode 100644 index 0000000..21e5f46 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/circuits/basic.json @@ -0,0 +1,5 @@ +{ + "values": [ + "qstorage:basic_circuit" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/circuits/elite.json b/src/generated/resources/data/c/tags/item/circuits/elite.json new file mode 100644 index 0000000..87ac2cc --- /dev/null +++ b/src/generated/resources/data/c/tags/item/circuits/elite.json @@ -0,0 +1,5 @@ +{ + "values": [ + "qstorage:elite_circuit" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/circuits/ultimate.json b/src/generated/resources/data/c/tags/item/circuits/ultimate.json new file mode 100644 index 0000000..5729e35 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/circuits/ultimate.json @@ -0,0 +1,5 @@ +{ + "values": [ + "qstorage:ultimate_circuit" + ] +} \ No newline at end of file diff --git a/src/main/java/dev/wolfieboy09/qstorage/datagen/QSItemTagsProvider.java b/src/main/java/dev/wolfieboy09/qstorage/datagen/QSItemTagsProvider.java index 9bd1a2b..dd9dbc6 100644 --- a/src/main/java/dev/wolfieboy09/qstorage/datagen/QSItemTagsProvider.java +++ b/src/main/java/dev/wolfieboy09/qstorage/datagen/QSItemTagsProvider.java @@ -28,5 +28,17 @@ public void addTags(@NotNull HolderLookup.Provider provider) { tag(QSItemTags.ITEM_PORT) .add(QSItems.ITEM_PORT.get()); + + tag(QSItemTags.BASIC_CIRCUIT) + .add(QSItems.BASIC_CIRCUIT.get()); + + tag(QSItemTags.ADVANCED_CIRCUIT) + .add(QSItems.ADVANCED_CIRCUIT.get()); + + tag(QSItemTags.ELITE_CIRCUIT) + .add(QSItems.ELITE_CIRCUIT.get()); + + tag(QSItemTags.ULTIMATE_CIRCUIT) + .add(QSItems.ULTIMATE_CIRCUIT.get()); } } diff --git a/src/main/java/dev/wolfieboy09/qstorage/registries/QSItems.java b/src/main/java/dev/wolfieboy09/qstorage/registries/QSItems.java index 23e1f70..75ee40a 100644 --- a/src/main/java/dev/wolfieboy09/qstorage/registries/QSItems.java +++ b/src/main/java/dev/wolfieboy09/qstorage/registries/QSItems.java @@ -21,6 +21,11 @@ public class QSItems { public static final DeferredItem ITEM_PORT = simpleItem("item_port"); + public static final DeferredItem BASIC_CIRCUIT = simpleItem("basic_circuit"); + public static final DeferredItem ADVANCED_CIRCUIT = simpleItem("advanced_circuit"); + public static final DeferredItem ELITE_CIRCUIT = simpleItem("elite_circuit"); + public static final DeferredItem ULTIMATE_CIRCUIT = simpleItem("ultimate_circuit"); + public static final DeferredItem BASIC_ITEM_DISK = registerItemStorageDisk("basic_storage_disk", ItemStorageType.BASIC); public static final DeferredItem ADVANCED_ITEM_DISK = registerItemStorageDisk("advanced_storage_disk", ItemStorageType.ADVANCED); public static final DeferredItem SUPERIOR_ITEM_DISK = registerItemStorageDisk("superior_storage_disk", ItemStorageType.SUPERIOR); diff --git a/src/main/java/dev/wolfieboy09/qstorage/registries/tags/QSItemTags.java b/src/main/java/dev/wolfieboy09/qstorage/registries/tags/QSItemTags.java index 7bfd1b3..2d5354e 100644 --- a/src/main/java/dev/wolfieboy09/qstorage/registries/tags/QSItemTags.java +++ b/src/main/java/dev/wolfieboy09/qstorage/registries/tags/QSItemTags.java @@ -5,13 +5,24 @@ import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; +import org.jetbrains.annotations.NotNull; public class QSItemTags { // Global tags - public static final TagKey STEEL_INGOT = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "ingots/steel")); - public static final TagKey SILICON = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "silicon")); + public static final TagKey STEEL_INGOT = globalTag("ingots/steel"); + public static final TagKey SILICON = globalTag("silicon"); + + public static final TagKey BASIC_CIRCUIT = globalTag("circuits/basic"); + public static final TagKey ADVANCED_CIRCUIT = globalTag("circuits/advanced"); + public static final TagKey ELITE_CIRCUIT = globalTag("circuits/elite"); + public static final TagKey ULTIMATE_CIRCUIT = globalTag("circuits/ultimate"); + // Mod Tags public static final TagKey DATA_CRYSTAL = ItemTags.create(ResourceHelper.asResource("data_crystals")); public static final TagKey ITEM_PORT = ItemTags.create(ResourceHelper.asResource("item_ports")); + + private static @NotNull TagKey globalTag(String path) { + return ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", path)); + } } diff --git a/src/main/resources/assets/qstorage/textures/item/advanced_circuit.png b/src/main/resources/assets/qstorage/textures/item/advanced_circuit.png new file mode 100644 index 0000000000000000000000000000000000000000..d082eb69b09d2e5b810dda55c50bec5c00090827 GIT binary patch literal 279 zcmV+y0qFjTP)0O%ZG3M{tF-v`%~`08DaG zri-n+TuZ)RX@Tzf`kcTRz(6$}S;9b1il0O%ZG3M{tF-v`%~`08DaG zri-n+TuZ)RX@Tzf`kcTRz(6$}S;9b1il0O%ZG3M{tF-v`%~`08DaG zri-n+TuZ)RX@Tzf`kcTRz(6$}S;9b1il0O%ZG3M{tF-v`%~`08DaG zri-n+TuZ)RX@Tzf`kcTRz(6$}S;9b1il