From 1117eba6205ee5929fb164446dd39e1991a6e4b9 Mon Sep 17 00:00:00 2001 From: Lucwousin Date: Sun, 15 Dec 2019 01:16:59 +0100 Subject: [PATCH] Change source level to 11, remove reflectutil --- build.gradle.kts | 9 ++- .../config/ConfigInvocationHandler.java | 4 +- .../net/runelite/client/util/ReflectUtil.java | 72 ------------------- runelite-mixins/runelite-mixins.gradle.kts | 10 ++- .../net/runelite/mixins/RSWidgetMixin.java | 38 ++++------ 5 files changed, 26 insertions(+), 107 deletions(-) delete mode 100644 runelite-client/src/main/java/net/runelite/client/util/ReflectUtil.java diff --git a/build.gradle.kts b/build.gradle.kts index 6ffad698ea..d2c29e1231 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -44,7 +44,6 @@ plugins { id(Plugins.latestVersion.first) version Plugins.latestVersion.second id(Plugins.grgit.first) version Plugins.grgit.second - checkstyle application } @@ -83,9 +82,9 @@ subprojects { project.extra["rootPath"] = rootDir.toString().replace("\\", "/") if (this.name != "runescape-client") { - apply(plugin = "checkstyle") + apply() - checkstyle { + configure { maxWarnings = 0 toolVersion = "8.25" isShowViolations = true @@ -114,8 +113,8 @@ subprojects { tasks { java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } withType { diff --git a/runelite-client/src/main/java/net/runelite/client/config/ConfigInvocationHandler.java b/runelite-client/src/main/java/net/runelite/client/config/ConfigInvocationHandler.java index 26844922cd..e3adf0fb71 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/ConfigInvocationHandler.java +++ b/runelite-client/src/main/java/net/runelite/client/config/ConfigInvocationHandler.java @@ -26,11 +26,11 @@ package net.runelite.client.config; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; +import java.lang.invoke.MethodHandles; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.util.Objects; import lombok.extern.slf4j.Slf4j; -import net.runelite.client.util.ReflectUtil; @Slf4j class ConfigInvocationHandler implements InvocationHandler @@ -169,7 +169,7 @@ class ConfigInvocationHandler implements InvocationHandler static Object callDefaultMethod(Object proxy, Method method, Object[] args) throws Throwable { Class declaringClass = method.getDeclaringClass(); - return ReflectUtil.privateLookupIn(declaringClass) + return MethodHandles.privateLookupIn(declaringClass, MethodHandles.lookup()) .unreflectSpecial(method, declaringClass) .bindTo(proxy) .invokeWithArguments(args); diff --git a/runelite-client/src/main/java/net/runelite/client/util/ReflectUtil.java b/runelite-client/src/main/java/net/runelite/client/util/ReflectUtil.java deleted file mode 100644 index 76530b6ab6..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/util/ReflectUtil.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2018, Tomas Slusny - * Copyright (c) 2018, Abex - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.util; - -import java.lang.invoke.MethodHandles; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -public class ReflectUtil -{ - private ReflectUtil() - { - } - - public static MethodHandles.Lookup privateLookupIn(Class clazz) - { - try - { - // Java 9+ has privateLookupIn method on MethodHandles, but since we are shipping and using Java 8 - // we need to access it via reflection. This is preferred way because it's Java 9+ public api and is - // likely to not change - final Method privateLookupIn = MethodHandles.class.getMethod("privateLookupIn", Class.class, MethodHandles.Lookup.class); - return (MethodHandles.Lookup) privateLookupIn.invoke(null, clazz, MethodHandles.lookup()); - } - catch (InvocationTargetException | IllegalAccessException e) - { - throw new RuntimeException(e); - } - catch (NoSuchMethodException e) - { - try - { - // In Java 8 we first do standard lookupIn class - final MethodHandles.Lookup lookupIn = MethodHandles.lookup().in(clazz); - - // and then we mark it as trusted for private lookup via reflection on private field - final Field modes = MethodHandles.Lookup.class.getDeclaredField("allowedModes"); - modes.setAccessible(true); - modes.setInt(lookupIn, -1); // -1 == TRUSTED - return lookupIn; - } - catch (ReflectiveOperationException ex) - { - throw new RuntimeException(ex); - } - } - } -} diff --git a/runelite-mixins/runelite-mixins.gradle.kts b/runelite-mixins/runelite-mixins.gradle.kts index 671ec4055f..1a07f77286 100644 --- a/runelite-mixins/runelite-mixins.gradle.kts +++ b/runelite-mixins/runelite-mixins.gradle.kts @@ -29,12 +29,16 @@ dependencies { compileOnly(Libraries.guava) compileOnly(Libraries.javaxInject) compileOnly(Libraries.slf4jApi) - - implementation(project(":runescape-api")) + compileOnly(project(":runescape-api")) } tasks { + java { + sourceCompatibility = JavaVersion.VERSION_1_7 + targetCompatibility = JavaVersion.VERSION_1_7 + disableAutoTargetJvm() + } withType { - options.compilerArgs.addAll(arrayOf("-source", "7", "-Xlint:-unchecked")) + options.compilerArgs.addAll(arrayOf("-Xlint:-unchecked")) } } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java index 8135716926..466baf67d1 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java @@ -24,6 +24,11 @@ */ package net.runelite.mixins; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; import net.runelite.api.HashTable; import net.runelite.api.Node; import net.runelite.api.Point; @@ -31,20 +36,15 @@ import net.runelite.api.WidgetNode; import net.runelite.api.events.WidgetHiddenChanged; import net.runelite.api.events.WidgetPositioned; import net.runelite.api.mixins.Copy; +import net.runelite.api.mixins.FieldHook; +import net.runelite.api.mixins.Inject; +import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Replace; +import net.runelite.api.mixins.Shadow; import net.runelite.api.widgets.Widget; import static net.runelite.api.widgets.WidgetInfo.TO_CHILD; import static net.runelite.api.widgets.WidgetInfo.TO_GROUP; import net.runelite.api.widgets.WidgetItem; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import net.runelite.api.mixins.FieldHook; -import net.runelite.api.mixins.Inject; -import net.runelite.api.mixins.Mixin; -import net.runelite.api.mixins.Shadow; import net.runelite.rs.api.RSClient; import net.runelite.rs.api.RSModel; import net.runelite.rs.api.RSNode; @@ -215,22 +215,10 @@ public abstract class RSWidgetMixin implements RSWidget Widget parent = getParent(); - if (parent == null) - { - if (TO_GROUP(getId()) != client.getWidgetRoot()) - { - // Widget has no parent and is not the root widget (which is always visible), - // so it's not visible. - return true; - } - } - else if (parent.isHidden()) - { - // If the parent is hidden, this widget is also hidden. - return true; - } - - return false; + // If the parent is hidden, this widget is also hidden. + // Widget has no parent and is not the root widget (which is always visible), + // so it's not visible. + return parent == null ? TO_GROUP(getId()) != client.getWidgetRoot() : parent.isHidden(); } @Inject