diff --git a/.gradle/8.0/executionHistory/executionHistory.bin b/.gradle/8.0/executionHistory/executionHistory.bin index 6ca322b..7e82767 100644 Binary files a/.gradle/8.0/executionHistory/executionHistory.bin and b/.gradle/8.0/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.0/executionHistory/executionHistory.lock b/.gradle/8.0/executionHistory/executionHistory.lock index 76f1936..c77e34a 100644 Binary files a/.gradle/8.0/executionHistory/executionHistory.lock and b/.gradle/8.0/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.0/fileHashes/fileHashes.bin b/.gradle/8.0/fileHashes/fileHashes.bin index baa1a76..4af5a67 100644 Binary files a/.gradle/8.0/fileHashes/fileHashes.bin and b/.gradle/8.0/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.0/fileHashes/fileHashes.lock b/.gradle/8.0/fileHashes/fileHashes.lock index 422c309..a10d036 100644 Binary files a/.gradle/8.0/fileHashes/fileHashes.lock and b/.gradle/8.0/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.0/fileHashes/resourceHashesCache.bin b/.gradle/8.0/fileHashes/resourceHashesCache.bin index ec5d7e5..0dc400b 100644 Binary files a/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/.gradle/8.0/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index a56806e..7180b07 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 82b3db8..879ff70 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/build/classes/java/main/net/lax1dude/eaglercraft/ConfigConstants.class b/build/classes/java/main/net/lax1dude/eaglercraft/ConfigConstants.class index 92d0d85..2a2f760 100644 Binary files a/build/classes/java/main/net/lax1dude/eaglercraft/ConfigConstants.class and b/build/classes/java/main/net/lax1dude/eaglercraft/ConfigConstants.class differ diff --git a/build/classes/java/main/net/lax1dude/eaglercraft/EaglerProfile.class b/build/classes/java/main/net/lax1dude/eaglercraft/EaglerProfile.class index 851df19..ce73bb6 100644 Binary files a/build/classes/java/main/net/lax1dude/eaglercraft/EaglerProfile.class and b/build/classes/java/main/net/lax1dude/eaglercraft/EaglerProfile.class differ diff --git a/build/classes/java/main/net/minecraft/src/EnumOptions.class b/build/classes/java/main/net/minecraft/src/EnumOptions.class index c9f2c7c..11e2dd2 100644 Binary files a/build/classes/java/main/net/minecraft/src/EnumOptions.class and b/build/classes/java/main/net/minecraft/src/EnumOptions.class differ diff --git a/build/classes/java/main/net/minecraft/src/EnumOptionsHelper.class b/build/classes/java/main/net/minecraft/src/EnumOptionsHelper.class index f81ec9a..baed82e 100644 Binary files a/build/classes/java/main/net/minecraft/src/EnumOptionsHelper.class and b/build/classes/java/main/net/minecraft/src/EnumOptionsHelper.class differ diff --git a/build/classes/java/main/net/minecraft/src/GameSettings.class b/build/classes/java/main/net/minecraft/src/GameSettings.class index a3dec84..8d33cd3 100644 Binary files a/build/classes/java/main/net/minecraft/src/GameSettings.class and b/build/classes/java/main/net/minecraft/src/GameSettings.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiMainMenu.class b/build/classes/java/main/net/minecraft/src/GuiMainMenu.class index 8e8ea17..fce6ac1 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiMainMenu.class and b/build/classes/java/main/net/minecraft/src/GuiMainMenu.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiOptions.class b/build/classes/java/main/net/minecraft/src/GuiOptions.class index 2f0709b..4d5eaff 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiOptions.class and b/build/classes/java/main/net/minecraft/src/GuiOptions.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiVideoSettings.class b/build/classes/java/main/net/minecraft/src/GuiVideoSettings.class index fbfa469..e4fc2d4 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiVideoSettings.class and b/build/classes/java/main/net/minecraft/src/GuiVideoSettings.class differ diff --git a/build/classes/java/main/net/minecraft/src/Minecraft.class b/build/classes/java/main/net/minecraft/src/Minecraft.class index 3b60a9c..6434391 100644 Binary files a/build/classes/java/main/net/minecraft/src/Minecraft.class and b/build/classes/java/main/net/minecraft/src/Minecraft.class differ diff --git a/build/libs/eaglercraft.jar b/build/libs/eaglercraft.jar index 506e9c1..719c4e3 100644 Binary files a/build/libs/eaglercraft.jar and b/build/libs/eaglercraft.jar differ diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index d9917e1..5b06748 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/lwjgl-rundir/_eagstorage.a.dat b/lwjgl-rundir/_eagstorage.a.dat new file mode 100644 index 0000000..72f052d Binary files /dev/null and b/lwjgl-rundir/_eagstorage.a.dat differ diff --git a/lwjgl-rundir/_eagstorage.forced.dat b/lwjgl-rundir/_eagstorage.forced.dat new file mode 100644 index 0000000..3d90e9d Binary files /dev/null and b/lwjgl-rundir/_eagstorage.forced.dat differ diff --git a/lwjgl-rundir/_eagstorage.g.dat b/lwjgl-rundir/_eagstorage.g.dat new file mode 100644 index 0000000..edc907c Binary files /dev/null and b/lwjgl-rundir/_eagstorage.g.dat differ diff --git a/lwjgl-rundir/_eagstorage.p.dat b/lwjgl-rundir/_eagstorage.p.dat new file mode 100644 index 0000000..b447fb5 Binary files /dev/null and b/lwjgl-rundir/_eagstorage.p.dat differ diff --git a/lwjgl-rundir/client-log.txt b/lwjgl-rundir/client-log.txt new file mode 100644 index 0000000..eb44714 --- /dev/null +++ b/lwjgl-rundir/client-log.txt @@ -0,0 +1,4 @@ +2025-02-02 13:24:54 [CLIENT] [WARNING] Failed to load options +2025-02-02 13:32:00 [CLIENT] [WARNING] Failed to load options +2025-02-02 13:34:18 [CLIENT] [WARNING] Failed to load options +2025-02-02 13:35:42 [CLIENT] [WARNING] Failed to load options diff --git a/lwjgl-rundir/eaglercraft.jar b/lwjgl-rundir/eaglercraft.jar index 4f0b7f5..719c4e3 100644 Binary files a/lwjgl-rundir/eaglercraft.jar and b/lwjgl-rundir/eaglercraft.jar differ diff --git a/src/main/java/net/lax1dude/eaglercraft/ConfigConstants.java b/src/main/java/net/lax1dude/eaglercraft/ConfigConstants.java index 58b64dd..1953298 100644 --- a/src/main/java/net/lax1dude/eaglercraft/ConfigConstants.java +++ b/src/main/java/net/lax1dude/eaglercraft/ConfigConstants.java @@ -3,10 +3,8 @@ package net.lax1dude.eaglercraft; import java.util.List; public class ConfigConstants { - - public static boolean profanity = false; - public static final String version = "1.5.2-sp2.01"; + public static final String version = "1.6.4 (25w05a)"; public static final String mainMenuString = "eaglercraft " + version; public static final String forkMe = null; diff --git a/src/main/java/net/lax1dude/eaglercraft/EaglerProfile.java b/src/main/java/net/lax1dude/eaglercraft/EaglerProfile.java index e64fc39..673ba1c 100644 --- a/src/main/java/net/lax1dude/eaglercraft/EaglerProfile.java +++ b/src/main/java/net/lax1dude/eaglercraft/EaglerProfile.java @@ -199,13 +199,7 @@ public class EaglerProfile { } static { - String[] usernameDefaultWords = ConfigConstants.profanity ? new String[] { - "Eagler", "Eagler", "Bitch", "Cock", "Milf", "Milf", "Yeer", "Groon", - "Eag", "Deevis", "Chode", "Deev", "Deev", "Fucker", "Fucking", - "Dumpster", "Dumpster", "Cum", "Chad", "Egg", "Fudgler", "Fudgli", - "Yee", "Yee", "Yee", "Yeet", "Flumpter", "Darvy", "Darver", "Darver", - "Fuck", "Fuck", "Frick", "Eagler", "Vigg", "Vigg", "Cunt", "Darvig" - } : new String[] { + String[] usernameDefaultWords = new String[] { "Yeeish", "Yeeish", "Yee", "Yee", "Yeer", "Yeeler", "Eagler", "Eagl", "Darver", "Darvler", "Vool", "Vigg", "Vigg", "Deev", "Yigg", "Yeeg" }; diff --git a/src/main/java/net/minecraft/src/EnumOptions.java b/src/main/java/net/minecraft/src/EnumOptions.java index 9f58dcb..9b6449d 100644 --- a/src/main/java/net/minecraft/src/EnumOptions.java +++ b/src/main/java/net/minecraft/src/EnumOptions.java @@ -1,54 +1,28 @@ package net.minecraft.src; -public enum EnumOptions -{ - MUSIC("options.music", true, false), - SOUND("options.sound", true, false), - INVERT_MOUSE("options.invertMouse", false, true), - SENSITIVITY("options.sensitivity", true, false), - FOV("options.fov", true, false), - GAMMA("options.gamma", true, false), - RENDER_DISTANCE("options.renderDistance", false, false), - VIEW_BOBBING("options.viewBobbing", false, true), - ANAGLYPH("options.anaglyph", false, true), - ADVANCED_OPENGL("options.advancedOpengl", false, true), - FRAMERATE_LIMIT("options.framerateLimit", false, false), - DIFFICULTY("options.difficulty", false, false), - GRAPHICS("options.graphics", false, false), - AMBIENT_OCCLUSION("options.ao", false, false), - GUI_SCALE("options.guiScale", false, false), - RENDER_CLOUDS("options.renderClouds", false, true), - PARTICLES("options.particles", false, false), - CHAT_VISIBILITY("options.chat.visibility", false, false), - CHAT_COLOR("options.chat.color", false, true), - CHAT_LINKS("options.chat.links", false, true), - CHAT_OPACITY("options.chat.opacity", true, false), - CHAT_LINKS_PROMPT("options.chat.links.prompt", false, true), - USE_SERVER_TEXTURES("options.serverTextures", false, true), - SNOOPER_ENABLED("options.snooper", false, true), - USE_FULLSCREEN("options.fullscreen", false, true), - ENABLE_VSYNC("options.vsync", false, true), - SHOW_CAPE("options.showCape", false, true), - TOUCHSCREEN("options.touchscreen", false, true), - CHAT_SCALE("options.chat.scale", true, false), - CHAT_WIDTH("options.chat.width", true, false), - CHAT_HEIGHT_FOCUSED("options.chat.height.focused", true, false), - CHAT_HEIGHT_UNFOCUSED("options.chat.height.unfocused", true, false); +public enum EnumOptions { + MUSIC("options.music", true, false), SOUND("options.sound", true, false), INVERT_MOUSE("options.invertMouse", false, true), SENSITIVITY("options.sensitivity", true, false), FOV("options.fov", true, false), + GAMMA("options.gamma", true, false), RENDER_DISTANCE("options.renderDistance", false, false), VIEW_BOBBING("options.viewBobbing", false, true), ANAGLYPH("options.anaglyph", false, true), + /*ADVANCED_OPENGL("options.advancedOpengl", false, true),*/ FRAMERATE_LIMIT("options.framerateLimit", false, false), DIFFICULTY("options.difficulty", false, false), GRAPHICS("options.graphics", false, false), + AMBIENT_OCCLUSION("options.ao", false, false), GUI_SCALE("options.guiScale", false, false), RENDER_CLOUDS("options.renderClouds", false, true), PARTICLES("options.particles", false, false), + CHAT_VISIBILITY("options.chat.visibility", false, false), CHAT_COLOR("options.chat.color", false, true), CHAT_LINKS("options.chat.links", false, true), CHAT_OPACITY("options.chat.opacity", true, false), + CHAT_LINKS_PROMPT("options.chat.links.prompt", false, true), USE_SERVER_TEXTURES("options.serverTextures", false, true), SNOOPER_ENABLED("options.snooper", false, true), USE_FULLSCREEN("options.fullscreen", false, true), + ENABLE_FOG("options.fog", false, true), SHOW_CAPE("options.showCape", false, true), ANTIALIASING("options.framebufferAntialias", false, false), CHAT_SCALE("options.chat.scale", true, false), CHAT_WIDTH("options.chat.width", true, false), + CHAT_HEIGHT_FOCUSED("options.chat.height.focused", true, false), CHAT_HEIGHT_UNFOCUSED("options.chat.height.unfocused", true, false), CHUNK_UPDATES("options.chunkUpdates", false, false), ADDERALL("options.adderall", false, true), + VSYNC("options.vsync", false, true); + private final boolean enumFloat; private final boolean enumBoolean; private final String enumString; - public static EnumOptions getEnumOptions(int par0) - { + public static EnumOptions getEnumOptions(int par0) { EnumOptions[] var1 = values(); int var2 = var1.length; - for (int var3 = 0; var3 < var2; ++var3) - { + for (int var3 = 0; var3 < var2; ++var3) { EnumOptions var4 = var1[var3]; - if (var4.returnEnumOrdinal() == par0) - { + if (var4.returnEnumOrdinal() == par0) { return var4; } } @@ -56,30 +30,25 @@ public enum EnumOptions return null; } - private EnumOptions(String par3Str, boolean par4, boolean par5) - { + private EnumOptions(String par3Str, boolean par4, boolean par5) { this.enumString = par3Str; this.enumFloat = par4; this.enumBoolean = par5; } - public boolean getEnumFloat() - { + public boolean getEnumFloat() { return this.enumFloat; } - public boolean getEnumBoolean() - { + public boolean getEnumBoolean() { return this.enumBoolean; } - public int returnEnumOrdinal() - { + public int returnEnumOrdinal() { return this.ordinal(); } - public String getEnumString() - { + public String getEnumString() { return this.enumString; } } diff --git a/src/main/java/net/minecraft/src/EnumOptionsHelper.java b/src/main/java/net/minecraft/src/EnumOptionsHelper.java index 7a88b33..9025a03 100644 --- a/src/main/java/net/minecraft/src/EnumOptionsHelper.java +++ b/src/main/java/net/minecraft/src/EnumOptionsHelper.java @@ -33,15 +33,6 @@ class EnumOptionsHelper ; } - try - { - enumOptionsMappingHelperArray[EnumOptions.ADVANCED_OPENGL.ordinal()] = 4; - } - catch (NoSuchFieldError var11) - { - ; - } - try { enumOptionsMappingHelperArray[EnumOptions.RENDER_CLOUDS.ordinal()] = 5; @@ -107,7 +98,7 @@ class EnumOptionsHelper try { - enumOptionsMappingHelperArray[EnumOptions.ENABLE_VSYNC.ordinal()] = 12; + enumOptionsMappingHelperArray[EnumOptions.VSYNC.ordinal()] = 12; } catch (NoSuchFieldError var3) { @@ -122,14 +113,5 @@ class EnumOptionsHelper { ; } - - try - { - enumOptionsMappingHelperArray[EnumOptions.TOUCHSCREEN.ordinal()] = 14; - } - catch (NoSuchFieldError var1) - { - ; - } } } diff --git a/src/main/java/net/minecraft/src/GameSettings.java b/src/main/java/net/minecraft/src/GameSettings.java index b9bdfef..18c4d16 100644 --- a/src/main/java/net/minecraft/src/GameSettings.java +++ b/src/main/java/net/minecraft/src/GameSettings.java @@ -1,75 +1,71 @@ package net.minecraft.src; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.PrintWriter; -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.Display; +import net.lax1dude.eaglercraft.EaglerAdapter; +import net.lax1dude.eaglercraft.IntegratedServer; +import net.lax1dude.eaglercraft.LocalStorageManager; +import net.minecraft.src.Minecraft; -public class GameSettings -{ - private static final String[] RENDER_DISTANCES = new String[] {"options.renderDistance.far", "options.renderDistance.normal", "options.renderDistance.short", "options.renderDistance.tiny"}; - private static final String[] DIFFICULTIES = new String[] {"options.difficulty.peaceful", "options.difficulty.easy", "options.difficulty.normal", "options.difficulty.hard"}; +public class GameSettings { + private static final String[] RENDER_DISTANCES = new String[] { "options.renderDistance.far", "options.renderDistance.normal", "options.renderDistance.short", "options.renderDistance.tiny" }; + private static final String[] DIFFICULTIES = new String[] { "options.difficulty.peaceful", "options.difficulty.easy", "options.difficulty.normal", "options.difficulty.hard" }; /** GUI scale values */ - private static final String[] GUISCALES = new String[] {"options.guiScale.auto", "options.guiScale.small", "options.guiScale.normal", "options.guiScale.large"}; - private static final String[] CHAT_VISIBILITIES = new String[] {"options.chat.visibility.full", "options.chat.visibility.system", "options.chat.visibility.hidden"}; - private static final String[] PARTICLES = new String[] {"options.particles.all", "options.particles.decreased", "options.particles.minimal"}; + private static final String[] GUISCALES = new String[] { "options.guiScale.auto", "options.guiScale.small", "options.guiScale.normal", "options.guiScale.large" }; + private static final String[] CHAT_VISIBILITIES = new String[] { "options.chat.visibility.full", "options.chat.visibility.system", "options.chat.visibility.hidden" }; + private static final String[] PARTICLES = new String[] { "options.particles.all", "options.particles.decreased", "options.particles.minimal" }; /** Limit framerate labels */ - private static final String[] LIMIT_FRAMERATES = new String[] {"performance.max", "performance.balanced", "performance.powersaver"}; - private static final String[] AMBIENT_OCCLUSIONS = new String[] {"options.ao.off", "options.ao.min", "options.ao.max"}; + private static final String[] LIMIT_FRAMERATES = new String[] { "performance.max", "performance.balanced", "performance.powersaver" }; + private static final String[] AMBIENT_OCCLUSIONS = new String[] { "options.ao.off", "options.ao.min", "options.ao.max" }; private static final String[] ANTIALIASING = new String[] { "options.framebufferAntialias.none", "options.framebufferAntialias.auto", "options.framebufferAntialias.fxaa" , "options.framebufferAntialias.msaa4", "options.framebufferAntialias.msaa8" }; public float musicVolume = 1.0F; public float soundVolume = 1.0F; public float mouseSensitivity = 0.5F; - public boolean invertMouse; - public int renderDistance; + public boolean invertMouse = false; + public int renderDistance = 2; public boolean viewBobbing = true; - public boolean anaglyph; + public boolean anaglyph = false; /** Advanced OpenGL */ - public boolean advancedOpengl; - public int limitFramerate = 1; - public boolean fancyGraphics = true; + public boolean advancedOpengl = false; + public int limitFramerate = 0; + public boolean fancyGraphics = false; + public boolean enableFog = true; /** Smooth Lighting */ - public int ambientOcclusion = 2; + public int ambientOcclusion = 0; /** Clouds flag */ - public boolean clouds = true; + public boolean clouds = false; /** The name of the selected texture pack. */ public String skin = "Default"; - public int chatVisibility; + public int chatVisibility = 0; public boolean chatColours = true; public boolean chatLinks = true; public boolean chatLinksPrompt = true; public float chatOpacity = 1.0F; public boolean serverTextures = true; - public boolean snooperEnabled = true; - public boolean fullScreen; + public boolean snooperEnabled = false; + public boolean fullScreen = false; public boolean enableVsync = true; public boolean hideVsyncWarning = false; - public boolean hideServerAddress; + public boolean hideServerAddress = false; /** * Whether to show advanced information on item tooltips, toggled by F3+H */ - public boolean advancedItemTooltips; + public boolean advancedItemTooltips = false; /** Whether to pause when the game loses focus, toggled by F3+P */ public boolean pauseOnLostFocus = true; /** Whether to show your cape */ public boolean showCape = true; - public boolean touchscreen; + public boolean touchscreen = false; public int antialiasMode = 1; - public int overrideWidth; - public int overrideHeight; + public int overrideWidth = 0; + public int overrideHeight = 0; public boolean heldItemTooltips = true; public float chatScale = 1.0F; public float chatWidth = 1.0F; @@ -88,13 +84,11 @@ public class GameSettings public KeyBinding keyBindUseItem = new KeyBinding("key.use", -99); public KeyBinding keyBindPlayerList = new KeyBinding("key.playerlist", 15); public KeyBinding keyBindPickBlock = new KeyBinding("key.pickItem", -98); - public KeyBinding keyBindCommand = new KeyBinding("key.command", 53); public KeyBinding keyBindSprint = new KeyBinding("key.sprint", 19); public KeyBinding keyBindZoom = new KeyBinding("key.zoom", 46); public KeyBinding keyBindFunction = new KeyBinding("key.function", 33); public KeyBinding[] keyBindings; protected Minecraft mc; - private File optionsFile; public int difficulty; public boolean hideGUI; public int thirdPersonView; @@ -103,6 +97,8 @@ public class GameSettings public boolean showDebugInfo; public boolean showDebugProfilerChart; + public boolean showCoordinates; + /** The lastServer string. */ public String lastServer; @@ -130,48 +126,31 @@ public class GameSettings /** Game settings language */ public String language; + public boolean showSkinJacket = true; + public boolean showSkinHat = true; + public boolean showSkinLeftArm = true; + public boolean showSkinRightArm = true; + public boolean showSkinLeftLeg = true; + public boolean showSkinRightLeg = true; - /** Eagler settings */ - public boolean showSkinJacket = true; - public boolean showSkinHat = true; - public boolean showSkinLeftArm = true; - public boolean showSkinRightArm = true; - public boolean showSkinLeftLeg = true; - public boolean showSkinRightLeg = true; + public boolean allowFNAWSkins = true; + public boolean showOtherCapes = true; - public boolean allowFNAWSkins = true; - public boolean showOtherCapes = true; + public int chunkUpdatePerFrame = 0; - public int chunkUpdatePerFrame = 0; + public int voiceListenRadius = 16; + public float voiceListenVolume = 0.5f; + public float voiceSpeakVolume = 0.5f; + public int voicePTTKey = 47; - public int voiceListenRadius = 16; - public float voiceListenVolume = 0.5f; - public float voiceSpeakVolume = 0.5f; - public int voicePTTKey = 47; - - public boolean hideJoinCode = false; - public int relayTimeout = 4; - - public boolean adderall = false; + public boolean hideJoinCode = false; + public int relayTimeout = 4; - public boolean showCoordinates; - - public GameSettings(Minecraft par1Minecraft, File par2File) - { - this.keyBindings = new KeyBinding[] {this.keyBindAttack, this.keyBindUseItem, this.keyBindForward, this.keyBindLeft, this.keyBindBack, this.keyBindRight, this.keyBindJump, this.keyBindSneak, this.keyBindDrop, this.keyBindInventory, this.keyBindChat, this.keyBindPlayerList, this.keyBindPickBlock, this.keyBindCommand}; - this.difficulty = 2; - this.lastServer = ""; - this.noclipRate = 1.0F; - this.debugCamRate = 1.0F; - this.language = "en_US"; - this.mc = par1Minecraft; - this.optionsFile = new File(par2File, "options.txt"); - this.loadOptions(); - } + public boolean adderall = false; public GameSettings(Minecraft par1Minecraft) { this.keyBindings = new KeyBinding[] { this.keyBindAttack, this.keyBindUseItem, this.keyBindForward, this.keyBindLeft, this.keyBindBack, this.keyBindRight, this.keyBindJump, this.keyBindSneak, this.keyBindDrop, this.keyBindInventory, - this.keyBindChat, this.keyBindPlayerList, this.keyBindPickBlock}; + this.keyBindChat, this.keyBindPlayerList, this.keyBindPickBlock, this.keyBindSprint, this.keyBindZoom, this.keyBindFunction }; this.difficulty = 1; this.hideGUI = false; this.thirdPersonView = 0; @@ -193,37 +172,15 @@ public class GameSettings this.loadOptions(); } - public GameSettings() - { - this.keyBindings = new KeyBinding[] {this.keyBindAttack, this.keyBindUseItem, this.keyBindForward, this.keyBindLeft, this.keyBindBack, this.keyBindRight, this.keyBindJump, this.keyBindSneak, this.keyBindDrop, this.keyBindInventory, this.keyBindChat, this.keyBindPlayerList, this.keyBindPickBlock, this.keyBindCommand}; - this.difficulty = 2; - this.lastServer = ""; - this.noclipRate = 1.0F; - this.debugCamRate = 1.0F; - this.language = "en_US"; - } - - public int getSkinLayers() { - int skinLayersByte = 0; - if(showSkinJacket) skinLayersByte |= 1; - if(showSkinHat) skinLayersByte |= 2; - if(showSkinLeftArm) skinLayersByte |= 4; - if(showSkinRightArm) skinLayersByte |= 8; - if(showSkinLeftLeg) skinLayersByte |= 16; - if(showSkinRightLeg) skinLayersByte |= 32; - return skinLayersByte; - } - - public String getKeyBindingDescription(int par1) - { - return I18n.getString(this.keyBindings[par1].keyDescription); + public String getKeyBindingDescription(int par1) { + StringTranslate var2 = StringTranslate.getInstance(); + return var2.translateKey(this.keyBindings[par1].keyDescription); } /** * The string that appears inside the button/slider in the options menu. */ - public String getOptionDisplayString(int par1) - { + public String getOptionDisplayString(int par1) { int var2 = this.keyBindings[par1].keyCode; return getKeyDisplayString(var2); } @@ -231,228 +188,207 @@ public class GameSettings /** * Represents a key or mouse button as a string. Args: key */ - public static String getKeyDisplayString(int par0) - { - return par0 < 0 ? I18n.getStringParams("key.mouseButton", new Object[] {Integer.valueOf(par0 + 101)}): Keyboard.getKeyName(par0); + public static String getKeyDisplayString(int par0) { + return par0 < 0 ? StatCollector.translateToLocalFormatted("key.mouseButton", new Object[] { Integer.valueOf(par0 + 101) }) : EaglerAdapter.getKeyName(par0); } /** * Returns whether the specified key binding is currently being pressed. */ - public static boolean isKeyDown(KeyBinding par0KeyBinding) - { - return par0KeyBinding.keyCode < 0 ? Mouse.isButtonDown(par0KeyBinding.keyCode + 100) : Keyboard.isKeyDown(par0KeyBinding.keyCode); + public static boolean isKeyDown(KeyBinding par0KeyBinding) { + return par0KeyBinding.keyCode < 0 ? EaglerAdapter.mouseIsButtonDown(par0KeyBinding.keyCode + 100) : EaglerAdapter.isKeyDown(par0KeyBinding.keyCode); } /** * Sets a key binding. */ - public void setKeyBinding(int par1, int par2) - { + public void setKeyBinding(int par1, int par2) { this.keyBindings[par1].keyCode = par2; this.saveOptions(); } /** - * If the specified option is controlled by a slider (float value), this will set the float value. + * If the specified option is controlled by a slider (float value), this will + * set the float value. */ - public void setOptionFloatValue(EnumOptions par1EnumOptions, float par2) - { - if (par1EnumOptions == EnumOptions.MUSIC) - { + public void setOptionFloatValue(EnumOptions par1EnumOptions, float par2) { + if (par1EnumOptions == EnumOptions.MUSIC) { this.musicVolume = par2; this.mc.sndManager.onSoundOptionsChanged(); } - if (par1EnumOptions == EnumOptions.SOUND) - { + if (par1EnumOptions == EnumOptions.SOUND) { this.soundVolume = par2; this.mc.sndManager.onSoundOptionsChanged(); } - if (par1EnumOptions == EnumOptions.SENSITIVITY) - { + if (par1EnumOptions == EnumOptions.SENSITIVITY) { this.mouseSensitivity = par2; } - if (par1EnumOptions == EnumOptions.FOV) - { + if (par1EnumOptions == EnumOptions.FOV) { this.fovSetting = par2; } - if (par1EnumOptions == EnumOptions.GAMMA) - { + if (par1EnumOptions == EnumOptions.GAMMA) { this.gammaSetting = par2; } - if (par1EnumOptions == EnumOptions.CHAT_OPACITY) - { + if (par1EnumOptions == EnumOptions.CHAT_OPACITY) { this.chatOpacity = par2; this.mc.ingameGUI.getChatGUI().func_96132_b(); } - if (par1EnumOptions == EnumOptions.CHAT_HEIGHT_FOCUSED) - { + if (par1EnumOptions == EnumOptions.CHAT_HEIGHT_FOCUSED) { this.chatHeightFocused = par2; this.mc.ingameGUI.getChatGUI().func_96132_b(); } - if (par1EnumOptions == EnumOptions.CHAT_HEIGHT_UNFOCUSED) - { + if (par1EnumOptions == EnumOptions.CHAT_HEIGHT_UNFOCUSED) { this.chatHeightUnfocused = par2; this.mc.ingameGUI.getChatGUI().func_96132_b(); } - if (par1EnumOptions == EnumOptions.CHAT_WIDTH) - { + if (par1EnumOptions == EnumOptions.CHAT_WIDTH) { this.chatWidth = par2; this.mc.ingameGUI.getChatGUI().func_96132_b(); } - if (par1EnumOptions == EnumOptions.CHAT_SCALE) - { + if (par1EnumOptions == EnumOptions.CHAT_SCALE) { this.chatScale = par2; this.mc.ingameGUI.getChatGUI().func_96132_b(); } } /** - * For non-float options. Toggles the option on/off, or cycles through the list i.e. render distances. + * For non-float options. Toggles the option on/off, or cycles through the list + * i.e. render distances. */ - public void setOptionValue(EnumOptions par1EnumOptions, int par2) - { - if (par1EnumOptions == EnumOptions.INVERT_MOUSE) - { + public void setOptionValue(EnumOptions par1EnumOptions, int par2) { + if (par1EnumOptions == EnumOptions.INVERT_MOUSE) { this.invertMouse = !this.invertMouse; } - if (par1EnumOptions == EnumOptions.RENDER_DISTANCE) - { + if (par1EnumOptions == EnumOptions.RENDER_DISTANCE) { this.renderDistance = this.renderDistance + par2 & 3; + if(this.mc.isSingleplayerOrLAN()) { + Minecraft.getMinecraft().displayEaglercraftText("changing render distance in singleplayer may take a few seconds, this is not a glitch plz don't report"); + } } - if (par1EnumOptions == EnumOptions.GUI_SCALE) - { + if (par1EnumOptions == EnumOptions.GUI_SCALE) { this.guiScale = this.guiScale + par2 & 3; } - if (par1EnumOptions == EnumOptions.PARTICLES) - { + if (par1EnumOptions == EnumOptions.PARTICLES) { this.particleSetting = (this.particleSetting + par2) % 3; } - if (par1EnumOptions == EnumOptions.VIEW_BOBBING) - { + if (par1EnumOptions == EnumOptions.VIEW_BOBBING) { this.viewBobbing = !this.viewBobbing; } - if (par1EnumOptions == EnumOptions.RENDER_CLOUDS) - { + if (par1EnumOptions == EnumOptions.RENDER_CLOUDS) { this.clouds = !this.clouds; } - if (par1EnumOptions == EnumOptions.ADVANCED_OPENGL) - { - this.advancedOpengl = !this.advancedOpengl; - this.mc.renderGlobal.loadRenderers(); + if (par1EnumOptions == EnumOptions.ENABLE_FOG) { + this.enableFog = !this.enableFog; } - if (par1EnumOptions == EnumOptions.ANAGLYPH) - { - //this.anaglyph = !this.anaglyph; - //this.mc.refreshResources(); + if (par1EnumOptions == EnumOptions.ANAGLYPH) { + this.anaglyph = !this.anaglyph; + this.mc.renderEngine.refreshTextures(); } - if (par1EnumOptions == EnumOptions.FRAMERATE_LIMIT) - { + if (par1EnumOptions == EnumOptions.FRAMERATE_LIMIT) { this.limitFramerate = (this.limitFramerate + par2 + 3) % 3; } - if (par1EnumOptions == EnumOptions.DIFFICULTY) - { + if (par1EnumOptions == EnumOptions.CHUNK_UPDATES) { + this.chunkUpdatePerFrame = (this.chunkUpdatePerFrame + par2) % 5; + } + + if (par1EnumOptions == EnumOptions.DIFFICULTY) { this.difficulty = this.difficulty + par2 & 3; } - if (par1EnumOptions == EnumOptions.GRAPHICS) - { + if (par1EnumOptions == EnumOptions.GRAPHICS) { this.fancyGraphics = !this.fancyGraphics; this.mc.renderGlobal.loadRenderers(); } - if (par1EnumOptions == EnumOptions.AMBIENT_OCCLUSION) - { + if (par1EnumOptions == EnumOptions.AMBIENT_OCCLUSION) { this.ambientOcclusion = (this.ambientOcclusion + par2) % 3; this.mc.renderGlobal.loadRenderers(); } - if (par1EnumOptions == EnumOptions.CHAT_VISIBILITY) - { + if (par1EnumOptions == EnumOptions.CHAT_VISIBILITY) { this.chatVisibility = (this.chatVisibility + par2) % 3; } - if (par1EnumOptions == EnumOptions.CHAT_COLOR) - { + if (par1EnumOptions == EnumOptions.CHAT_COLOR) { this.chatColours = !this.chatColours; } - if (par1EnumOptions == EnumOptions.CHAT_LINKS) - { + if (par1EnumOptions == EnumOptions.CHAT_LINKS) { this.chatLinks = !this.chatLinks; } - if (par1EnumOptions == EnumOptions.CHAT_LINKS_PROMPT) - { + if (par1EnumOptions == EnumOptions.CHAT_LINKS_PROMPT) { this.chatLinksPrompt = !this.chatLinksPrompt; } - if (par1EnumOptions == EnumOptions.USE_SERVER_TEXTURES) - { + if (par1EnumOptions == EnumOptions.USE_SERVER_TEXTURES) { this.serverTextures = !this.serverTextures; } - if (par1EnumOptions == EnumOptions.SNOOPER_ENABLED) - { + if (par1EnumOptions == EnumOptions.SNOOPER_ENABLED) { this.snooperEnabled = !this.snooperEnabled; } - if (par1EnumOptions == EnumOptions.SHOW_CAPE) - { + if (par1EnumOptions == EnumOptions.SHOW_CAPE) { this.showCape = !this.showCape; } - if (par1EnumOptions == EnumOptions.TOUCHSCREEN) - { - this.touchscreen = !this.touchscreen; + if (par1EnumOptions == EnumOptions.ANTIALIASING) { + this.antialiasMode = (this.antialiasMode + par2) % 5; } - if (par1EnumOptions == EnumOptions.USE_FULLSCREEN) - { + if (par1EnumOptions == EnumOptions.USE_FULLSCREEN) { this.fullScreen = !this.fullScreen; - if (this.mc.isFullScreen() != this.fullScreen) - { + if (this.mc.isFullScreen() != this.fullScreen) { this.mc.toggleFullscreen(); } } - if (par1EnumOptions == EnumOptions.ENABLE_VSYNC) - { + if (par1EnumOptions == EnumOptions.ADDERALL) { + this.adderall = !this.adderall; + this.mc.sndManager.stopAllSounds(); + } + + if (par1EnumOptions == EnumOptions.VSYNC) { this.enableVsync = !this.enableVsync; - Display.setVSyncEnabled(this.enableVsync); } this.saveOptions(); } - public float getOptionFloatValue(EnumOptions par1EnumOptions) - { - return par1EnumOptions == EnumOptions.FOV ? this.fovSetting : (par1EnumOptions == EnumOptions.GAMMA ? this.gammaSetting : (par1EnumOptions == EnumOptions.MUSIC ? this.musicVolume : (par1EnumOptions == EnumOptions.SOUND ? this.soundVolume : (par1EnumOptions == EnumOptions.SENSITIVITY ? this.mouseSensitivity : (par1EnumOptions == EnumOptions.CHAT_OPACITY ? this.chatOpacity : (par1EnumOptions == EnumOptions.CHAT_HEIGHT_FOCUSED ? this.chatHeightFocused : (par1EnumOptions == EnumOptions.CHAT_HEIGHT_UNFOCUSED ? this.chatHeightUnfocused : (par1EnumOptions == EnumOptions.CHAT_SCALE ? this.chatScale : (par1EnumOptions == EnumOptions.CHAT_WIDTH ? this.chatWidth : 0.0F))))))))); + public float getOptionFloatValue(EnumOptions par1EnumOptions) { + return par1EnumOptions == EnumOptions.FOV ? this.fovSetting + : (par1EnumOptions == EnumOptions.GAMMA ? this.gammaSetting + : (par1EnumOptions == EnumOptions.MUSIC ? this.musicVolume + : (par1EnumOptions == EnumOptions.SOUND ? this.soundVolume + : (par1EnumOptions == EnumOptions.SENSITIVITY ? this.mouseSensitivity + : (par1EnumOptions == EnumOptions.CHAT_OPACITY ? this.chatOpacity + : (par1EnumOptions == EnumOptions.CHAT_HEIGHT_FOCUSED ? this.chatHeightFocused + : (par1EnumOptions == EnumOptions.CHAT_HEIGHT_UNFOCUSED ? this.chatHeightUnfocused + : (par1EnumOptions == EnumOptions.CHAT_SCALE ? this.chatScale : (par1EnumOptions == EnumOptions.CHAT_WIDTH ? this.chatWidth : 0.0F))))))))); } - public boolean getOptionOrdinalValue(EnumOptions par1EnumOptions) - { - switch (EnumOptionsHelper.enumOptionsMappingHelperArray[par1EnumOptions.ordinal()]) - { + public boolean getOptionOrdinalValue(EnumOptions par1EnumOptions) { + switch (EnumOptionsHelper.enumOptionsMappingHelperArray[par1EnumOptions.ordinal()]) { case 1: return this.invertMouse; @@ -463,7 +399,7 @@ public class GameSettings return this.anaglyph; case 4: - return this.advancedOpengl; + return this.enableVsync; case 5: return this.clouds; @@ -486,448 +422,259 @@ public class GameSettings case 11: return this.fullScreen; - case 12: - return this.enableVsync; - case 13: return this.showCape; case 14: return this.touchscreen; + case 15: + return this.enableFog; + + case 17: + return this.adderall; + default: return false; } } /** - * Returns the translation of the given index in the given String array. If the index is smaller than 0 or greater - * than/equal to the length of the String array, it is changed to 0. + * Returns the translation of the given index in the given String array. If the + * index is smaller than 0 or greater than/equal to the length of the String + * array, it is changed to 0. */ - private static String getTranslation(String[] par0ArrayOfStr, int par1) - { - if (par1 < 0 || par1 >= par0ArrayOfStr.length) - { + private static String getTranslation(String[] par0ArrayOfStr, int par1) { + if (par1 < 0 || par1 >= par0ArrayOfStr.length) { par1 = 0; } - return I18n.getString(par0ArrayOfStr[par1]); + StringTranslate var2 = StringTranslate.getInstance(); + return var2.translateKey(par0ArrayOfStr[par1]); } /** * Gets a key binding. */ - public String getKeyBinding(EnumOptions par1EnumOptions) - { - String var2 = I18n.getString(par1EnumOptions.getEnumString()) + ": "; + public String getKeyBinding(EnumOptions par1EnumOptions) { + StringTranslate var2 = StringTranslate.getInstance(); + String var3 = var2.translateKey(par1EnumOptions.getEnumString()) + ": "; - if (par1EnumOptions.getEnumFloat()) - { + if (par1EnumOptions.getEnumFloat()) { float var5 = this.getOptionFloatValue(par1EnumOptions); - return par1EnumOptions == EnumOptions.SENSITIVITY ? (var5 == 0.0F ? var2 + I18n.getString("options.sensitivity.min") : (var5 == 1.0F ? var2 + I18n.getString("options.sensitivity.max") : var2 + (int)(var5 * 200.0F) + "%")) : (par1EnumOptions == EnumOptions.FOV ? (var5 == 0.0F ? var2 + I18n.getString("options.fov.min") : (var5 == 1.0F ? var2 + I18n.getString("options.fov.max") : var2 + (int)(70.0F + var5 * 40.0F))) : (par1EnumOptions == EnumOptions.GAMMA ? (var5 == 0.0F ? var2 + I18n.getString("options.gamma.min") : (var5 == 1.0F ? var2 + I18n.getString("options.gamma.max") : var2 + "+" + (int)(var5 * 100.0F) + "%")) : (par1EnumOptions == EnumOptions.CHAT_OPACITY ? var2 + (int)(var5 * 90.0F + 10.0F) + "%" : (par1EnumOptions == EnumOptions.CHAT_HEIGHT_UNFOCUSED ? var2 + GuiNewChat.func_96130_b(var5) + "px" : (par1EnumOptions == EnumOptions.CHAT_HEIGHT_FOCUSED ? var2 + GuiNewChat.func_96130_b(var5) + "px" : (par1EnumOptions == EnumOptions.CHAT_WIDTH ? var2 + GuiNewChat.func_96128_a(var5) + "px" : (var5 == 0.0F ? var2 + I18n.getString("options.off") : var2 + (int)(var5 * 100.0F) + "%"))))))); - } - else if (par1EnumOptions.getEnumBoolean()) - { + return par1EnumOptions == EnumOptions.SENSITIVITY ? (var5 == 0.0F ? var3 + var2.translateKey("options.sensitivity.min") : (var5 == 1.0F ? var3 + var2.translateKey("options.sensitivity.max") : var3 + (int) (var5 * 200.0F) + "%")) + : (par1EnumOptions == EnumOptions.FOV ? (var5 == 0.0F ? var3 + var2.translateKey("options.fov.min") : (var5 == 1.0F ? var3 + var2.translateKey("options.fov.max") : var3 + (int) (70.0F + var5 * 40.0F))) + : (par1EnumOptions == EnumOptions.GAMMA ? (var5 == 0.0F ? var3 + var2.translateKey("options.gamma.min") : (var5 == 1.0F ? var3 + var2.translateKey("options.gamma.max") : var3 + "+" + (int) (var5 * 100.0F) + "%")) + : (par1EnumOptions == EnumOptions.CHAT_OPACITY ? var3 + (int) (var5 * 90.0F + 10.0F) + "%" + : (par1EnumOptions == EnumOptions.CHAT_HEIGHT_UNFOCUSED ? var3 + GuiNewChat.func_96130_b(var5) + "px" + : (par1EnumOptions == EnumOptions.CHAT_HEIGHT_FOCUSED ? var3 + GuiNewChat.func_96130_b(var5) + "px" + : (par1EnumOptions == EnumOptions.CHAT_WIDTH ? var3 + GuiNewChat.func_96128_a(var5) + "px" + : (var5 == 0.0F ? var3 + var2.translateKey("options.off") : var3 + (int) (var5 * 100.0F) + "%"))))))); + } else if (EaglerAdapter.isWebGL && par1EnumOptions == EnumOptions.VSYNC) { boolean var4 = this.getOptionOrdinalValue(par1EnumOptions); - return var4 ? var2 + I18n.getString("options.on") : var2 + I18n.getString("options.off"); - } - else if (par1EnumOptions == EnumOptions.RENDER_DISTANCE) - { - return var2 + getTranslation(RENDER_DISTANCES, this.renderDistance); - } - else if (par1EnumOptions == EnumOptions.DIFFICULTY) - { - return var2 + getTranslation(DIFFICULTIES, this.difficulty); - } - else if (par1EnumOptions == EnumOptions.GUI_SCALE) - { - return var2 + getTranslation(GUISCALES, this.guiScale); - } - else if (par1EnumOptions == EnumOptions.CHAT_VISIBILITY) - { - return var2 + getTranslation(CHAT_VISIBILITIES, this.chatVisibility); - } - else if (par1EnumOptions == EnumOptions.PARTICLES) - { - return var2 + getTranslation(PARTICLES, this.particleSetting); - } - else if (par1EnumOptions == EnumOptions.FRAMERATE_LIMIT) - { - return var2 + getTranslation(LIMIT_FRAMERATES, this.limitFramerate); - } - else if (par1EnumOptions == EnumOptions.AMBIENT_OCCLUSION) - { - return var2 + getTranslation(AMBIENT_OCCLUSIONS, this.ambientOcclusion); - } - else if (par1EnumOptions == EnumOptions.GRAPHICS) - { - if (this.fancyGraphics) - { - return var2 + I18n.getString("options.graphics.fancy"); - } - else - { - String var3 = "options.graphics.fast"; - return var2 + I18n.getString("options.graphics.fast"); - } - } - else - { - return var2; + return var4 ? var3 + var2.translateKey("options.on") : EnumChatFormatting.RED + var3 + var2.translateKey("options.off"); + } if (par1EnumOptions.getEnumBoolean()) { + boolean var4 = this.getOptionOrdinalValue(par1EnumOptions); + return var4 ? var3 + var2.translateKey("options.on") : var3 + var2.translateKey("options.off"); + } else { + return par1EnumOptions == EnumOptions.RENDER_DISTANCE ? var3 + getTranslation(RENDER_DISTANCES, this.renderDistance) + : (par1EnumOptions == EnumOptions.DIFFICULTY ? var3 + getTranslation(DIFFICULTIES, this.difficulty) + : (par1EnumOptions == EnumOptions.GUI_SCALE ? var3 + getTranslation(GUISCALES, this.guiScale) + : (par1EnumOptions == EnumOptions.CHAT_VISIBILITY ? var3 + getTranslation(CHAT_VISIBILITIES, this.chatVisibility) + : (par1EnumOptions == EnumOptions.PARTICLES ? var3 + getTranslation(PARTICLES, this.particleSetting) + : (par1EnumOptions == EnumOptions.FRAMERATE_LIMIT ? var3 + getTranslation(LIMIT_FRAMERATES, this.limitFramerate) + : (par1EnumOptions == EnumOptions.AMBIENT_OCCLUSION ? var3 + getTranslation(AMBIENT_OCCLUSIONS, this.ambientOcclusion) + : (par1EnumOptions == EnumOptions.ANTIALIASING ? var3 + getTranslation(ANTIALIASING, this.antialiasMode) + : (par1EnumOptions == EnumOptions.CHUNK_UPDATES ? var3 + (chunkUpdatePerFrame + 1) + : (par1EnumOptions == EnumOptions.GRAPHICS ? (this.fancyGraphics ? var3 + var2.translateKey("options.graphics.fancy") : var3 + var2.translateKey("options.graphics.fast")) + : var3))))))))); } } /** - * Loads the options from the options file. It appears that this has replaced the previous 'loadOptions' + * Loads the options from the options file. It appears that this has replaced + * the previous 'loadOptions' */ - public void loadOptions() - { - try - { - if (!this.optionsFile.exists()) - { - return; - } + public void loadOptions() { + NBTTagCompound yee = LocalStorageManager.gameSettingsStorage; + if(!yee.hasNoTags()) { + if(yee.hasKey("musicVolume")) this.musicVolume = yee.getFloat("musicVolume"); + if(yee.hasKey("soundVolume")) this.soundVolume = yee.getFloat("soundVolume"); + if(yee.hasKey("sensitivity")) this.mouseSensitivity = yee.getFloat("sensitivity"); + if(yee.hasKey("fov")) this.fovSetting = yee.getFloat("fov"); + if(yee.hasKey("gamma")) this.gammaSetting = yee.getFloat("gamma"); + if(yee.hasKey("invertMouse")) this.invertMouse = yee.getBoolean("invertMouse"); + if(yee.hasKey("viewDistance")) this.renderDistance = yee.getInteger("viewDistance"); + if(yee.hasKey("guiScale")) this.guiScale = yee.getInteger("guiScale"); + if(yee.hasKey("particles")) this.particleSetting = yee.getInteger("particles"); + if(yee.hasKey("viewBobbing")) this.viewBobbing = yee.getBoolean("viewBobbing"); + if(yee.hasKey("anaglyph")) this.anaglyph = yee.getBoolean("anaglyph"); + if(yee.hasKey("limitFramerate")) this.limitFramerate = yee.getInteger("limitFramerate"); + if(yee.hasKey("fancyGraphics")) this.fancyGraphics = yee.getBoolean("fancyGraphics"); + if(yee.hasKey("ambientOcclusion")) this.ambientOcclusion = yee.getInteger("ambientOcclusion"); + if(yee.hasKey("clouds")) this.clouds = yee.getBoolean("clouds"); + if(yee.hasKey("fog")) this.enableFog = yee.getBoolean("fog"); + if(yee.hasKey("lastServer")) this.lastServer = yee.getString("lastServer"); + if(yee.hasKey("language")) this.language = yee.getString("language"); + if(yee.hasKey("chatVisibility")) this.chatVisibility = yee.getInteger("chatVisibility"); + if(yee.hasKey("chatColours")) this.chatColours = yee.getBoolean("chatColours"); + if(yee.hasKey("chatLinks")) this.chatLinks = yee.getBoolean("chatLinks"); + if(yee.hasKey("chatLinksPrompt")) this.chatLinksPrompt = yee.getBoolean("chatLinksPrompt"); + if(yee.hasKey("chatOpacity")) this.chatOpacity = yee.getFloat("chatOpacity"); + if(yee.hasKey("fullScreen")) this.fullScreen = yee.getBoolean("fullScreen"); + if(yee.hasKey("hideServerAddress")) this.hideServerAddress = yee.getBoolean("hideServerAddress"); + if(yee.hasKey("advancedTooltips")) this.advancedItemTooltips = yee.getBoolean("advancedTooltips"); + if(yee.hasKey("pauseOnLostFocus")) this.pauseOnLostFocus = yee.getBoolean("pauseOnLostFocus"); + if(yee.hasKey("showCape")) this.showCape = yee.getBoolean("showCape"); + if(yee.hasKey("touchscreen")) this.touchscreen = yee.getBoolean("touchscreen"); + if(yee.hasKey("forceHeight")) this.overrideHeight = yee.getInteger("forceHeight"); + if(yee.hasKey("forceWidth")) this.overrideWidth = yee.getInteger("forceWidth"); + if(yee.hasKey("antialiasMode")) this.antialiasMode = yee.getInteger("antialiasMode"); + if(yee.hasKey("heldItemTooltips")) this.heldItemTooltips = yee.getBoolean("heldItemTooltips"); + if(yee.hasKey("chatHeightFocused")) this.chatHeightFocused = yee.getFloat("chatHeightFocused"); + if(yee.hasKey("chatHeightUnfocused")) this.chatHeightUnfocused = yee.getFloat("chatHeightUnfocused"); + if(yee.hasKey("chatScale")) this.chatScale = yee.getFloat("chatScale"); + if(yee.hasKey("chatWidth")) this.chatWidth = yee.getFloat("chatWidth"); + if(yee.hasKey("showCoordinates")) this.showCoordinates = yee.getBoolean("showCoordinates"); + if(yee.hasKey("showSkinJacket")) showSkinJacket = yee.getBoolean("showSkinJacket"); + if(yee.hasKey("showSkinHat")) showSkinHat = yee.getBoolean("showSkinHat"); + if(yee.hasKey("showSkinLeftArm")) showSkinLeftArm = yee.getBoolean("showSkinLeftArm"); + if(yee.hasKey("showSkinRightArm")) showSkinRightArm = yee.getBoolean("showSkinRightArm"); + if(yee.hasKey("showSkinLeftLeg")) showSkinLeftLeg = yee.getBoolean("showSkinLeftLeg"); + if(yee.hasKey("showSkinRightLeg")) showSkinRightLeg = yee.getBoolean("showSkinRightLeg"); + if(yee.hasKey("allowFNAWSkins")) allowFNAWSkins = yee.getBoolean("allowFNAWSkins"); + if(yee.hasKey("showOtherCapes")) showOtherCapes = yee.getBoolean("showOtherCapes"); + if(yee.hasKey("chunkUpdates")) chunkUpdatePerFrame = yee.getInteger("chunkUpdates"); + if(yee.hasKey("voiceListenVolume")) voiceListenVolume = yee.getFloat("voiceListenVolume"); + if(yee.hasKey("voiceSpeakVolume")) voiceSpeakVolume = yee.getFloat("voiceSpeakVolume"); + if(yee.hasKey("voicePTTKey")) voicePTTKey = yee.getInteger("voicePTTKey"); + if(yee.hasKey("voiceListenRadius")) voiceListenRadius = yee.getInteger("voiceListenRadius"); + if(yee.hasKey("difficulty")) difficulty = yee.getByte("difficulty"); + if(yee.hasKey("hideJoinCode")) hideJoinCode = yee.getBoolean("hideJoinCode"); + if(yee.hasKey("relayTimeout")) relayTimeout = yee.getByte("relayTimeout"); + if(yee.hasKey("adderall")) adderall = yee.getBoolean("adderall"); + if(yee.hasKey("skin")) skin = yee.getString("skin"); + if(yee.hasKey("enableVsync")) enableVsync = yee.getBoolean("enableVsync"); + if(yee.hasKey("hideVsyncWarning")) hideVsyncWarning = yee.getBoolean("hideVsyncWarning"); - BufferedReader var1 = new BufferedReader(new FileReader(this.optionsFile)); - String var2 = ""; + if(voiceListenRadius < 5) voiceListenRadius = 5; + else if(voiceListenRadius > 22) voiceListenRadius = 22; - while ((var2 = var1.readLine()) != null) - { - try - { - String[] var3 = var2.split(":"); + EaglerAdapter.setVoiceListenVolume(voiceListenVolume); + EaglerAdapter.setVoiceSpeakVolume(voiceSpeakVolume); + EaglerAdapter.setVoiceProximity(voiceListenRadius); - if (var3[0].equals("music")) - { - this.musicVolume = this.parseFloat(var3[1]); - } - - if (var3[0].equals("sound")) - { - this.soundVolume = this.parseFloat(var3[1]); - } - - if (var3[0].equals("mouseSensitivity")) - { - this.mouseSensitivity = this.parseFloat(var3[1]); - } - - if (var3[0].equals("fov")) - { - this.fovSetting = this.parseFloat(var3[1]); - } - - if (var3[0].equals("gamma")) - { - this.gammaSetting = this.parseFloat(var3[1]); - } - - if (var3[0].equals("invertYMouse")) - { - this.invertMouse = var3[1].equals("true"); - } - - if (var3[0].equals("viewDistance")) - { - this.renderDistance = Integer.parseInt(var3[1]); - } - - if (var3[0].equals("guiScale")) - { - this.guiScale = Integer.parseInt(var3[1]); - } - - if (var3[0].equals("particles")) - { - this.particleSetting = Integer.parseInt(var3[1]); - } - - if (var3[0].equals("bobView")) - { - this.viewBobbing = var3[1].equals("true"); - } - - if (var3[0].equals("anaglyph3d")) - { - this.anaglyph = var3[1].equals("true"); - } - - if (var3[0].equals("advancedOpengl")) - { - this.advancedOpengl = var3[1].equals("true"); - } - - if (var3[0].equals("fpsLimit")) - { - this.limitFramerate = Integer.parseInt(var3[1]); - } - - if (var3[0].equals("difficulty")) - { - this.difficulty = Integer.parseInt(var3[1]); - } - - if (var3[0].equals("fancyGraphics")) - { - this.fancyGraphics = var3[1].equals("true"); - } - - if (var3[0].equals("ao")) - { - if (var3[1].equals("true")) - { - this.ambientOcclusion = 2; - } - else if (var3[1].equals("false")) - { - this.ambientOcclusion = 0; - } - else - { - this.ambientOcclusion = Integer.parseInt(var3[1]); - } - } - - if (var3[0].equals("clouds")) - { - this.clouds = var3[1].equals("true"); - } - - if (var3[0].equals("skin")) - { - this.skin = var3[1]; - } - - if (var3[0].equals("lastServer") && var3.length >= 2) - { - this.lastServer = var2.substring(var2.indexOf(58) + 1); - } - - if (var3[0].equals("lang") && var3.length >= 2) - { - this.language = var3[1]; - } - - if (var3[0].equals("chatVisibility")) - { - this.chatVisibility = Integer.parseInt(var3[1]); - } - - if (var3[0].equals("chatColors")) - { - this.chatColours = var3[1].equals("true"); - } - - if (var3[0].equals("chatLinks")) - { - this.chatLinks = var3[1].equals("true"); - } - - if (var3[0].equals("chatLinksPrompt")) - { - this.chatLinksPrompt = var3[1].equals("true"); - } - - if (var3[0].equals("chatOpacity")) - { - this.chatOpacity = this.parseFloat(var3[1]); - } - - if (var3[0].equals("serverTextures")) - { - this.serverTextures = var3[1].equals("true"); - } - - if (var3[0].equals("snooperEnabled")) - { - this.snooperEnabled = var3[1].equals("true"); - } - - if (var3[0].equals("fullscreen")) - { - this.fullScreen = var3[1].equals("true"); - } - - if (var3[0].equals("enableVsync")) - { - this.enableVsync = var3[1].equals("true"); - } - - if (var3[0].equals("hideServerAddress")) - { - this.hideServerAddress = var3[1].equals("true"); - } - - if (var3[0].equals("advancedItemTooltips")) - { - this.advancedItemTooltips = var3[1].equals("true"); - } - - if (var3[0].equals("pauseOnLostFocus")) - { - this.pauseOnLostFocus = var3[1].equals("true"); - } - - if (var3[0].equals("showCape")) - { - this.showCape = var3[1].equals("true"); - } - - if (var3[0].equals("touchscreen")) - { - this.touchscreen = var3[1].equals("true"); - } - - if (var3[0].equals("overrideHeight")) - { - this.overrideHeight = Integer.parseInt(var3[1]); - } - - if (var3[0].equals("overrideWidth")) - { - this.overrideWidth = Integer.parseInt(var3[1]); - } - - if (var3[0].equals("heldItemTooltips")) - { - this.heldItemTooltips = var3[1].equals("true"); - } - - if (var3[0].equals("chatHeightFocused")) - { - this.chatHeightFocused = this.parseFloat(var3[1]); - } - - if (var3[0].equals("chatHeightUnfocused")) - { - this.chatHeightUnfocused = this.parseFloat(var3[1]); - } - - if (var3[0].equals("chatScale")) - { - this.chatScale = this.parseFloat(var3[1]); - } - - if (var3[0].equals("chatWidth")) - { - this.chatWidth = this.parseFloat(var3[1]); - } - - for (int var4 = 0; var4 < this.keyBindings.length; ++var4) - { - if (var3[0].equals("key_" + this.keyBindings[var4].keyDescription)) - { - this.keyBindings[var4].keyCode = Integer.parseInt(var3[1]); - } - } - } - catch (Exception var5) - { - this.mc.getLogAgent().logWarning("Skipping bad option: " + var2); - } + for (int var4 = 0; var4 < this.keyBindings.length; ++var4) { + if(yee.hasKey(keyBindings[var4].keyDescription)) this.keyBindings[var4].keyCode = yee.getInteger(keyBindings[var4].keyDescription); } KeyBinding.resetKeyBindingArrayAndHash(); - var1.close(); - } - catch (Exception var6) - { - this.mc.getLogAgent().logWarning("Failed to load options"); - var6.printStackTrace(); - } - } - /** - * Parses a string into a float. - */ - private float parseFloat(String par1Str) - { - return par1Str.equals("true") ? 1.0F : (par1Str.equals("false") ? 0.0F : Float.parseFloat(par1Str)); + IntegratedServer.relayManager.load(LocalStorageManager.gameSettingsStorage.getTagList("relays")); + }else { + IntegratedServer.relayManager.load(null); + } } /** * Saves the options to the options file. */ - public void saveOptions() - { - try - { - PrintWriter var1 = new PrintWriter(new FileWriter(this.optionsFile)); - var1.println("music:" + this.musicVolume); - var1.println("sound:" + this.soundVolume); - var1.println("invertYMouse:" + this.invertMouse); - var1.println("mouseSensitivity:" + this.mouseSensitivity); - var1.println("fov:" + this.fovSetting); - var1.println("gamma:" + this.gammaSetting); - var1.println("viewDistance:" + this.renderDistance); - var1.println("guiScale:" + this.guiScale); - var1.println("particles:" + this.particleSetting); - var1.println("bobView:" + this.viewBobbing); - var1.println("anaglyph3d:" + this.anaglyph); - var1.println("advancedOpengl:" + this.advancedOpengl); - var1.println("fpsLimit:" + this.limitFramerate); - var1.println("difficulty:" + this.difficulty); - var1.println("fancyGraphics:" + this.fancyGraphics); - var1.println("ao:" + this.ambientOcclusion); - var1.println("clouds:" + this.clouds); - var1.println("skin:" + this.skin); - var1.println("lastServer:" + this.lastServer); - var1.println("lang:" + this.language); - var1.println("chatVisibility:" + this.chatVisibility); - var1.println("chatColors:" + this.chatColours); - var1.println("chatLinks:" + this.chatLinks); - var1.println("chatLinksPrompt:" + this.chatLinksPrompt); - var1.println("chatOpacity:" + this.chatOpacity); - var1.println("serverTextures:" + this.serverTextures); - var1.println("snooperEnabled:" + this.snooperEnabled); - var1.println("fullscreen:" + this.fullScreen); - var1.println("enableVsync:" + this.enableVsync); - var1.println("hideServerAddress:" + this.hideServerAddress); - var1.println("advancedItemTooltips:" + this.advancedItemTooltips); - var1.println("pauseOnLostFocus:" + this.pauseOnLostFocus); - var1.println("showCape:" + this.showCape); - var1.println("touchscreen:" + this.touchscreen); - var1.println("overrideWidth:" + this.overrideWidth); - var1.println("overrideHeight:" + this.overrideHeight); - var1.println("heldItemTooltips:" + this.heldItemTooltips); - var1.println("chatHeightFocused:" + this.chatHeightFocused); - var1.println("chatHeightUnfocused:" + this.chatHeightUnfocused); - var1.println("chatScale:" + this.chatScale); - var1.println("chatWidth:" + this.chatWidth); + public void saveOptions() { + NBTTagCompound yee = LocalStorageManager.gameSettingsStorage; - for (int var2 = 0; var2 < this.keyBindings.length; ++var2) - { - var1.println("key_" + this.keyBindings[var2].keyDescription + ":" + this.keyBindings[var2].keyCode); - } + yee.setFloat("musicVolume", this.musicVolume); + yee.setFloat("soundVolume", this.soundVolume); + yee.setFloat("sensitivity", this.mouseSensitivity); + yee.setFloat("fov", this.fovSetting); + yee.setFloat("gamma", this.gammaSetting); + yee.setBoolean("invertMouse", this.invertMouse); + yee.setInteger("viewDistance", this.renderDistance); + yee.setInteger("guiScale", this.guiScale); + yee.setInteger("particles", this.particleSetting); + yee.setBoolean("viewBobbing", this.viewBobbing); + yee.setBoolean("anaglyph", this.anaglyph); + yee.setInteger("limitFramerate", this.limitFramerate); + yee.setBoolean("fancyGraphics", this.fancyGraphics); + yee.setInteger("ambientOcclusion", this.ambientOcclusion); + yee.setBoolean("clouds", this.clouds); + yee.setBoolean("fog", this.enableFog); + yee.setString("lastServer", this.lastServer); + yee.setString("language", this.language); + yee.setInteger("chatVisibility", this.chatVisibility); + yee.setBoolean("chatColours", this.chatColours); + yee.setBoolean("chatLinks", this.chatLinks); + yee.setBoolean("chatLinksPrompt", this.chatLinksPrompt); + yee.setFloat("chatOpacity", this.chatOpacity); + yee.setBoolean("fullScreen", this.fullScreen); + yee.setBoolean("hideServerAddress", this.hideServerAddress); + yee.setBoolean("advancedTooltips", this.advancedItemTooltips); + yee.setBoolean("pauseOnLostFocus", this.pauseOnLostFocus); + yee.setBoolean("showCape", this.showCape); + yee.setBoolean("touchscreen", this.touchscreen); + yee.setInteger("forceHeight", this.overrideHeight); + yee.setInteger("forceWidth", this.overrideWidth); + yee.setInteger("antialiasMode", this.antialiasMode); + yee.setBoolean("heldItemTooltips", this.heldItemTooltips); + yee.setFloat("chatHeightFocused", this.chatHeightFocused); + yee.setFloat("chatHeightUnfocused", this.chatHeightUnfocused); + yee.setFloat("chatScale", this.chatScale); + yee.setFloat("chatWidth", this.chatWidth); + yee.setBoolean("showCoordinates", this.showCoordinates); + yee.setBoolean("showSkinJacket", showSkinJacket); + yee.setBoolean("showSkinHat", showSkinHat); + yee.setBoolean("showSkinLeftArm", showSkinLeftArm); + yee.setBoolean("showSkinRightArm", showSkinRightArm); + yee.setBoolean("showSkinLeftLeg", showSkinLeftLeg); + yee.setBoolean("showSkinRightLeg", showSkinRightLeg); + yee.setBoolean("allowFNAWSkins", allowFNAWSkins); + yee.setBoolean("showOtherCapes", showOtherCapes); + yee.setInteger("chunkUpdates", chunkUpdatePerFrame); + yee.setFloat("voiceListenVolume", voiceListenVolume); + yee.setFloat("voiceSpeakVolume", voiceSpeakVolume); + yee.setInteger("voicePTTKey", voicePTTKey); + yee.setInteger("voiceListenRadius", voiceListenRadius); + yee.setByte("difficulty", (byte)difficulty); + yee.setBoolean("hideJoinCode", hideJoinCode); + yee.setByte("relayTimeout", (byte)relayTimeout); + yee.setBoolean("adderall", adderall); + yee.setString("skin", skin); + yee.setBoolean("enableVsync", enableVsync); + yee.setBoolean("hideVsyncWarning", hideVsyncWarning); - var1.close(); - } - catch (Exception var3) - { - this.mc.getLogAgent().logWarning("Failed to save options"); - var3.printStackTrace(); + for (int var4 = 0; var4 < this.keyBindings.length; ++var4) { + yee.setInteger(keyBindings[var4].keyDescription, keyBindings[var4].keyCode); } + LocalStorageManager.saveStorageG(); + this.sendSettingsToServer(); } /** * Send a client info packet with settings information to the server */ - public void sendSettingsToServer() - { - if (this.mc.thePlayer != null) - { + public void sendSettingsToServer() { + if (this.mc.thePlayer != null) { this.mc.thePlayer.sendQueue.addToSendQueue(new Packet204ClientInfo(this.language, this.renderDistance, this.chatVisibility, this.chatColours, this.difficulty, this.showCape)); + this.mc.thePlayer.sendQueue.addToSendQueue(new Packet250CustomPayload("EAG|SkinLayers", new byte[] { (byte)getSkinLayers() })); } } + public int getSkinLayers() { + int skinLayersByte = 0; + if(showSkinJacket) skinLayersByte |= 1; + if(showSkinHat) skinLayersByte |= 2; + if(showSkinLeftArm) skinLayersByte |= 4; + if(showSkinRightArm) skinLayersByte |= 8; + if(showSkinLeftLeg) skinLayersByte |= 16; + if(showSkinRightLeg) skinLayersByte |= 32; + return skinLayersByte; + } + /** * Should render clouds */ - public boolean shouldRenderClouds() - { + public boolean shouldRenderClouds() { return this.renderDistance < 2 && this.clouds; } -} +} \ No newline at end of file diff --git a/src/main/java/net/minecraft/src/GuiOptions.java b/src/main/java/net/minecraft/src/GuiOptions.java index 57f0045..e094a22 100644 --- a/src/main/java/net/minecraft/src/GuiOptions.java +++ b/src/main/java/net/minecraft/src/GuiOptions.java @@ -5,7 +5,7 @@ public class GuiOptions extends GuiScreen /** * An array of options that can be changed directly from the options GUI. */ - private static final EnumOptions[] relevantOptions = new EnumOptions[] {EnumOptions.MUSIC, EnumOptions.SOUND, EnumOptions.INVERT_MOUSE, EnumOptions.SENSITIVITY, EnumOptions.FOV, EnumOptions.DIFFICULTY, EnumOptions.TOUCHSCREEN}; + private static final EnumOptions[] relevantOptions = new EnumOptions[] {EnumOptions.MUSIC, EnumOptions.SOUND, EnumOptions.INVERT_MOUSE, EnumOptions.SENSITIVITY, EnumOptions.FOV, EnumOptions.DIFFICULTY}; /** * A reference to the screen object that created this. Used for navigating between screens. diff --git a/src/main/java/net/minecraft/src/GuiVideoSettings.java b/src/main/java/net/minecraft/src/GuiVideoSettings.java index 15ea831..6fd288a 100644 --- a/src/main/java/net/minecraft/src/GuiVideoSettings.java +++ b/src/main/java/net/minecraft/src/GuiVideoSettings.java @@ -16,7 +16,7 @@ public class GuiVideoSettings extends GuiScreen private boolean is64bit; /** An array of all of EnumOption's video options. */ - private static EnumOptions[] videoOptions = new EnumOptions[] {EnumOptions.GRAPHICS, EnumOptions.RENDER_DISTANCE, EnumOptions.AMBIENT_OCCLUSION, EnumOptions.FRAMERATE_LIMIT, EnumOptions.ANAGLYPH, EnumOptions.VIEW_BOBBING, EnumOptions.GUI_SCALE, EnumOptions.ADVANCED_OPENGL, EnumOptions.GAMMA, EnumOptions.RENDER_CLOUDS, EnumOptions.PARTICLES, EnumOptions.USE_SERVER_TEXTURES, EnumOptions.USE_FULLSCREEN, EnumOptions.ENABLE_VSYNC}; + private static EnumOptions[] videoOptions = new EnumOptions[] {EnumOptions.GRAPHICS, EnumOptions.RENDER_DISTANCE, EnumOptions.AMBIENT_OCCLUSION, EnumOptions.FRAMERATE_LIMIT, EnumOptions.ANAGLYPH, EnumOptions.VIEW_BOBBING, EnumOptions.GUI_SCALE, EnumOptions.GAMMA, EnumOptions.RENDER_CLOUDS, EnumOptions.PARTICLES, EnumOptions.USE_SERVER_TEXTURES, EnumOptions.USE_FULLSCREEN, EnumOptions.VSYNC}; public GuiVideoSettings(GuiScreen par1GuiScreen, GameSettings par2GameSettings) { diff --git a/src/main/java/net/minecraft/src/Minecraft.java b/src/main/java/net/minecraft/src/Minecraft.java index 069f36c..f21fde1 100644 --- a/src/main/java/net/minecraft/src/Minecraft.java +++ b/src/main/java/net/minecraft/src/Minecraft.java @@ -16,8 +16,9 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import javax.imageio.ImageIO; -import net.minecraft.client.ClientBrandRetriever; -import net.minecraft.server.MinecraftServer; +import net.minecraft.src.Item; +import net.minecraft.src.ItemRenderer; +import net.minecraft.src.ItemStack; import org.lwjgl.LWJGLException; import org.lwjgl.Sys; import org.lwjgl.opengl.Display; @@ -190,7 +191,7 @@ public class Minecraft public Minecraft() { - this.mcLogAgent = new LogAgent("Eagler-Client", " [CLIENT]", null); + this.mcLogAgent = new LogAgent("Eagler-Client", " [CLIENT]", "client-log.txt"); this.tempDisplayHeight = 480; this.fullscreen = false; Packet3Chat.maxChatLength = 32767;