diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItems.java b/src/main/java/com/minelittlepony/unicopia/item/UItems.java index 87079ba9..9604ea65 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/UItems.java +++ b/src/main/java/com/minelittlepony/unicopia/item/UItems.java @@ -54,9 +54,9 @@ public interface UItems { Item LIGHTNING_JAR = register("lightning_jar", new JarItem(new Item.Settings().maxCount(1).fireproof().recipeRemainder(EMPTY_JAR), false, false, true), ItemGroups.FUNCTIONAL); Item ZAP_APPLE_JAM_JAR = register("zap_apple_jam_jar", new JarItem(new Item.Settings().maxCount(1).fireproof().recipeRemainder(EMPTY_JAR), false, false, true), ItemGroups.FUNCTIONAL); - Item TOAST = register("toast", new Item(new Item.Settings().maxCount(1).food(UFoodComponents.TOAST)), ItemGroups.FOOD_AND_DRINK); - Item BURNED_TOAST = register("burned_toast", new Item(new Item.Settings().maxCount(1).food(UFoodComponents.BURNED_TOAST)), ItemGroups.FOOD_AND_DRINK); - Item JAM_TOAST = register("jam_toast", new Item(new Item.Settings().maxCount(1).food(UFoodComponents.JAM_TOAST)), ItemGroups.FOOD_AND_DRINK); + Item TOAST = register("toast", new Item(new Item.Settings().maxCount(16).food(UFoodComponents.TOAST)), ItemGroups.FOOD_AND_DRINK); + Item BURNED_TOAST = register("burned_toast", new Item(new Item.Settings().maxCount(16).food(UFoodComponents.BURNED_TOAST)), ItemGroups.FOOD_AND_DRINK); + Item JAM_TOAST = register("jam_toast", new Item(new Item.Settings().maxCount(16).food(UFoodComponents.JAM_TOAST)), ItemGroups.FOOD_AND_DRINK); Item CRYSTAL_HEART = register("crystal_heart", new CrystalHeartItem(new Item.Settings().maxCount(1)), ItemGroups.TOOLS); Item CRYSTAL_SHARD = register("crystal_shard", new Item(new Item.Settings()), ItemGroups.NATURAL); @@ -210,8 +210,9 @@ public interface UItems { FuelRegistry.INSTANCE.add(DRAGON_BREATH_SCROLL, 20000); FuelRegistry.INSTANCE.add(BUTTERFLY, 2); FuelRegistry.INSTANCE.add(SPELLBOOK, 9000); - FuelRegistry.INSTANCE.add(MEADOWBROOKS_STAFF, 300); - FuelRegistry.INSTANCE.add(UTags.BASKETS, 700); + FuelRegistry.INSTANCE.add(MEADOWBROOKS_STAFF, 800); + FuelRegistry.INSTANCE.add(BURNED_TOAST, 1600); + FuelRegistry.INSTANCE.add(UTags.BASKETS, 1700); CompostingChanceRegistry.INSTANCE.add(GREEN_APPLE, 0.65F); CompostingChanceRegistry.INSTANCE.add(SWEET_APPLE, 0.65F); diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index 5d59bbfd..b8ee61f3 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -973,6 +973,12 @@ "advancements.unicopia.apple_route.description": "Start your journey towards the apple of legend", "advancements.unicopia.juice.title": "Refreshing", "advancements.unicopia.juice.description": "Finally a use for all these apples", + "advancements.unicopia.toast.title": "He Crispy and delicious!", + "advancements.unicopia.toast.description": "Make a toasted companion", + "advancements.unicopia.burned_toast.title": "Toasty NOOOOOOO!", + "advancements.unicopia.burned_toast.description": "Burn Toasty", + "advancements.unicopia.lucky.title": "As seen on TV", + "advancements.unicopia.lucky.description": "Make some lucky horse shoe fries", "advancements.unicopia.sweet_apple_acres.title": "Sweet Apple Acres", "advancements.unicopia.sweet_apple_acres.description": "Obtain one of every apple", "advancements.unicopia.brew_cider.title": "Applejack's Finest", diff --git a/src/main/resources/data/unicopia/advancements/recipes/food/burned_toast.json b/src/main/resources/data/unicopia/advancements/recipes/food/burned_toast.json new file mode 100644 index 00000000..312159fe --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/recipes/food/burned_toast.json @@ -0,0 +1,30 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "unicopia:burned_toast" + ] + }, + "criteria": { + "has_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "items": [ "unicopia:toast" ] } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "unicopia:burned_toast" + } + } + }, + "requirements": [ + [ + "has_ingredients", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/advancements/recipes/food/candied_apple.json b/src/main/resources/data/unicopia/advancements/recipes/food/candied_apple.json new file mode 100644 index 00000000..c135476b --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/recipes/food/candied_apple.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "unicopia:candied_apple" + ] + }, + "criteria": { + "has_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "items": [ "minecraft:stick" ] }, + { "items": [ "minecraft:sugar" ] }, + { "tag": "unicopia:fresh_apples" } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "unicopia:candied_apple" + } + } + }, + "requirements": [ + [ + "has_ingredients", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/advancements/recipes/food/horse_shoe_fries.json b/src/main/resources/data/unicopia/advancements/recipes/food/horse_shoe_fries.json new file mode 100644 index 00000000..bdbfd011 --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/recipes/food/horse_shoe_fries.json @@ -0,0 +1,30 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "unicopia:horse_shoe_fries" + ] + }, + "criteria": { + "has_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "items": [ "minecraft:baked_potato" ] } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "unicopia:horse_shoe_fries" + } + } + }, + "requirements": [ + [ + "has_ingredients", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/advancements/recipes/food/jam_toast.json b/src/main/resources/data/unicopia/advancements/recipes/food/jam_toast.json new file mode 100644 index 00000000..bec51648 --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/recipes/food/jam_toast.json @@ -0,0 +1,31 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "unicopia:jam_toast" + ] + }, + "criteria": { + "has_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "items": [ "unicopia:toast" ] }, + { "items": [ "unicopia:zap_apple_jam_jar" ] } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "unicopia:jam_toast" + } + } + }, + "requirements": [ + [ + "has_ingredients", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/advancements/recipes/food/rock_candy.json b/src/main/resources/data/unicopia/advancements/recipes/food/rock_candy.json new file mode 100644 index 00000000..6a633e0f --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/recipes/food/rock_candy.json @@ -0,0 +1,31 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "unicopia:rock_candy" + ] + }, + "criteria": { + "has_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "items": [ "unicopia:pebbles" ] }, + { "items": [ "minecraft:sugar" ] } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "unicopia:rock_candy" + } + } + }, + "requirements": [ + [ + "has_ingredients", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/advancements/recipes/food/toast.json b/src/main/resources/data/unicopia/advancements/recipes/food/toast.json new file mode 100644 index 00000000..7548a5fc --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/recipes/food/toast.json @@ -0,0 +1,30 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "unicopia:toast" + ] + }, + "criteria": { + "has_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "items": [ "minecraft:bread" ] } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "unicopia:toast" + } + } + }, + "requirements": [ + [ + "has_ingredients", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/advancements/unicopia/burn_toast.json b/src/main/resources/data/unicopia/advancements/unicopia/burn_toast.json new file mode 100644 index 00000000..1a667430 --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/unicopia/burn_toast.json @@ -0,0 +1,31 @@ +{ + "parent": "unicopia:unicopia/toast", + "display": { + "icon": { + "item": "unicopia:burned_toast" + }, + "title": { + "translate": "advancements.unicopia.burn_toast.title" + }, + "description": { + "translate": "advancements.unicopia.burn_toast.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": true + }, + "criteria": { + "has_burned_toast": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "items": [ "unicopia:burned_toast" ] } + ] + } + } + }, + "requirements": [ + [ "has_burned_toast" ] + ] +} diff --git a/src/main/resources/data/unicopia/advancements/unicopia/lucky.json b/src/main/resources/data/unicopia/advancements/unicopia/lucky.json new file mode 100644 index 00000000..ba89a4ba --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/unicopia/lucky.json @@ -0,0 +1,31 @@ +{ + "parent": "unicopia:unicopia/apple_route", + "display": { + "icon": { + "item": "unicopia:horse_shoe_fries" + }, + "title": { + "translate": "advancements.unicopia.lucky.title" + }, + "description": { + "translate": "advancements.unicopia.lucky.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "criteria": { + "has_horse_shoe_fries": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "items": [ "unicopia:horse_shoe_fries" ] } + ] + } + } + }, + "requirements": [ + [ "has_horse_shoe_fries" ] + ] +} diff --git a/src/main/resources/data/unicopia/advancements/unicopia/toast.json b/src/main/resources/data/unicopia/advancements/unicopia/toast.json new file mode 100644 index 00000000..35500103 --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/unicopia/toast.json @@ -0,0 +1,31 @@ +{ + "parent": "unicopia:unicopia/apple_route", + "display": { + "icon": { + "item": "unicopia:toast" + }, + "title": { + "translate": "advancements.unicopia.toast.title" + }, + "description": { + "translate": "advancements.unicopia.toast.description" + }, + "frame": "task", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "criteria": { + "has_toast": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "items": [ "unicopia:toast" ] } + ] + } + } + }, + "requirements": [ + [ "has_toast" ] + ] +} diff --git a/src/main/resources/data/unicopia/recipes/burned_toast.json b/src/main/resources/data/unicopia/recipes/burned_toast.json new file mode 100644 index 00000000..341cb93e --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/burned_toast.json @@ -0,0 +1,9 @@ +{ + "type": "smelting", + "ingredient": { + "item": "unicopia:toast" + }, + "result": "unicopia:burned_toast", + "experience": 0.2, + "cookingtime": 30 +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/candied_apple.json b/src/main/resources/data/unicopia/recipes/candied_apple.json new file mode 100644 index 00000000..0745ca43 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/candied_apple.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "minecraft:stick" }, + { "tag": "unicopia:fresh_apples" }, + { "item": "minecraft:sugar" }, + { "item": "minecraft:sugar" }, + { "item": "minecraft:sugar" }, + { "item": "minecraft:sugar" } + ], + "result": { "item": "unicopia:candied_apple" } +} diff --git a/src/main/resources/data/unicopia/recipes/horse_shoe_fries.json b/src/main/resources/data/unicopia/recipes/horse_shoe_fries.json new file mode 100644 index 00000000..fd256912 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/horse_shoe_fries.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "* *", + "* *", + " * " + ], + "key": { + "*": { + "item": "minecraft:baked_potato" + } + }, + "result": { + "item": "unicopia:horse_shoe_fries", + "count": 15 + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/jam_toast.json b/src/main/resources/data/unicopia/recipes/jam_toast.json new file mode 100644 index 00000000..7e5bbd06 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/jam_toast.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "___", + "_X_", + "___" + ], + "key": { + "_": { + "item": "unicopia:toast" + }, + "X": { + "item": "unicopia:zap_apple_jam_jar" + } + }, + "result": { + "item": "unicopia:jam_toast", + "count": 8 + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/rock_candy.json b/src/main/resources/data/unicopia/recipes/rock_candy.json new file mode 100644 index 00000000..043e1a51 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/rock_candy.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { "item": "unicopia:pebbles" }, + { "item": "unicopia:pebbles" }, + { "item": "unicopia:pebbles" }, + { "item": "minecraft:sugar" }, + { "item": "minecraft:sugar" }, + { "item": "minecraft:sugar" }, + { "item": "minecraft:sugar" }, + { "item": "minecraft:sugar" }, + { "item": "minecraft:sugar" } + ], + "result": { "item": "unicopia:rock_candy", "count": 3 } +} diff --git a/src/main/resources/data/unicopia/recipes/toast.json b/src/main/resources/data/unicopia/recipes/toast.json new file mode 100644 index 00000000..7edc3a02 --- /dev/null +++ b/src/main/resources/data/unicopia/recipes/toast.json @@ -0,0 +1,9 @@ +{ + "type": "smelting", + "ingredient": { + "item": "minecraft:bread" + }, + "result": "unicopia:toast", + "experience": 0.2, + "cookingtime": 430 +} \ No newline at end of file