diff --git a/patches/minecraft/net/minecraft/client/audio/SoundHandler.edit.java b/patches/minecraft/net/minecraft/client/audio/SoundHandler.edit.java index bd96d42..0ec2942 100644 --- a/patches/minecraft/net/minecraft/client/audio/SoundHandler.edit.java +++ b/patches/minecraft/net/minecraft/client/audio/SoundHandler.edit.java @@ -13,17 +13,15 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 15 @ 1 : 11 +> CHANGE 1 : 13 @ 1 : 11 ~ import java.util.Set; ~ ~ 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/patches/minecraft/net/minecraft/client/resources/ResourcePackRepository.edit.java b/patches/minecraft/net/minecraft/client/resources/ResourcePackRepository.edit.java index a544564..6f2ef20 100644 --- a/patches/minecraft/net/minecraft/client/resources/ResourcePackRepository.edit.java +++ b/patches/minecraft/net/minecraft/client/resources/ResourcePackRepository.edit.java @@ -154,8 +154,9 @@ > DELETE 3 @ 3 : 6 -> CHANGE 6 : 8 @ 6 : 7 +> CHANGE 5 : 8 @ 5 : 7 +~ } catch (Throwable var2) { ~ logger.error("Failed to load resource pack icon for \"{}\"!", reResourcePack.resourcePackFile); ~ logger.error(var2); diff --git a/patches/minecraft/net/minecraft/command/CommandWeather.edit.java b/patches/minecraft/net/minecraft/command/CommandWeather.edit.java index 906ecf1..5df0ee5 100644 --- a/patches/minecraft/net/minecraft/command/CommandWeather.edit.java +++ b/patches/minecraft/net/minecraft/command/CommandWeather.edit.java @@ -7,7 +7,7 @@ > CHANGE 3 : 5 @ 3 : 8 -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; +~ ~ import net.lax1dude.eaglercraft.v1_8.ThreadLocalRandom; > INSERT 6 : 7 @ 6 diff --git a/sources/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java b/sources/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java index 02ad4e4..ece3fff 100644 --- a/sources/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java +++ b/sources/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformFilesystem.java @@ -80,7 +80,8 @@ public class PlatformFilesystem { } } }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/sources/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java b/sources/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java index 788f4b5..074cace 100644 --- a/sources/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java +++ b/sources/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java @@ -192,6 +192,10 @@ public class PlatformInput { 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 class PlatformInput { } 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 class PlatformInput { 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/sources/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/LWJGLEntryPoint.java b/sources/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/LWJGLEntryPoint.java index 1c79202..23af40b 100644 --- a/sources/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/LWJGLEntryPoint.java +++ b/sources/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/LWJGLEntryPoint.java @@ -6,6 +6,7 @@ import javax.swing.UnsupportedLookAndFeelException; 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 class LWJGLEntryPoint { 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/sources/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/MainMenuCreditsDialog.java b/sources/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/MainMenuCreditsDialog.java index 4b8f666..7c96190 100644 --- a/sources/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/MainMenuCreditsDialog.java +++ b/sources/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/lwjgl/MainMenuCreditsDialog.java @@ -2,7 +2,6 @@ package net.lax1dude.eaglercraft.v1_8.internal.lwjgl; 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/sources/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenImportProfile.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenImportProfile.java index 2c21f7c..7eecc81 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenImportProfile.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenImportProfile.java @@ -10,7 +10,6 @@ import net.lax1dude.eaglercraft.v1_8.minecraft.GuiScreenGenericErrorMessage; 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/sources/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java b/sources/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java index b581bd8..e9ad8a2 100644 --- a/sources/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java +++ b/sources/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMClientConfigAdapter.java @@ -4,13 +4,11 @@ import java.util.ArrayList; 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;