diff --git a/src/generated/resources/.cache/5db5b310cf1abc4c7f33d2d565e2a2290a7f6c4d b/src/generated/resources/.cache/5db5b310cf1abc4c7f33d2d565e2a2290a7f6c4d index ff3a6455..f6f377de 100644 --- a/src/generated/resources/.cache/5db5b310cf1abc4c7f33d2d565e2a2290a7f6c4d +++ b/src/generated/resources/.cache/5db5b310cf1abc4c7f33d2d565e2a2290a7f6c4d @@ -1,7 +1,9 @@ -// 1.21.1 2024-09-06T15:44:54.6487524 Item Models: modjam +// 1.21.1 2024-09-07T16:00:13.3184328 Item Models: modjam 207e815e9b4c9ebca4f444f877e2488a5ce9b1c5 assets/modjam/models/item/aquarine_steel.json 51765874ad3111adf69684269ad9a422bfbaac4a assets/modjam/models/item/aquarine_steel_block.json dd0c37deb1f33fb0844da4a540706681887fc3d4 assets/modjam/models/item/aquatic_catalyst.json 246cda7a0fca8b278dd6ed5392d0ce745d9fa097 assets/modjam/models/item/chiseled_dark_prismarine.json 5dd5fd7a7c348bbaf51df14605c5241bf75e18ae assets/modjam/models/item/dark_prismarine_pillar.json +5b6b9e8621c065cb4167e4b6dfdfaecb0fd7186d assets/modjam/models/item/eas_vial.json +f0f9891cd57b3a66f7440a71b925348bb8ea745b assets/modjam/models/item/glass_vial.json dab337d602d93b0a4930b69e652b1155300c6502 assets/modjam/models/item/prism_monocle.json diff --git a/src/generated/resources/assets/modjam/models/item/eas_vial.json b/src/generated/resources/assets/modjam/models/item/eas_vial.json new file mode 100644 index 00000000..1e77d959 --- /dev/null +++ b/src/generated/resources/assets/modjam/models/item/eas_vial.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "modjam:item/eas_vial" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modjam/models/item/glass_vial.json b/src/generated/resources/assets/modjam/models/item/glass_vial.json new file mode 100644 index 00000000..5561a32f --- /dev/null +++ b/src/generated/resources/assets/modjam/models/item/glass_vial.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "modjam:item/glass_vial" + } +} \ No newline at end of file diff --git a/src/main/java/com/portingdeadmods/modjam/datagen/ItemModelProvider.java b/src/main/java/com/portingdeadmods/modjam/datagen/ItemModelProvider.java index 03cde8ef..907c21f2 100644 --- a/src/main/java/com/portingdeadmods/modjam/datagen/ItemModelProvider.java +++ b/src/main/java/com/portingdeadmods/modjam/datagen/ItemModelProvider.java @@ -25,6 +25,9 @@ protected void registerModels() { // Register item models here basicItem(MJItems.PRISM_MONOCLE.get()); basicItem(MJItems.AQUARINE_STEEL.get()); + basicItem(MJItems.ELECTROLYTE_ALGAE_SERUM_VIAL.get()); + basicItem(MJItems.GLASS_VIAL.get()); + blockItems(); } diff --git a/src/main/java/com/portingdeadmods/modjam/registries/MJItems.java b/src/main/java/com/portingdeadmods/modjam/registries/MJItems.java index 316b72a6..f49bfc3a 100644 --- a/src/main/java/com/portingdeadmods/modjam/registries/MJItems.java +++ b/src/main/java/com/portingdeadmods/modjam/registries/MJItems.java @@ -25,6 +25,10 @@ public final class MJItems { public static final DeferredItem AQUARINE_STEEL = registerItem("aquarine_steel", Item::new, new Item.Properties()); + + public static final DeferredItem GLASS_VIAL = registerItem("glass_vial", Item::new, new Item.Properties()); + public static final DeferredItem ELECTROLYTE_ALGAE_SERUM_VIAL = registerItem("eas_vial", Item::new, new Item.Properties()); + public static final DeferredItem PRISM_MONOCLE = registerItem("prism_monocle", PrismMonocleItem::new, new Item.Properties()); diff --git a/src/main/resources/assets/modjam/lang/en_us.json b/src/main/resources/assets/modjam/lang/en_us.json index 649d45d3..58d70206 100644 --- a/src/main/resources/assets/modjam/lang/en_us.json +++ b/src/main/resources/assets/modjam/lang/en_us.json @@ -2,10 +2,15 @@ "curios.identifier.prism_monocle": "Monocle", "modjam.creative_tab.main": "ModJam", + "fluid_type.modjam.soap_water": "Soap Water", + "fluid_type.modjam.electrolyte_algae_serum": "Electrolyte Algae Serum", + "item.modjam.prism_monocle": "Prism Monocle", "item.modjam.aquarine_steel": "Aquarine Steel Ingot", "item.modjam.salt_water_bucket": "Salt Water Bucket", "item.modjam.electrolyte_algae_serum_bucket": "Electrolyte Algae Serum (EAS) Bucket", + "item.modjam.glass_vial": "Glass Vial", + "item.modjam.eas_vial": "Vial of Electrolyte Algae Serum", "block.modjam.aquarine_steel_block": "Aquarine Steel Block", "block.modjam.aquatic_catalyst": "Aquatic Catalyst", diff --git a/src/main/resources/assets/modjam/textures/item/eas_vial.png b/src/main/resources/assets/modjam/textures/item/eas_vial.png new file mode 100644 index 00000000..85f83454 Binary files /dev/null and b/src/main/resources/assets/modjam/textures/item/eas_vial.png differ diff --git a/src/main/resources/assets/modjam/textures/item/glass_vial.png b/src/main/resources/assets/modjam/textures/item/glass_vial.png new file mode 100644 index 00000000..824065c7 Binary files /dev/null and b/src/main/resources/assets/modjam/textures/item/glass_vial.png differ