R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop clearing fields/methods on mixin classes

Browse Source 
This seems to break generating the needed bridge access$xxx methods
for inner classes in mixins.

Example mixin that breaks: d5b3c910ac/common/src/main/java/com/railwayteam/railways/mixin/client/MixinStationScreen.java
This commit is contained in:
embeddedt 2024-03-29 10:46:12 -04:00
parent 66abdcd9a7
commit ddffe93f1a
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/org/embeddedt/modernfix/util/ClassInfoManager.java
View File

@ -12,7 +12,6 @@ import org.spongepowered.asm.service.MixinServiceAbstract;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -54,15 +53,13 @@ public class ClassInfoManager {
private static void doClear() { private static void doClear() {
Map<String, ClassInfo> classInfoCache; Map<String, ClassInfo> classInfoCache;
Field mixinField, stateField, classNodeField, methodsField, fieldsField; Field mixinField, stateField, classNodeField;
Class<?> stateClz; Class<?> stateClz;
try { try {
disableLoggers(); disableLoggers();
Field field = accessible(ClassInfo.class.getDeclaredField("cache")); Field field = accessible(ClassInfo.class.getDeclaredField("cache"));
classInfoCache = (Map<String, ClassInfo>) field.get(null); classInfoCache = (Map<String, ClassInfo>) field.get(null);
mixinField = accessible(ClassInfo.class.getDeclaredField("mixin")); mixinField = accessible(ClassInfo.class.getDeclaredField("mixin"));
methodsField = accessible(ClassInfo.class.getDeclaredField("methods"));
fieldsField = accessible(ClassInfo.class.getDeclaredField("fields"));
stateClz = Class.forName("org.spongepowered.asm.mixin.transformer.MixinInfo$State"); stateClz = Class.forName("org.spongepowered.asm.mixin.transformer.MixinInfo$State");
stateField = accessible(Class.forName("org.spongepowered.asm.mixin.transformer.MixinInfo").getDeclaredField("state")); stateField = accessible(Class.forName("org.spongepowered.asm.mixin.transformer.MixinInfo").getDeclaredField("state"));
classNodeField = accessible(stateClz.getDeclaredField("classNode")); classNodeField = accessible(stateClz.getDeclaredField("classNode"));
@ -87,9 +84,6 @@ public class ClassInfoManager {
if (state != null) if (state != null)
classNodeField.set(state, emptyNode); classNodeField.set(state, emptyNode);
} }
// clear fields, methods
((Collection<?>)methodsField.get(mixinClz)).clear();
((Collection<?>)fieldsField.get(mixinClz)).clear();
} catch (ReflectiveOperationException | RuntimeException e) { } catch (ReflectiveOperationException | RuntimeException e) {
e.printStackTrace(); e.printStackTrace();
} }