Skip to content

Commit

Permalink
Add rose gold ingot
Browse files Browse the repository at this point in the history
  • Loading branch information
xYundy committed Apr 2, 2024
1 parent 0140e16 commit 12e8345
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 6 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
// 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
cbae0d76c7081cc2a6373ced0f6186dc4551aa9d assets/squaredadditions/models/item/emerald_axe.json
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "squaredadditions:item/rose_gold_ingot"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
8 changes: 7 additions & 1 deletion src/main/java/pl/xyundy/squaredadditions/item/ModItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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!");

Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/assets/squaredadditions/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/squaredadditions/lang/pl_pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"

}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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"
}
}

0 comments on commit 12e8345

Please sign in to comment.