Fix test. Why did we use jdk.internal.misc instead of sun.misc though

CleanroomMC · Nov 23, 2023 · e4344e3 · e4344e3
1 parent 08ebc83
commit e4344e3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1035,10 +1035,10 @@ project(':cleanroom') {
     // TODO: MDK Task
 
     userdevConfig {
-        def artifacts = Util.getArtifacts(project, project.configurations.installer, true)
+        /*def artifacts = Util.getArtifacts(project, project.configurations.installer, true)
         artifacts.each { key, lib ->
             libraries.add(lib.name)
-        }
+        }*/
         libraries.add('net.minecraftforge:legacydev:0.2.3.+:fatjar')
         universalFilters.add('^(?!binpatches\\.pack\\.lzma$).*$')
 

diff --git a/src/main/java/net/minecraftforge/registries/ObjectHolderRef.java b/src/main/java/net/minecraftforge/registries/ObjectHolderRef.java
@@ -20,12 +20,13 @@
 package net.minecraftforge.registries;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.InaccessibleObjectException;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.Queue;
 
 import com.cleanroommc.hackery.ReflectionHackery;
-import jdk.internal.misc.Unsafe;
+import sun.misc.Unsafe;
 import net.minecraft.util.ResourceLocation;
 
 import net.minecraftforge.fml.common.FMLLog;
@@ -154,7 +155,17 @@ public void apply()
     @SuppressWarnings("removal")
     private static class FinalFieldHelper
     {
-        private static final Unsafe unsafe=ReflectionHackery.unsafe;
+        private static final Unsafe unsafe;
+        static {
+            Field f;
+            try {
+                f = Unsafe.class.getDeclaredField("theUnsafe");
+                f.setAccessible(true);
+                unsafe = (Unsafe) f.get(null);
+            } catch (NoSuchFieldException | IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
+        }
         static Field makeWritable(Field f) throws ReflectiveOperationException
         {
             f.setAccessible(true);
@@ -164,7 +175,10 @@ static Field makeWritable(Field f) throws ReflectiveOperationException
 
         static void setField(Field field, @Nullable Object instance, Object thing) throws ReflectiveOperationException
         {
-            field.get(instance);
+
+            try {
+                field.get(instance);
+            } catch (InaccessibleObjectException ignored) {}
             unsafe.putObject(unsafe.staticFieldBase(field), unsafe.staticFieldOffset(field), thing);
         }
     }