diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index dbb770ef6..ecbb2d149 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -36,6 +36,7 @@ import net.minecraft.item.Items; import net.minecraft.util.DefaultUncaughtExceptionHandler; import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; @@ -138,10 +139,7 @@ public final class ContributorFancinessHandler extends LayerRenderer { if (!icon.isEmpty()) { ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180)); ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180)); - // todo 1.15 - ShaderHelper.useShader(ShaderHelper.BotaniaShader.GOLD); - renderItem(ms, buffers, light, overlay, icon); - ShaderHelper.releaseShader(); + RenderHelper.renderItemModelGold(null, icon, ItemCameraTransforms.TransformType.HEAD, ms, buffers, null, light, overlay); } } } diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index 97a5504f4..0ace36e31 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -10,6 +10,11 @@ */ package vazkii.botania.common.lib; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; + public final class LibObfuscation { // EntityLiving public static final String GET_LIVING_SOUND = "func_184639_G"; @@ -22,4 +27,12 @@ public final class LibObfuscation { // HoeItem public static final String HOE_LOOKUP = "field_195973_b"; + + public static MethodHandle getMethod(Class clazz, String srg, Class... paramTypes) { + try { + return MethodHandles.publicLookup().unreflect(ObfuscationReflectionHelper.findMethod(clazz, srg, paramTypes)); + } catch (IllegalAccessException e) { + throw new IllegalStateException("Can't find " + srg, e); + } + } }