diff --git a/.idea/misc.xml b/.idea/misc.xml index 18ad7e3..8bddb52 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/lwjgl-rundir/codecjorbis-20101023.jar b/lwjgl-rundir/codecjorbis-20101023.jar deleted file mode 100644 index e7e1f4a..0000000 Binary files a/lwjgl-rundir/codecjorbis-20101023.jar and /dev/null differ diff --git a/lwjgl-rundir/codecwav-20101023.jar b/lwjgl-rundir/codecwav-20101023.jar deleted file mode 100644 index 7b6b1bd..0000000 Binary files a/lwjgl-rundir/codecwav-20101023.jar and /dev/null differ diff --git a/lwjgl-rundir/eaglercraft.jar b/lwjgl-rundir/eaglercraft.jar index cc119a5..faaac96 100644 Binary files a/lwjgl-rundir/eaglercraft.jar and b/lwjgl-rundir/eaglercraft.jar differ diff --git a/lwjgl-rundir/libraryjavasound-20101123.jar b/lwjgl-rundir/libraryjavasound-20101123.jar deleted file mode 100644 index f1681b7..0000000 Binary files a/lwjgl-rundir/libraryjavasound-20101123.jar and /dev/null differ diff --git a/lwjgl-rundir/librarylwjglopenal-20100824.jar b/lwjgl-rundir/librarylwjglopenal-20100824.jar deleted file mode 100644 index 2f5e910..0000000 Binary files a/lwjgl-rundir/librarylwjglopenal-20100824.jar and /dev/null differ diff --git a/lwjgl-rundir/soundsystem-20120107.jar b/lwjgl-rundir/soundsystem-20120107.jar deleted file mode 100644 index 52b6468..0000000 Binary files a/lwjgl-rundir/soundsystem-20120107.jar and /dev/null differ diff --git a/src/main/java/net/minecraft/src/Minecraft.java b/src/main/java/net/minecraft/src/Minecraft.java index 2158e57..f386770 100644 --- a/src/main/java/net/minecraft/src/Minecraft.java +++ b/src/main/java/net/minecraft/src/Minecraft.java @@ -12,18 +12,11 @@ import java.nio.charset.StandardCharsets; import java.text.DecimalFormat; import java.util.*; import javax.imageio.ImageIO; -import org.lwjgl.LWJGLException; -import org.lwjgl.Sys; -import org.lwjgl.opengl.Display; -import org.lwjgl.opengl.DisplayMode; -import net.lax1dude.eaglercraft.EaglerAdapter; -import org.lwjgl.util.glu.GLU; public class Minecraft { /** A 10MiB preallocation to ensure the heap is reasonably sized. */ public static byte[] memoryReserve = new byte[10485760]; - private static final List macDisplayModes = new ArrayList<>(List.of(new DisplayMode[]{new DisplayMode(2560, 1600), new DisplayMode(2880, 1800)})); private ServerData currentServerData; /** The RenderEngine instance used by Minecraft */ @@ -496,55 +489,9 @@ public class Minecraft return var4; } - private void updateDisplayMode() throws LWJGLException + private void updateDisplayMode() { - HashSet var1 = new HashSet(); - Collections.addAll(var1, Display.getAvailableDisplayModes()); - DisplayMode var2 = Display.getDesktopDisplayMode(); - - if (!var1.contains(var2) && Util.getOSType() == EnumOS.MACOS) - { - Iterator var3 = macDisplayModes.iterator(); - - while (var3.hasNext()) - { - DisplayMode var4 = (DisplayMode)var3.next(); - boolean var5 = true; - Iterator var6 = var1.iterator(); - DisplayMode var7; - - while (var6.hasNext()) - { - var7 = (DisplayMode)var6.next(); - - if (var7.getBitsPerPixel() == 32 && var7.getWidth() == var4.getWidth() && var7.getHeight() == var4.getHeight()) - { - var5 = false; - break; - } - } - - if (!var5) - { - var6 = var1.iterator(); - - while (var6.hasNext()) - { - var7 = (DisplayMode)var6.next(); - - if (var7.getBitsPerPixel() == 32 && var7.getWidth() == var4.getWidth() / 2 && var7.getHeight() == var4.getHeight() / 2) - { - var2 = var7; - break; - } - } - } - } - } - - Display.setDisplayMode(var2); - this.displayWidth = var2.getWidth(); - this.displayHeight = var2.getHeight(); + this.updateDisplay(); } public static EnumOS getOs() { @@ -1002,16 +949,10 @@ public class Minecraft */ public void setIngameFocus() { - if (Display.isActive()) - { - if (!this.inGameHasFocus) - { - this.inGameHasFocus = true; - this.mouseHelper.grabMouseCursor(); - this.displayGuiScreen((GuiScreen)null); - this.leftClickCounter = 10000; - } - } + this.inGameHasFocus = true; + this.mouseHelper.grabMouseCursor(); + this.displayGuiScreen((GuiScreen)null); + this.leftClickCounter = 10000; } /** @@ -1019,12 +960,12 @@ public class Minecraft */ public void setIngameNotInFocus() { - if (this.inGameHasFocus) - { + //if (this.inGameHasFocus) + //{ KeyBinding.unPressAllKeys(); this.inGameHasFocus = false; this.mouseHelper.ungrabMouseCursor(); - } + //} } /** @@ -1162,56 +1103,7 @@ public class Minecraft */ public void toggleFullscreen() { - try - { - this.fullscreen = !this.fullscreen; - if (this.fullscreen) - { - this.updateDisplayMode(); - this.displayWidth = Display.getDisplayMode().getWidth(); - this.displayHeight = Display.getDisplayMode().getHeight(); - - if (this.displayWidth <= 0) - { - this.displayWidth = 1; - } - - if (this.displayHeight <= 0) - { - this.displayHeight = 1; - } - } - else - { - Display.setDisplayMode(new DisplayMode(this.tempDisplayWidth, this.tempDisplayHeight)); - this.displayWidth = this.tempDisplayWidth; - this.displayHeight = this.tempDisplayHeight; - - if (this.displayWidth <= 0) - { - this.displayWidth = 1; - } - - if (this.displayHeight <= 0) - { - this.displayHeight = 1; - } - } - - if (this.currentScreen != null) - { - this.resize(this.displayWidth, this.displayHeight); - } - - Display.setFullscreen(this.fullscreen); - Display.setVSyncEnabled(this.gameSettings.enableVsync); - Display.update(); - } - catch (Exception var2) - { - var2.printStackTrace(); - } } /**