Should have a way to trigger cinit

CleanroomMC · Nov 23, 2023 · 821cc5e · 821cc5e
1 parent e4344e3
commit 821cc5e
Show file tree

Hide file tree

Showing 3 changed files with 7 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/gradle.properties b/gradle.properties
@@ -37,4 +37,6 @@ org.gradle.parallel=true
 # Allow Gradle to cache build to avoid recompiling classes that did not change.
 org.gradle.caching=true
 # Set java home when gradle refuse to respect IDE setting
-# org.gradle.java.home=/usr/lib/jvm/java-1.17.0-openjdk-amd64
+# org.gradle.java.home=/usr/lib/jvm/java-1.17.0-openjdk-amd64
+# Daemon
+org.gradle.daemon=false
diff --git a/src/main/java/net/minecraftforge/registries/ObjectHolderRef.java b/src/main/java/net/minecraftforge/registries/ObjectHolderRef.java
@@ -177,8 +177,8 @@ static void setField(Field field, @Nullable Object instance, Object thing) throw
         {
 
             try {
-                field.get(instance);
-            } catch (InaccessibleObjectException ignored) {}
+                field.getDeclaringClass().newInstance();
+            } catch (Throwable ignored) {}
             unsafe.putObject(unsafe.staticFieldBase(field), unsafe.staticFieldOffset(field), thing);
         }
     }