From cf5ccbf1acfec6c852146278cb9d0298c19a9776 Mon Sep 17 00:00:00 2001 From: downthecrop Date: Mon, 28 Oct 2024 16:32:51 -0700 Subject: [PATCH] undo some testing changes --- client/src/main/java/plugin/PluginRepository.java | 6 +++--- client/src/main/java/rt4/GameShell.java | 6 ++---- client/src/main/java/rt4/GlRenderer.java | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/client/src/main/java/plugin/PluginRepository.java b/client/src/main/java/plugin/PluginRepository.java index 4225c8c..55faf80 100644 --- a/client/src/main/java/plugin/PluginRepository.java +++ b/client/src/main/java/plugin/PluginRepository.java @@ -70,7 +70,7 @@ public class PluginRepository { File pluginsDirectory = new File(GlobalJsonConfig.instance.pluginsFolder); if (!pluginsDirectory.exists()) { - //System.out.println("Skipping plugin initialization - " + pluginsDirectory.getAbsolutePath() + " does not exist."); + System.out.println("Skipping plugin initialization - " + pluginsDirectory.getAbsolutePath() + " does not exist."); return; } @@ -120,7 +120,7 @@ public class PluginRepository { } if (loadedPlugins.containsKey(info)) { - //System.out.println("Skipping reloading of plugin " + file.getName() + " as it already exists and has OnPluginsReloaded."); + System.out.println("Skipping reloading of plugin " + file.getName() + " as it already exists and has OnPluginsReloaded."); continue; } @@ -143,7 +143,7 @@ public class PluginRepository { loader.loadClass(file.getName() + "." + f.getName().replace(".class","")); } - //System.out.println("Successfully loaded plugin " + file.getName() + ", version " + info.version); + System.out.println("Successfully loaded plugin " + file.getName() + ", version " + info.version); } } catch (Exception e) { System.err.println("Unexpected exception during plugin initialization:"); diff --git a/client/src/main/java/rt4/GameShell.java b/client/src/main/java/rt4/GameShell.java index 68e6c32..80a799d 100644 --- a/client/src/main/java/rt4/GameShell.java +++ b/client/src/main/java/rt4/GameShell.java @@ -323,7 +323,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene @OriginalMember(owner = "client!rc", name = "b", descriptor = "(B)V") public final synchronized void addCanvas() { if (canvas != null) { - // Remove the old canvas if it exists canvas.removeFocusListener(this); canvas.getParent().remove(canvas); } @@ -514,10 +513,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene canvasScale = getCurrentDevice().getDefaultConfiguration().getDefaultTransform().getScaleX(); if (frame != null && fullScreenFrame == null) { @Pc(84) Insets insets = frame.getInsets(); - // TODO: Add a flag to ignore this. - //canvas.setLocation(insets.left + leftMargin, topMargin + insets.top); + canvas.setLocation(insets.left + leftMargin, topMargin + insets.top); } else { - //canvas.setLocation(leftMargin, topMargin); + canvas.setLocation(leftMargin, topMargin); } } this.mainRedraw(); diff --git a/client/src/main/java/rt4/GlRenderer.java b/client/src/main/java/rt4/GlRenderer.java index d644740..92e4564 100644 --- a/client/src/main/java/rt4/GlRenderer.java +++ b/client/src/main/java/rt4/GlRenderer.java @@ -73,7 +73,7 @@ public final class GlRenderer { private static int maxTextureCoords; @OriginalMember(owner = "client!tf", name = "E", descriptor = "Lgl!javax/media/opengl/GLDrawable;") - public static GLDrawable drawable; + private static GLDrawable drawable; @OriginalMember(owner = "client!tf", name = "H", descriptor = "Z") public static boolean arbVertexProgramSupported;