Update #30 - Fixed various client bugs

This commit is contained in:
lax1dude
2024-05-18 23:17:29 -07:00
parent 32fda35ace
commit c6ac781036
50 changed files with 798 additions and 446 deletions

View File

@ -20,7 +20,7 @@
> DELETE 1 @ 1 : 4
> CHANGE 1 : 55 @ 1 : 4
> CHANGE 1 : 56 @ 1 : 4
~
~ import net.lax1dude.eaglercraft.v1_8.internal.PlatformInput;
@ -31,6 +31,7 @@
~
~ import net.lax1dude.eaglercraft.v1_8.Display;
~ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
~ import net.lax1dude.eaglercraft.v1_8.EagUtils;
~ import net.lax1dude.eaglercraft.v1_8.EaglerXBungeeVersion;
~ import net.lax1dude.eaglercraft.v1_8.HString;
~ import net.lax1dude.eaglercraft.v1_8.IOUtils;
@ -430,7 +431,21 @@
~ Util.func_181617_a((FutureTask) this.scheduledTasks.remove(0), logger);
> DELETE 18 @ 18 : 26
> CHANGE 7 : 18 @ 7 : 8
~ if (this.timer.elapsedTicks > 1) {
~ long watchdog = System.currentTimeMillis();
~ for (int j = 0; j < this.timer.elapsedTicks; ++j) {
~ this.runTick();
~ long millis = System.currentTimeMillis();
~ if (millis - watchdog > 50l) {
~ watchdog = millis;
~ EagUtils.sleep(0l);
~ }
~ }
~ } else if (this.timer.elapsedTicks == 1) {
> DELETE 10 @ 10 : 18
> CHANGE 1 : 4 @ 1 : 5
@ -503,9 +518,13 @@
+ Mouse.tickCursorShape();
> INSERT 5 : 6 @ 5
> INSERT 5 : 10 @ 5
+ Display.setVSync(this.gameSettings.enableVsync);
+ if (Display.isVSyncSupported()) {
+ Display.setVSync(this.gameSettings.enableVsync);
+ } else {
+ this.gameSettings.enableVsync = false;
+ }
> DELETE 34 @ 34 : 52

View File

@ -30,7 +30,9 @@
> DELETE 7 @ 7 : 11
> DELETE 3 @ 3 : 18
> CHANGE 3 : 4 @ 3 : 18
~ private static final Logger tipLogger = LogManager.getLogger("EaglercraftX");
> CHANGE 3 : 4 @ 3 : 4
@ -44,7 +46,14 @@
~ for (Entry entry : (Set<Entry>) map.entrySet()) {
> INSERT 14 : 24 @ 14
> INSERT 12 : 16 @ 12
+ if (this.sndRegistry.getObject(new ResourceLocation("minecraft:sounds/music/game/calm1.ogg")) == null) {
+ tipLogger.info(
+ "Download this resource pack if you want music: https://bafybeiayojww5jfyzvlmtuk7l5ufkt7nlfto7mhwmzf2vs4bvsjd5ouiuq.ipfs.nftstorage.link/?filename=Music_For_Eaglercraft.zip");
+ }
> INSERT 2 : 12 @ 2
+ public static class SoundMap {
+

View File

@ -7,11 +7,12 @@
> DELETE 2 @ 2 : 3
> INSERT 1 : 9 @ 1
> INSERT 1 : 10 @ 1
+
+ import com.google.common.collect.Maps;
+
+ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
+ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
@ -32,12 +33,16 @@
+ private RenderPlayer eaglerRenderer;
> CHANGE 82 : 88 @ 82 : 83
> CHANGE 82 : 92 @ 82 : 83
~ this.skinMap.put("slim", new RenderPlayer(this, true, false));
~ this.skinMap.put("zombie", new RenderPlayer(this, false, true));
~ this.eaglerRenderer = new RenderHighPoly(this, this.playerRenderer.getMainModel(),
~ this.playerRenderer.shadowSize);
~ if (EagRuntime.getConfiguration().isAllowFNAWSkins()) {
~ this.eaglerRenderer = new RenderHighPoly(this, this.playerRenderer.getMainModel(),
~ this.playerRenderer.shadowSize);
~ } else {
~ this.eaglerRenderer = this.playerRenderer;
~ }
~ this.skinMap.put("eagler",
~ Minecraft.getMinecraft().gameSettings.enableFNAWSkins ? this.eaglerRenderer : this.playerRenderer);

View File

@ -225,7 +225,7 @@
~ worldIn.theItemInWorldManager.initializeGameType(parWorld.getWorldInfo().getGameType());
~ } else {
~ parEntityPlayerMP2.theItemInWorldManager.setGameType(lanGamemode);
~ worldIn.theItemInWorldManager.setGameType(lanGamemode);
~ }
> CHANGE 7 : 8 @ 7 : 8