From fba84e11a137ed53718b69fcc8cdafbd2eada677 Mon Sep 17 00:00:00 2001 From: Hubry Date: Mon, 29 Jun 2020 17:52:52 +0200 Subject: [PATCH] Remove no longer needed reflection for entity type tags --- .../java/vazkii/botania/common/lib/ModTags.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/main/java/vazkii/botania/common/lib/ModTags.java b/src/main/java/vazkii/botania/common/lib/ModTags.java index 7e0fa58a2..79b3e9bcc 100644 --- a/src/main/java/vazkii/botania/common/lib/ModTags.java +++ b/src/main/java/vazkii/botania/common/lib/ModTags.java @@ -18,10 +18,6 @@ import net.minecraft.tags.ITag; import net.minecraft.tags.ItemTags; import net.minecraft.util.ResourceLocation; -import vazkii.botania.client.lib.LibResources; - -import java.lang.invoke.MethodHandle; - public class ModTags { public static class Items { public static final ITag.INamedTag DUSTS_MANA = forgeTag("dusts/mana"); @@ -191,15 +187,10 @@ public class ModTags { } public static class Entities { - public static final ITag.INamedTag> SHADED_MESA_BLACKLIST; + public static final ITag.INamedTag> SHADED_MESA_BLACKLIST = tag("shaded_mesa_blacklist"); - static { - MethodHandle handle = LibObfuscation.getMethod(EntityTypeTags.class, "func_232896_a_", String.class); - try { - SHADED_MESA_BLACKLIST = (ITag.INamedTag>) handle.invokeExact(LibResources.PREFIX_MOD + "shaded_mesa_blacklist"); - } catch (Throwable throwable) { - throw new RuntimeException(throwable); - } + private static ITag.INamedTag> tag(String name) { + return EntityTypeTags.func_232896_a_(new ResourceLocation(LibMisc.MOD_ID, name).toString()); } } }