Use UnsafeHacks to set final fields

Removes always definalizing fields

2 files changed, 9 insertions, 4 deletions

diff --git a/build.gradle b/build.gradle
index f73cc9b..6b06ff4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,6 +42,7 @@ dependencies {
     gradlecompImplementation sourceSets.shared.output
     gradlecompImplementation gradleApi()
     gradlecompImplementation 'com.google.guava:guava:30.1-jre'
+    gradlecompImplementation 'net.minecraftforge:unsafe:0.2.0'
 
     compile sourceSets.api.output
     compile sourceSets.shared.output
diff --git a/src/gradlecomp/java/net/minecraftforge/artifactural/gradle/ReflectionUtils.java b/src/gradlecomp/java/net/minecraftforge/artifactural/gradle/ReflectionUtils.java
index 4e18885..1c8cdac 100644
--- a/src/gradlecomp/java/net/minecraftforge/artifactural/gradle/ReflectionUtils.java
+++ b/src/gradlecomp/java/net/minecraftforge/artifactural/gradle/ReflectionUtils.java
@@ -19,8 +19,11 @@
 
 package net.minecraftforge.artifactural.gradle;
 
+import net.minecraftforge.fml.unsafe.UnsafeHacks;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.function.UnaryOperator;
 
 public class ReflectionUtils {
@@ -39,7 +42,11 @@ public class ReflectionUtils {
 
             T oldV = (T)f.get(target);
             T newV = operator.apply(oldV);
-            f.set(target, newV);
+            if (Modifier.isFinal(f.getModifiers())) {
+                UnsafeHacks.setField(f, target, newV);
+            } else {
+                f.set(target, newV);
+            }
 
             if (f.get(target) != newV) {
                 throw new IllegalStateException("Failed to set new value on " + f.getDeclaringClass().getName() + "." + f.getName());
@@ -68,9 +75,6 @@ public class ReflectionUtils {
             for (Field f : clazz.getDeclaredFields()) {
                 if (f.getName().equals(name)) {
                     f.setAccessible(true);
-                    if (!ModifierAccess.definalize(f)) {
-                        System.out.println("Could not definalize field " + f.getDeclaringClass().getName() + "." + f.getName() + " Exception ate, lets see if it works");
-                    }
                     return f;
                 }
             }