diff --git a/src/main/java/com/minelittlepony/unicopia/UTags.java b/src/main/java/com/minelittlepony/unicopia/UTags.java index d5815ff8..dc381cbe 100644 --- a/src/main/java/com/minelittlepony/unicopia/UTags.java +++ b/src/main/java/com/minelittlepony/unicopia/UTags.java @@ -8,6 +8,7 @@ import net.minecraft.util.Identifier; public interface UTags { Tag CURSED_ARTEFACTS = TagRegistry.item(new Identifier("unicopia", "cursed_artefacts")); Tag HAMMERPACE_IMMUNE = TagRegistry.item(new Identifier("unicopia", "hammerspace_immune")); + Tag APPLES = TagRegistry.item(new Identifier("unicopia", "apples")); static void bootstrap() { } } diff --git a/src/main/java/com/minelittlepony/unicopia/item/ZapAppleItem.java b/src/main/java/com/minelittlepony/unicopia/item/ZapAppleItem.java index ab753323..9940f8cd 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/ZapAppleItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/ZapAppleItem.java @@ -1,9 +1,7 @@ package com.minelittlepony.unicopia.item; -import java.util.List; - -import com.google.common.collect.Lists; +import com.minelittlepony.unicopia.UTags; import com.minelittlepony.unicopia.toxin.Toxicity; import com.minelittlepony.unicopia.util.MagicalDamageSource; import com.minelittlepony.unicopia.util.VecHelper; @@ -33,15 +31,6 @@ import net.minecraft.world.World; public class ZapAppleItem extends AppleItem { - private static final List ALIASABLE_ITEMS = Lists.newArrayList( - Items.APPLE, - UItems.GREEN_APPLE, - UItems.SWEET_APPLE, - UItems.SOUR_APPLE, - UItems.ROTTEN_APPLE, - UItems.COOKED_ZAP_APPLE - ); - public ZapAppleItem(Settings settings) { super(settings); } @@ -96,10 +85,12 @@ public class ZapAppleItem extends AppleItem { public void appendStacks(ItemGroup tab, DefaultedList items) { super.appendStacks(tab, items); if (isIn(tab)) { - ALIASABLE_ITEMS.forEach(item -> { - ItemStack stack = new ItemStack(this); - stack.getOrCreateTag().putString("appearance", Registry.ITEM.getId(item).toString()); - items.add(stack); + UTags.APPLES.values().forEach(item -> { + if (item != this) { + ItemStack stack = new ItemStack(this); + stack.getOrCreateTag().putString("appearance", Registry.ITEM.getId(item).toString()); + items.add(stack); + } }); } } diff --git a/src/main/resources/data/unicopia/tags/items/apples.json b/src/main/resources/data/unicopia/tags/items/apples.json new file mode 100644 index 00000000..fd81af55 --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/apples.json @@ -0,0 +1,12 @@ +{ + "replace": false, + "values": [ + "minecraft:apple", + "unicopia:apple_green", + "unicopia:apple_sweet", + "unicopia:apple_sour", + "unicopia:rotten_apple", + "unicopia:zap_apple", + "unicopia:cooked_zap_apple" + ] +} \ No newline at end of file