u39

eaglercraft · eaglercraft · commit d50d01b735ba · 2024-09-26T22:34:10.000-07:00
diff --git a/CompileJS.bat b/CompileJS.bat
@@ -1,4 +1,4 @@
-@echo off
-title gradlew generateJavascript
-gradlew generateJavascript
+@echo off
+title gradlew generateJavascript
+call gradlew generateJavascript
 pause
diff --git a/EAGLERCRAFTX_README.md b/EAGLERCRAFTX_README.md
@@ -196,6 +196,7 @@ The default eaglercraftXOpts values is this:
 - `eaglerNoDelay:` can be used to disable "Vigg's Algorithm", an algorithm that delays and combines multiple EaglercraftX packets together if they are sent in the same tick (does not affect regular Minecraft 1.8 packets)
 - `ramdiskMode:` if worlds and resource packs should be stored in RAM instead of IndexedDB
 - `singleThreadMode:` if the game should run the client and integrated server in the same context instead of creating a worker object
+- `enableEPKVersionCheck:` if the game should attempt to bypass the browser's cache and retry downloading assets.epk when its outdated
 - `hooks:` can be used to define JavaScript callbacks for certain events
     * `localStorageSaved:` JavaScript callback to save local storage keys (key, data)
     * `localStorageLoaded:` JavaScript callback to load local storage keys (key) returns data
diff --git a/desktopRuntime/resources/EPKVersionIdentifier.txt b/desktopRuntime/resources/EPKVersionIdentifier.txt
@@ -0,0 +1 @@
+u39
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraftX_1_8.txt b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraftX_1_8.txt
@@ -62,5 +62,6 @@
 	"disableBlobURLs": false,
 	"eaglerNoDelay": false,
 	"ramdiskMode": false,
-	"singleThreadMode": false
+	"singleThreadMode": false,
+	"enableEPKVersionCheck": true
 }
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraftX_1_8_demo.txt b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraftX_1_8_demo.txt
@@ -62,5 +62,6 @@
 	"disableBlobURLs": false,
 	"eaglerNoDelay": false,
 	"ramdiskMode": false,
-	"singleThreadMode": false
+	"singleThreadMode": false,
+	"enableEPKVersionCheck": true
 }
diff --git a/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraftX_1_8_html5Cursors.txt b/desktopRuntime/resources/assets/eagler/boot_menu/opts_template_eaglercraftX_1_8_html5Cursors.txt
@@ -62,5 +62,6 @@
 	"disableBlobURLs": false,
 	"eaglerNoDelay": false,
 	"ramdiskMode": false,
-	"singleThreadMode": false
+	"singleThreadMode": false,
+	"enableEPKVersionCheck": true
 }
diff --git a/desktopRuntime/resources/assets/minecraft/lang/en_US.lang b/desktopRuntime/resources/assets/minecraft/lang/en_US.lang
@@ -49,6 +49,14 @@ eaglercraft.editCape.clearCape=Clear List
 
 eaglercraft.editProfile.importExport=Import/Export
 
+eaglercraft.defaultUsernameDetected.title=Default Username Detected
+eaglercraft.defaultUsernameDetected.text0=The username "%s" was auto-generated by Eaglercraft
+eaglercraft.defaultUsernameDetected.text1=It may already be taken on the largest servers
+eaglercraft.defaultUsernameDetected.text2=Would you like to pick a different username instead?
+eaglercraft.defaultUsernameDetected.changeUsername=Change Username
+eaglercraft.defaultUsernameDetected.continueAnyway=Continue Anyway
+eaglercraft.defaultUsernameDetected.doNotShow=Do not show again
+
 eaglercraft.settingsBackup.importExport.title=What do you wanna do?
 eaglercraft.settingsBackup.importExport.import=Import Profile and Settings...
 eaglercraft.settingsBackup.importExport.export=Export Profile and Settings...
diff --git a/src/game/java/net/minecraft/client/Minecraft.java b/src/game/java/net/minecraft/client/Minecraft.java
@@ -1347,7 +1347,7 @@ public String call() throws Exception {
 						int j = Mouse.getEventDWheel();
 						if (j != 0) {
 							if (this.isZoomKey) {
-								this.adjustedZoomValue = MathHelper.clamp_float(adjustedZoomValue - j * 4.0f, 5.0f,
+								this.adjustedZoomValue = MathHelper.clamp_float(adjustedZoomValue - j * 4.0f, 4.0f,
 										32.0f);
 							} else if (this.thePlayer.isSpectator()) {
 								j = j < 0 ? -1 : 1;
diff --git a/src/game/java/net/minecraft/client/settings/GameSettings.java b/src/game/java/net/minecraft/client/settings/GameSettings.java
@@ -211,6 +211,7 @@ public class GameSettings {
 	public boolean enableProfanityFilter = false;
 	public boolean hasShownProfanityFilter = false;
 	public float touchControlOpacity = 1.0f;
+	public boolean hideDefaultUsernameWarning = false;
 
 	public int voiceListenRadius = 16;
 	public float voiceListenVolume = 0.5f;
@@ -1072,6 +1073,10 @@ public void loadOptions(byte[] data) {
 						touchControlOpacity = parseFloat(astring[1]);
 					}
 
+					if (astring[0].equals("hideDefaultUsernameWarning")) {
+						this.hideDefaultUsernameWarning = astring[1].equals("true");
+					}
+
 					deferredShaderConf.readOption(astring[0], astring[1]);
 				} catch (Exception var8) {
 					logger.warn("Skipping bad option: " + s);
@@ -1213,6 +1218,7 @@ public byte[] writeOptions() {
 			printwriter.println("screenRecordGameVolume:" + this.screenRecordGameVolume);
 			printwriter.println("screenRecordMicVolume:" + this.screenRecordMicVolume);
 			printwriter.println("touchControlOpacity:" + this.touchControlOpacity);
+			printwriter.println("hideDefaultUsernameWarning:" + this.hideDefaultUsernameWarning);
 
 			for (KeyBinding keybinding : this.keyBindings) {
 				printwriter.println("key_" + keybinding.getKeyDescription() + ":" + keybinding.getKeyCode());
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
@@ -479,7 +479,11 @@ public static int mouseGetEventY() {
 	}
 
 	public static int mouseGetEventDWheel() {
-		return (int)currentMouseEvent.wheel;
+		return fixWheel(currentMouseEvent.wheel);
+	}
+
+	private static int fixWheel(float val) {
+		return (val > 0.0f ? 1 : (val < 0.0f ? -1 : 0));
 	}
 
 	public static int mouseGetX() {
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/ArrayUtils.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/ArrayUtils.java
@@ -61,7 +61,7 @@ public static byte[] asciiString(String string) {
 	public static String hexString(byte[] bytesIn) {
 		char[] ret = new char[bytesIn.length << 1];
 		for(int i = 0; i < bytesIn.length; ++i) {
-			ret[i << 1] = hex.charAt((bytesIn[i] >> 4) & 15);
+			ret[i << 1] = hex.charAt((bytesIn[i] >>> 4) & 15);
 			ret[(i << 1) + 1] = hex.charAt(bytesIn[i] & 15);
 		}
 		return new String(ret);
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java
@@ -10,7 +10,7 @@ public class EaglercraftVersion {
 	/// Customize these to fit your fork:
 	
 	public static final String projectForkName = "EaglercraftX";
-	public static final String projectForkVersion = "u38";
+	public static final String projectForkVersion = "u39";
 	public static final String projectForkVendor = "lax1dude";
 	
 	public static final String projectForkURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8";
@@ -20,18 +20,20 @@ public class EaglercraftVersion {
 	public static final String projectOriginName = "EaglercraftX";
 	public static final String projectOriginAuthor = "lax1dude";
 	public static final String projectOriginRevision = "1.8";
-	public static final String projectOriginVersion = "u38";
+	public static final String projectOriginVersion = "u39";
 	
 	public static final String projectOriginURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; // rest in peace
 	
+	// EPK Version Identifier
 	
+	public static final String EPKVersionIdentifier = "u39"; // Set to null to disable EPK version check
 	
 	// Updating configuration
 	
 	public static final boolean enableUpdateService = true;
 
 	public static final String updateBundlePackageName = "net.lax1dude.eaglercraft.v1_8.client";
-	public static final int updateBundlePackageVersionInt = 38;
+	public static final int updateBundlePackageVersionInt = 39;
 
 	public static final String updateLatestLocalStorageKey = "latestUpdate_" + updateBundlePackageName;
 
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerFolderResourcePack.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/minecraft/EaglerFolderResourcePack.java
@@ -271,6 +271,7 @@ public static EaglerFolderResourcePack importResourcePack(String name, String pr
 
 	public static void loadRemoteResourcePack(String url, String hash, Consumer<EaglerFolderResourcePack> cb, Consumer<Runnable> ast, Runnable loading) {
 		if (!isSupported || !hash.matches("^[a-f0-9]{40}$")) {
+			logger.error("Invalid character in resource pack hash! (is it lowercase?)");
 			cb.accept(null);
 			return;
 		}
@@ -292,8 +293,9 @@ public static void loadRemoteResourcePack(String url, String hash, Consumer<Eagl
 				digest.update(arr, 0, arr.length);
 				byte[] hashOut = new byte[20];
 				digest.doFinal(hashOut, 0);
-				if(!hash.equals(ArrayUtils.hexString(hashOut))) {
-					logger.error("Downloaded resource pack hash does not equal expected resource pack hash!");
+				String hashOutStr = ArrayUtils.hexString(hashOut);
+				if(!hash.equals(hashOutStr)) {
+					logger.error("Downloaded resource pack hash does not equal expected resource pack hash! ({} != {})", hashOutStr, hash);
 					cb.accept(null);
 					return;
 				}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/EaglerProfile.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/EaglerProfile.java
@@ -9,6 +9,7 @@
 import net.lax1dude.eaglercraft.v1_8.EaglerOutputStream;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
 import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
+import net.lax1dude.eaglercraft.v1_8.HString;
 import net.minecraft.client.Minecraft;
 import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.nbt.NBTTagCompound;
@@ -464,7 +465,7 @@ public static void save() {
 		rand = new EaglercraftRandom();
 		
 		do {
-			username = defaultNames[rand.nextInt(defaultNames.length)] + defaultNames[rand.nextInt(defaultNames.length)] + (100 + rand.nextInt(900));
+			username = HString.format("%s%s%04d", defaultNames[rand.nextInt(defaultNames.length)], defaultNames[rand.nextInt(defaultNames.length)], rand.nextInt(10000));
 		}while(username.length() > 16);
 		
 		setName(username);
@@ -479,4 +480,8 @@ public static void save() {
 		
 	}
 
+	public static boolean isDefaultUsername(String str) {
+		return str.toLowerCase().matches("^(yeeish|yee|yeer|yeeler|eagler|eagl|darver|darvler|vool|vigg|deev|yigg|yeeg){2}\\d{2,4}$");
+	}
+
 }
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenDefaultUsernameNote.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenDefaultUsernameNote.java
@@ -0,0 +1,61 @@
+package net.lax1dude.eaglercraft.v1_8.profile;
+
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
+
+/**
+ * Copyright (c) 2024 lax1dude. All Rights Reserved.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
+ */
+public class GuiScreenDefaultUsernameNote extends GuiScreen {
+
+	private final GuiScreen back;
+	private final GuiScreen cont;
+
+	public GuiScreenDefaultUsernameNote(GuiScreen back, GuiScreen cont) {
+		this.back = back;
+		this.cont = cont;
+	}
+
+	public void initGui() {
+		this.buttonList.clear();
+		this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 6 + 112, I18n.format("defaultUsernameDetected.changeUsername")));
+		this.buttonList.add(new GuiButton(1, this.width / 2 - 100, this.height / 6 + 142, I18n.format("defaultUsernameDetected.continueAnyway")));
+		this.buttonList.add(new GuiButton(2, this.width / 2 - 100, this.height / 6 + 172, I18n.format("defaultUsernameDetected.doNotShow")));
+	}
+
+	public void drawScreen(int par1, int par2, float par3) {
+		this.drawDefaultBackground();
+		this.drawCenteredString(fontRendererObj, I18n.format("defaultUsernameDetected.title"), this.width / 2, 70, 11184810);
+		this.drawCenteredString(fontRendererObj, I18n.format("defaultUsernameDetected.text0", EaglerProfile.getName()), this.width / 2, 90, 16777215);
+		this.drawCenteredString(fontRendererObj, I18n.format("defaultUsernameDetected.text1"), this.width / 2, 105, 16777215);
+		this.drawCenteredString(fontRendererObj, I18n.format("defaultUsernameDetected.text2"), this.width / 2, 120, 16777215);
+		super.drawScreen(par1, par2, par3);
+	}
+
+	@Override
+	protected void actionPerformed(GuiButton parGuiButton) {
+		if(parGuiButton.id == 0) {
+			this.mc.displayGuiScreen(back);
+		}else if(parGuiButton.id == 1) {
+			this.mc.displayGuiScreen(cont);
+		}else if(parGuiButton.id == 2) {
+			this.mc.gameSettings.hideDefaultUsernameWarning = true;
+			this.mc.gameSettings.saveOptions();
+			this.mc.displayGuiScreen(cont);
+		}
+	}
+
+}
diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenEditProfile.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/profile/GuiScreenEditProfile.java
@@ -315,7 +315,11 @@ protected void actionPerformed(GuiButton par1GuiButton) {
 			if(par1GuiButton.id == 0) {
 				safeProfile();
 				EaglerProfile.save();
-				this.mc.displayGuiScreen((GuiScreen) parent);
+				if(!this.mc.gameSettings.hideDefaultUsernameWarning && EaglerProfile.isDefaultUsername(EaglerProfile.getName())) {
+					this.mc.displayGuiScreen(new GuiScreenDefaultUsernameNote(this, parent));
+				}else {
+					this.mc.displayGuiScreen(parent);
+				}
 			}else if(par1GuiButton.id == 1) {
 				EagRuntime.displayFileChooser("image/png", "png");
 			}else if(par1GuiButton.id == 2) {
diff --git a/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuEntryPoint.java b/src/teavm-boot-menu/java/net/lax1dude/eaglercraft/v1_8/boot_menu/teavm/BootMenuEntryPoint.java
@@ -60,12 +60,14 @@ public static boolean checkShouldLaunchFlag(Window win) {
 		return ((flag & 1) != 0 || IBootMenuConfigAdapter.instance.isShowBootMenuOnLaunch()) && !getHasAlreadyBooted();
 	}
 
+	private static boolean hasInit = false;
 	private static byte[] signatureData = null;
 	private static byte[] bundleData = null;
 
 	public static void launchMenu(Window parentWindow, HTMLElement parentElement) {
 		signatureData = PlatformUpdateSvc.getClientSignatureData();
 		bundleData = PlatformUpdateSvc.getClientBundleData();
+		hasInit = true;
 		BootMenuMain.launchMenu(parentWindow, parentElement);
 	}
 
@@ -83,6 +85,11 @@ public static void bootOriginClient(Runnable doBeforeBoot) {
 	}
 
 	public static boolean isSignedClient() {
+		if(!hasInit) {
+			signatureData = PlatformUpdateSvc.getClientSignatureData();
+			bundleData = PlatformUpdateSvc.getClientBundleData();
+			hasInit = true;
+		}
 		return signatureData != null && bundleData != null;
 	}
 
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformInput.java
@@ -597,7 +597,7 @@ public void handleEvent(TouchEvent evt) {
 			public void handleEvent(WheelEvent evt) {
 				evt.preventDefault();
 				evt.stopPropagation();
-				double delta = evt.getDeltaY();
+				double delta = -evt.getDeltaY();
 				mouseDWheel += delta;
 				if(hasShownPressAnyKey) {
 					int eventX = (int)(getOffsetX(evt, touchOffsetXTeaVM) * windowDPI);
@@ -1246,7 +1246,11 @@ public static int mouseGetEventY() {
 	}
 
 	public static int mouseGetEventDWheel() {
-		return (currentEvent.type == EVENT_MOUSE_WHEEL) ? (currentEvent.wheel == 0.0f ? 0 : (currentEvent.wheel > 0.0f ? -1 : 1)) : 0;
+		return (currentEvent.type == EVENT_MOUSE_WHEEL) ? fixWheel(currentEvent.wheel) : 0;
+	}
+
+	private static int fixWheel(float val) {
+		return (val > 0.0f ? 1 : (val < 0.0f ? -1 : 0));
 	}
 
 	public static int mouseGetX() {
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformRuntime.java
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/EPKDownloadHelper.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/EPKDownloadHelper.java
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
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMFetchJS.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/TeaVMFetchJS.java
diff --git a/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/opts/JSEaglercraftXOptsRoot.java b/src/teavm/java/net/lax1dude/eaglercraft/v1_8/internal/teavm/opts/JSEaglercraftXOptsRoot.java

Original file line number	Diff line number	Diff line change
`@@ -62,5 +62,6 @@`
`62`	`62`	`"disableBlobURLs": false,`
`63`	`63`	`"eaglerNoDelay": false,`
`64`	`64`	`"ramdiskMode": false,`
`65`		`- "singleThreadMode": false`
	`65`	`+ "singleThreadMode": false,`
	`66`	`+ "enableEPKVersionCheck": true`
`66`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -479,7 +479,11 @@ public static int mouseGetEventY() {`
`479`	`479`	`}`
`480`	`480`
`481`	`481`	`public static int mouseGetEventDWheel() {`
`482`		`- return (int)currentMouseEvent.wheel;`
	`482`	`+ return fixWheel(currentMouseEvent.wheel);`
	`483`	`+ }`
	`484`	`+`
	`485`	`+ private static int fixWheel(float val) {`
	`486`	`+ return (val > 0.0f ? 1 : (val < 0.0f ? -1 : 0));`
`483`	`487`	`}`
`484`	`488`
`485`	`489`	`public static int mouseGetX() {`