From 12e83453f6f47d151a063ed8f61836512dccfa4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20Zi=C4=99ciak?= Date: Tue, 2 Apr 2024 21:44:44 +0200 Subject: [PATCH] Add rose gold ingot --- gradle.properties | 2 +- .../9adbe1c44971b18122390f472ecf7bb970889f75 | 5 +++-- .../models/item/rose_gold_ingot.json | 6 ++++++ .../datagen/ModModelProvider.java | 2 ++ .../squaredadditions/item/ModItems.java | 8 ++++++- .../assets/squaredadditions/lang/en_us.json | 3 ++- .../assets/squaredadditions/lang/pl_pl.json | 4 +++- .../textures/item/rose_gold_ingot.png | Bin 0 -> 336 bytes .../recipes/rose_gold_ingot.json | 20 ++++++++++++++++++ 9 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 src/main/generated/assets/squaredadditions/models/item/rose_gold_ingot.json create mode 100644 src/main/resources/assets/squaredadditions/textures/item/rose_gold_ingot.png create mode 100644 src/main/resources/data/squaredadditions/recipes/rose_gold_ingot.json diff --git a/gradle.properties b/gradle.properties index cca81f2..f83e15f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ yarn_mappings=1.20.1+build.10 loader_version=0.15.7 # Mod Properties -mod_version=0.4.3 +mod_version=0.5.0 maven_group=pl.xyundy.squaredadditions archives_base_name=squaredadditions diff --git a/src/main/generated/.cache/9adbe1c44971b18122390f472ecf7bb970889f75 b/src/main/generated/.cache/9adbe1c44971b18122390f472ecf7bb970889f75 index 478c987..a308608 100644 --- a/src/main/generated/.cache/9adbe1c44971b18122390f472ecf7bb970889f75 +++ b/src/main/generated/.cache/9adbe1c44971b18122390f472ecf7bb970889f75 @@ -1,4 +1,4 @@ -// 1.20.1 2024-03-16T18:24:45.868883 Squared Additions/Model Definitions +// 1.20.1 2024-04-02T21:38:24.042888 Squared Additions/Model Definitions 71776dfec5b5f01ce4a9d3b3e000c3bf53bd5bf5 assets/squaredadditions/models/item/copper_shovel.json d12673ccac5079afad74fa93feb5535be7cbcb26 assets/squaredadditions/models/item/emerald_shovel.json 6f15bf8607ada3d987a355d2f2a351969840e7e1 assets/squaredadditions/models/item/emerald_sword.json @@ -6,6 +6,7 @@ cbae0d76c7081cc2a6373ced0f6186dc4551aa9d assets/squaredadditions/models/item/eme 176ad04c6ba42342adc0e6c5fd107be0e63c65b6 assets/squaredadditions/models/item/emerald_hoe.json 9011be1ee37f6ae56b0d484b34eac096b9f6e907 assets/squaredadditions/models/item/emerald_pickaxe.json 5dc59b79a3e713f07045de3613f4ed4b3e29befc assets/squaredadditions/models/item/copper_sword.json +0aa7b4259ef0cf273586e6aa78649b2887b01a87 assets/squaredadditions/models/item/rose_gold_ingot.json 32fe678c1527b64ea225930db2db5251c0a7ba7a assets/squaredadditions/models/item/copper_pickaxe.json -e707267f36198cf7a546e3b58db73fa98b8e056a assets/squaredadditions/models/item/copper_axe.json f6bd2f2c35340d899a2928bdacb127ca28140e3d assets/squaredadditions/models/item/copper_hoe.json +e707267f36198cf7a546e3b58db73fa98b8e056a assets/squaredadditions/models/item/copper_axe.json diff --git a/src/main/generated/assets/squaredadditions/models/item/rose_gold_ingot.json b/src/main/generated/assets/squaredadditions/models/item/rose_gold_ingot.json new file mode 100644 index 0000000..a83ab1a --- /dev/null +++ b/src/main/generated/assets/squaredadditions/models/item/rose_gold_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "squaredadditions:item/rose_gold_ingot" + } +} \ No newline at end of file diff --git a/src/main/java/pl/xyundy/squaredadditions/datagen/ModModelProvider.java b/src/main/java/pl/xyundy/squaredadditions/datagen/ModModelProvider.java index 663a76d..1e94828 100644 --- a/src/main/java/pl/xyundy/squaredadditions/datagen/ModModelProvider.java +++ b/src/main/java/pl/xyundy/squaredadditions/datagen/ModModelProvider.java @@ -28,5 +28,7 @@ public void generateItemModels(ItemModelGenerator itemModelGenerator) { itemModelGenerator.register(ModItems.EMERALD_SHOVEL, Models.HANDHELD); itemModelGenerator.register(ModItems.EMERALD_AXE, Models.HANDHELD); itemModelGenerator.register(ModItems.EMERALD_HOE, Models.HANDHELD); + + itemModelGenerator.register(ModItems.ROSE_GOLD_INGOT, Models.GENERATED); } } \ No newline at end of file diff --git a/src/main/java/pl/xyundy/squaredadditions/item/ModItems.java b/src/main/java/pl/xyundy/squaredadditions/item/ModItems.java index 9157aa3..ef0ca1e 100644 --- a/src/main/java/pl/xyundy/squaredadditions/item/ModItems.java +++ b/src/main/java/pl/xyundy/squaredadditions/item/ModItems.java @@ -33,7 +33,8 @@ public class ModItems { public static final Item EMERALD_HOE = registerItem("emerald_hoe", new HoeItem(ModToolMaterial.EMERALD, -2, -1.0F, new FabricItemSettings())); - + public static final Item ROSE_GOLD_INGOT = registerItem("rose_gold_ingot", + new Item(new FabricItemSettings())); private static Item registerItem(String name, Item item) { return Registry.register(Registries.ITEM, new Identifier(SquaredAdditions.MOD_ID, name), item); @@ -59,11 +60,16 @@ public static void itemGroupTools(FabricItemGroupEntries entries) { entries.add(EMERALD_HOE); } + public static void itemGroupIngredient(FabricItemGroupEntries entries) { + entries.add(ROSE_GOLD_INGOT); + } + public static void registerModItems() { SquaredAdditions.LOGGER.info("Registering Mod Items for " + SquaredAdditions.MOD_ID); ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register(ModItems::itemGroupTools); ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register(ModItems::itemGroupCombat); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.INGREDIENTS).register(ModItems::itemGroupIngredient); SquaredAdditions.LOGGER.info("Registering Mod Items for " + SquaredAdditions.MOD_ID + " finished!"); diff --git a/src/main/resources/assets/squaredadditions/lang/en_us.json b/src/main/resources/assets/squaredadditions/lang/en_us.json index ee97434..5770102 100644 --- a/src/main/resources/assets/squaredadditions/lang/en_us.json +++ b/src/main/resources/assets/squaredadditions/lang/en_us.json @@ -14,5 +14,6 @@ "item.squaredadditions.emerald_shovel": "Emerald Shovel", "item.squaredadditions.emerald_hoe": "Emerald Hoe", "item.squaredadditions.emerald_axe": "Emerald Axe", - "item.squaredadditions.emerald_pickaxe": "Emerald Pickaxe" + "item.squaredadditions.emerald_pickaxe": "Emerald Pickaxe", + "item.squaredadditions.rose_gold_ingot": "Rose Gold Ingot" } \ No newline at end of file diff --git a/src/main/resources/assets/squaredadditions/lang/pl_pl.json b/src/main/resources/assets/squaredadditions/lang/pl_pl.json index 3162ea0..dc8f9d8 100644 --- a/src/main/resources/assets/squaredadditions/lang/pl_pl.json +++ b/src/main/resources/assets/squaredadditions/lang/pl_pl.json @@ -15,5 +15,7 @@ "item.squaredadditions.emerald_shovel": "Szmaragdowa Łopata", "item.squaredadditions.emerald_hoe": "Szmaragdowa Motyka", "item.squaredadditions.emerald_axe": "Szmaragdowa Siekiera", - "item.squaredadditions.emerald_pickaxe": "Szmaragdowy Kilof" + "item.squaredadditions.emerald_pickaxe": "Szmaragdowy Kilof", + "item.squaredadditions.rose_gold_ingot": "Sztabka Różowego Złota" + } \ No newline at end of file diff --git a/src/main/resources/assets/squaredadditions/textures/item/rose_gold_ingot.png b/src/main/resources/assets/squaredadditions/textures/item/rose_gold_ingot.png new file mode 100644 index 0000000000000000000000000000000000000000..c28b9e1b1dea82250bedc13838e195e0f750f016 GIT binary patch literal 336 zcmV-W0k8gvP)Px$2}wjjR5(v#WS|f*QmCJSXahEdh5ZLv=C^7UiXOZMz%+q0dZnj>9lLGjOcX;f z3_#ITTZ`3)+nSr&hS@E41dtPdc{zml*G{b@F623NVD&vMGSv$-zF+N znN?LG>YhAdsBv~?fEWPspS3kkL*SaA8t*Py!k}Pl3w8y<0C{-^1{oQ+A?TVu?%2Wb z=FJl9z=Rp{@%nYVnvkOlB_YAm!^x8;!D^6g i!WG9v=LMP>001PmfAPkLoKgS)002ovPDHLkV1fV@Uxsf0 literal 0 HcmV?d00001 diff --git a/src/main/resources/data/squaredadditions/recipes/rose_gold_ingot.json b/src/main/resources/data/squaredadditions/recipes/rose_gold_ingot.json new file mode 100644 index 0000000..9750a52 --- /dev/null +++ b/src/main/resources/data/squaredadditions/recipes/rose_gold_ingot.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "GGG", + "GCG", + "GGG" + ], + "key": { + "C": { + "item": "minecraft:copper_ingot" + }, + "G": { + "item": "minecraft:gold_nugget" + } + }, + "result": { + "item": "squaredadditions:rose_gold_ingot" + } +} \ No newline at end of file