Fix issues with desktop runtime

eaglercraft · eaglercraft · commit d262f9c825d9 · 2024-03-10T18:30:16.000-07:00
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java
@@ -80,7 +80,8 @@ public static ByteBuffer eaglerRead(String pathName) {
 				}
 			}
 		}else {
-			throw new EaglerFileSystemException("Not a file: " + f.getAbsolutePath());
+			logger.warn("Tried to read file that doesn't exist: \"{}\"", f.getAbsolutePath());
+			return null;
 		}
 	}
 
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java
@@ -192,6 +192,10 @@ static void initHooks(long glfwWindow) {
 		cursorHand = glfwCreateStandardCursor(GLFW_HAND_CURSOR);
 		cursorText = glfwCreateStandardCursor(GLFW_IBEAM_CURSOR);
 		glfwSetCursor(glfwWindow, cursorDefault);
+
+		if(!fullscreen && startupFullscreen) {
+			toggleFullscreen();
+		}
 	}
 	
 	public static int getWindowWidth() {
@@ -386,6 +390,7 @@ public static void setFunctionKeyModifier(int key) {
 	}
 
 	private static boolean fullscreen = false;
+	private static boolean startupFullscreen = false;
 	private static int[] lastPos = new int[4];
 
 	public static void toggleFullscreen() {
@@ -407,6 +412,10 @@ public static void toggleFullscreen() {
 		fullscreen = !fullscreen;
 	}
 
+	public static void setStartupFullscreen(boolean bool) {
+		startupFullscreen = bool;
+	}
+
 	// https://stackoverflow.com/a/31526753
 	private static long getCurrentMonitor(long window) {
 		int nmonitors, i;
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/LWJGLEntryPoint.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/LWJGLEntryPoint.java
@@ -6,6 +6,7 @@
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
 import net.lax1dude.eaglercraft.v1_8.EagUtils;
 import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformANGLE;
+import net.lax1dude.eaglercraft.v1_8.internal.PlatformInput;
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
 import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.program.ShaderSource;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayManager;
@@ -40,24 +41,33 @@ public static void main_(String[] args) {
 			System.err.println("Could not set system look and feel: " + e.toString());
 		}
 		
-		LaunchRenderDocDialog lr = new LaunchRenderDocDialog();
-		lr.setLocationRelativeTo(null);
-		lr.setVisible(true);
-		
-		while(lr.isVisible()) {
-			EagUtils.sleep(100l);
-		}
-		
-		lr.dispose();
-		
-		getANGLEPlatformFromArgs(args);
-		
+		boolean hideRenderDocDialog = false;
 		for(int i = 0; i < args.length; ++i) {
 			if(args[i].equalsIgnoreCase("highp")) {
 				ShaderSource.setHighP(true);
 			}
+			if(args[i].equalsIgnoreCase("hide-renderdoc")) {
+				hideRenderDocDialog = true;
+			}
+			if(args[i].equalsIgnoreCase("fullscreen")) {
+				PlatformInput.setStartupFullscreen(true);
+			}
+		}
+		
+		if(!hideRenderDocDialog) {
+			LaunchRenderDocDialog lr = new LaunchRenderDocDialog();
+			lr.setLocationRelativeTo(null);
+			lr.setVisible(true);
+			
+			while(lr.isVisible()) {
+				EagUtils.sleep(100l);
+			}
+			
+			lr.dispose();
 		}
 		
+		getANGLEPlatformFromArgs(args);
+		
 		RelayManager.relayManager.load(EagRuntime.getStorage("r"));
 
 		if (RelayManager.relayManager.count() <= 0) {
diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/MainMenuCreditsDialog.java b/src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/MainMenuCreditsDialog.java
@@ -2,7 +2,6 @@
 
 import javax.swing.JFrame;
 import javax.swing.JPanel;
-import javax.swing.border.EmptyBorder;
 import java.awt.BorderLayout;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenImportProfile.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenImportProfile.java
@@ -10,7 +10,6 @@
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.resources.I18n;
-import net.minecraft.client.resources.ResourcePackRepository;
 
 /**
  * Copyright (c) 2024 lax1dude. All Rights Reserved.
diff --git a/src/main/java/net/minecraft/client/audio/SoundHandler.java b/src/main/java/net/minecraft/client/audio/SoundHandler.java
@@ -11,11 +11,9 @@
 
 import net.lax1dude.eaglercraft.v1_8.internal.PlatformAudio;
 
-import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
-import net.lax1dude.eaglercraft.v1_8.EaglercraftSoundManager;
-
 import com.google.common.collect.Lists;
 
+import net.lax1dude.eaglercraft.v1_8.EaglercraftSoundManager;
 import net.lax1dude.eaglercraft.v1_8.IOUtils;
 import net.lax1dude.eaglercraft.v1_8.ThreadLocalRandom;
 import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider;
diff --git a/src/main/java/net/minecraft/client/resources/ResourcePackRepository.java b/src/main/java/net/minecraft/client/resources/ResourcePackRepository.java
@@ -185,7 +185,7 @@ public void updateResourcePack() throws IOException {
 
 			try {
 				this.texturePackIcon = this.reResourcePack.getPackImage();
-			} catch (IOException var2) {
+			} catch (Throwable var2) {
 				logger.error("Failed to load resource pack icon for \"{}\"!", reResourcePack.resourcePackFile);
 				logger.error(var2);
 			}
diff --git a/src/main/java/net/minecraft/command/CommandWeather.java b/src/main/java/net/minecraft/command/CommandWeather.java
@@ -1,7 +1,7 @@
 package net.minecraft.command;
 
 import java.util.List;
-import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
+
 import net.lax1dude.eaglercraft.v1_8.ThreadLocalRandom;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.BlockPos;
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java
@@ -4,13 +4,11 @@
 import java.util.List;
 
 import net.lax1dude.eaglercraft.v1_8.EagRuntime;
-import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
 import net.lax1dude.eaglercraft.v1_8.ThreadLocalRandom;
 import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayManager;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.teavm.jso.JSBody;
 import org.teavm.jso.JSObject;
 
 import net.lax1dude.eaglercraft.v1_8.internal.IClientConfigAdapter;

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,8 @@ public static ByteBuffer eaglerRead(String pathName) {`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`	`}else {`
`83`		`- throw new EaglerFileSystemException("Not a file: " + f.getAbsolutePath());`
	`83`	`+ logger.warn("Tried to read file that doesn't exist: \"{}\"", f.getAbsolutePath());`
	`84`	`+ return null;`
`84`	`85`	`}`
`85`	`86`	`}`
`86`	`87`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ public void updateResourcePack() throws IOException {`
`185`	`185`
`186`	`186`	`try {`
`187`	`187`	`this.texturePackIcon = this.reResourcePack.getPackImage();`
`188`		`- } catch (IOException var2) {`
	`188`	`+ } catch (Throwable var2) {`
`189`	`189`	`logger.error("Failed to load resource pack icon for \"{}\"!", reResourcePack.resourcePackFile);`
`190`	`190`	`logger.error(var2);`
`191`	`191`	`}`