diff --git a/src/main/java/com/minelittlepony/unicopia/item/toxin/Toxics.java b/src/main/java/com/minelittlepony/unicopia/item/toxin/Toxics.java index 64486cd6..843f4b89 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/toxin/Toxics.java +++ b/src/main/java/com/minelittlepony/unicopia/item/toxin/Toxics.java @@ -25,6 +25,12 @@ public interface Toxics { .with(Race.CHANGELING, of(FAIR, LOVE_SICKNESS)) ); + Toxic FORAGE_EDIBLE_FILLING = register("forage_edible_filling", new Toxic.Builder(Ailment.INNERT) + .food(UFoodComponents.RANDOM_FOLIAGE_FILLING) + .with(Race.HUMAN, of(LETHAL, FOOD_POISONING)) + .with(Race.CHANGELING, of(FAIR, LOVE_SICKNESS)) + ); + Toxic FORAGE_RISKY = register("forage_risky", new Toxic.Builder(of(FAIR, WEAK_NAUSEA.withChance(20))) .food(UFoodComponents.RANDOM_FOLIAGE) .with(Race.HUMAN, of(LETHAL, FOOD_POISONING)) diff --git a/src/main/java/com/minelittlepony/unicopia/item/toxin/UFoodComponents.java b/src/main/java/com/minelittlepony/unicopia/item/toxin/UFoodComponents.java index 5445a403..ba654e42 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/toxin/UFoodComponents.java +++ b/src/main/java/com/minelittlepony/unicopia/item/toxin/UFoodComponents.java @@ -24,6 +24,7 @@ public interface UFoodComponents { FoodComponent BURNED_JUICE = builder(3, 1).build(); FoodComponent RANDOM_FOLIAGE = builder(2, 1).build(); + FoodComponent RANDOM_FOLIAGE_FILLING = builder(18, 1).build(); FoodComponent INSECTS = builder(1, 0).alwaysEdible().build(); FoodComponent CEREAL = builder(9, 0.8F).build(); 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 b2b4d2cb..6150dbdf 100644 --- a/src/main/resources/data/c/tags/items/foraging/edibles.json +++ b/src/main/resources/data/c/tags/items/foraging/edibles.json @@ -2,7 +2,6 @@ "replace": false, "values": [ { "id": "#c:mushrooms", "required": false }, - { "id": "#c:saplings", "required": false }, - { "id": "farmersdelight:horse_feed", "required": false } + { "id": "#c:saplings", "required": false } ] } diff --git a/src/main/resources/data/c/tags/items/foraging/edibles_filling.json b/src/main/resources/data/c/tags/items/foraging/edibles_filling.json new file mode 100644 index 00000000..c183c3fb --- /dev/null +++ b/src/main/resources/data/c/tags/items/foraging/edibles_filling.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + { "id": "farmersdelight:horse_feed", "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 570aafda..819fd30d 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 @@ -9,7 +9,6 @@ "minecraft:peony", "minecraft:dandelion", "minecraft:tall_grass", - "minecraft:hay_block", "minecraft:wheat", "#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 new file mode 100644 index 00000000..c3245df5 --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/food_types/forage_edible_filling.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:hay_block", + "#c:foraging/edibles_filling" + ] +}