diff --git a/gradle.properties b/gradle.properties index a192c42..b7262f5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ loader_version=0.18.4 loom_version=1.15-SNAPSHOT # Mod Properties -mod_version=26.1-snapshot-9-1 +mod_version=26.1-snapshot-9-2 maven_group=de.jottyfan.minecraft archives_base_name=quickly diff --git a/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java b/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java index 676b301..92ca7d8 100644 --- a/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java +++ b/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java @@ -46,6 +46,7 @@ public class QuicklyItems { public static final Item SALPETER = registerItem(ID.SALPETER); public static final Item SULFOR = registerItem(ID.SULFOR); public static final Item CARROTSTACK = registerItem(ID.CARROTSTACK); + public static final Item POTATOSTACK = registerItem(ID.POTATOSTACK); // TODO: rename tools to speedaxe and quickaxe instead of the powder version @@ -125,6 +126,7 @@ public class QuicklyItems { set.add(SALPETER); set.add(SULFOR); set.add(CARROTSTACK); + set.add(POTATOSTACK); set.add(SPEEDAXE); set.add(SPEEDHOE); set.add(SPEEDPICKAXE); diff --git a/src/main/java/de/jottyfan/minecraft/name/ID.java b/src/main/java/de/jottyfan/minecraft/name/ID.java index 3cea276..48664cd 100644 --- a/src/main/java/de/jottyfan/minecraft/name/ID.java +++ b/src/main/java/de/jottyfan/minecraft/name/ID.java @@ -38,6 +38,7 @@ public class ID { public static final Identifier SALPETER = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "salpeter"); public static final Identifier SULFOR = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "sulfor"); public static final Identifier CARROTSTACK = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "carrotstack"); + public static final Identifier POTATOSTACK = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "potatostack"); public static final Identifier SPEEDPOWDERAXE = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "speedpowderaxe"); public static final Identifier SPEEDPOWDERHOE = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, "speedpowderhoe"); public static final Identifier SPEEDPOWDERPICKAXE = Identifier.fromNamespaceAndPath(Quickly.MOD_ID, diff --git a/src/main/resources/assets/quickly/items/potatostack.json b/src/main/resources/assets/quickly/items/potatostack.json new file mode 100644 index 0000000..405d312 --- /dev/null +++ b/src/main/resources/assets/quickly/items/potatostack.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:item/potatostack" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/lang/de_de.json b/src/main/resources/assets/quickly/lang/de_de.json index a6f32a1..66b7cd6 100644 --- a/src/main/resources/assets/quickly/lang/de_de.json +++ b/src/main/resources/assets/quickly/lang/de_de.json @@ -38,6 +38,7 @@ "item.quickly.oresulfor": "Schwefelgestein", "item.quickly.oreturquoise": "Türkiserz", "item.quickly.oxidizedcopperpowder": "oxidiertes Kupferpulver", + "item.quickly.potatostack": "Kartoffelbündel", "item.quickly.quickieingot": "Eilpulverbarren", "item.quickly.quickiepowder": "Eilpulver", "item.quickly.quickiepowderaxe": "Eilaxt", diff --git a/src/main/resources/assets/quickly/lang/en_us.json b/src/main/resources/assets/quickly/lang/en_us.json index aa46731..47225a9 100644 --- a/src/main/resources/assets/quickly/lang/en_us.json +++ b/src/main/resources/assets/quickly/lang/en_us.json @@ -38,6 +38,7 @@ "item.quickly.oresulfor": "sulfor stone", "item.quickly.oreturquoise": "turquoise ore", "item.quickly.oxidizedcopperpowder": "oxidized copper powder", + "item.quickly.potatostack": "potato bundle", "item.quickly.quickieingot": "quickie powder ingot", "item.quickly.quickiepowder": "quickie powder", "item.quickly.quickiepowderaxe": "hurry axe", diff --git a/src/main/resources/assets/quickly/models/item/potatostack.json b/src/main/resources/assets/quickly/models/item/potatostack.json new file mode 100644 index 0000000..6d69df4 --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/potatostack.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickly:item/potatostack" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/textures/item/potatostack.png b/src/main/resources/assets/quickly/textures/item/potatostack.png new file mode 100644 index 0000000..59000a3 Binary files /dev/null and b/src/main/resources/assets/quickly/textures/item/potatostack.png differ diff --git a/src/main/resources/data/quickly/recipe/shaped_potatostack_from_potatos.json b/src/main/resources/data/quickly/recipe/shaped_potatostack_from_potatos.json new file mode 100644 index 0000000..e902da6 --- /dev/null +++ b/src/main/resources/data/quickly/recipe/shaped_potatostack_from_potatos.json @@ -0,0 +1,13 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "cc", + "cc" + ], + "key": { + "c": "minecraft:potato" + }, + "result": { + "id": "quickly:potatostack" + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/recipe/shapeless_potatos_from_potatostack.json b/src/main/resources/data/quickly/recipe/shapeless_potatos_from_potatostack.json new file mode 100644 index 0000000..18c7ff7 --- /dev/null +++ b/src/main/resources/data/quickly/recipe/shapeless_potatos_from_potatostack.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + "quickly:potatostack" + ], + "result": { + "id": "minecraft:potato", + "count": 4 + } +} \ No newline at end of file