Trigger <cinit> before unsafe

CleanroomMC · Nov 22, 2023 · 08ebc83 · 08ebc83
1 parent 53538d2
commit 08ebc83
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ patch_version = 0
 
 # MAJOR.SPEC_MAJOR.SPEC_MINOR.BUILD
 last_forge_version = 14.23.5.2860
-new_forge_version = 15.24.0.3010
+new_forge_version = 15.24.0.3011
 
 # Minecraft & Mappings
 mapping_channel = stable

diff --git a/src/main/java/net/minecraftforge/fml/common/registry/ItemStackHolderRef.java b/src/main/java/net/minecraftforge/fml/common/registry/ItemStackHolderRef.java
@@ -76,6 +76,7 @@ public void apply()
         }
         try
         {
+            field.get(is);
             ReflectionHackery.unsafe.putObject(ReflectionHackery.unsafe.staticFieldBase(field), ReflectionHackery.unsafe.staticFieldOffset(field), is);
             //field.set(null, is);
         }

diff --git a/src/main/java/net/minecraftforge/registries/ObjectHolderRef.java b/src/main/java/net/minecraftforge/registries/ObjectHolderRef.java
@@ -25,12 +25,12 @@
 import java.util.Queue;
 
 import com.cleanroommc.hackery.ReflectionHackery;
+import jdk.internal.misc.Unsafe;
 import net.minecraft.util.ResourceLocation;
 
 import net.minecraftforge.fml.common.FMLLog;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
-import sun.misc.Unsafe;
 
 import javax.annotation.Nullable;
 
@@ -151,29 +151,20 @@ public void apply()
         }
     }
 
+    @SuppressWarnings("removal")
     private static class FinalFieldHelper
     {
-        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);
-            }
-        }
+        private static final Unsafe unsafe=ReflectionHackery.unsafe;
         static Field makeWritable(Field f) throws ReflectiveOperationException
         {
             f.setAccessible(true);
-            //ReflectionHackery.stripFieldOfFinalModifier(f);
+            ReflectionHackery.stripFieldOfFinalModifier(f);
             return f;
         }
 
         static void setField(Field field, @Nullable Object instance, Object thing) throws ReflectiveOperationException
         {
-            //field.set(instance, thing);
+            field.get(instance);
             unsafe.putObject(unsafe.staticFieldBase(field), unsafe.staticFieldOffset(field), thing);
         }
     }