From 7cf32cce521699ed37c03c5cdf5636fc425fcfbd Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 27 Mar 2024 19:24:06 +0000 Subject: [PATCH] Added bowl of nuts, oatmeal cookie, and pinecone cookie --- .../datagen/providers/UModelProvider.java | 6 ++--- .../UBlockAdditionsLootTableProvider.java | 22 +++++++++++++----- .../providers/recipe/URecipeProvider.java | 11 +++++++++ .../minelittlepony/unicopia/item/UItems.java | 4 ++++ .../resources/assets/unicopia/lang/en_us.json | 3 +++ .../unicopia/textures/item/bowl_of_nuts.png | Bin 0 -> 8620 bytes .../unicopia/textures/item/oatmeal_cookie.png | Bin 0 -> 9087 bytes .../textures/item/pinecone_cookie.png | Bin 0 -> 9118 bytes .../tags/items/food_types/baked_goods.json | 3 +++ .../tags/items/groups/earth_pony.json | 3 +++ 10 files changed, 43 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/assets/unicopia/textures/item/bowl_of_nuts.png create mode 100644 src/main/resources/assets/unicopia/textures/item/oatmeal_cookie.png create mode 100644 src/main/resources/assets/unicopia/textures/item/pinecone_cookie.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 64bbc4be..1c58e4f7 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java @@ -57,7 +57,7 @@ public class UModelProvider extends FabricModelProvider { public void generateItemModels(ItemModelGenerator itemModelGenerator) { ItemModels.register(itemModelGenerator, UItems.ACORN, UItems.APPLE_PIE_HOOF, UItems.APPLE_PIE_SLICE, UItems.APPLE_PIE, - UItems.BANANA, UItems.BOTCHED_GEM, UItems.BROKEN_SUNGLASSES, UItems.BURNED_JUICE, UItems.BURNED_TOAST, + 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.DAFFODIL_DAISY_SANDWICH, UItems.DRAGON_BREATH_SCROLL, UItems.EMPTY_JAR, @@ -69,8 +69,8 @@ public class UModelProvider extends FabricModelProvider { UItems.JAM_TOAST, UItems.JUICE, UItems.LIGHTNING_JAR, UItems.MANGO, UItems.MUFFIN, - UItems.OATMEAL, - UItems.PEBBLES, UItems.PEGASUS_FEATHER, UItems.PINECONE, UItems.PINEAPPLE_CROWN, + UItems.OATMEAL, UItems.OATMEAL_COOKIE, + 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, UItems.SWEET_APPLE_SEEDS, UItems.SWEET_APPLE, diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UBlockAdditionsLootTableProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UBlockAdditionsLootTableProvider.java index 9788e234..4663bd66 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UBlockAdditionsLootTableProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UBlockAdditionsLootTableProvider.java @@ -11,6 +11,7 @@ import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.data.server.loottable.BlockLootTableGenerator; import net.minecraft.enchantment.Enchantments; +import net.minecraft.item.ItemConvertible; import net.minecraft.loot.LootPool; import net.minecraft.loot.LootTable; import net.minecraft.loot.condition.LootCondition; @@ -54,18 +55,29 @@ public class UBlockAdditionsLootTableProvider extends FabricBlockLootTableProvid addVanillaDrop(Blocks.PODZOL, block -> wormDrops(block, 4, 0.06F, 0.062222223F, 0.065F, 0.077777776F, 0.2F)); addVanillaDrop(Blocks.DIAMOND_ORE, this::crystalShardDrops); addVanillaDrop(Blocks.DEEPSLATE_DIAMOND_ORE, this::crystalShardDrops); + addVanillaDrop(Blocks.OAK_LEAVES, block -> chanceDropWithShears(block, UItems.ACORN, GEMSTONES_FORTUNE_CHANCE)); + addVanillaDrop(Blocks.SPRUCE_LEAVES, block -> chanceDropWithShears(block, UItems.PINECONE, GEMSTONES_FORTUNE_CHANCE)); } private void addVanillaDrop(Block block, Function lootTableFunction) { lootTables.put(new Identifier("unicopiamc", block.getLootTableId().getPath()), lootTableFunction.apply(block)); } + public LootTable.Builder chanceDropWithShears(Block block, ItemConvertible drop, float...chance) { + return LootTable.builder() + .pool(LootPool.builder() + .rolls(ConstantLootNumberProvider.create(1)) + .conditionally(WITHOUT_SILK_TOUCH.and(WITH_SHEARS)) + .with(chanceDrops(block, drop, 1, chance)) + ); + } + public LootTable.Builder wormDrops(Block block, int max, float...chance) { return LootTable.builder() .pool(LootPool.builder() .rolls(ConstantLootNumberProvider.create(1)) .conditionally(WITHOUT_SILK_TOUCH) - .with(wheatwormDrops(block, max, chance)) + .with(chanceDrops(block, UItems.WHEAT_WORMS, max, chance)) ); } @@ -75,7 +87,7 @@ public class UBlockAdditionsLootTableProvider extends FabricBlockLootTableProvid .rolls(ConstantLootNumberProvider.create(1)) .conditionally(WITHOUT_SILK_TOUCH) .with(gemstoneDrops(block, 0.1F)) - .with(wheatwormDrops(block, max, chance)) + .with(chanceDrops(block, UItems.WHEAT_WORMS, max, chance)) ); } @@ -111,16 +123,14 @@ public class UBlockAdditionsLootTableProvider extends FabricBlockLootTableProvid .conditionally(TableBonusLootCondition.builder(Enchantments.FORTUNE, GEMSTONES_FORTUNE_CHANCE)); } - public LootPoolEntry.Builder wheatwormDrops(Block block, int max, float...chance) { - return applyExplosionDecay(block, ItemEntry.builder(UItems.WHEAT_WORMS) + public LootPoolEntry.Builder chanceDrops(Block block, ItemConvertible drop, int max, float...chance) { + return applyExplosionDecay(block, ItemEntry.builder(drop) .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1, max))) ) .conditionally(TableBonusLootCondition.builder(Enchantments.FORTUNE, chance)); } - public static LootTable.Builder dropsWithGemfinding(Block drop, LootPoolEntry.Builder child) { return BlockLootTableGenerator.drops(drop, WITHOUT_SILK_TOUCH_AND_GEM_FINDER, child); } - } 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 ed82fb66..57340e26 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 @@ -315,6 +315,17 @@ public class URecipeProvider extends FabricRecipeProvider { .input(UItems.ROCK, 3).criterion(hasItem(UItems.ROCK), conditionsFromItem(UItems.ROCK)) .input(Items.BOWL) .offerTo(exporter); + ShapelessRecipeJsonBuilder.create(RecipeCategory.FOOD, UItems.BOWL_OF_NUTS) + .input(UItems.ACORN, 3).criterion(hasItem(UItems.ACORN), conditionsFromItem(UItems.ACORN)) + .input(Items.BOWL) + .offerTo(exporter); + ShapelessRecipeJsonBuilder.create(RecipeCategory.FOOD, UItems.OATMEAL_COOKIE) + .input(UItems.OATS, 3).criterion(hasItem(UItems.OATS), conditionsFromItem(UItems.OATS)) + .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.ROCK_CANDY, 3) .input(Items.SUGAR, 6).criterion(hasItem(Items.SUGAR), conditionsFromItem(Items.SUGAR)) .input(UItems.PEBBLES, 3) diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItems.java b/src/main/java/com/minelittlepony/unicopia/item/UItems.java index 1f036829..ce60d14b 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/UItems.java +++ b/src/main/java/com/minelittlepony/unicopia/item/UItems.java @@ -75,6 +75,10 @@ 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 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 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_FRIES = register("hay_fries", new Item(new Item.Settings().maxCount(16).food(UFoodComponents.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 0941798f..8558c7b3 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -146,6 +146,9 @@ "item.unicopia.horse_shoe_fries": "Horse Shoe Fries", "item.unicopia.wheat_worms": "Wheat Worms", "item.unicopia.muffin": "Muffin", + "item.unicopia.oatmeal_cookie": "Oatmeal Cookie", + "item.unicopia.pinecone_cookie": "Pinecone Cookie", + "item.unicopia.bowl_of_nuts": "Bowl of Nuts", "item.unicopia.pegasus_amulet": "Wings of Icarus", "item.unicopia.pegasus_amulet.lore": "Grants temporary flight to whoever wears it", diff --git a/src/main/resources/assets/unicopia/textures/item/bowl_of_nuts.png b/src/main/resources/assets/unicopia/textures/item/bowl_of_nuts.png new file mode 100644 index 0000000000000000000000000000000000000000..8e684446c117429bfb1a6b04ce495bbffd916317 GIT binary patch literal 8620 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 Z1Z)@0k=!EON)o-*I*~Tm725d6{S$aW#=ign literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/unicopia/textures/item/oatmeal_cookie.png b/src/main/resources/assets/unicopia/textures/item/oatmeal_cookie.png new file mode 100644 index 0000000000000000000000000000000000000000..daa46c80f62cfae0c47d488bae33a9d8a0f1d036 GIT binary patch literal 9087 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/unicopia/textures/item/pinecone_cookie.png b/src/main/resources/assets/unicopia/textures/item/pinecone_cookie.png new file mode 100644 index 0000000000000000000000000000000000000000..79fb1ed76ed999e863ea7a0f4878139271f7d9f6 GIT binary patch literal 9118 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 KbD?8!{NDhhiccW` 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 02828b2e..b28e7389 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 @@ -17,6 +17,9 @@ "unicopia:hay_fries", "unicopia:crispy_hay_fries", "unicopia:horse_shoe_fries", + "unicopia:oatmeal_cookie", + "unicopia:pinecone_cookie", + "unicopia:bowl_of_nuts", { "id": "farmersdelight:wheat_dough", "required": false }, { "id": "farmersdelight:raw_pasta", "required": false }, { "id": "farmersdelight:pie_crust", "required": false }, diff --git a/src/main/resources/data/unicopia/tags/items/groups/earth_pony.json b/src/main/resources/data/unicopia/tags/items/groups/earth_pony.json index d88b92b7..e3ec6fc3 100644 --- a/src/main/resources/data/unicopia/tags/items/groups/earth_pony.json +++ b/src/main/resources/data/unicopia/tags/items/groups/earth_pony.json @@ -51,6 +51,7 @@ "unicopia:oats", "unicopia:imported_oats", "unicopia:oatmeal", + "unicopia:oatmeal_cookie", "unicopia:daffodil_daisy_sandwich", "unicopia:hay_burger", "unicopia:hay_fries", @@ -61,6 +62,8 @@ "unicopia:muffin", "unicopia:acorn", "unicopia:pinecone", + "unicopia:pinecone_cookie", + "unicopia:bowl_of_nuts", "unicopia:crystal_shard", "unicopia:pebbles", "unicopia:rock",