From bf76791ab0cfef81b5ae16736938913903fe676f Mon Sep 17 00:00:00 2001 From: SciWhiz12 Date: Sat, 15 May 2021 11:24:36 +0800 Subject: Use UnsafeHacks to set final fields Removes always definalizing fields --- .../minecraftforge/artifactural/gradle/ReflectionUtils.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src') 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; } } -- cgit From 499ff87b31ad4714acfc7b160a89494547ad55a4 Mon Sep 17 00:00:00 2001 From: SciWhiz12 Date: Sat, 15 May 2021 12:03:09 +0800 Subject: Remove ModifierAccess and java9 source set/project --- build.gradle | 43 ---------------- settings.gradle | 3 +- .../artifactural/gradle/ModifierAccess.java | 55 --------------------- .../artifactural/gradle/ModifierAccess.java | 57 ---------------------- 4 files changed, 1 insertion(+), 157 deletions(-) delete mode 100644 src/gradlecomp/java/net/minecraftforge/artifactural/gradle/ModifierAccess.java delete mode 100644 src/java9/net/minecraftforge/artifactural/gradle/ModifierAccess.java (limited to 'src') diff --git a/build.gradle b/build.gradle index 6b06ff4..9fff891 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,6 @@ sourceSets { api shared gradlecomp - java9 } repositories { @@ -35,8 +34,6 @@ configurations { } dependencies { - java9Implementation files(sourceSets.main.output.classesDirs) { builtBy compileJava } - sharedImplementation sourceSets.api.output gradlecompImplementation sourceSets.shared.output @@ -58,50 +55,10 @@ java { toolchain.languageVersion = JavaLanguageVersion.of(8) } -project(':artifactural9') { - apply plugin: 'java' - apply plugin: 'eclipse' - group = rootProject.group - java.toolchain.languageVersion = JavaLanguageVersion.of(9) - - sourceSets { - java9.java.srcDirs = [rootProject.file('src/java9').getAbsolutePath()] - } - - eclipse { - project { - name rootProject.name + '9' - linkedResource name: 'java9', type: '2', location: rootProject.file('src/java9').getAbsolutePath() - } - jdt { - sourceCompatibility = targetCompatibility = 9 - } - } - - tasks.withType(JavaCompile) { - options.encoding = 'utf-8' - javaCompiler = javaToolchains.compilerFor { - languageVersion = JavaLanguageVersion.of(9) - } - } -} - - - jar { from sourceSets.api.output from sourceSets.shared.output from(sourceSets.gradlecomp.output) - - into('META-INF/versions/9') { - from project(':artifactural9').sourceSets.java9.output - } - - manifest { - attributes( - 'Multi-Release': 'true' - ) - } } task sourcesJar(type: Jar, dependsOn: classes) { diff --git a/settings.gradle b/settings.gradle index c0a8d84..20e6c4f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1 @@ -rootProject.name = 'artifactural' -include 'artifactural9' +rootProject.name = 'artifactural' \ No newline at end of file diff --git a/src/gradlecomp/java/net/minecraftforge/artifactural/gradle/ModifierAccess.java b/src/gradlecomp/java/net/minecraftforge/artifactural/gradle/ModifierAccess.java deleted file mode 100644 index fb68144..0000000 --- a/src/gradlecomp/java/net/minecraftforge/artifactural/gradle/ModifierAccess.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Artifactural - * Copyright (c) 2018-2021. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package net.minecraftforge.artifactural.gradle; - -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; - -public class ModifierAccess { - private static Field MODIFIER_ACCESS = null; - private static boolean accessAttempted = false; - - public static synchronized boolean definalize(Field target) { - if ((target.getModifiers() & Modifier.FINAL) == 0) { - return true; - } - - if (MODIFIER_ACCESS == null && !accessAttempted) { - try { - final Field modifiers = Field.class.getDeclaredField("modifiers"); - modifiers.setAccessible(true); - MODIFIER_ACCESS = modifiers; - } catch (NoSuchFieldException e) { - throw new RuntimeException("Could not access Field.modifiers to definalize reflection object. Use Java 8, current version: " + System.getProperty("java.version"), e); - } - accessAttempted = true; - } - if (MODIFIER_ACCESS != null) { - try { - MODIFIER_ACCESS.setInt(target, target.getModifiers() & ~Modifier.FINAL); - } catch (IllegalArgumentException | IllegalAccessException e) { - throw new RuntimeException("Could not definalize field " + target.getDeclaringClass().getName() + "." + target.getName(), e); - } - return true; - } - return false; - } - -} diff --git a/src/java9/net/minecraftforge/artifactural/gradle/ModifierAccess.java b/src/java9/net/minecraftforge/artifactural/gradle/ModifierAccess.java deleted file mode 100644 index cf6f65f..0000000 --- a/src/java9/net/minecraftforge/artifactural/gradle/ModifierAccess.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Artifactural - * Copyright (c) 2018. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package net.minecraftforge.artifactural.gradle; - -import java.lang.invoke.MethodHandles; -import java.lang.invoke.MethodHandles.Lookup; -import java.lang.invoke.VarHandle; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; - -public class ModifierAccess { - private static VarHandle MODIFIER_ACCESS = null; - private static boolean accessAttempted = false; - - public static synchronized boolean definalize(Field target) { - if ((target.getModifiers() & Modifier.FINAL) == 0) { - return true; - } - - if (MODIFIER_ACCESS == null && !accessAttempted) { - try { - Lookup lookup = MethodHandles.privateLookupIn(Field.class, MethodHandles.lookup()); - MODIFIER_ACCESS = lookup.findVarHandle(Field.class, "modifiers", int.class); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException("Could not access Field.modifiers to definalize reflection object. Use Java 8, current version: " + System.getProperty("java.version"), e); - } - accessAttempted = true; - } - if (MODIFIER_ACCESS != null) { - try { - MODIFIER_ACCESS.set(target, target.getModifiers() & ~Modifier.FINAL); - } catch (IllegalArgumentException e) { - throw new RuntimeException("Could not definalize field " + target.getDeclaringClass().getName() + "." + target.getName(), e); - } - return true; - } - return false; - } - -} -- cgit