From 80cb31222b2ea604d84d61cbb90b7c7a3da36a71 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 3 Sep 2023 22:13:36 +0100 Subject: [PATCH] Change the horse feed creative tab into a "Foraging" tab and make more blocks foragable --- .../unicopia/item/group/UItemGroups.java | 12 ++---------- .../resources/assets/unicopia/lang/en_us.json | 4 ++-- .../data/c/tags/items/foraging/edibles.json | 3 ++- .../tags/items/food_types/forage_edible.json | 2 ++ .../items/food_types/forage_edible_filling.json | 1 + .../tags/items/food_types/forage_prickly.json | 3 ++- .../food_types/forage_severely_nauseating.json | 2 +- .../data/unicopia/tags/items/groups/foraging.json | 15 +++++++++++++++ 8 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 src/main/resources/data/unicopia/tags/items/groups/foraging.json diff --git a/src/main/java/com/minelittlepony/unicopia/item/group/UItemGroups.java b/src/main/java/com/minelittlepony/unicopia/item/group/UItemGroups.java index 077863d4..9fe298f6 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/group/UItemGroups.java +++ b/src/main/java/com/minelittlepony/unicopia/item/group/UItemGroups.java @@ -4,23 +4,15 @@ import java.util.stream.Stream; import com.minelittlepony.unicopia.item.ChameleonItem; import com.minelittlepony.unicopia.item.UItems; -import com.minelittlepony.unicopia.item.toxin.Toxic; -import com.minelittlepony.unicopia.item.toxin.ToxicHolder; - import net.minecraft.item.*; -import net.minecraft.registry.Registries; import net.minecraft.registry.RegistryKey; public interface UItemGroups { - RegistryKey ALL_ITEMS = ItemGroupRegistry.createDynamic("items", UItems.EMPTY_JAR::getDefaultStack, () -> { + RegistryKey ALL_ITEMS = ItemGroupRegistry.createDynamic("items", UItems.CRYSTAL_HEART::getDefaultStack, () -> { return Stream.concat(Stream.of(Items.APPLE), ItemGroupRegistry.ITEMS.stream() .filter(item -> !(item instanceof ChameleonItem) || ((ChameleonItem)item).isFullyDisguised())); }); - RegistryKey HORSE_FEED = ItemGroupRegistry.createDynamic("horsefeed", UItems.ZAP_APPLE::getDefaultStack, () -> { - return Registries.ITEM.stream() - .filter(item -> ((ToxicHolder)item).getToxic(item.getDefaultStack()) != Toxic.EMPTY); - }); - + RegistryKey FORAGING_ITEMS = ItemGroupRegistry.createGroupFromTag("foraging", Items.HAY_BLOCK::getDefaultStack); RegistryKey EARTH_PONY_ITEMS = ItemGroupRegistry.createGroupFromTag("earth_pony", UItems.EARTH_BADGE::getDefaultStack); RegistryKey UNICORN_ITEMS = ItemGroupRegistry.createGroupFromTag("unicorn", UItems.UNICORN_BADGE::getDefaultStack); RegistryKey PEGASUS_ITEMS = ItemGroupRegistry.createGroupFromTag("pegasus", UItems.PEGASUS_BADGE::getDefaultStack); diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index a9d5e07c..3a2337a7 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -11,8 +11,8 @@ "ability.unicopia.too_low": "I need to get higher up", "ability.unicopia.clear_skies": "The skies already look pretty clear", - "itemGroup.unicopia.items": "Unicopia - Misc.", - "itemGroup.unicopia.horsefeed": "Unicopia - Horse Feed", + "itemGroup.unicopia.items": "Unicopia", + "itemGroup.unicopia.foraging": "Unicopia - Foraging", "itemGroup.unicopia.earth_pony": "Unicopia - Ponyville", "itemGroup.unicopia.unicorn": "Unicopia - Canterlot", "itemGroup.unicopia.pegasus": "Unicopia - Cloudsdale", diff --git a/src/main/resources/data/c/tags/items/foraging/edibles.json b/src/main/resources/data/c/tags/items/foraging/edibles.json index 6150dbdf..02f30bd2 100644 --- a/src/main/resources/data/c/tags/items/foraging/edibles.json +++ b/src/main/resources/data/c/tags/items/foraging/edibles.json @@ -2,6 +2,7 @@ "replace": false, "values": [ { "id": "#c:mushrooms", "required": false }, - { "id": "#c:saplings", "required": false } + { "id": "#c:saplings", "required": false }, + { "id": "farmersdelight:sandy_shrub", "required": false } ] } diff --git a/src/main/resources/data/unicopia/tags/items/food_types/forage_edible.json b/src/main/resources/data/unicopia/tags/items/food_types/forage_edible.json index 819fd30d..50a1fd8b 100644 --- a/src/main/resources/data/unicopia/tags/items/food_types/forage_edible.json +++ b/src/main/resources/data/unicopia/tags/items/food_types/forage_edible.json @@ -10,6 +10,8 @@ "minecraft:dandelion", "minecraft:tall_grass", "minecraft:wheat", + "minecraft:dead_bush", + "minecraft:pink_petals", "#c:foraging/edibles" ] } diff --git a/src/main/resources/data/unicopia/tags/items/food_types/forage_edible_filling.json b/src/main/resources/data/unicopia/tags/items/food_types/forage_edible_filling.json index aedd6c7f..ce1ec0f6 100644 --- a/src/main/resources/data/unicopia/tags/items/food_types/forage_edible_filling.json +++ b/src/main/resources/data/unicopia/tags/items/food_types/forage_edible_filling.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "minecraft:hay_block", + "#minecraft:leaves", "#c:foraging/edibles_filling", { "id": "farmersdelight:rice_bale", "required": false } ] diff --git a/src/main/resources/data/unicopia/tags/items/food_types/forage_prickly.json b/src/main/resources/data/unicopia/tags/items/food_types/forage_prickly.json index 2b1e3945..3fbb59d5 100644 --- a/src/main/resources/data/unicopia/tags/items/food_types/forage_prickly.json +++ b/src/main/resources/data/unicopia/tags/items/food_types/forage_prickly.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "minecraft:rose_bush" + "minecraft:rose_bush", + "#minecraft:saplings" ] } diff --git a/src/main/resources/data/unicopia/tags/items/food_types/forage_severely_nauseating.json b/src/main/resources/data/unicopia/tags/items/food_types/forage_severely_nauseating.json index ac9767c7..4021dc09 100644 --- a/src/main/resources/data/unicopia/tags/items/food_types/forage_severely_nauseating.json +++ b/src/main/resources/data/unicopia/tags/items/food_types/forage_severely_nauseating.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:dead_bush" + ] } diff --git a/src/main/resources/data/unicopia/tags/items/groups/foraging.json b/src/main/resources/data/unicopia/tags/items/groups/foraging.json new file mode 100644 index 00000000..805c9869 --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/groups/foraging.json @@ -0,0 +1,15 @@ +{ + "replace": false, + "values": [ + "#unicopia:food_types/forage_dangerous", + "#unicopia:food_types/forage_edible_filling", + "#unicopia:food_types/forage_edible", + "#unicopia:food_types/forage_nauseating", + "#unicopia:food_types/forage_prickly", + "#unicopia:food_types/forage_radioactive", + "#unicopia:food_types/forage_risky", + "#unicopia:food_types/forage_severely_nauseating", + "#unicopia:food_types/forage_severely_prickly", + "#unicopia:food_types/forage_strengthening" + ] +}