This commit is contained in:
catfoolyou 2025-02-02 14:46:21 -05:00
parent 477aa74050
commit 342f1c993e
32 changed files with 353 additions and 658 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -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

Binary file not shown.

View File

@ -3,10 +3,8 @@ package net.lax1dude.eaglercraft;
import java.util.List; import java.util.List;
public class ConfigConstants { 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 mainMenuString = "eaglercraft " + version;
public static final String forkMe = null; public static final String forkMe = null;

View File

@ -199,13 +199,7 @@ public class EaglerProfile {
} }
static { static {
String[] usernameDefaultWords = ConfigConstants.profanity ? new String[] { String[] usernameDefaultWords = 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[] {
"Yeeish", "Yeeish", "Yee", "Yee", "Yeer", "Yeeler", "Eagler", "Eagl", "Yeeish", "Yeeish", "Yee", "Yee", "Yeer", "Yeeler", "Eagler", "Eagl",
"Darver", "Darvler", "Vool", "Vigg", "Vigg", "Deev", "Yigg", "Yeeg" "Darver", "Darvler", "Vool", "Vigg", "Vigg", "Deev", "Yigg", "Yeeg"
}; };

View File

@ -1,54 +1,28 @@
package net.minecraft.src; package net.minecraft.src;
public enum EnumOptions 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),
MUSIC("options.music", true, false), GAMMA("options.gamma", true, false), RENDER_DISTANCE("options.renderDistance", false, false), VIEW_BOBBING("options.viewBobbing", false, true), ANAGLYPH("options.anaglyph", false, true),
SOUND("options.sound", true, false), /*ADVANCED_OPENGL("options.advancedOpengl", false, true),*/ FRAMERATE_LIMIT("options.framerateLimit", false, false), DIFFICULTY("options.difficulty", false, false), GRAPHICS("options.graphics", false, false),
INVERT_MOUSE("options.invertMouse", false, true), AMBIENT_OCCLUSION("options.ao", false, false), GUI_SCALE("options.guiScale", false, false), RENDER_CLOUDS("options.renderClouds", false, true), PARTICLES("options.particles", false, false),
SENSITIVITY("options.sensitivity", true, 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),
FOV("options.fov", 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),
GAMMA("options.gamma", true, false), 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),
RENDER_DISTANCE("options.renderDistance", false, 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),
VIEW_BOBBING("options.viewBobbing", false, true), VSYNC("options.vsync", 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);
private final boolean enumFloat; private final boolean enumFloat;
private final boolean enumBoolean; private final boolean enumBoolean;
private final String enumString; private final String enumString;
public static EnumOptions getEnumOptions(int par0) public static EnumOptions getEnumOptions(int par0) {
{
EnumOptions[] var1 = values(); EnumOptions[] var1 = values();
int var2 = var1.length; int var2 = var1.length;
for (int var3 = 0; var3 < var2; ++var3) for (int var3 = 0; var3 < var2; ++var3) {
{
EnumOptions var4 = var1[var3]; EnumOptions var4 = var1[var3];
if (var4.returnEnumOrdinal() == par0) if (var4.returnEnumOrdinal() == par0) {
{
return var4; return var4;
} }
} }
@ -56,30 +30,25 @@ public enum EnumOptions
return null; return null;
} }
private EnumOptions(String par3Str, boolean par4, boolean par5) private EnumOptions(String par3Str, boolean par4, boolean par5) {
{
this.enumString = par3Str; this.enumString = par3Str;
this.enumFloat = par4; this.enumFloat = par4;
this.enumBoolean = par5; this.enumBoolean = par5;
} }
public boolean getEnumFloat() public boolean getEnumFloat() {
{
return this.enumFloat; return this.enumFloat;
} }
public boolean getEnumBoolean() public boolean getEnumBoolean() {
{
return this.enumBoolean; return this.enumBoolean;
} }
public int returnEnumOrdinal() public int returnEnumOrdinal() {
{
return this.ordinal(); return this.ordinal();
} }
public String getEnumString() public String getEnumString() {
{
return this.enumString; return this.enumString;
} }
} }

View File

@ -33,15 +33,6 @@ class EnumOptionsHelper
; ;
} }
try
{
enumOptionsMappingHelperArray[EnumOptions.ADVANCED_OPENGL.ordinal()] = 4;
}
catch (NoSuchFieldError var11)
{
;
}
try try
{ {
enumOptionsMappingHelperArray[EnumOptions.RENDER_CLOUDS.ordinal()] = 5; enumOptionsMappingHelperArray[EnumOptions.RENDER_CLOUDS.ordinal()] = 5;
@ -107,7 +98,7 @@ class EnumOptionsHelper
try try
{ {
enumOptionsMappingHelperArray[EnumOptions.ENABLE_VSYNC.ordinal()] = 12; enumOptionsMappingHelperArray[EnumOptions.VSYNC.ordinal()] = 12;
} }
catch (NoSuchFieldError var3) catch (NoSuchFieldError var3)
{ {
@ -122,14 +113,5 @@ class EnumOptionsHelper
{ {
; ;
} }
try
{
enumOptionsMappingHelperArray[EnumOptions.TOUCHSCREEN.ordinal()] = 14;
}
catch (NoSuchFieldError var1)
{
;
}
} }
} }

File diff suppressed because it is too large Load Diff

View File

@ -5,7 +5,7 @@ public class GuiOptions extends GuiScreen
/** /**
* An array of options that can be changed directly from the options GUI. * 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. * A reference to the screen object that created this. Used for navigating between screens.

View File

@ -16,7 +16,7 @@ public class GuiVideoSettings extends GuiScreen
private boolean is64bit; private boolean is64bit;
/** An array of all of EnumOption's video options. */ /** 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) public GuiVideoSettings(GuiScreen par1GuiScreen, GameSettings par2GameSettings)
{ {

View File

@ -16,8 +16,9 @@ import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import net.minecraft.client.ClientBrandRetriever; import net.minecraft.src.Item;
import net.minecraft.server.MinecraftServer; import net.minecraft.src.ItemRenderer;
import net.minecraft.src.ItemStack;
import org.lwjgl.LWJGLException; import org.lwjgl.LWJGLException;
import org.lwjgl.Sys; import org.lwjgl.Sys;
import org.lwjgl.opengl.Display; import org.lwjgl.opengl.Display;
@ -190,7 +191,7 @@ public class Minecraft
public 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.tempDisplayHeight = 480;
this.fullscreen = false; this.fullscreen = false;
Packet3Chat.maxChatLength = 32767; Packet3Chat.maxChatLength = 32767;