Uplandustries/Eaglercraft-1.8
1
0
Fork 0
mirror of https://github.com/Eaglercraft-Archive/Eaglercraftx-1.8.8-src.git synced 2025-06-27 18:38:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update #41 - Fix swords unable to break blocks in survival

Browse Source
This commit is contained in:
lax1dude
2024-11-08 22:13:23 -08:00
parent 79eae996fd
commit 6d8df8128f
19 changed files with 302 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
patches/minecraft/net/minecraft/client/Minecraft.edit.java
View File

@ -18,7 +18,7 @@
> DELETE 1 @ 1 : 4
> CHANGE 1 : 73 @ 1 : 4
> CHANGE 1 : 74 @ 1 : 4
~
~ import net.lax1dude.eaglercraft.v1_8.ClientUUIDLoadingCache;
@ -52,6 +52,7 @@
~ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFontRenderer;
~ import net.lax1dude.eaglercraft.v1_8.minecraft.EnumInputEvent;
~ import net.lax1dude.eaglercraft.v1_8.minecraft.GuiScreenGenericErrorMessage;
~ import net.lax1dude.eaglercraft.v1_8.minecraft.GuiScreenVideoSettingsWarning;
~ import net.lax1dude.eaglercraft.v1_8.notifications.ServerNotificationRenderer;
~ import net.lax1dude.eaglercraft.v1_8.opengl.EaglerMeshLoader;
~ import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
@ -358,21 +359,27 @@
~ mainMenu = new GuiConnecting(mainMenu, this, this.serverName, this.serverPort);
> INSERT 2 : 10 @ 2
> CHANGE 2 : 5 @ 2 : 7
+ mainMenu = new GuiScreenEditProfile(mainMenu);
+
+ if (!EagRuntime.getConfiguration().isForceProfanityFilter() && !gameSettings.hasShownProfanityFilter) {
+ mainMenu = new GuiScreenContentWarning(mainMenu);
+ }
+
+ this.displayGuiScreen(mainMenu);
+
~ int vidIssues = gameSettings.checkBadVideoSettings();
~ if (vidIssues != 0) {
~ mainMenu = new GuiScreenVideoSettingsWarning(mainMenu, vidIssues);
> DELETE 3 @ 3 : 6
> CHANGE 2 : 6 @ 2 : 7
> CHANGE 1 : 7 @ 1 : 9
~ mainMenu = new GuiScreenEditProfile(mainMenu);
~
~ if (!EagRuntime.getConfiguration().isForceProfanityFilter() && !gameSettings.hasShownProfanityFilter) {
~ mainMenu = new GuiScreenContentWarning(mainMenu);
> CHANGE 2 : 14 @ 2 : 3
~ this.displayGuiScreen(mainMenu);
~
~ this.renderEngine.deleteTexture(this.mojangLogo);
~ this.mojangLogo = null;
~ this.loadingScreen = new LoadingScreenRenderer(this);
~
~ while (Mouse.next())
~ ;
~ while (Keyboard.next())
@ -959,10 +966,11 @@
+ }
+
> INSERT 26 : 28 @ 26
> INSERT 26 : 29 @ 26
+ boolean miningTouch = isMiningTouch();
+ boolean useTouch = thePlayer.getItemShouldUseOnTouchEagler();
+ boolean touchMode = PointerInputAbstraction.isTouchMode();
+ boolean miningTouch = touchMode && isMiningTouch();
+ boolean useTouch = touchMode && thePlayer.getItemShouldUseOnTouchEagler();
> CHANGE 1 : 2 @ 1 : 2

16
patches/minecraft/net/minecraft/client/gui/GuiVideoSettings.edit.java
View File

@ -5,10 +5,11 @@
# Version: 1.0
# Author: lax1dude
> CHANGE 3 : 8 @ 3 : 9
> CHANGE 3 : 9 @ 3 : 9
~
~ import net.lax1dude.eaglercraft.v1_8.Display;
~ import net.lax1dude.eaglercraft.v1_8.minecraft.GuiScreenVideoSettingsWarning;
~ import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
~ import net.lax1dude.eaglercraft.v1_8.opengl.ext.dynamiclights.DynamicLightsStateManager;
~ import net.lax1dude.eaglercraft.v1_8.recording.ScreenRecordingController;
@ -71,7 +72,18 @@
~
~ protected void actionPerformed(GuiButton parGuiButton) {
> CHANGE 9 : 10 @ 9 : 10
> CHANGE 3 : 9 @ 3 : 4
~ GuiScreen contScreen = parentGuiScreen;
~ int vidIssues = mc.gameSettings.checkBadVideoSettings();
~ if (vidIssues != 0) {
~ contScreen = new GuiScreenVideoSettingsWarning(contScreen, vidIssues);
~ }
~ this.mc.displayGuiScreen(contScreen);
> DELETE 1 @ 1 : 2
> CHANGE 3 : 4 @ 3 : 4
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {

33
patches/minecraft/net/minecraft/client/settings/GameSettings.edit.java
View File

@ -14,7 +14,7 @@
> DELETE 1 @ 1 : 3
> INSERT 3 : 31 @ 3
> INSERT 3 : 32 @ 3
+
+ import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayManager;
@ -39,6 +39,7 @@
+ import net.lax1dude.eaglercraft.v1_8.internal.KeyboardConstants;
+ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
+ import net.lax1dude.eaglercraft.v1_8.minecraft.GuiScreenVideoSettingsWarning;
+ import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.EaglerDeferredConfig;
+ import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.EaglerDeferredPipeline;
+ import net.lax1dude.eaglercraft.v1_8.opengl.ext.dynamiclights.DynamicLightsStateManager;
@ -95,7 +96,7 @@
~ public int guiScale = 3;
> INSERT 3 : 23 @ 3
> INSERT 3 : 24 @ 3
+ public boolean hudFps = true;
+ public boolean hudCoords = true;
@ -117,6 +118,7 @@
+ public boolean hasShownProfanityFilter = false;
+ public float touchControlOpacity = 1.0f;
+ public boolean hideDefaultUsernameWarning = false;
+ public boolean hideVideoSettingsWarning = false;
> CHANGE 1 : 15 @ 1 : 2
@ -536,7 +538,7 @@
~ for (EnumPlayerModelParts enumplayermodelparts : EnumPlayerModelParts._VALUES) {
> INSERT 4 : 70 @ 4
> INSERT 4 : 74 @ 4
+
+ if (astring[0].equals("enableFNAWSkins")) {
@ -603,6 +605,10 @@
+ this.hideDefaultUsernameWarning = astring[1].equals("true");
+ }
+
+ if (astring[0].equals("hideVideoSettingsWarning")) {
+ hideVideoSettingsWarning = astring[1].equals("true");
+ }
+
+ deferredShaderConf.readOption(astring[0], astring[1]);
> CHANGE 6 : 23 @ 6 : 7
@ -666,7 +672,7 @@
> DELETE 9 @ 9 : 20
> INSERT 5 : 36 @ 5
> INSERT 5 : 37 @ 5
+ printwriter.println("hudFps:" + this.hudFps);
+ printwriter.println("hudWorld:" + this.hudWorld);
@ -699,6 +705,7 @@
+ printwriter.println("screenRecordMicVolume:" + this.screenRecordMicVolume);
+ printwriter.println("touchControlOpacity:" + this.touchControlOpacity);
+ printwriter.println("hideDefaultUsernameWarning:" + this.hideDefaultUsernameWarning);
+ printwriter.println("hideVideoSettingsWarning:" + this.hideVideoSettingsWarning);
> CHANGE 5 : 8 @ 5 : 6
@ -731,7 +738,7 @@
~ Math.max(this.renderDistanceChunks, 2), this.chatVisibility, this.chatColours, i));
> INSERT 36 : 44 @ 36
> INSERT 36 : 60 @ 36
+ private String toJSONArray(List<String> e) {
+ JSONArray arr = new JSONArray();
@ -741,6 +748,22 @@
+ return arr.toString();
+ }
+
+ public int checkBadVideoSettings() {
+ return hideVideoSettingsWarning ? 0
+ : ((renderDistanceChunks > 6 ? GuiScreenVideoSettingsWarning.WARNING_RENDER_DISTANCE : 0)
+ | (!enableVsync ? GuiScreenVideoSettingsWarning.WARNING_VSYNC : 0)
+ | (limitFramerate < 30 ? GuiScreenVideoSettingsWarning.WARNING_FRAME_LIMIT : 0));
+ }
+
+ public void fixBadVideoSettings() {
+ if (renderDistanceChunks > 6)
+ renderDistanceChunks = 4;
+ if (!enableVsync)
+ enableVsync = true;
+ if (limitFramerate < 30)
+ limitFramerate = 260;
+ }
+
> CHANGE 4 : 5 @ 4 : 5

18
patches/resources/assets/minecraft/lang/en_US.edit.lang
View File

@ -257,7 +257,7 @@
+ eaglercraft.command.clientStub=This command is client side!
+
> INSERT 163 : 545 @ 163
> INSERT 163 : 561 @ 163
+ eaglercraft.singleplayer.busy.killTask=Cancel Task
+ eaglercraft.singleplayer.busy.cancelWarning=Are you sure?
@ -641,6 +641,22 @@
+
+ eaglercraft.touch.interact.entity=Interact
+
+ eaglercraft.options.badVideoSettingsDetected.title=Issues Detected
+ eaglercraft.options.badVideoSettingsDetected.0=Some of your video settings may be causing
+ eaglercraft.options.badVideoSettingsDetected.1=the game to lag excessively
+ eaglercraft.options.badVideoSettingsDetected.vsync.0=VSync is disabled, some browsers require
+ eaglercraft.options.badVideoSettingsDetected.vsync.1=VSync to be enabled to hint when the
+ eaglercraft.options.badVideoSettingsDetected.vsync.2=framebuffer has updated. If the game feels
+ eaglercraft.options.badVideoSettingsDetected.vsync.3=significantly slower than is indicated by
+ eaglercraft.options.badVideoSettingsDetected.vsync.4=the FPS counter, you should enable VSync.
+ eaglercraft.options.badVideoSettingsDetected.renderDistance.0=Render distance is %d chunks, most devices
+ eaglercraft.options.badVideoSettingsDetected.renderDistance.1=lag when the render distance is greater
+ eaglercraft.options.badVideoSettingsDetected.renderDistance.2=than 4 chunks
+ eaglercraft.options.badVideoSettingsDetected.frameLimit.0=Framerate limit is set to %d
+ eaglercraft.options.badVideoSettingsDetected.fixSettings=Fix Settings
+ eaglercraft.options.badVideoSettingsDetected.continueAnyway=Continue Anyway
+ eaglercraft.options.badVideoSettingsDetected.doNotShowAgain=Do Not Show Again
+
> INSERT 18 : 19 @ 18