From 0a06dee124000d0cf711e6974a878d9fc4897d6e Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 12 Jun 2021 17:16:42 +0200 Subject: [PATCH] Move toxics to item tags and add a default for when a food isn't registered --- .../com/minelittlepony/unicopia/Race.java | 2 +- .../com/minelittlepony/unicopia/UTags.java | 10 +-- .../minelittlepony/unicopia/item/UItems.java | 1 - .../unicopia/item/toxin/FoodType.java | 4 +- .../unicopia/item/toxin/Toxic.java | 20 ++++- .../unicopia/item/toxin/ToxicHolder.java | 2 - .../unicopia/item/toxin/Toxics.java | 82 ++++++++++--------- .../unicopia/mixin/MixinItem.java | 24 ++++-- .../data/unicopia/tags/items/cooked_fish.json | 7 ++ .../data/unicopia/tags/items/cooked_meat.json | 10 +++ .../unicopia/tags/items/forage_blinding.json | 6 ++ .../unicopia/tags/items/forage_dangerous.json | 6 ++ .../{non_toxic.json => forage_edible.json} | 4 - .../tags/items/forage_nauseating.json | 6 ++ .../unicopia/tags/items/forage_prickly.json | 6 ++ .../tags/items/forage_radioactive.json | 6 ++ .../{fairly_toxic.json => forage_risky.json} | 0 .../items/forage_severely_nauseating.json | 6 ++ .../tags/items/forage_severely_prickly.json | 6 ++ .../tags/items/forage_strengthening.json | 6 ++ .../data/unicopia/tags/items/raw_fish.json | 9 ++ .../data/unicopia/tags/items/raw_meat.json | 10 +++ .../unicopia/tags/items/severely_toxic.json | 10 --- 23 files changed, 172 insertions(+), 71 deletions(-) create mode 100644 src/main/resources/data/unicopia/tags/items/cooked_fish.json create mode 100644 src/main/resources/data/unicopia/tags/items/cooked_meat.json create mode 100644 src/main/resources/data/unicopia/tags/items/forage_blinding.json create mode 100644 src/main/resources/data/unicopia/tags/items/forage_dangerous.json rename src/main/resources/data/unicopia/tags/items/{non_toxic.json => forage_edible.json} (68%) create mode 100644 src/main/resources/data/unicopia/tags/items/forage_nauseating.json create mode 100644 src/main/resources/data/unicopia/tags/items/forage_prickly.json create mode 100644 src/main/resources/data/unicopia/tags/items/forage_radioactive.json rename src/main/resources/data/unicopia/tags/items/{fairly_toxic.json => forage_risky.json} (100%) create mode 100644 src/main/resources/data/unicopia/tags/items/forage_severely_nauseating.json create mode 100644 src/main/resources/data/unicopia/tags/items/forage_severely_prickly.json create mode 100644 src/main/resources/data/unicopia/tags/items/forage_strengthening.json create mode 100644 src/main/resources/data/unicopia/tags/items/raw_fish.json create mode 100644 src/main/resources/data/unicopia/tags/items/raw_meat.json delete mode 100644 src/main/resources/data/unicopia/tags/items/severely_toxic.json diff --git a/src/main/java/com/minelittlepony/unicopia/Race.java b/src/main/java/com/minelittlepony/unicopia/Race.java index 286fe774..a2fd6e63 100644 --- a/src/main/java/com/minelittlepony/unicopia/Race.java +++ b/src/main/java/com/minelittlepony/unicopia/Race.java @@ -51,7 +51,7 @@ public enum Race implements Affine { public boolean canConsume(FoodType type) { if (!isUsable()) { - return type != FoodType.VEGAN; + return type != FoodType.FORAGE; } if (type.isMeat()) { return this == BAT || this == CHANGELING || this == HUMAN; diff --git a/src/main/java/com/minelittlepony/unicopia/UTags.java b/src/main/java/com/minelittlepony/unicopia/UTags.java index 169897ef..0ee5fd35 100644 --- a/src/main/java/com/minelittlepony/unicopia/UTags.java +++ b/src/main/java/com/minelittlepony/unicopia/UTags.java @@ -1,5 +1,7 @@ package com.minelittlepony.unicopia; +import com.minelittlepony.unicopia.item.toxin.Toxics; + import net.fabricmc.fabric.api.tag.TagRegistry; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -10,10 +12,6 @@ public interface UTags { Tag APPLES = item("apples"); Tag FESH_APPLES = item("fresh_apples"); - Tag NON_TOXIC = item("non_toxic"); - Tag FAIRLY_TOXIC = item("fairly_toxic"); - Tag SEVERELY_TOXIC = item("severely_toxic"); - Tag FALLS_SLOWLY = item("falls_slowly"); Tag FRAGILE = block("fragile"); @@ -30,5 +28,7 @@ public interface UTags { return TagRegistry.block(new Identifier("unicopia", name)); } - static void bootstrap() { } + static void bootstrap() { + Toxics.bootstrap(); + } } diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItems.java b/src/main/java/com/minelittlepony/unicopia/item/UItems.java index 2510c871..44da7065 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/UItems.java +++ b/src/main/java/com/minelittlepony/unicopia/item/UItems.java @@ -87,7 +87,6 @@ public interface UItems { } static void bootstrap() { - Toxics.bootstrap(); UEnchantments.bootstrap(); URecipes.bootstrap(); UItemGroups.bootstrap(); diff --git a/src/main/java/com/minelittlepony/unicopia/item/toxin/FoodType.java b/src/main/java/com/minelittlepony/unicopia/item/toxin/FoodType.java index a39bb879..f840c450 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/toxin/FoodType.java +++ b/src/main/java/com/minelittlepony/unicopia/item/toxin/FoodType.java @@ -3,10 +3,10 @@ package com.minelittlepony.unicopia.item.toxin; public enum FoodType { RAW_MEAT, COOKED_MEAT, RAW_FISH, COOKED_FISH, - VEGAN; + FORAGE; public boolean isRaw() { - return this == RAW_MEAT || this == RAW_FISH || this == VEGAN; + return this == RAW_MEAT || this == RAW_FISH || this == FORAGE; } public boolean isMeat() { diff --git a/src/main/java/com/minelittlepony/unicopia/item/toxin/Toxic.java b/src/main/java/com/minelittlepony/unicopia/item/toxin/Toxic.java index 462b10d6..6bea4c66 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/toxin/Toxic.java +++ b/src/main/java/com/minelittlepony/unicopia/item/toxin/Toxic.java @@ -1,5 +1,7 @@ package com.minelittlepony.unicopia.item.toxin; +import java.util.Optional; +import java.util.function.Predicate; import java.util.function.Supplier; import com.minelittlepony.unicopia.Race; @@ -10,6 +12,8 @@ import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.FoodComponent; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; import net.minecraft.util.Hand; @@ -25,13 +29,27 @@ public class Toxic { private final FoodType type; - Toxic(UseAction action, FoodType type, Ailment lowerBound, Ailment upperBound) { + private final Optional component; + + private final Predicate tag; + + Toxic(UseAction action, FoodType type, Optional component, Predicate tag, Ailment lowerBound, Ailment upperBound) { this.action = action; this.type = type; + this.component = component; + this.tag = tag; this.lowerBound = lowerBound; this.upperBound = upperBound; } + public boolean matches(Item item) { + return tag.test(item); + } + + public Optional getFoodComponent() { + return component; + } + public UseAction getUseAction(ItemStack stack) { return action; } diff --git a/src/main/java/com/minelittlepony/unicopia/item/toxin/ToxicHolder.java b/src/main/java/com/minelittlepony/unicopia/item/toxin/ToxicHolder.java index b788678c..377fbf15 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/toxin/ToxicHolder.java +++ b/src/main/java/com/minelittlepony/unicopia/item/toxin/ToxicHolder.java @@ -7,8 +7,6 @@ import net.minecraft.item.FoodComponent; public interface ToxicHolder { void setFood(FoodComponent food); - void setToxic(Toxic toxic); - default Optional getToxic() { return Optional.empty(); } 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 e1eb085c..e84443eb 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/toxin/Toxics.java +++ b/src/main/java/com/minelittlepony/unicopia/item/toxin/Toxics.java @@ -1,62 +1,66 @@ package com.minelittlepony.unicopia.item.toxin; -import java.util.Objects; +import java.util.Optional; +import java.util.function.Predicate; + +import com.minelittlepony.unicopia.UTags; +import com.minelittlepony.unicopia.util.Registries; import net.minecraft.item.FoodComponent; import net.minecraft.item.Item; import net.minecraft.item.Items; +import net.minecraft.util.Identifier; import net.minecraft.util.UseAction; +import net.minecraft.util.registry.Registry; + +import static com.minelittlepony.unicopia.item.toxin.Toxicity.*; +import static com.minelittlepony.unicopia.item.toxin.Toxin.*; public interface Toxics { - Toxic FORAGED = register(UFoodComponents.RANDOM_FOLIAGE, FoodType.VEGAN, UseAction.EAT, Toxicity.SAFE, Items.DANDELION, Items.BLUE_ORCHID, Items.RED_TULIP, Items.ORANGE_TULIP, Items.PINK_TULIP, Items.CORNFLOWER, Items.PEONY, Items.TALL_GRASS); - Toxic RISKY_FORAGED = register(UFoodComponents.RANDOM_FOLIAGE, FoodType.VEGAN, UseAction.EAT, Toxicity.FAIR, Items.ALLIUM, Items.WHITE_TULIP); - Toxic DANGER_FORAGED = register(UFoodComponents.RANDOM_FOLIAGE, FoodType.VEGAN, UseAction.EAT, Toxicity.SEVERE, Items.POPPY); + Registry REGISTRY = Registries.createSimple(new Identifier("unicopia:toxic")); - Toxic GRASS = register(UFoodComponents.RANDOM_FOLIAGE, FoodType.VEGAN, UseAction.EAT, Toxicity.SAFE, Toxin.NAUSEA, Items.GRASS); - Toxic AZUER_BLUET = register(UFoodComponents.RANDOM_FOLIAGE, FoodType.VEGAN, UseAction.EAT, Toxicity.SAFE, Toxin.RADIOACTIVITY, Items.AZURE_BLUET); - Toxic ROSE_BUSH = register(UFoodComponents.RANDOM_FOLIAGE, FoodType.VEGAN, UseAction.EAT, Toxicity.SAFE, Toxin.DAMAGE, Items.ROSE_BUSH); - Toxic FERN = register(UFoodComponents.RANDOM_FOLIAGE, FoodType.VEGAN, UseAction.EAT, Toxicity.SEVERE, Toxin.STRENGTH, Items.FERN); - Toxic DEAD_BUSH = register(UFoodComponents.RANDOM_FOLIAGE, FoodType.VEGAN, UseAction.EAT, Toxicity.SEVERE, Toxin.NAUSEA, Items.DEAD_BUSH); - Toxic OXEYE_DAISY = register(UFoodComponents.RANDOM_FOLIAGE, FoodType.VEGAN, UseAction.EAT, Toxicity.SEVERE, Toxin.BLINDNESS, Items.OXEYE_DAISY); - Toxic LARGE_FERN = register(UFoodComponents.RANDOM_FOLIAGE, FoodType.VEGAN, UseAction.EAT, Toxicity.SEVERE, Toxin.DAMAGE, Items.LARGE_FERN); + Toxic EDIBLE = forage("edible", SAFE, FOOD); + Toxic RISKY = forage("risky", FAIR, FOOD); + Toxic DANGEROUS = forage("dangerous", SEVERE, FOOD); + Toxic NAUSEATING = forage("nauseating", SAFE, NAUSEA); + Toxic RADIOACTIVE = forage("radioactive", SAFE, RADIOACTIVITY); + Toxic PRICKLY = forage("prickly", SAFE, DAMAGE); + Toxic STRENGHTENING = forage("strengthening", SEVERE, STRENGTH); + Toxic SEVERELY_NAUSEATING = forage("severely_nauseating", SEVERE, NAUSEA); + Toxic BLINDING = forage("blinding", SEVERE, BLINDNESS); + Toxic SEVERELY_PRICKLY = forage("severely_prickly", SEVERE, DAMAGE); - Toxic RAW_MEAT = register(new Toxic(UseAction.EAT, FoodType.RAW_MEAT, Ailment.INNERT, Ailment.of(Toxicity.MILD)), Items.PORKCHOP, Items.BEEF, Items.MUTTON, Items.RABBIT, Items.CHICKEN); - Toxic COOKED_MEAT = register(new Toxic(UseAction.EAT, FoodType.COOKED_MEAT, Ailment.INNERT, Ailment.of(Toxicity.MILD)), Items.COOKED_PORKCHOP, Items.COOKED_BEEF, Items.COOKED_MUTTON, Items.COOKED_RABBIT, Items.COOKED_CHICKEN); + Toxic RAW_MEAT = meat(FoodType.RAW_MEAT, MILD); + Toxic COOKED_MEAT = meat(FoodType.COOKED_MEAT, MILD); - Toxic RAW_FISH = register(new Toxic(UseAction.EAT, FoodType.RAW_FISH, Ailment.INNERT, Ailment.of(Toxicity.FAIR)), Items.PUFFERFISH, Items.COD, Items.SALMON, Items.TROPICAL_FISH); - Toxic COOKED_FISH = register(new Toxic(UseAction.EAT, FoodType.COOKED_FISH, Ailment.INNERT, Ailment.of(Toxicity.FAIR)), Items.COOKED_COD, Items.COOKED_SALMON); + Toxic RAW_FISH = meat(FoodType.RAW_FISH, FAIR); + Toxic COOKED_FISH = meat(FoodType.COOKED_FISH, FAIR); static void bootstrap() {} - static Toxic register(FoodComponent food, FoodType type, UseAction action, Toxicity toxicity, Item... items) { - Toxic toxic = new Toxic(action, type, Ailment.of(toxicity), Ailment.of(Toxicity.LETHAL)); - for (Item i : items) { - ToxicHolder holder = (ToxicHolder)i; - holder.setToxic(toxic); - holder.setFood(Objects.requireNonNull(food, i.getTranslationKey() + " food")); + static Toxic forage(String name, Toxicity toxicity, Toxin toxin) { + if (toxin != FOOD) { + toxin = FOOD.and(toxin); } + name = "forage_" + name; - return toxic; - + return register(name, UseAction.EAT, FoodType.FORAGE, + Optional.of(UFoodComponents.RANDOM_FOLIAGE), + UTags.item(name)::contains, + new Ailment(toxicity, toxin), + new Ailment(Toxicity.LETHAL, toxin)); } - static Toxic register(FoodComponent food, FoodType type, UseAction action, Toxicity toxicity, Toxin toxin, Item target) { - toxin = Toxin.FOOD.and(toxin); - return register(target, food, type, action, new Ailment(toxicity, toxin), new Ailment(Toxicity.LETHAL, toxin)); + static Toxic meat(FoodType type, Toxicity toxicity) { + String name = type.name().toLowerCase(); + return register(name, UseAction.EAT, type, + Optional.empty(), + UTags.item(name)::contains, + Ailment.INNERT, + Ailment.of(toxicity)); } - static Toxic register(Item target, FoodComponent food, FoodType type, UseAction action, Ailment lowerBound, Ailment upperbound) { - Toxic toxic = new Toxic(action, type, lowerBound, upperbound); - ToxicHolder holder = (ToxicHolder)target; - holder.setToxic(toxic); - holder.setFood(Objects.requireNonNull(food, target.getTranslationKey() + " food")); - return toxic; - } - - static Toxic register(Toxic toxic, Item... items) { - for (Item i : items) { - ((ToxicHolder)i).setToxic(toxic); - } - return toxic; + static Toxic register(String name, UseAction action, FoodType type, Optional component, Predicate tag, Ailment lower, Ailment upper) { + return Registry.register(REGISTRY, name, new Toxic(action, type, component, tag, lower, upper)); } } diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/MixinItem.java b/src/main/java/com/minelittlepony/unicopia/mixin/MixinItem.java index 6ad7ff4a..c80024dd 100644 --- a/src/main/java/com/minelittlepony/unicopia/mixin/MixinItem.java +++ b/src/main/java/com/minelittlepony/unicopia/mixin/MixinItem.java @@ -2,6 +2,8 @@ package com.minelittlepony.unicopia.mixin; import java.util.Optional; +import javax.annotation.Nullable; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.injection.At; @@ -10,6 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import com.minelittlepony.unicopia.item.toxin.Toxic; import com.minelittlepony.unicopia.item.toxin.ToxicHolder; +import com.minelittlepony.unicopia.item.toxin.Toxics; import net.minecraft.entity.LivingEntity; import net.minecraft.item.FoodComponent; @@ -20,19 +23,28 @@ import net.minecraft.world.World; @Mixin(Item.class) abstract class MixinItem implements ToxicHolder { - private Optional toxic = Optional.empty(); + @Nullable + private FoodComponent originalFoodComponent; @Override @Accessor("foodComponent") public abstract void setFood(FoodComponent food); - @Override - public void setToxic(Toxic toxic) { - this.toxic = Optional.of(toxic); - } - @Override public Optional getToxic() { + if (originalFoodComponent == null) { + originalFoodComponent = ((Item)(Object)this).getFoodComponent(); + } + setFood(originalFoodComponent); + + Optional toxic = Toxics.REGISTRY.stream().filter(i -> i.matches((Item)(Object)this)).map(t -> { + t.getFoodComponent().ifPresent(this::setFood); + return t; + }).findFirst(); + + if (!toxic.isPresent() && ((Item)(Object)this).getFoodComponent() != null) { + return Optional.of(Toxics.EDIBLE); + } return toxic; } diff --git a/src/main/resources/data/unicopia/tags/items/cooked_fish.json b/src/main/resources/data/unicopia/tags/items/cooked_fish.json new file mode 100644 index 00000000..1e41161c --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/cooked_fish.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:cooked_cod", + "minecraft:cooked_salmon" + ] +} diff --git a/src/main/resources/data/unicopia/tags/items/cooked_meat.json b/src/main/resources/data/unicopia/tags/items/cooked_meat.json new file mode 100644 index 00000000..521f6289 --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/cooked_meat.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:cooked_porkchop", + "minecraft:cooked_beef", + "minecraft:cooked_mutton", + "minecraft:cooked_rabbit", + "minecraft:cooked_chicken" + ] +} diff --git a/src/main/resources/data/unicopia/tags/items/forage_blinding.json b/src/main/resources/data/unicopia/tags/items/forage_blinding.json new file mode 100644 index 00000000..ec167071 --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/forage_blinding.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:oxey_daisy" + ] +} diff --git a/src/main/resources/data/unicopia/tags/items/forage_dangerous.json b/src/main/resources/data/unicopia/tags/items/forage_dangerous.json new file mode 100644 index 00000000..70881761 --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/forage_dangerous.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:poppy" + ] +} diff --git a/src/main/resources/data/unicopia/tags/items/non_toxic.json b/src/main/resources/data/unicopia/tags/items/forage_edible.json similarity index 68% rename from src/main/resources/data/unicopia/tags/items/non_toxic.json rename to src/main/resources/data/unicopia/tags/items/forage_edible.json index 9102cf07..86f7893c 100644 --- a/src/main/resources/data/unicopia/tags/items/non_toxic.json +++ b/src/main/resources/data/unicopia/tags/items/forage_edible.json @@ -1,15 +1,11 @@ { "replace": false, "values": [ - "minecraft:grass", - "minecraft:dandelion", "minecraft:blue_orchid", - "minecraft:azure_bluet", "minecraft:red_tulip", "minecraft:orange_tulip", "minecraft:pink_tulip", "minecraft:cornflower", - "minecraft:rose_bush", "minecraft:peony", "minecraft:tall_grass" ] diff --git a/src/main/resources/data/unicopia/tags/items/forage_nauseating.json b/src/main/resources/data/unicopia/tags/items/forage_nauseating.json new file mode 100644 index 00000000..005622cb --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/forage_nauseating.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:grass" + ] +} diff --git a/src/main/resources/data/unicopia/tags/items/forage_prickly.json b/src/main/resources/data/unicopia/tags/items/forage_prickly.json new file mode 100644 index 00000000..2b1e3945 --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/forage_prickly.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:rose_bush" + ] +} diff --git a/src/main/resources/data/unicopia/tags/items/forage_radioactive.json b/src/main/resources/data/unicopia/tags/items/forage_radioactive.json new file mode 100644 index 00000000..a722eb51 --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/forage_radioactive.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:azure_bluet" + ] +} diff --git a/src/main/resources/data/unicopia/tags/items/fairly_toxic.json b/src/main/resources/data/unicopia/tags/items/forage_risky.json similarity index 100% rename from src/main/resources/data/unicopia/tags/items/fairly_toxic.json rename to src/main/resources/data/unicopia/tags/items/forage_risky.json diff --git a/src/main/resources/data/unicopia/tags/items/forage_severely_nauseating.json b/src/main/resources/data/unicopia/tags/items/forage_severely_nauseating.json new file mode 100644 index 00000000..ac9767c7 --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/forage_severely_nauseating.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:dead_bush" + ] +} diff --git a/src/main/resources/data/unicopia/tags/items/forage_severely_prickly.json b/src/main/resources/data/unicopia/tags/items/forage_severely_prickly.json new file mode 100644 index 00000000..4ff8aebc --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/forage_severely_prickly.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:large_fern" + ] +} diff --git a/src/main/resources/data/unicopia/tags/items/forage_strengthening.json b/src/main/resources/data/unicopia/tags/items/forage_strengthening.json new file mode 100644 index 00000000..97038fab --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/forage_strengthening.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:fern" + ] +} diff --git a/src/main/resources/data/unicopia/tags/items/raw_fish.json b/src/main/resources/data/unicopia/tags/items/raw_fish.json new file mode 100644 index 00000000..5a5329f4 --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/raw_fish.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "minecraft:pufferfish", + "minecraft:cod", + "minecraft:salmon", + "minecraft:tropical_fish" + ] +} diff --git a/src/main/resources/data/unicopia/tags/items/raw_meat.json b/src/main/resources/data/unicopia/tags/items/raw_meat.json new file mode 100644 index 00000000..fa7160e1 --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/raw_meat.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:porkchop", + "minecraft:beef", + "minecraft:mutton", + "minecraft:rabbit", + "minecraft:chicken" + ] +} diff --git a/src/main/resources/data/unicopia/tags/items/severely_toxic.json b/src/main/resources/data/unicopia/tags/items/severely_toxic.json deleted file mode 100644 index e3abc044..00000000 --- a/src/main/resources/data/unicopia/tags/items/severely_toxic.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:fern", - "minecraft:dead_bush", - "minecraft:poppy", - "minecraft:oxeye_daisy", - "minecraft:large_fern" - ] -}