From c9794ad6816b2b8775b2328b53fe1eb4d9b51773 Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Sun, 29 Jun 2025 21:14:39 +0200 Subject: [PATCH] added copperstick --- gradle.properties | 2 +- .../quickiemod/identifier/ModIdentifiers.java | 1 + .../de/jottyfan/quickiemod/item/ModItems.java | 5 ++++- .../assets/quickiemod/items/copperstick.json | 6 ++++++ .../assets/quickiemod/lang/de_de.json | 3 ++- .../assets/quickiemod/lang/en_us.json | 1 + .../quickiemod/models/item/copperstick.json | 6 ++++++ .../quickiemod/textures/item/copperstick.png | Bin 0 -> 5666 bytes .../quickiemod/textures/item/copperstring.png | Bin 5593 -> 778 bytes .../recipe/blasting_copperstick.json | 2 +- .../blasting_oxidized_copper_powder5.json | 8 ++++++++ .../recipe/shaped_quickiepowderaxe.json | 2 +- .../recipe/shaped_quickiepowderhoe.json | 2 +- .../recipe/shaped_quickiepowderpickaxe.json | 2 +- .../recipe/shaped_quickiepowdershovel.json | 2 +- .../recipe/shapeless_copperstub.json | 10 ++++++++++ .../recipe/stonecutting_quickiepowder.json | 8 ++++++++ .../recipe/stonecutting_speedpowder.json | 8 ++++++++ 18 files changed, 60 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/assets/quickiemod/items/copperstick.json create mode 100644 src/main/resources/assets/quickiemod/models/item/copperstick.json create mode 100644 src/main/resources/assets/quickiemod/textures/item/copperstick.png create mode 100644 src/main/resources/data/quickiemod/recipe/blasting_oxidized_copper_powder5.json create mode 100644 src/main/resources/data/quickiemod/recipe/shapeless_copperstub.json create mode 100644 src/main/resources/data/quickiemod/recipe/stonecutting_quickiepowder.json create mode 100644 src/main/resources/data/quickiemod/recipe/stonecutting_speedpowder.json diff --git a/gradle.properties b/gradle.properties index d0fba27..2a07431 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ yarn_mappings=1.21.6+build.1 loader_version=0.16.14 # Mod Properties -mod_version=1.21.6.2 +mod_version=1.21.6.3 maven_group=de.jottyfan.quickiemod archives_base_name=quickiemod diff --git a/src/main/java/de/jottyfan/quickiemod/identifier/ModIdentifiers.java b/src/main/java/de/jottyfan/quickiemod/identifier/ModIdentifiers.java index 1eb766d..97f1dcc 100644 --- a/src/main/java/de/jottyfan/quickiemod/identifier/ModIdentifiers.java +++ b/src/main/java/de/jottyfan/quickiemod/identifier/ModIdentifiers.java @@ -30,6 +30,7 @@ public class ModIdentifiers { public static final Identifier ITEM_COPPERSTRING = Identifier.of(Quickiemod.MOD_ID, "copperstring"); public static final Identifier ITEM_COPPERPOWDER = Identifier.of(Quickiemod.MOD_ID, "copperpowder"); public static final Identifier ITEM_COPPERSTUB = Identifier.of(Quickiemod.MOD_ID, "copperstub"); + public static final Identifier ITEM_COPPERSTICK = Identifier.of(Quickiemod.MOD_ID, "copperstick"); public static final Identifier TOOL_SPEEDPOWDERAXE = Identifier.of(Quickiemod.MOD_ID, "speedpowderaxe"); public static final Identifier TOOL_SPEEDPOWDERHOE = Identifier.of(Quickiemod.MOD_ID, "speedpowderhoe"); diff --git a/src/main/java/de/jottyfan/quickiemod/item/ModItems.java b/src/main/java/de/jottyfan/quickiemod/item/ModItems.java index de561cc..18e7b4f 100644 --- a/src/main/java/de/jottyfan/quickiemod/item/ModItems.java +++ b/src/main/java/de/jottyfan/quickiemod/item/ModItems.java @@ -58,6 +58,8 @@ public class ModItems { new Item64Stack(ModIdentifiers.ITEM_COPPERPOWDER)); public static final Item ITEM_COPPERSTUB = registerItem(ModIdentifiers.ITEM_COPPERSTUB, new Item64Stack(ModIdentifiers.ITEM_COPPERSTUB)); + public static final Item ITEM_COPPERSTICK = registerItem(ModIdentifiers.ITEM_COPPERSTICK, + new Item64Stack(ModIdentifiers.ITEM_COPPERSTICK)); public static final Item TOOL_SPEEDPOWDERAXE = registerItem(ModIdentifiers.TOOL_SPEEDPOWDERAXE, new ToolSpeedpowderAxe(ModIdentifiers.TOOL_SPEEDPOWDERAXE)); @@ -108,8 +110,9 @@ public class ModItems { items.add(ITEM_CANOLASEED); items.add(ITEM_CANOLABOTTLE); items.add(ITEM_CANOLABOTTLESTACK); - items.add(ITEM_COPPERSTRING); items.add(ITEM_COPPERPOWDER); + items.add(ITEM_COPPERSTRING); + items.add(ITEM_COPPERSTICK); items.add(ITEM_COPPERSTUB); items.add(TOOL_SPEEDPOWDERPICKAXE); diff --git a/src/main/resources/assets/quickiemod/items/copperstick.json b/src/main/resources/assets/quickiemod/items/copperstick.json new file mode 100644 index 0000000..ecd7a06 --- /dev/null +++ b/src/main/resources/assets/quickiemod/items/copperstick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickiemod:item/copperstick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiemod/lang/de_de.json b/src/main/resources/assets/quickiemod/lang/de_de.json index 39c09e1..5724e12 100644 --- a/src/main/resources/assets/quickiemod/lang/de_de.json +++ b/src/main/resources/assets/quickiemod/lang/de_de.json @@ -52,7 +52,8 @@ "item.quickiemod.quickieingot": "Eilpulverbarren", "item.quickiemod.copperstring": "Kupferband", "item.quickiemod.copperpowder": "Kupferpulver", - "item.quickiemod.copperstub": "Kupferstab", + "item.quickiemod.copperstub": "Kupferstummel", + "item.quickiemod.copperstick": "Kupferstock", "block.quickiemod.orenethersulphor": "Nether-Schwefel", "block.quickiemod.oresalpeter": "Salpetererz", "block.quickiemod.oresandsalpeter": "Salpetergestein", diff --git a/src/main/resources/assets/quickiemod/lang/en_us.json b/src/main/resources/assets/quickiemod/lang/en_us.json index b5fd79b..0f1c7bd 100644 --- a/src/main/resources/assets/quickiemod/lang/en_us.json +++ b/src/main/resources/assets/quickiemod/lang/en_us.json @@ -53,6 +53,7 @@ "item.quickiemod.copperstring": "copper string", "item.quickiemod.copperpowder": "copper powder", "item.quickiemod.copperstub": "copper stub", + "item.quickiemod.copperstick": "copper stick", "block.quickiemod.orenethersulphor": "nether sulfur", "block.quickiemod.oresalpeter": "salpeter ore", "block.quickiemod.oresandsalpeter": "salpeter stone", diff --git a/src/main/resources/assets/quickiemod/models/item/copperstick.json b/src/main/resources/assets/quickiemod/models/item/copperstick.json new file mode 100644 index 0000000..4bb4ccf --- /dev/null +++ b/src/main/resources/assets/quickiemod/models/item/copperstick.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickiemod:item/copperstick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiemod/textures/item/copperstick.png b/src/main/resources/assets/quickiemod/textures/item/copperstick.png new file mode 100644 index 0000000000000000000000000000000000000000..3804165d4b4dd5b311b63e2ba83d2e87c67b4cff GIT binary patch literal 5666 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 Z&ye3{y6tuz#s|=h(7^D3iup-d{{i~)2b%x@ diff --git a/src/main/resources/data/quickiemod/recipe/blasting_copperstick.json b/src/main/resources/data/quickiemod/recipe/blasting_copperstick.json index bc4d7a0..ac7c96c 100644 --- a/src/main/resources/data/quickiemod/recipe/blasting_copperstick.json +++ b/src/main/resources/data/quickiemod/recipe/blasting_copperstick.json @@ -2,7 +2,7 @@ "type": "minecraft:blasting", "ingredient": "quickiemod:copperstring", "result": { - "id":"quickiemod:copperstub" + "id":"quickiemod:copperstick" }, "experience": 0.0, "cookingtime": 200 diff --git a/src/main/resources/data/quickiemod/recipe/blasting_oxidized_copper_powder5.json b/src/main/resources/data/quickiemod/recipe/blasting_oxidized_copper_powder5.json new file mode 100644 index 0000000..4fd30eb --- /dev/null +++ b/src/main/resources/data/quickiemod/recipe/blasting_oxidized_copper_powder5.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:blasting", + "ingredient": "quickiemod:copperpowder", + "result": { + "id": "quickiemod:oxidizedcopperpowder"}, + "experience": 0.0, + "cookingtime": 400 +} \ No newline at end of file diff --git a/src/main/resources/data/quickiemod/recipe/shaped_quickiepowderaxe.json b/src/main/resources/data/quickiemod/recipe/shaped_quickiepowderaxe.json index 74a97af..1ea2f6e 100644 --- a/src/main/resources/data/quickiemod/recipe/shaped_quickiepowderaxe.json +++ b/src/main/resources/data/quickiemod/recipe/shaped_quickiepowderaxe.json @@ -8,7 +8,7 @@ ], "key": { "s": "quickiemod:quickieingot", - "|": "quickiemod:copperstub" + "|": "quickiemod:copperstick" }, "result": { "id": "quickiemod:quickiepowderaxe", diff --git a/src/main/resources/data/quickiemod/recipe/shaped_quickiepowderhoe.json b/src/main/resources/data/quickiemod/recipe/shaped_quickiepowderhoe.json index d6c8cc9..199cca7 100644 --- a/src/main/resources/data/quickiemod/recipe/shaped_quickiepowderhoe.json +++ b/src/main/resources/data/quickiemod/recipe/shaped_quickiepowderhoe.json @@ -8,7 +8,7 @@ ], "key": { "s": "quickiemod:quickieingot", - "|": "quickiemod:copperstub" + "|": "quickiemod:copperstick" }, "result": { "id": "quickiemod:quickiepowderhoe", diff --git a/src/main/resources/data/quickiemod/recipe/shaped_quickiepowderpickaxe.json b/src/main/resources/data/quickiemod/recipe/shaped_quickiepowderpickaxe.json index 73ab436..5e301d1 100644 --- a/src/main/resources/data/quickiemod/recipe/shaped_quickiepowderpickaxe.json +++ b/src/main/resources/data/quickiemod/recipe/shaped_quickiepowderpickaxe.json @@ -8,7 +8,7 @@ ], "key": { "s": "quickiemod:quickieingot", - "|": "quickiemod:copperstub" + "|": "quickiemod:copperstick" }, "result": { "id": "quickiemod:quickiepowderpickaxe", diff --git a/src/main/resources/data/quickiemod/recipe/shaped_quickiepowdershovel.json b/src/main/resources/data/quickiemod/recipe/shaped_quickiepowdershovel.json index 5d67d10..bdc6a8b 100644 --- a/src/main/resources/data/quickiemod/recipe/shaped_quickiepowdershovel.json +++ b/src/main/resources/data/quickiemod/recipe/shaped_quickiepowdershovel.json @@ -8,7 +8,7 @@ ], "key": { "s": "quickiemod:quickieingot", - "|": "quickiemod:copperstub" + "|": "quickiemod:copperstick" }, "result": { "id": "quickiemod:quickiepowdershovel", diff --git a/src/main/resources/data/quickiemod/recipe/shapeless_copperstub.json b/src/main/resources/data/quickiemod/recipe/shapeless_copperstub.json new file mode 100644 index 0000000..1c0e7be --- /dev/null +++ b/src/main/resources/data/quickiemod/recipe/shapeless_copperstub.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + "quickiemod:copperstick" + ], + "result": { + "id": "quickiemod:copperstub", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiemod/recipe/stonecutting_quickiepowder.json b/src/main/resources/data/quickiemod/recipe/stonecutting_quickiepowder.json new file mode 100644 index 0000000..2160e76 --- /dev/null +++ b/src/main/resources/data/quickiemod/recipe/stonecutting_quickiepowder.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "quickiemod:quickieingot", + "result": { + "id": "quickiemod:quickiepowder" + }, + "count": 1 +} diff --git a/src/main/resources/data/quickiemod/recipe/stonecutting_speedpowder.json b/src/main/resources/data/quickiemod/recipe/stonecutting_speedpowder.json new file mode 100644 index 0000000..4b9d98e --- /dev/null +++ b/src/main/resources/data/quickiemod/recipe/stonecutting_speedpowder.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "quickiemod:speedingot", + "result": { + "id": "quickiemod:speedpowder" + }, + "count": 1 +}