diff --git a/gradle.properties b/gradle.properties index 91b5683..d0fba27 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.1 +mod_version=1.21.6.2 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 bfcc191..1eb766d 100644 --- a/src/main/java/de/jottyfan/quickiemod/identifier/ModIdentifiers.java +++ b/src/main/java/de/jottyfan/quickiemod/identifier/ModIdentifiers.java @@ -27,6 +27,9 @@ public class ModIdentifiers { public static final Identifier ITEM_CANOLASEED = Identifier.of(Quickiemod.MOD_ID, "canolaseed"); public static final Identifier ITEM_CANOLABOTTLE = Identifier.of(Quickiemod.MOD_ID, "canolabottle"); public static final Identifier ITEM_CANOLABOTTLESTACK = Identifier.of(Quickiemod.MOD_ID, "canolabottlestack"); + 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 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 3b4285e..de561cc 100644 --- a/src/main/java/de/jottyfan/quickiemod/item/ModItems.java +++ b/src/main/java/de/jottyfan/quickiemod/item/ModItems.java @@ -52,6 +52,12 @@ public class ModItems { new Item64Stack(ModIdentifiers.ITEM_CANOLABOTTLE)); public static final Item ITEM_CANOLABOTTLESTACK = registerItem(ModIdentifiers.ITEM_CANOLABOTTLESTACK, new Item64Stack(ModIdentifiers.ITEM_CANOLABOTTLESTACK)); + public static final Item ITEM_COPPERSTRING = registerItem(ModIdentifiers.ITEM_COPPERSTRING, + new Item64Stack(ModIdentifiers.ITEM_COPPERSTRING)); + public static final Item ITEM_COPPERPOWDER = registerItem(ModIdentifiers.ITEM_COPPERPOWDER, + new Item64Stack(ModIdentifiers.ITEM_COPPERPOWDER)); + public static final Item ITEM_COPPERSTUB = registerItem(ModIdentifiers.ITEM_COPPERSTUB, + new Item64Stack(ModIdentifiers.ITEM_COPPERSTUB)); public static final Item TOOL_SPEEDPOWDERAXE = registerItem(ModIdentifiers.TOOL_SPEEDPOWDERAXE, new ToolSpeedpowderAxe(ModIdentifiers.TOOL_SPEEDPOWDERAXE)); @@ -102,6 +108,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_COPPERSTUB); items.add(TOOL_SPEEDPOWDERPICKAXE); items.add(TOOL_SPEEDPOWDERAXE); diff --git a/src/main/resources/assets/quickiemod/items/copperpowder.json b/src/main/resources/assets/quickiemod/items/copperpowder.json new file mode 100644 index 0000000..b05a68f --- /dev/null +++ b/src/main/resources/assets/quickiemod/items/copperpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickiemod:item/copperpowder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiemod/items/copperstring.json b/src/main/resources/assets/quickiemod/items/copperstring.json new file mode 100644 index 0000000..a682894 --- /dev/null +++ b/src/main/resources/assets/quickiemod/items/copperstring.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickiemod:item/copperstring" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiemod/items/copperstub.json b/src/main/resources/assets/quickiemod/items/copperstub.json new file mode 100644 index 0000000..764d358 --- /dev/null +++ b/src/main/resources/assets/quickiemod/items/copperstub.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickiemod:item/copperstub" + } +} \ 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 e33a19a..39c09e1 100644 --- a/src/main/resources/assets/quickiemod/lang/de_de.json +++ b/src/main/resources/assets/quickiemod/lang/de_de.json @@ -50,6 +50,9 @@ "item.quickiemod.oxidizedcopperpowder": "oxidiertes Kupferpulver", "item.quickiemod.speedingot": "Fluchtpulverbarren", "item.quickiemod.quickieingot": "Eilpulverbarren", + "item.quickiemod.copperstring": "Kupferband", + "item.quickiemod.copperpowder": "Kupferpulver", + "item.quickiemod.copperstub": "Kupferstab", "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 ea8d350..b5fd79b 100644 --- a/src/main/resources/assets/quickiemod/lang/en_us.json +++ b/src/main/resources/assets/quickiemod/lang/en_us.json @@ -50,6 +50,9 @@ "item.quickiemod.oxidizedcopperpowder": "oxidized copper powder", "item.quickiemod.speedingot": "Speedpowderingot", "item.quickiemod.quickieingot": "Hurrypowderingot", + "item.quickiemod.copperstring": "copper string", + "item.quickiemod.copperpowder": "copper powder", + "item.quickiemod.copperstub": "copper stub", "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/copperpowder.json b/src/main/resources/assets/quickiemod/models/item/copperpowder.json new file mode 100644 index 0000000..434dfe5 --- /dev/null +++ b/src/main/resources/assets/quickiemod/models/item/copperpowder.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickiemod:item/copperpowder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiemod/models/item/copperstring.json b/src/main/resources/assets/quickiemod/models/item/copperstring.json new file mode 100644 index 0000000..888c6e0 --- /dev/null +++ b/src/main/resources/assets/quickiemod/models/item/copperstring.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickiemod:item/copperstring" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiemod/models/item/copperstub.json b/src/main/resources/assets/quickiemod/models/item/copperstub.json new file mode 100644 index 0000000..9e90075 --- /dev/null +++ b/src/main/resources/assets/quickiemod/models/item/copperstub.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickiemod:item/copperstub" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiemod/textures/item/copperpowder.png b/src/main/resources/assets/quickiemod/textures/item/copperpowder.png new file mode 100644 index 0000000..583d032 Binary files /dev/null and b/src/main/resources/assets/quickiemod/textures/item/copperpowder.png differ diff --git a/src/main/resources/assets/quickiemod/textures/item/copperstring.png b/src/main/resources/assets/quickiemod/textures/item/copperstring.png new file mode 100644 index 0000000..2be73d3 Binary files /dev/null and b/src/main/resources/assets/quickiemod/textures/item/copperstring.png differ diff --git a/src/main/resources/assets/quickiemod/textures/item/copperstub.png b/src/main/resources/assets/quickiemod/textures/item/copperstub.png new file mode 100644 index 0000000..eaa5a5c Binary files /dev/null and b/src/main/resources/assets/quickiemod/textures/item/copperstub.png differ diff --git a/src/main/resources/assets/quickiemod/textures/item/quickiepowderaxe.png b/src/main/resources/assets/quickiemod/textures/item/quickiepowderaxe.png index c658e6d..0aa56aa 100644 Binary files a/src/main/resources/assets/quickiemod/textures/item/quickiepowderaxe.png and b/src/main/resources/assets/quickiemod/textures/item/quickiepowderaxe.png differ diff --git a/src/main/resources/assets/quickiemod/textures/item/quickiepowderhoe.png b/src/main/resources/assets/quickiemod/textures/item/quickiepowderhoe.png index b74b377..f8f9f0b 100644 Binary files a/src/main/resources/assets/quickiemod/textures/item/quickiepowderhoe.png and b/src/main/resources/assets/quickiemod/textures/item/quickiepowderhoe.png differ diff --git a/src/main/resources/assets/quickiemod/textures/item/quickiepowderpickaxe.png b/src/main/resources/assets/quickiemod/textures/item/quickiepowderpickaxe.png index f12ad7e..3b8146b 100644 Binary files a/src/main/resources/assets/quickiemod/textures/item/quickiepowderpickaxe.png and b/src/main/resources/assets/quickiemod/textures/item/quickiepowderpickaxe.png differ diff --git a/src/main/resources/assets/quickiemod/textures/item/quickiepowdershears.png b/src/main/resources/assets/quickiemod/textures/item/quickiepowdershears.png index d532040..cf0a275 100644 Binary files a/src/main/resources/assets/quickiemod/textures/item/quickiepowdershears.png and b/src/main/resources/assets/quickiemod/textures/item/quickiepowdershears.png differ diff --git a/src/main/resources/assets/quickiemod/textures/item/quickiepowdershovel.png b/src/main/resources/assets/quickiemod/textures/item/quickiepowdershovel.png index 9a86273..56d2b5d 100644 Binary files a/src/main/resources/assets/quickiemod/textures/item/quickiepowdershovel.png and b/src/main/resources/assets/quickiemod/textures/item/quickiepowdershovel.png differ diff --git a/src/main/resources/assets/quickiemod/textures/item/quickiepowderwaterhoe.png b/src/main/resources/assets/quickiemod/textures/item/quickiepowderwaterhoe.png index 4629099..52cc760 100644 Binary files a/src/main/resources/assets/quickiemod/textures/item/quickiepowderwaterhoe.png and b/src/main/resources/assets/quickiemod/textures/item/quickiepowderwaterhoe.png differ diff --git a/src/main/resources/assets/quickiemod/textures/item/speedpowdershears.png b/src/main/resources/assets/quickiemod/textures/item/speedpowdershears.png index 2488dc9..11ecda3 100644 Binary files a/src/main/resources/assets/quickiemod/textures/item/speedpowdershears.png and b/src/main/resources/assets/quickiemod/textures/item/speedpowdershears.png differ diff --git a/src/main/resources/data/quickiemod/recipe/blasting_copperstick.json b/src/main/resources/data/quickiemod/recipe/blasting_copperstick.json new file mode 100644 index 0000000..bc4d7a0 --- /dev/null +++ b/src/main/resources/data/quickiemod/recipe/blasting_copperstick.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": "quickiemod:copperstring", + "result": { + "id":"quickiemod:copperstub" + }, + "experience": 0.0, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/main/resources/data/quickiemod/recipe/shaped_copperstring.json b/src/main/resources/data/quickiemod/recipe/shaped_copperstring.json new file mode 100644 index 0000000..0f440f2 --- /dev/null +++ b/src/main/resources/data/quickiemod/recipe/shaped_copperstring.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "c", + "c", + "c" + ], + "key": { + "c": "quickiemod:copperpowder" + }, + "result": { + "id": "quickiemod:copperstring", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiemod/recipe/shaped_monsterhoarder.json b/src/main/resources/data/quickiemod/recipe/shaped_monsterhoarder.json index d19381d..6f93470 100644 --- a/src/main/resources/data/quickiemod/recipe/shaped_monsterhoarder.json +++ b/src/main/resources/data/quickiemod/recipe/shaped_monsterhoarder.json @@ -6,9 +6,9 @@ "oqo" ], "key": { - "q": "quickiemod:quickieingot", + "o": "quickiemod:quickieingot", "t": "minecraft:torch", - "o": "minecraft:obsidian" + "q": "quickiemod:copperstub" }, "result": { "id": "quickiemod:monsterhoarder", diff --git a/src/main/resources/data/quickiemod/recipe/shaped_quickiepowderaxe.json b/src/main/resources/data/quickiemod/recipe/shaped_quickiepowderaxe.json index 2de441b..74a97af 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", - "|": "minecraft:stick" + "|": "quickiemod:copperstub" }, "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 defdd14..d6c8cc9 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", - "|": "minecraft:stick" + "|": "quickiemod:copperstub" }, "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 99c0879..73ab436 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", - "|": "minecraft:stick" + "|": "quickiemod:copperstub" }, "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 6e4a73d..5d67d10 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", - "|": "minecraft:stick" + "|": "quickiemod:copperstub" }, "result": { "id": "quickiemod:quickiepowdershovel", diff --git a/src/main/resources/data/quickiemod/recipe/stonecutting_copperpowder.json b/src/main/resources/data/quickiemod/recipe/stonecutting_copperpowder.json new file mode 100644 index 0000000..b3c942d --- /dev/null +++ b/src/main/resources/data/quickiemod/recipe/stonecutting_copperpowder.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "minecraft:copper_ingot", + "result": { + "id": "quickiemod:copperpowder" + }, + "count": 1 +}