From 37265afbfa2cc6b5222e7d9f331b87dc1ba76aaa Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 31 Jan 2019 19:16:49 +0200 Subject: [PATCH] Fixed crafting recipes for trick apples --- .../com/minelittlepony/unicopia/UItems.java | 2 +- .../resources/assets/unicopia/lang/en_US.lang | 1 + .../unicopia/models/item/zap_apple_zap.json | 6 ++++++ .../{apple_2.json => trick_green_apple.json} | 8 ++++---- .../{apple.json => trick_red_apple.json} | 8 ++++---- .../unicopia/recipes/trick_sour_apple.json | 18 ++++++++++++++++++ .../{apple_3.json => trick_sweet_apple.json} | 8 ++++---- .../{apple_4.json => trick_zap_apple.json} | 8 ++++---- 8 files changed, 42 insertions(+), 17 deletions(-) create mode 100644 src/main/resources/assets/unicopia/models/item/zap_apple_zap.json rename src/main/resources/assets/unicopia/recipes/{apple_2.json => trick_green_apple.json} (65%) rename src/main/resources/assets/unicopia/recipes/{apple.json => trick_red_apple.json} (65%) create mode 100644 src/main/resources/assets/unicopia/recipes/trick_sour_apple.json rename src/main/resources/assets/unicopia/recipes/{apple_3.json => trick_sweet_apple.json} (65%) rename src/main/resources/assets/unicopia/recipes/{apple_4.json => trick_zap_apple.json} (63%) diff --git a/src/main/java/com/minelittlepony/unicopia/UItems.java b/src/main/java/com/minelittlepony/unicopia/UItems.java index cfa818e4..77547b06 100644 --- a/src/main/java/com/minelittlepony/unicopia/UItems.java +++ b/src/main/java/com/minelittlepony/unicopia/UItems.java @@ -62,7 +62,7 @@ public class UItems { .setTypeRarities(10, 20, 10, 30); public static final ItemApple zap_apple = new ItemZapApple(Unicopia.MODID, "zap_apple") - .setSubTypes("zap_apple", "red", "green", "sweet", "sour"); + .setSubTypes("zap_apple", "red", "green", "sweet", "sour", "zap"); public static final ItemApple rotten_apple = new ItemRottenApple(Unicopia.MODID, "rotten_apple"); public static final ItemApple cooked_zap_apple = new ItemApple(Unicopia.MODID, "cooked_zap_apple"); diff --git a/src/main/resources/assets/unicopia/lang/en_US.lang b/src/main/resources/assets/unicopia/lang/en_US.lang index 5479730f..d59c0ac7 100644 --- a/src/main/resources/assets/unicopia/lang/en_US.lang +++ b/src/main/resources/assets/unicopia/lang/en_US.lang @@ -62,6 +62,7 @@ item.zap_apple.red.name=Apple item.zap_apple.green.name=Granny Smith Apple item.zap_apple.sweet.name=Sweet Apple Acres Apple item.zap_apple.sour.name=Sour Apple +item.zap_apple.zap.name=Cooked Zap Apple item.apple_seeds.name=Apple Seeds diff --git a/src/main/resources/assets/unicopia/models/item/zap_apple_zap.json b/src/main/resources/assets/unicopia/models/item/zap_apple_zap.json new file mode 100644 index 00000000..6dc1c575 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/zap_apple_zap.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:items/apple_zap_cooked" + } +} diff --git a/src/main/resources/assets/unicopia/recipes/apple_2.json b/src/main/resources/assets/unicopia/recipes/trick_green_apple.json similarity index 65% rename from src/main/resources/assets/unicopia/recipes/apple_2.json rename to src/main/resources/assets/unicopia/recipes/trick_green_apple.json index 9aba8c11..fd463981 100644 --- a/src/main/resources/assets/unicopia/recipes/apple_2.json +++ b/src/main/resources/assets/unicopia/recipes/trick_green_apple.json @@ -2,8 +2,8 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "minecraft:apple", - "data": 4 + "item": "unicopia:zap_apple", + "data": 0 }, { "item": "minecraft:dye", @@ -11,8 +11,8 @@ } ], "result": { - "item": "minecraft:apple", + "item": "unicopia:zap_apple", "count": 1, - "data": 7 + "data": 2 } } \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/recipes/apple.json b/src/main/resources/assets/unicopia/recipes/trick_red_apple.json similarity index 65% rename from src/main/resources/assets/unicopia/recipes/apple.json rename to src/main/resources/assets/unicopia/recipes/trick_red_apple.json index 44658f65..a87d6167 100644 --- a/src/main/resources/assets/unicopia/recipes/apple.json +++ b/src/main/resources/assets/unicopia/recipes/trick_red_apple.json @@ -2,8 +2,8 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "minecraft:apple", - "data": 4 + "item": "unicopia:zap_apple", + "data": 0 }, { "item": "minecraft:dye", @@ -11,8 +11,8 @@ } ], "result": { - "item": "minecraft:apple", + "item": "unicopia:zap_apple", "count": 1, - "data": 6 + "data": 1 } } \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/recipes/trick_sour_apple.json b/src/main/resources/assets/unicopia/recipes/trick_sour_apple.json new file mode 100644 index 00000000..56d80a77 --- /dev/null +++ b/src/main/resources/assets/unicopia/recipes/trick_sour_apple.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "unicopia:zap_apple", + "data": 0 + }, + { + "item": "minecraft:dye", + "data": 15 + } + ], + "result": { + "item": "unicopia:zap_apple", + "count": 1, + "data": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/recipes/apple_3.json b/src/main/resources/assets/unicopia/recipes/trick_sweet_apple.json similarity index 65% rename from src/main/resources/assets/unicopia/recipes/apple_3.json rename to src/main/resources/assets/unicopia/recipes/trick_sweet_apple.json index 627c6b23..230ec134 100644 --- a/src/main/resources/assets/unicopia/recipes/apple_3.json +++ b/src/main/resources/assets/unicopia/recipes/trick_sweet_apple.json @@ -2,8 +2,8 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "minecraft:apple", - "data": 4 + "item": "unicopia:zap_apple", + "data": 0 }, { "item": "minecraft:dye", @@ -11,8 +11,8 @@ } ], "result": { - "item": "minecraft:apple", + "item": "unicopia:zap_apple", "count": 1, - "data": 8 + "data": 3 } } \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/recipes/apple_4.json b/src/main/resources/assets/unicopia/recipes/trick_zap_apple.json similarity index 63% rename from src/main/resources/assets/unicopia/recipes/apple_4.json rename to src/main/resources/assets/unicopia/recipes/trick_zap_apple.json index 423b1f6e..bfc32275 100644 --- a/src/main/resources/assets/unicopia/recipes/apple_4.json +++ b/src/main/resources/assets/unicopia/recipes/trick_zap_apple.json @@ -2,16 +2,16 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "minecraft:apple", - "data": 4 + "item": "unicopia:zap_apple", + "data": 0 }, { "item": "minecraft:rotten_flesh" } ], "result": { - "item": "minecraft:apple", + "item": "unicopia:zap_apple", "count": 1, - "data": 9 + "data": 5 } } \ No newline at end of file