From 1fd17820517f6fe2959bf95df059cc0a406ece3e Mon Sep 17 00:00:00 2001 From: Sollace Date: Fri, 29 Mar 2024 20:32:50 +0000 Subject: [PATCH] Added chocolate oatmeal cookie Added scone Added recipe to craft bread from oats Changed hay fried recipe to be vertical --- .../datagen/providers/UModelProvider.java | 4 +-- .../providers/recipe/URecipeProvider.java | 25 ++++++++++++++++-- .../unicopia/item/UFoodComponents.java | 11 ++++++-- .../minelittlepony/unicopia/item/UItems.java | 8 +++--- .../resources/assets/unicopia/lang/en_us.json | 2 ++ .../item/chocolate_oatmeal_cookie.png | Bin 0 -> 9392 bytes .../assets/unicopia/textures/item/scone.png | Bin 0 -> 6751 bytes .../tags/items/food_types/baked_goods.json | 2 ++ 8 files changed, 43 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/assets/unicopia/textures/item/chocolate_oatmeal_cookie.png create mode 100644 src/main/resources/assets/unicopia/textures/item/scone.png diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java index 4a652170..8dd5d9c5 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java @@ -59,7 +59,7 @@ public class UModelProvider extends FabricModelProvider { ItemModels.register(itemModelGenerator, UItems.ACORN, UItems.APPLE_PIE_HOOF, UItems.APPLE_PIE_SLICE, UItems.APPLE_PIE, UItems.BANANA, UItems.BOTCHED_GEM, UItems.BOWL_OF_NUTS, UItems.BROKEN_SUNGLASSES, UItems.BURNED_JUICE, UItems.BURNED_TOAST, - UItems.CARAPACE, UItems.CLAM_SHELL, UItems.COOKED_ZAP_APPLE, UItems.CLOUD_LUMP, UItems.CRISPY_HAY_FRIES, UItems.CRYSTAL_HEART, UItems.CRYSTAL_SHARD, + UItems.CARAPACE, UItems.CLAM_SHELL, UItems.COOKED_ZAP_APPLE, UItems.CHOCOLATE_OATMEAL_COOKIE, UItems.CLOUD_LUMP, UItems.CRISPY_HAY_FRIES, UItems.CRYSTAL_HEART, UItems.CRYSTAL_SHARD, UItems.DAFFODIL_DAISY_SANDWICH, UItems.DRAGON_BREATH_SCROLL, UItems.EMPTY_JAR, UItems.FRIENDSHIP_BRACELET, @@ -70,7 +70,7 @@ public class UModelProvider extends FabricModelProvider { UItems.JAM_TOAST, UItems.JUICE, UItems.LIGHTNING_JAR, UItems.MANGO, UItems.MUFFIN, - UItems.OATMEAL, UItems.OATMEAL_COOKIE, + UItems.OATMEAL, UItems.OATMEAL_COOKIE, UItems.SCONE, UItems.PEBBLES, UItems.PEGASUS_FEATHER, UItems.PINECONE, UItems.PINECONE_COOKIE, UItems.PINEAPPLE_CROWN, UItems.RAIN_CLOUD_JAR, UItems.ROCK_STEW, UItems.ROCK, UItems.ROTTEN_APPLE, UItems.SALT_CUBE, UItems.SCALLOP_SHELL, UItems.SHELLY, UItems.SOUR_APPLE_SEEDS, UItems.SOUR_APPLE, UItems.SPELLBOOK, UItems.STORM_CLOUD_JAR, diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/recipe/URecipeProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/recipe/URecipeProvider.java index 2161b97a..3a95e32e 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/recipe/URecipeProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/recipe/URecipeProvider.java @@ -3,6 +3,7 @@ package com.minelittlepony.unicopia.datagen.providers.recipe; import java.util.Arrays; import java.util.List; import java.util.function.Consumer; +import java.util.stream.Stream; import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.UConventionalTags; @@ -320,16 +321,28 @@ public class URecipeProvider extends FabricRecipeProvider { .input(Items.BOWL) .offerTo(exporter); ShapelessRecipeJsonBuilder.create(RecipeCategory.FOOD, UItems.OATMEAL_COOKIE) - .input(UItems.OATS, 3).criterion(hasItem(UItems.OATS), conditionsFromItem(UItems.OATS)) + .input(UItems.OATS, 2).criterion(hasItem(UItems.OATS), conditionsFromItem(UItems.OATS)) + .offerTo(exporter); + ShapelessRecipeJsonBuilder.create(RecipeCategory.FOOD, UItems.CHOCOLATE_OATMEAL_COOKIE) + .input(UItems.OATS, 2) + .input(Items.COCOA_BEANS).criterion(hasItem(Items.COCOA_BEANS), conditionsFromItem(Items.COCOA_BEANS)) .offerTo(exporter); ShapelessRecipeJsonBuilder.create(RecipeCategory.FOOD, UItems.PINECONE_COOKIE) .input(UItems.PINECONE).criterion(hasItem(UItems.PINECONE), conditionsFromItem(UItems.PINECONE)) .input(Items.WHEAT, 2) .offerTo(exporter); + ShapelessRecipeJsonBuilder.create(RecipeCategory.FOOD, UItems.SCONE) + .input(UItems.OATS).criterion(hasItem(UItems.OATS), conditionsFromItem(UItems.OATS)) + .input(Items.WHEAT, 2) + .offerTo(exporter); ShapelessRecipeJsonBuilder.create(RecipeCategory.FOOD, UItems.ROCK_CANDY, 3) .input(Items.SUGAR, 6).criterion(hasItem(Items.SUGAR), conditionsFromItem(Items.SUGAR)) .input(UItems.PEBBLES, 3) .offerTo(exporter); + ShapedRecipeJsonBuilder.create(RecipeCategory.FOOD, Items.BREAD) + .input('#', UItems.OATS).criterion("has_oats", conditionsFromItem(UItems.OATS)) + .pattern("###") + .offerTo(exporter, convertBetween(UItems.OATS, Items.WHEAT)); ShapelessRecipeJsonBuilder.create(RecipeCategory.FOOD, UItems.JUICE) .input(Ingredient.fromTag(UTags.FRESH_APPLES), 6).criterion(hasItem(Items.APPLE), conditionsFromTag(UTags.FRESH_APPLES)) .input(Items.GLASS_BOTTLE) @@ -349,7 +362,9 @@ public class URecipeProvider extends FabricRecipeProvider { ShapedRecipeJsonBuilder.create(RecipeCategory.FOOD, UItems.HAY_FRIES) .input('#', UItems.OATS).criterion(hasItem(UItems.OATS), conditionsFromItem(UItems.OATS)) - .pattern("###") + .pattern("#") + .pattern("#") + .pattern("#") .offerTo(exporter); ShapedRecipeJsonBuilder.create(RecipeCategory.FOOD, UItems.HAY_BURGER) .input('~', Items.BREAD).criterion(hasItem(Items.BREAD), conditionsFromItem(Items.BREAD)) @@ -717,4 +732,10 @@ public class URecipeProvider extends FabricRecipeProvider { .traits(traits) .offerTo(exporter); } + + public static InventoryChangedCriterion.Conditions conditionsFromMultipleItems(ItemConvertible... items) { + return conditionsFromItemPredicates( + Stream.of(items).map(item -> ItemPredicate.Builder.create().items(item).build()).toArray(ItemPredicate[]::new) + ); + } } diff --git a/src/main/java/com/minelittlepony/unicopia/item/UFoodComponents.java b/src/main/java/com/minelittlepony/unicopia/item/UFoodComponents.java index a7ff322a..ee093b08 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/UFoodComponents.java +++ b/src/main/java/com/minelittlepony/unicopia/item/UFoodComponents.java @@ -3,6 +3,7 @@ package com.minelittlepony.unicopia.item; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.FoodComponent; +import net.minecraft.item.FoodComponents; public interface UFoodComponents { FoodComponent OATS = builder(1, 0.7F).build(); @@ -12,8 +13,8 @@ public interface UFoodComponents { .statusEffect(new StatusEffectInstance(StatusEffects.STRENGTH, 1200, 1), 0.3F) .statusEffect(new StatusEffectInstance(StatusEffects.SPEED, 1200, 1), 0.2F) .build(); - FoodComponent DAFODIL_DAISY_SANDWICH = builder(3, 2).build(); - FoodComponent HAY_BURGER = builder(7, 1.4F).build(); + FoodComponent DAFODIL_DAISY_SANDWICH = builder(3, 1.4F).build(); + FoodComponent BURGER = builder(7, 1.4F).build(); FoodComponent HAY_FRIES = builder(4, 2).build(); FoodComponent CRISPY_HAY_FRIES = builder(6, 7).build(); @@ -23,6 +24,12 @@ public interface UFoodComponents { FoodComponent JUICE = builder(2, 1.8F).alwaysEdible().build(); FoodComponent BURNED_JUICE = builder(3, 1).build(); + FoodComponent NUT_BOWL = FoodComponents.BAKED_POTATO; //builder(4, 0.6F).build(); + + FoodComponent OATMEAL_COOKIE = FoodComponents.COOKIE; //builder(2, 0.1F).build(); + FoodComponent CHOCOLATE_OATMEAL_COOKIE = builder(3, 0.4F).build(); + FoodComponent SCONE = builder(2, 0.2F).build(); + @Deprecated FoodComponent RANDOM_FOLIAGE = builder(2, 1).build(); @Deprecated diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItems.java b/src/main/java/com/minelittlepony/unicopia/item/UItems.java index 5e365031..242e9a13 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/UItems.java +++ b/src/main/java/com/minelittlepony/unicopia/item/UItems.java @@ -75,12 +75,14 @@ public interface UItems { Item IMPORTED_OATS = register("imported_oats", new Item(new Item.Settings().food(UFoodComponents.IMPORTED_OATS)), ItemGroups.FOOD_AND_DRINK); Item OATMEAL = register("oatmeal", new OatmealItem(new Item.Settings().recipeRemainder(Items.BOWL).maxCount(1).food(UFoodComponents.OATMEAL)), ItemGroups.FOOD_AND_DRINK); - Item OATMEAL_COOKIE = register("oatmeal_cookie", new Item(new Item.Settings().food(FoodComponents.COOKIE)), ItemGroups.FOOD_AND_DRINK); + Item OATMEAL_COOKIE = register("oatmeal_cookie", new Item(new Item.Settings().food(UFoodComponents.OATMEAL_COOKIE)), ItemGroups.FOOD_AND_DRINK); + Item CHOCOLATE_OATMEAL_COOKIE = register("chocolate_oatmeal_cookie", new Item(new Item.Settings().food(UFoodComponents.CHOCOLATE_OATMEAL_COOKIE)), ItemGroups.FOOD_AND_DRINK); Item PINECONE_COOKIE = register("pinecone_cookie", new Item(new Item.Settings().food(FoodComponents.COOKIE)), ItemGroups.FOOD_AND_DRINK); - Item BOWL_OF_NUTS = register("bowl_of_nuts", new StewItem(new Item.Settings().food(FoodComponents.BAKED_POTATO).recipeRemainder(Items.BOWL)), ItemGroups.FOOD_AND_DRINK); + Item BOWL_OF_NUTS = register("bowl_of_nuts", new StewItem(new Item.Settings().food(UFoodComponents.NUT_BOWL).recipeRemainder(Items.BOWL)), ItemGroups.FOOD_AND_DRINK); + Item SCONE = register("scone", new MuffinItem(new Item.Settings().maxCount(32).food(UFoodComponents.SCONE), 0), ItemGroups.FOOD_AND_DRINK); Item DAFFODIL_DAISY_SANDWICH = register("daffodil_daisy_sandwich", new Item(new Item.Settings().food(UFoodComponents.DAFODIL_DAISY_SANDWICH)), ItemGroups.FOOD_AND_DRINK); - Item HAY_BURGER = register("hay_burger", new Item(new Item.Settings().maxCount(1).food(UFoodComponents.HAY_BURGER)), ItemGroups.FOOD_AND_DRINK); + Item HAY_BURGER = register("hay_burger", new Item(new Item.Settings().maxCount(1).food(UFoodComponents.BURGER)), ItemGroups.FOOD_AND_DRINK); Item HAY_FRIES = register("hay_fries", new Item(new Item.Settings().maxCount(16).food(UFoodComponents.HAY_FRIES)), ItemGroups.FOOD_AND_DRINK); Item CRISPY_HAY_FRIES = register("crispy_hay_fries", new Item(new Item.Settings().maxCount(16).food(UFoodComponents.CRISPY_HAY_FRIES)), ItemGroups.FOOD_AND_DRINK); /** diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index 6b3a168b..22f18738 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -147,7 +147,9 @@ "item.unicopia.wheat_worms": "Wheat Worms", "item.unicopia.baited_fishing_rod": "Baited Fishing Rod", "item.unicopia.muffin": "Muffin", + "item.unicopia.scone": "Scone", "item.unicopia.oatmeal_cookie": "Oatmeal Cookie", + "item.unicopia.chocolate_oatmeal_cookie": "Chocolate Oatmeal Cookie", "item.unicopia.pinecone_cookie": "Pinecone Cookie", "item.unicopia.bowl_of_nuts": "Bowl of Nuts", diff --git a/src/main/resources/assets/unicopia/textures/item/chocolate_oatmeal_cookie.png b/src/main/resources/assets/unicopia/textures/item/chocolate_oatmeal_cookie.png new file mode 100644 index 0000000000000000000000000000000000000000..d3396a3a71ef6a0d413dd0e6b587d53f83047d8d GIT binary patch literal 9392 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/data/unicopia/tags/items/food_types/baked_goods.json b/src/main/resources/data/unicopia/tags/items/food_types/baked_goods.json index b28e7389..e9ac11e8 100644 --- a/src/main/resources/data/unicopia/tags/items/food_types/baked_goods.json +++ b/src/main/resources/data/unicopia/tags/items/food_types/baked_goods.json @@ -4,6 +4,7 @@ "minecraft:bread", "minecraft:cookie", "unicopia:muffin", + "unicopia:scone", "#c:grain", "unicopia:cooked_zap_apple", "minecraft:pumpkin_pie", @@ -18,6 +19,7 @@ "unicopia:crispy_hay_fries", "unicopia:horse_shoe_fries", "unicopia:oatmeal_cookie", + "unicopia:chocolate_oatmeal_cookie", "unicopia:pinecone_cookie", "unicopia:bowl_of_nuts", { "id": "farmersdelight:wheat_dough", "required": false },