Skip to content

Commit

Permalink
New items and datagen for those items
Browse files Browse the repository at this point in the history
  • Loading branch information
wolfieboy09 committed Nov 5, 2024
1 parent eebb431 commit 62cc4ad
Show file tree
Hide file tree
Showing 16 changed files with 79 additions and 3 deletions.
6 changes: 5 additions & 1 deletion src/generated/resources/assets/qstorage/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,19 @@
"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",
"item.qstorage.silicon": "Silicon",
"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"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "qstorage:item/advanced_circuit"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "qstorage:item/basic_circuit"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "qstorage:item/elite_circuit"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "qstorage:item/ultimate_circuit"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"qstorage:advanced_circuit"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/circuits/basic.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"qstorage:basic_circuit"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/c/tags/item/circuits/elite.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"qstorage:elite_circuit"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"qstorage:ultimate_circuit"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ public class QSItems {

public static final DeferredItem<Item> ITEM_PORT = simpleItem("item_port");

public static final DeferredItem<Item> BASIC_CIRCUIT = simpleItem("basic_circuit");
public static final DeferredItem<Item> ADVANCED_CIRCUIT = simpleItem("advanced_circuit");
public static final DeferredItem<Item> ELITE_CIRCUIT = simpleItem("elite_circuit");
public static final DeferredItem<Item> ULTIMATE_CIRCUIT = simpleItem("ultimate_circuit");

public static final DeferredItem<ItemStorageDisk> BASIC_ITEM_DISK = registerItemStorageDisk("basic_storage_disk", ItemStorageType.BASIC);
public static final DeferredItem<ItemStorageDisk> ADVANCED_ITEM_DISK = registerItemStorageDisk("advanced_storage_disk", ItemStorageType.ADVANCED);
public static final DeferredItem<ItemStorageDisk> SUPERIOR_ITEM_DISK = registerItemStorageDisk("superior_storage_disk", ItemStorageType.SUPERIOR);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Item> STEEL_INGOT = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "ingots/steel"));
public static final TagKey<Item> SILICON = ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", "silicon"));
public static final TagKey<Item> STEEL_INGOT = globalTag("ingots/steel");
public static final TagKey<Item> SILICON = globalTag("silicon");

public static final TagKey<Item> BASIC_CIRCUIT = globalTag("circuits/basic");
public static final TagKey<Item> ADVANCED_CIRCUIT = globalTag("circuits/advanced");
public static final TagKey<Item> ELITE_CIRCUIT = globalTag("circuits/elite");
public static final TagKey<Item> ULTIMATE_CIRCUIT = globalTag("circuits/ultimate");


// Mod Tags
public static final TagKey<Item> DATA_CRYSTAL = ItemTags.create(ResourceHelper.asResource("data_crystals"));
public static final TagKey<Item> ITEM_PORT = ItemTags.create(ResourceHelper.asResource("item_ports"));

private static @NotNull TagKey<Item> globalTag(String path) {
return ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", path));
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 62cc4ad

Please sign in to comment.