diff --git a/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java b/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java index f0cfdd4..e971191 100644 --- a/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java +++ b/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java @@ -46,8 +46,8 @@ public class QuicklyItems { public static final Item MAGNIFIER = registerItem("magnifier"); public static final Item SALPETER = registerItem("salpeter"); public static final Item SULFOR = registerItem("sulfor"); + public static final Item CARROTSTACK = registerItem("carrotstack"); - // TODO: carrot stack // TODO: tools public static final Item ARMOR_TURQUOISE_BOOTS = registerItem("turquoise_boots", ArmorType.BOOTS); @@ -85,6 +85,7 @@ public class QuicklyItems { item.accept(COTTON); item.accept(COTTONSEED); item.accept(ROTTENFLESHSTRIPES); + item.accept(CARROTSTACK); item.accept(CANOLA); item.accept(CANOLASEED); item.accept(CANOLABOTTLE); diff --git a/src/main/resources/assets/quickly/items/carrotstack.json b/src/main/resources/assets/quickly/items/carrotstack.json new file mode 100644 index 0000000..0c42aa0 --- /dev/null +++ b/src/main/resources/assets/quickly/items/carrotstack.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:item/carrotstack" + } +} \ 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 1fd133d..b15d0b6 100644 --- a/src/main/resources/assets/quickly/lang/de_de.json +++ b/src/main/resources/assets/quickly/lang/de_de.json @@ -14,6 +14,7 @@ "item.quickly.canolabottle": "Rapsöl", "item.quickly.canolabottlestack": "Rapsölsammlung", "item.quickly.canolaseed": "Rapssaat", + "item.quickly.carrotstack": "Karottenbündel", "item.quickly.copperpowder": "Kupferpulver", "item.quickly.copperstick": "Kupferstock", "item.quickly.copperstring": "Kupferband", diff --git a/src/main/resources/assets/quickly/lang/en_us.json b/src/main/resources/assets/quickly/lang/en_us.json index 88b64fc..fe3bbdf 100644 --- a/src/main/resources/assets/quickly/lang/en_us.json +++ b/src/main/resources/assets/quickly/lang/en_us.json @@ -14,6 +14,7 @@ "item.quickly.canolabottle": "canola oil", "item.quickly.canolabottlestack": "canola oil collection", "item.quickly.canolaseed": "canola seed", + "item.quickly.carrotstack": "carrot bundle", "item.quickly.copperpowder": "copper powder", "item.quickly.copperstick": "copper stick", "item.quickly.copperstring": "copper string", diff --git a/src/main/resources/assets/quickly/models/item/carrotstack.json b/src/main/resources/assets/quickly/models/item/carrotstack.json new file mode 100644 index 0000000..de74f6e --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/carrotstack.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickly:item/carrotstack" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/textures/item/carrotstack.png b/src/main/resources/assets/quickly/textures/item/carrotstack.png new file mode 100644 index 0000000..6c3737a Binary files /dev/null and b/src/main/resources/assets/quickly/textures/item/carrotstack.png differ diff --git a/src/main/resources/data/quickly/recipe/shaped_carrotstack_from_carrots.json b/src/main/resources/data/quickly/recipe/shaped_carrotstack_from_carrots.json new file mode 100644 index 0000000..ae2bea9 --- /dev/null +++ b/src/main/resources/data/quickly/recipe/shaped_carrotstack_from_carrots.json @@ -0,0 +1,13 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "cc", + "cc" + ], + "key": { + "c": "minecraft:carrot" + }, + "result": { + "id": "quickly:carrotstack" + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/recipe/shapeless_carrots_from_carrotstack.json b/src/main/resources/data/quickly/recipe/shapeless_carrots_from_carrotstack.json new file mode 100644 index 0000000..d14a6f3 --- /dev/null +++ b/src/main/resources/data/quickly/recipe/shapeless_carrots_from_carrotstack.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + "quickly:carrotstack" + ], + "result": { + "id": "minecraft:carrot", + "count": 4 + } +} \ No newline at end of file