From 8c61f3fc1e9cf5d1f063567510d7d9acd96a9696 Mon Sep 17 00:00:00 2001 From: IThundxr Date: Sat, 11 May 2024 21:14:18 -0400 Subject: [PATCH] Obfuscated Obfuscation - Fix ObfuscationReflectionHelper#setPrivateValue using SRG mapped names, Neoforge has switched to mojmap at runtime --- .../java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/forge/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java b/forge/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java index 203460ef1..c4bc9ffae 100644 --- a/forge/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java +++ b/forge/src/main/java/dev/engine_room/flywheel/impl/FlwLibXplatImpl.java @@ -34,8 +34,7 @@ public class FlwLibXplatImpl implements FlwLibXplat { field.setAccessible(true); field.set(dispatcher, field.get(defaultDispatcher)); } - // fixme ~ is this still needed? neoforge uses mojmap at runtime - ObfuscationReflectionHelper.setPrivateValue(BlockRenderDispatcher.class, dispatcher, new ModelBlockRenderer(Minecraft.getInstance().getBlockColors()), "f_110900_"); + ObfuscationReflectionHelper.setPrivateValue(BlockRenderDispatcher.class, dispatcher, new ModelBlockRenderer(Minecraft.getInstance().getBlockColors()), "modelRenderer"); } catch (Exception e) { FlwImpl.LOGGER.error("Failed to initialize vanilla BlockRenderDispatcher!", e); return defaultDispatcher;