diff --git a/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java b/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java index 582864c..54ca743 100644 --- a/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java +++ b/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java @@ -29,6 +29,8 @@ public class QuicklyItems { public static final Item CANOLA = registerItem("canola"); public static final Item CANOLAPLANT = registerItem("canolaplant"); public static final Item CANOLASEED = registerItem("canolaseed", properties -> new Plant(properties, "blockcanolaplant")); + public static final Item CANOLABOTTLE = registerItem("canolabottle"); + public static final Item CANOLABOTTLESTACK = registerItem("canolabottlestack"); public static final Item ROTTENFLESHSTRIPES = registerItem("rotten_flesh_stripes"); @@ -64,11 +66,15 @@ public class QuicklyItems { public static void registerModItems() { ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(item -> { item.accept(STUB); - item.accept(RAWTURQUOISE); - item.accept(TURQUOISEINGOT); item.accept(COTTON); item.accept(COTTONSEED); item.accept(ROTTENFLESHSTRIPES); + item.accept(CANOLA); + item.accept(CANOLASEED); + item.accept(CANOLABOTTLE); + item.accept(CANOLABOTTLESTACK); + item.accept(RAWTURQUOISE); + item.accept(TURQUOISEINGOT); item.accept(ARMOR_TURQUOISE_HELMET); item.accept(ARMOR_TURQUOISE_CHESTPLATE); diff --git a/src/main/resources/assets/quickly/items/canolabottle.json b/src/main/resources/assets/quickly/items/canolabottle.json new file mode 100644 index 0000000..aabd8b5 --- /dev/null +++ b/src/main/resources/assets/quickly/items/canolabottle.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:item/canolabottle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/items/canolabottlestack.json b/src/main/resources/assets/quickly/items/canolabottlestack.json new file mode 100644 index 0000000..e0d68f7 --- /dev/null +++ b/src/main/resources/assets/quickly/items/canolabottlestack.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:item/canolabottlestack" + } +} \ 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 8a9d53a..67c47a4 100644 --- a/src/main/resources/assets/quickly/lang/de_de.json +++ b/src/main/resources/assets/quickly/lang/de_de.json @@ -3,6 +3,8 @@ "item.quickly.blockcottonplant": "Baumwollpflanze", "item.quickly.blockturquoise": "Türkisblock", "item.quickly.canola": "Raps", + "item.quickly.canolabottle": "Rapsöl", + "item.quickly.canolabottlestack": "Rapsölsammlung", "item.quickly.canolaseed": "Rapssaat", "item.quickly.cotton": "Baumwolle", "item.quickly.cottonseed": "Baumwollsaat", diff --git a/src/main/resources/assets/quickly/lang/en_us.json b/src/main/resources/assets/quickly/lang/en_us.json index f0de2c7..1aa92d0 100644 --- a/src/main/resources/assets/quickly/lang/en_us.json +++ b/src/main/resources/assets/quickly/lang/en_us.json @@ -3,6 +3,8 @@ "item.quickly.blockcottonplant": "cotton plant", "item.quickly.blockturquoise": "block of turquoise", "item.quickly.canola": "canola", + "item.quickly.canolabottle": "canola oil", + "item.quickly.canolabottlestack": "canola oil collection", "item.quickly.canolaseed": "canola seed", "item.quickly.cotton": "cotton", "item.quickly.cottonseed": "cotton seed", diff --git a/src/main/resources/assets/quickly/models/item/canolabottle.json b/src/main/resources/assets/quickly/models/item/canolabottle.json new file mode 100644 index 0000000..8ee1993 --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/canolabottle.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickly:item/canolabottle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/item/canolabottlestack.json b/src/main/resources/assets/quickly/models/item/canolabottlestack.json new file mode 100644 index 0000000..7faf852 --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/canolabottlestack.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickly:item/canolabottlestack" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/textures/item/canolabottle.png b/src/main/resources/assets/quickly/textures/item/canolabottle.png new file mode 100644 index 0000000..fcd7a3a Binary files /dev/null and b/src/main/resources/assets/quickly/textures/item/canolabottle.png differ diff --git a/src/main/resources/assets/quickly/textures/item/canolabottlestack.png b/src/main/resources/assets/quickly/textures/item/canolabottlestack.png new file mode 100644 index 0000000..9805652 Binary files /dev/null and b/src/main/resources/assets/quickly/textures/item/canolabottlestack.png differ diff --git a/src/main/resources/data/quickly/recipe/shaped_canolabottlestack.json b/src/main/resources/data/quickly/recipe/shaped_canolabottlestack.json new file mode 100644 index 0000000..97717bc --- /dev/null +++ b/src/main/resources/data/quickly/recipe/shaped_canolabottlestack.json @@ -0,0 +1,15 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "ccc", + "ccc", + "ccc" + ], + "key": { + "c":"quickly:canolabottle" + }, + "result": { + "id": "quickly:canolabottlestack", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/recipe/shapeless_canolabottle.json b/src/main/resources/data/quickly/recipe/shapeless_canolabottle.json new file mode 100644 index 0000000..19baec3 --- /dev/null +++ b/src/main/resources/data/quickly/recipe/shapeless_canolabottle.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + "minecraft:glass_bottle", + "quickly:canola" + ], + "result": { + "id": "quickly:canolabottle", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/recipe/shapeless_canolabottle_from_stack.json b/src/main/resources/data/quickly/recipe/shapeless_canolabottle_from_stack.json new file mode 100644 index 0000000..19060af --- /dev/null +++ b/src/main/resources/data/quickly/recipe/shapeless_canolabottle_from_stack.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + "quickly:canolabottlestack" + ], + "result": { + "id": "quickly:canolabottle", + "count": 9 + } +} \ No newline at end of file