undo some testing changes

This commit is contained in:
downthecrop 2024-10-28 16:32:51 -07:00
parent cb9758f7d5
commit cf5ccbf1ac
3 changed files with 6 additions and 8 deletions

View file

@ -70,7 +70,7 @@ public class PluginRepository {
File pluginsDirectory = new File(GlobalJsonConfig.instance.pluginsFolder); File pluginsDirectory = new File(GlobalJsonConfig.instance.pluginsFolder);
if (!pluginsDirectory.exists()) { 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; return;
} }
@ -120,7 +120,7 @@ public class PluginRepository {
} }
if (loadedPlugins.containsKey(info)) { 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; continue;
} }
@ -143,7 +143,7 @@ public class PluginRepository {
loader.loadClass(file.getName() + "." + f.getName().replace(".class","")); 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) { } catch (Exception e) {
System.err.println("Unexpected exception during plugin initialization:"); System.err.println("Unexpected exception during plugin initialization:");

View file

@ -323,7 +323,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
@OriginalMember(owner = "client!rc", name = "b", descriptor = "(B)V") @OriginalMember(owner = "client!rc", name = "b", descriptor = "(B)V")
public final synchronized void addCanvas() { public final synchronized void addCanvas() {
if (canvas != null) { if (canvas != null) {
// Remove the old canvas if it exists
canvas.removeFocusListener(this); canvas.removeFocusListener(this);
canvas.getParent().remove(canvas); canvas.getParent().remove(canvas);
} }
@ -514,10 +513,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
canvasScale = getCurrentDevice().getDefaultConfiguration().getDefaultTransform().getScaleX(); canvasScale = getCurrentDevice().getDefaultConfiguration().getDefaultTransform().getScaleX();
if (frame != null && fullScreenFrame == null) { if (frame != null && fullScreenFrame == null) {
@Pc(84) Insets insets = frame.getInsets(); @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 { } else {
//canvas.setLocation(leftMargin, topMargin); canvas.setLocation(leftMargin, topMargin);
} }
} }
this.mainRedraw(); this.mainRedraw();

View file

@ -73,7 +73,7 @@ public final class GlRenderer {
private static int maxTextureCoords; private static int maxTextureCoords;
@OriginalMember(owner = "client!tf", name = "E", descriptor = "Lgl!javax/media/opengl/GLDrawable;") @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") @OriginalMember(owner = "client!tf", name = "H", descriptor = "Z")
public static boolean arbVertexProgramSupported; public static boolean arbVertexProgramSupported;