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 0000000..3804165 Binary files /dev/null and b/src/main/resources/assets/quickiemod/textures/item/copperstick.png differ diff --git a/src/main/resources/assets/quickiemod/textures/item/copperstring.png b/src/main/resources/assets/quickiemod/textures/item/copperstring.png index 2be73d3..f18fdec 100644 Binary files a/src/main/resources/assets/quickiemod/textures/item/copperstring.png and b/src/main/resources/assets/quickiemod/textures/item/copperstring.png differ 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 +}