Develop beta 29 (#576)

Author: Su5eD

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -10,7 +10,7 @@ body:
       value: |
         ### 📋 Checklist
         Thank you for taking your time to report this bug!  
-        Before reporting, please make ensure that:
+        Before reporting, please ensure that:
         - You are using the **latest** available version of Connector and its dependencies
         - You've installed a **minimal set of mods** required to reproduce the issue. 
           Issues with modpacks and excessive amount of mods will *not* be accepted, as they take a long time to diagnose.

.github/ISSUE_TEMPLATE/mod_incompatibility.yml

@@ -10,7 +10,7 @@ body:
       value: |
         ### 📋 Checklist
         Thank you for taking your time to report this bug!  
-        Before reporting, please make ensure that:
+        Before reporting, please ensure that:
         - You are using the **latest** available version of Connector and its dependencies
         - You've installed a **minimal set of mods** required to reproduce the issue. 
           Issues with modpacks and excessive amount of mods will *not* be accepted, as they take a long time to diagnose.

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=true
 
 # Versions
-versionConnector=1.0.0-beta.28
+versionConnector=1.0.0-beta.29
 versionAdapter=1.8.16-1.20.1-20231120.221506
 versionAdapterDefinition=1.8.21
 
@@ -16,7 +16,7 @@ versionFabricLoaderUpstream=0.15.0
 versionAccessWidener=2.1.0
 versionFabricApi=0.90.7+1.9.33+1.20.1
 versionMixin=0.12.5+mixin.0.8.5
-versionMixinTransmog=0.4.2+1.20.1
+versionMixinTransmog=0.4.3+1.20.1
 
 # Publishing
 curseForgeId=890127

src/main/java/dev/su5ed/sinytra/connector/service/LenientRuntimeEnumExtender.java

@@ -22,9 +22,12 @@ public int processClassWithFlags(Phase phase, ClassNode classNode, Type classTyp
             FieldNode node = values.get(0);
             if ((node.access & Opcodes.ACC_FINAL) == 0) {
                 // It is likely a mixin already made the field mutable
-                // Make it final before it is processed and de-finalized again by super
+                // Make it final before it is processed
                 node.access |= Opcodes.ACC_FINAL;
-                return super.processClassWithFlags(phase, classNode, classType, reason);
+                int result = super.processClassWithFlags(phase, classNode, classType, reason);
+                // Return to original state
+                node.access &= ~Opcodes.ACC_FINAL;
+                return result;
             }
         }
         // Let super deal with this

src/main/java/dev/su5ed/sinytra/connector/transformer/patch/EnvironmentStripperTransformer.java

@@ -11,6 +11,7 @@
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.AnnotationNode;
 import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.FieldNode;
 import org.objectweb.asm.tree.MethodNode;
 
 import java.util.Iterator;
@@ -30,15 +31,13 @@ public Patch.Result apply(ClassNode classNode, @Nullable AnnotationValueHandle<?
                 applied = true;
             }
         }
-        // Field stripping is currently broken in fabric-loader, therefore we skip it until the issue is fixed upstream
-        // https://github.com/FabricMC/fabric-loader/issues/833
-//        for (Iterator<FieldNode> it = classNode.fields.iterator(); it.hasNext(); ) {
-//            FieldNode field = it.next();
-//            if (remove(field.invisibleAnnotations)) {
-//                it.remove();
-//                applied = true;
-//            }
-//        }
+        for (Iterator<FieldNode> it = classNode.fields.iterator(); it.hasNext(); ) {
+            FieldNode field = it.next();
+            if (remove(field.invisibleAnnotations)) {
+                it.remove();
+                applied = true;
+            }
+        }
         return applied ? Patch.Result.APPLY : Patch.Result.PASS;
     }