mirror of
https://github.com/Eaglercraft-Archive/Eaglercraftx-1.8.8-src.git
synced 2025-06-28 10:58:15 -05:00
Update #0 - First Release
This commit is contained in:
@ -0,0 +1,12 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 4 : 5 @ 4 : 5
|
||||
|
||||
~ return "eagler";
|
||||
|
||||
> EOF
|
@ -0,0 +1,57 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 4 @ 2 : 3
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
|
||||
|
||||
> DELETE 6 @ 5 : 7
|
||||
|
||||
> DELETE 7 @ 8 : 9
|
||||
|
||||
> DELETE 8 @ 10 : 11
|
||||
|
||||
> DELETE 18 @ 21 : 22
|
||||
|
||||
> DELETE 22 @ 26 : 28
|
||||
|
||||
> CHANGE 44 : 47 @ 50 : 60
|
||||
|
||||
~ ScaledResolution scaledresolution = new ScaledResolution(this.mc);
|
||||
~ GlStateManager.ortho(0.0D, scaledresolution.getScaledWidth_double(),
|
||||
~ scaledresolution.getScaledHeight_double(), 0.0D, 100.0D, 300.0D);
|
||||
|
||||
> INSERT 66 : 80 @ 79
|
||||
|
||||
+ public void eaglerShow(String line1, String line2) {
|
||||
+ if (!this.mc.running) {
|
||||
+ if (!this.field_73724_e) {
|
||||
+ throw new MinecraftError();
|
||||
+ }
|
||||
+ } else {
|
||||
+ this.systemTime = 0L;
|
||||
+ this.currentlyDisplayedText = line1;
|
||||
+ this.message = line2;
|
||||
+ this.setLoadingProgress(-1);
|
||||
+ this.systemTime = 0L;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
|
||||
> CHANGE 93 : 94 @ 92 : 99
|
||||
|
||||
~ GlStateManager.clear(256);
|
||||
|
||||
> CHANGE 101 : 103 @ 106 : 109
|
||||
|
||||
~ GlStateManager.clear(16640);
|
||||
~ GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
|
||||
|
||||
> DELETE 147 @ 153 : 158
|
||||
|
||||
> EOF
|
581
patches/minecraft/net/minecraft/client/Minecraft.edit.java
Normal file
581
patches/minecraft/net/minecraft/client/Minecraft.edit.java
Normal file
@ -0,0 +1,581 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 17
|
||||
|
||||
> DELETE 4 @ 19 : 23
|
||||
|
||||
> DELETE 5 @ 24 : 25
|
||||
|
||||
> CHANGE 7 : 8 @ 27 : 31
|
||||
|
||||
~ import java.util.LinkedList;
|
||||
|
||||
> DELETE 9 @ 32 : 35
|
||||
|
||||
> CHANGE 10 : 41 @ 36 : 39
|
||||
|
||||
~
|
||||
~ import org.apache.commons.lang3.Validate;
|
||||
~
|
||||
~ import com.google.common.collect.Lists;
|
||||
~
|
||||
~ import net.lax1dude.eaglercraft.v1_8.Display;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.HString;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.IOUtils;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.Keyboard;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.Mouse;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.futures.Executors;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.futures.FutureTask;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.futures.Futures;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.futures.ListenableFuture;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.futures.ListenableFutureTask;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformType;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.internal.PlatformRuntime;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerFontRenderer;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.profile.GuiScreenEditProfile;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.profile.SkinPreviewRenderer;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.socket.AddressResolver;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.socket.RateLimitTracker;
|
||||
|
||||
> DELETE 43 @ 41 : 43
|
||||
|
||||
> DELETE 56 @ 56 : 58
|
||||
|
||||
> DELETE 59 @ 61 : 62
|
||||
|
||||
> INSERT 62 : 63 @ 65
|
||||
|
||||
+ import net.minecraft.client.multiplayer.ServerAddress;
|
||||
|
||||
> INSERT 64 : 65 @ 66
|
||||
|
||||
+ import net.minecraft.client.multiplayer.ServerList;
|
||||
|
||||
> DELETE 66 @ 67 : 68
|
||||
|
||||
> DELETE 70 @ 72 : 73
|
||||
|
||||
> DELETE 71 @ 74 : 75
|
||||
|
||||
> DELETE 73 @ 77 : 78
|
||||
|
||||
> DELETE 88 @ 93 : 94
|
||||
|
||||
> DELETE 90 @ 96 : 97
|
||||
|
||||
> DELETE 104 @ 111 : 112
|
||||
|
||||
> DELETE 105 @ 113 : 115
|
||||
|
||||
> DELETE 126 @ 136 : 140
|
||||
|
||||
> DELETE 127 @ 141 : 143
|
||||
|
||||
> DELETE 128 @ 144 : 146
|
||||
|
||||
> DELETE 133 @ 151 : 152
|
||||
|
||||
> INSERT 144 : 145 @ 163
|
||||
|
||||
+ import net.minecraft.util.StringTranslate;
|
||||
|
||||
> DELETE 151 @ 169 : 189
|
||||
|
||||
> CHANGE 152 : 153 @ 190 : 191
|
||||
|
||||
~ public class Minecraft implements IThreadListener {
|
||||
|
||||
> CHANGE 155 : 156 @ 193 : 200
|
||||
|
||||
~ public static final boolean isRunningOnMac = false;
|
||||
|
||||
> DELETE 168 @ 212 : 214
|
||||
|
||||
> DELETE 187 @ 233 : 234
|
||||
|
||||
> DELETE 193 @ 240 : 242
|
||||
|
||||
> DELETE 194 @ 243 : 245
|
||||
|
||||
> CHANGE 205 : 206 @ 256 : 257
|
||||
|
||||
~ private EaglercraftNetworkManager myNetworkManager;
|
||||
|
||||
> DELETE 215 @ 266 : 268
|
||||
|
||||
> CHANGE 219 : 220 @ 272 : 275
|
||||
|
||||
~ private final List<FutureTask<?>> scheduledTasks = new LinkedList();
|
||||
|
||||
> INSERT 234 : 236 @ 289
|
||||
|
||||
+ public int joinWorldTickCounter = 0;
|
||||
+ private int dontPauseTimer = 0;
|
||||
|
||||
> CHANGE 239 : 240 @ 292 : 295
|
||||
|
||||
~ StringTranslate.doCLINIT();
|
||||
|
||||
> CHANGE 241 : 242 @ 296 : 304
|
||||
|
||||
~ this.mcDefaultResourcePack = new DefaultResourcePack();
|
||||
|
||||
> CHANGE 243 : 244 @ 305 : 307
|
||||
|
||||
~ logger.info("Setting user: " + this.session.getProfile().getName());
|
||||
|
||||
> CHANGE 251 : 256 @ 314 : 318
|
||||
|
||||
~ String serverToJoin = EagRuntime.getConfiguration().getServerToJoin();
|
||||
~ if (serverToJoin != null) {
|
||||
~ ServerAddress addr = AddressResolver.resolveAddressFromURI(serverToJoin);
|
||||
~ this.serverName = addr.getIP();
|
||||
~ this.serverPort = addr.getPort();
|
||||
|
||||
> DELETE 258 @ 320 : 321
|
||||
|
||||
> CHANGE 273 : 275 @ 336 : 338
|
||||
|
||||
~ try {
|
||||
~ while (true) {
|
||||
|
||||
> DELETE 291 @ 354 : 371
|
||||
|
||||
> CHANGE 292 : 307 @ 372 : 374
|
||||
|
||||
~ } catch (MinecraftError var12) {
|
||||
~ // ??
|
||||
~ } catch (ReportedException reportedexception) {
|
||||
~ this.addGraphicsAndWorldToCrashReport(reportedexception.getCrashReport());
|
||||
~ this.freeMemory();
|
||||
~ logger.fatal("Reported exception thrown!", reportedexception);
|
||||
~ this.displayCrashReport(reportedexception.getCrashReport());
|
||||
~ } catch (Throwable throwable1) {
|
||||
~ CrashReport crashreport1 = this
|
||||
~ .addGraphicsAndWorldToCrashReport(new CrashReport("Unexpected error", throwable1));
|
||||
~ this.freeMemory();
|
||||
~ logger.fatal("Unreported exception thrown!", throwable1);
|
||||
~ this.displayCrashReport(crashreport1);
|
||||
~ } finally {
|
||||
~ this.shutdownMinecraftApplet();
|
||||
|
||||
> CHANGE 311 : 313 @ 378 : 380
|
||||
|
||||
~ private void startGame() throws IOException {
|
||||
~ this.gameSettings = new GameSettings(this);
|
||||
|
||||
> DELETE 314 @ 381 : 382
|
||||
|
||||
> CHANGE 319 : 320 @ 387 : 390
|
||||
|
||||
~ logger.info("EagRuntime Version: " + EagRuntime.getVersion());
|
||||
|
||||
> DELETE 321 @ 391 : 394
|
||||
|
||||
> CHANGE 322 : 323 @ 395 : 397
|
||||
|
||||
~ this.mcResourcePackRepository = new ResourcePackRepository(this.mcDefaultResourcePack, this.metadataSerializer_,
|
||||
|
||||
> DELETE 331 @ 405 : 408
|
||||
|
||||
> CHANGE 334 : 336 @ 411 : 413
|
||||
|
||||
~ this.fontRendererObj = new EaglerFontRenderer(this.gameSettings,
|
||||
~ new ResourceLocation("textures/font/ascii.png"), this.renderEngine, false);
|
||||
|
||||
> CHANGE 341 : 342 @ 418 : 419
|
||||
|
||||
~ this.standardGalacticFontRenderer = new EaglerFontRenderer(this.gameSettings,
|
||||
|
||||
> CHANGE 350 : 351 @ 427 : 428
|
||||
|
||||
~ return HString.format(parString1, new Object[] { GameSettings
|
||||
|
||||
> CHANGE 361 : 362 @ 438 : 439
|
||||
|
||||
~ GlStateManager.clearDepth(1.0f);
|
||||
|
||||
> INSERT 392 : 393 @ 469
|
||||
|
||||
+ SkinPreviewRenderer.initialize();
|
||||
|
||||
> INSERT 395 : 399 @ 471
|
||||
|
||||
+
|
||||
+ ServerList.initServerList(this);
|
||||
+ EaglerProfile.read();
|
||||
+
|
||||
|
||||
> CHANGE 400 : 402 @ 472 : 473
|
||||
|
||||
~ this.displayGuiScreen(new GuiScreenEditProfile(
|
||||
~ new GuiConnecting(new GuiMainMenu(), this, this.serverName, this.serverPort)));
|
||||
|
||||
> CHANGE 403 : 404 @ 474 : 475
|
||||
|
||||
~ this.displayGuiScreen(new GuiScreenEditProfile(new GuiMainMenu()));
|
||||
|
||||
> DELETE 409 @ 480 : 492
|
||||
|
||||
> CHANGE 425 : 426 @ 508 : 516
|
||||
|
||||
~ throw new UnsupportedOperationException("wtf u trying to twitch stream in a browser game?");
|
||||
|
||||
> CHANGE 428 : 431 @ 518 : 540
|
||||
|
||||
~ private void createDisplay() {
|
||||
~ Display.create();
|
||||
~ Display.setTitle("Eaglercraft 1.8.8");
|
||||
|
||||
> DELETE 433 @ 542 : 579
|
||||
|
||||
> CHANGE 434 : 435 @ 580 : 590
|
||||
|
||||
~ return true;
|
||||
|
||||
> DELETE 437 @ 592 : 596
|
||||
|
||||
> DELETE 441 @ 600 : 617
|
||||
|
||||
> CHANGE 447 : 459 @ 623 : 636
|
||||
|
||||
~ String report = crashReportIn.getCompleteReport();
|
||||
~ Bootstrap.printToSYSOUT(report);
|
||||
~ PlatformRuntime.writeCrashReport(report);
|
||||
~ if (PlatformRuntime.getPlatformType() == EnumPlatformType.JAVASCRIPT) {
|
||||
~ System.err.println(
|
||||
~ "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%");
|
||||
~ System.err.println("NATIVE BROWSER EXCEPTION:");
|
||||
~ if (!PlatformRuntime.printJSExceptionIfBrowser(crashReportIn.getCrashCause())) {
|
||||
~ System.err.println("<undefined>");
|
||||
~ }
|
||||
~ System.err.println(
|
||||
~ "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%");
|
||||
|
||||
> DELETE 460 @ 637 : 638
|
||||
|
||||
> INSERT 467 : 469 @ 645
|
||||
|
||||
+ GlStateManager.recompileShaders();
|
||||
+
|
||||
|
||||
> CHANGE 483 : 485 @ 659 : 660
|
||||
|
||||
~ logger.info("Caught error stitching, removing all assigned resourcepacks");
|
||||
~ logger.info(runtimeexception);
|
||||
|
||||
> CHANGE 501 : 504 @ 676 : 688
|
||||
|
||||
~ private void updateDisplayMode() {
|
||||
~ this.displayWidth = Display.getWidth();
|
||||
~ this.displayHeight = Display.getHeight();
|
||||
|
||||
> CHANGE 506 : 510 @ 690 : 734
|
||||
|
||||
~ private void drawSplashScreen(TextureManager textureManagerInstance) {
|
||||
~ Display.update();
|
||||
~ updateDisplayMode();
|
||||
~ GlStateManager.viewport(0, 0, displayWidth, displayHeight);
|
||||
|
||||
> DELETE 512 @ 736 : 739
|
||||
|
||||
> CHANGE 528 : 529 @ 755 : 756
|
||||
|
||||
~ new DynamicTexture(ImageData.loadImageFile(inputstream)));
|
||||
|
||||
> DELETE 553 @ 780 : 782
|
||||
|
||||
> DELETE 579 @ 808 : 812
|
||||
|
||||
> CHANGE 610 : 611 @ 843 : 844
|
||||
|
||||
~ public void checkGLError(String message) {
|
||||
|
||||
> CHANGE 612 : 613 @ 845 : 846
|
||||
|
||||
~ int i = EaglercraftGPU.glGetError();
|
||||
|
||||
> CHANGE 614 : 615 @ 847 : 848
|
||||
|
||||
~ String s = EaglercraftGPU.gluErrorString(i);
|
||||
|
||||
> DELETE 625 @ 858 : 859
|
||||
|
||||
> CHANGE 635 : 636 @ 869 : 870
|
||||
|
||||
~ EagRuntime.destroy();
|
||||
|
||||
> CHANGE 637 : 638 @ 871 : 872
|
||||
|
||||
~ EagRuntime.exit();
|
||||
|
||||
> DELETE 641 @ 875 : 877
|
||||
|
||||
> CHANGE 646 : 647 @ 882 : 883
|
||||
|
||||
~ if (Display.isCloseRequested()) {
|
||||
|
||||
> CHANGE 661 : 662 @ 897 : 898
|
||||
|
||||
~ Util.func_181617_a((FutureTask) this.scheduledTasks.remove(0), logger);
|
||||
|
||||
> DELETE 680 @ 916 : 924
|
||||
|
||||
> CHANGE 681 : 691 @ 925 : 929
|
||||
|
||||
~ if (!Display.contextLost()) {
|
||||
~ GlStateManager.clearColor(0.0f, 0.0f, 0.0f, 1.0f);
|
||||
~ GlStateManager.pushMatrix();
|
||||
~ GlStateManager.clear(16640);
|
||||
~ this.mcProfiler.startSection("display");
|
||||
~ GlStateManager.enableTexture2D();
|
||||
~ if (this.thePlayer != null && this.thePlayer.isEntityInsideOpaqueBlock()) {
|
||||
~ this.gameSettings.thirdPersonView = 0;
|
||||
~ }
|
||||
~
|
||||
|
||||
> CHANGE 692 : 697 @ 930 : 931
|
||||
|
||||
~ if (!this.skipRenderWorld) {
|
||||
~ this.mcProfiler.endStartSection("gameRenderer");
|
||||
~ this.entityRenderer.func_181560_a(this.timer.renderPartialTicks, i);
|
||||
~ this.mcProfiler.endSection();
|
||||
~ }
|
||||
|
||||
> CHANGE 698 : 710 @ 932 : 936
|
||||
|
||||
~ this.mcProfiler.endSection();
|
||||
~ if (this.gameSettings.showDebugInfo && this.gameSettings.showDebugProfilerChart
|
||||
~ && !this.gameSettings.hideGUI) {
|
||||
~ if (!this.mcProfiler.profilingEnabled) {
|
||||
~ this.mcProfiler.clearProfiling();
|
||||
~ }
|
||||
~
|
||||
~ this.mcProfiler.profilingEnabled = true;
|
||||
~ this.displayDebugInfo(i1);
|
||||
~ } else {
|
||||
~ this.mcProfiler.profilingEnabled = false;
|
||||
~ this.prevFrameTime = System.nanoTime();
|
||||
|
||||
> CHANGE 712 : 714 @ 938 : 943
|
||||
|
||||
~ this.guiAchievement.updateAchievementWindow();
|
||||
~ GlStateManager.popMatrix();
|
||||
|
||||
> DELETE 716 @ 945 : 954
|
||||
|
||||
> DELETE 718 @ 956 : 964
|
||||
|
||||
> INSERT 719 : 720 @ 965
|
||||
|
||||
+
|
||||
|
||||
> CHANGE 721 : 722 @ 966 : 968
|
||||
|
||||
~ this.isGamePaused = false;
|
||||
|
||||
> CHANGE 728 : 729 @ 974 : 975
|
||||
|
||||
~ this.debug = HString.format("%d fps (%d chunk update%s) T: %s%s%s%s",
|
||||
|
||||
> CHANGE 734 : 736 @ 980 : 984
|
||||
|
||||
~ this.gameSettings.fancyGraphics ? "" : " fast", this.gameSettings.clouds == 0 ? ""
|
||||
~ : (this.gameSettings.clouds == 1 ? " fast-clouds" : " fancy-clouds") });
|
||||
|
||||
> DELETE 739 @ 987 : 991
|
||||
|
||||
> DELETE 788 @ 1040 : 1047
|
||||
|
||||
> CHANGE 836 : 837 @ 1095 : 1096
|
||||
|
||||
~ EaglercraftGPU.glLineWidth(1.0F);
|
||||
|
||||
> CHANGE 846 : 847 @ 1105 : 1106
|
||||
|
||||
~ (double) ((float) j - (float) short1 * 0.6F - 16.0F), 0.0D).color(0, 0, 0, 100).endVertex();
|
||||
|
||||
> CHANGE 848 : 849 @ 1107 : 1108
|
||||
|
||||
~ .color(0, 0, 0, 100).endVertex();
|
||||
|
||||
> CHANGE 850 : 851 @ 1109 : 1110
|
||||
|
||||
~ .color(0, 0, 0, 100).endVertex();
|
||||
|
||||
> CHANGE 852 : 853 @ 1111 : 1112
|
||||
|
||||
~ (double) ((float) j - (float) short1 * 0.6F - 16.0F), 0.0D).color(0, 0, 0, 100).endVertex();
|
||||
|
||||
> DELETE 963 @ 1222 : 1226
|
||||
|
||||
> CHANGE 1071 : 1072 @ 1334 : 1374
|
||||
|
||||
~ logger.error("Use F11 to toggle fullscreen!");
|
||||
|
||||
> DELETE 1083 @ 1385 : 1386
|
||||
|
||||
> DELETE 1085 @ 1388 : 1396
|
||||
|
||||
> INSERT 1094 : 1096 @ 1405
|
||||
|
||||
+ RateLimitTracker.tick();
|
||||
+
|
||||
|
||||
> INSERT 1119 : 1125 @ 1428
|
||||
|
||||
+ if (this.currentScreen == null && this.dontPauseTimer <= 0) {
|
||||
+ if (!Mouse.isMouseGrabbed()) {
|
||||
+ this.setIngameNotInFocus();
|
||||
+ this.displayInGameMenu();
|
||||
+ }
|
||||
+ }
|
||||
|
||||
> INSERT 1132 : 1137 @ 1435
|
||||
|
||||
+ this.dontPauseTimer = 6;
|
||||
+ } else {
|
||||
+ if (this.dontPauseTimer > 0) {
|
||||
+ --this.dontPauseTimer;
|
||||
+ }
|
||||
|
||||
> CHANGE 1147 : 1148 @ 1445 : 1446
|
||||
|
||||
~ return Minecraft.this.currentScreen.getClass().getName();
|
||||
|
||||
> CHANGE 1161 : 1162 @ 1459 : 1460
|
||||
|
||||
~ return Minecraft.this.currentScreen.getClass().getName();
|
||||
|
||||
> CHANGE 1202 : 1204 @ 1500 : 1501
|
||||
|
||||
~ if ((!this.inGameHasFocus || !Mouse.isActuallyGrabbed()) && Mouse.getEventButtonState()) {
|
||||
~ this.inGameHasFocus = false;
|
||||
|
||||
> CHANGE 1246 : 1247 @ 1543 : 1544
|
||||
|
||||
~ if (k == 1 || (k > -1 && k == this.gameSettings.keyBindClose.getKeyCode())) {
|
||||
|
||||
> INSERT 1288 : 1289 @ 1585
|
||||
|
||||
+ GlStateManager.recompileShaders();
|
||||
|
||||
> INSERT 1495 : 1501 @ 1791
|
||||
|
||||
+ if (this.theWorld != null) {
|
||||
+ ++joinWorldTickCounter;
|
||||
+ } else {
|
||||
+ joinWorldTickCounter = 0;
|
||||
+ }
|
||||
+
|
||||
|
||||
> CHANGE 1506 : 1507 @ 1796 : 1845
|
||||
|
||||
~ throw new UnsupportedOperationException("singleplayer has been removed");
|
||||
|
||||
> INSERT 1519 : 1520 @ 1857
|
||||
|
||||
+ session.reset();
|
||||
|
||||
> DELETE 1521 @ 1858 : 1864
|
||||
|
||||
> DELETE 1561 @ 1904 : 1905
|
||||
|
||||
> CHANGE 1581 : 1582 @ 1925 : 1927
|
||||
|
||||
~ this.thePlayer = this.playerController.func_178892_a(this.theWorld, new StatFileWriter());
|
||||
|
||||
> CHANGE 1747 : 1748 @ 2092 : 2093
|
||||
|
||||
~ return EagRuntime.getVersion();
|
||||
|
||||
> CHANGE 1752 : 1754 @ 2097 : 2098
|
||||
|
||||
~ return EaglercraftGPU.glGetString(7937) + " GL version " + EaglercraftGPU.glGetString(7938) + ", "
|
||||
~ + EaglercraftGPU.glGetString(7936);
|
||||
|
||||
> DELETE 1756 @ 2100 : 2110
|
||||
|
||||
> CHANGE 1758 : 1759 @ 2112 : 2116
|
||||
|
||||
~ return "Definitely Not; You're an eagler";
|
||||
|
||||
> DELETE 1795 @ 2152 : 2157
|
||||
|
||||
> INSERT 1809 : 1811 @ 2171
|
||||
|
||||
+ Minecraft.this.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"),
|
||||
+ I18n.format("resourcePack.load.pleaseWait"));
|
||||
|
||||
> DELETE 1816 @ 2176 : 2203
|
||||
|
||||
> CHANGE 1817 : 1818 @ 2204 : 2209
|
||||
|
||||
~ return this.currentServerData != null ? "multiplayer" : "out_of_game";
|
||||
|
||||
> DELETE 1820 @ 2211 : 2428
|
||||
|
||||
> CHANGE 1837 : 1838 @ 2445 : 2446
|
||||
|
||||
~ return false;
|
||||
|
||||
> DELETE 1840 @ 2448 : 2452
|
||||
|
||||
> DELETE 1841 @ 2453 : 2458
|
||||
|
||||
> DELETE 1842 @ 2459 : 2460
|
||||
|
||||
> DELETE 1844 @ 2462 : 2466
|
||||
|
||||
> CHANGE 1845 : 1846 @ 2467 : 2468
|
||||
|
||||
~ return System.currentTimeMillis();
|
||||
|
||||
> DELETE 1856 @ 2478 : 2495
|
||||
|
||||
> DELETE 1900 @ 2539 : 2543
|
||||
|
||||
> CHANGE 1906 : 1908 @ 2549 : 2589
|
||||
|
||||
~ if (i == this.gameSettings.keyBindScreenshot.getKeyCode()) {
|
||||
~ this.ingameGUI.getChatGUI().printChatMessage(ScreenShotHelper.saveScreenshot());
|
||||
|
||||
> DELETE 1909 @ 2590 : 2592
|
||||
|
||||
> DELETE 1910 @ 2593 : 2594
|
||||
|
||||
> DELETE 1914 @ 2598 : 2606
|
||||
|
||||
> CHANGE 1925 : 1929 @ 2617 : 2629
|
||||
|
||||
~ ListenableFutureTask listenablefuturetask = ListenableFutureTask.create(callableToSchedule);
|
||||
~ synchronized (this.scheduledTasks) {
|
||||
~ this.scheduledTasks.add(listenablefuturetask);
|
||||
~ return listenablefuturetask;
|
||||
|
||||
> DELETE 1937 @ 2637 : 2641
|
||||
|
||||
> DELETE 1961 @ 2665 : 2673
|
||||
|
||||
> INSERT 1968 : 1972 @ 2680
|
||||
|
||||
+
|
||||
+ public static int getGLMaximumTextureSize() {
|
||||
+ return EaglercraftGPU.glGetInteger(GL_MAX_TEXTURE_SIZE);
|
||||
+ }
|
||||
|
||||
> EOF
|
@ -0,0 +1,10 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 4
|
||||
|
||||
> EOF
|
@ -0,0 +1,10 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> EOF
|
@ -0,0 +1,10 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 4
|
||||
|
||||
> EOF
|
@ -0,0 +1,10 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> EOF
|
@ -0,0 +1,10 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 4
|
||||
|
||||
> EOF
|
@ -0,0 +1,19 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 4 @ 2 : 3
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
|
||||
~
|
||||
|
||||
> DELETE 5 @ 4 : 6
|
||||
|
||||
> CHANGE 10 : 11 @ 11 : 12
|
||||
|
||||
~ private final EaglercraftRandom rand = new EaglercraftRandom();
|
||||
|
||||
> EOF
|
@ -0,0 +1,10 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> EOF
|
@ -0,0 +1,10 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 4
|
||||
|
||||
> EOF
|
@ -0,0 +1,19 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> INSERT 4 : 6 @ 5
|
||||
|
||||
+ import com.google.common.collect.Maps;
|
||||
+
|
||||
|
||||
> CHANGE 8 : 9 @ 7 : 8
|
||||
|
||||
~ MOBS("hostile", 5), ANIMALS("neutral", 6), PLAYERS("player", 7), AMBIENT("ambient", 8), VOICE("voice", 9);
|
||||
|
||||
> EOF
|
@ -0,0 +1,10 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 5
|
||||
|
||||
> EOF
|
@ -0,0 +1,21 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> CHANGE 3 : 7 @ 4 : 9
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
|
||||
~
|
||||
~ import com.google.common.collect.Lists;
|
||||
~
|
||||
|
||||
> CHANGE 11 : 12 @ 13 : 14
|
||||
|
||||
~ private final EaglercraftRandom rnd = new EaglercraftRandom();
|
||||
|
||||
> EOF
|
@ -0,0 +1,96 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 5
|
||||
|
||||
> DELETE 5 @ 8 : 9
|
||||
|
||||
> INSERT 7 : 8 @ 11
|
||||
|
||||
+ import java.nio.charset.StandardCharsets;
|
||||
|
||||
> DELETE 10 @ 13 : 14
|
||||
|
||||
> CHANGE 11 : 24 @ 15 : 25
|
||||
|
||||
~ import java.util.Set;
|
||||
~
|
||||
~ import net.lax1dude.eaglercraft.v1_8.internal.PlatformAudio;
|
||||
~
|
||||
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftSoundManager;
|
||||
~
|
||||
~ import com.google.common.collect.Lists;
|
||||
~
|
||||
~ import net.lax1dude.eaglercraft.v1_8.IOUtils;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
|
||||
|
||||
> DELETE 31 @ 32 : 36
|
||||
|
||||
> CHANGE 34 : 35 @ 39 : 41
|
||||
|
||||
~
|
||||
|
||||
> CHANGE 51 : 52 @ 57 : 58
|
||||
|
||||
~ private final EaglercraftSoundManager sndManager;
|
||||
|
||||
> CHANGE 56 : 57 @ 62 : 63
|
||||
|
||||
~ this.sndManager = new EaglercraftSoundManager(gameSettingsIn, this);
|
||||
|
||||
> CHANGE 69 : 70 @ 75 : 76
|
||||
|
||||
~ for (Entry entry : (Set<Entry>) map.entrySet()) {
|
||||
|
||||
> INSERT 84 : 94 @ 90
|
||||
|
||||
+ public static class SoundMap {
|
||||
+
|
||||
+ protected final Map<String, SoundList> soundMap;
|
||||
+
|
||||
+ public SoundMap(Map<String, SoundList> soundMap) {
|
||||
+ this.soundMap = soundMap;
|
||||
+ }
|
||||
+
|
||||
+ }
|
||||
+
|
||||
|
||||
> CHANGE 95 : 96 @ 91 : 92
|
||||
|
||||
~ Map<String, SoundList> map = null;
|
||||
|
||||
> CHANGE 97 : 101 @ 93 : 94
|
||||
|
||||
~ map = JSONTypeProvider.deserialize(IOUtils.inputStreamToString(stream, StandardCharsets.UTF_8),
|
||||
~ SoundMap.class).soundMap;
|
||||
~ } catch (IOException e) {
|
||||
~ throw new RuntimeException("Exception caught reading JSON", e);
|
||||
|
||||
> INSERT 223 : 227 @ 216
|
||||
|
||||
+ if (category == SoundCategory.VOICE) {
|
||||
+ PlatformAudio.setMicVol(volume);
|
||||
+ }
|
||||
+
|
||||
|
||||
> CHANGE 240 : 246 @ 229 : 231
|
||||
|
||||
~ SoundCategory cat = soundeventaccessorcomposite.getSoundCategory();
|
||||
~ for (int i = 0; i < categories.length; ++i) {
|
||||
~ if (cat == categories[i]) {
|
||||
~ arraylist.add(soundeventaccessorcomposite);
|
||||
~ break;
|
||||
~ }
|
||||
|
||||
> CHANGE 252 : 253 @ 237 : 238
|
||||
|
||||
~ return (SoundEventAccessorComposite) arraylist.get((new EaglercraftRandom()).nextInt(arraylist.size()));
|
||||
|
||||
> EOF
|
@ -0,0 +1,17 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> DELETE 3 @ 4 : 5
|
||||
|
||||
> INSERT 4 : 6 @ 6
|
||||
|
||||
+ import com.google.common.collect.Lists;
|
||||
+
|
||||
|
||||
> EOF
|
@ -0,0 +1,68 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 12
|
||||
|
||||
> INSERT 3 : 6 @ 13
|
||||
|
||||
+ import org.json.JSONArray;
|
||||
+ import org.json.JSONException;
|
||||
+ import org.json.JSONObject;
|
||||
|
||||
> CHANGE 7 : 11 @ 14 : 18
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeDeserializer;
|
||||
~
|
||||
~ public class SoundListSerializer implements JSONTypeDeserializer<JSONObject, SoundList> {
|
||||
~ public SoundList deserialize(JSONObject jsonobject) throws JSONException {
|
||||
|
||||
> CHANGE 12 : 13 @ 19 : 20
|
||||
|
||||
~ soundlist.setReplaceExisting(jsonobject.optBoolean("replace", false));
|
||||
|
||||
> CHANGE 14 : 15 @ 21 : 22
|
||||
|
||||
~ .getCategory(jsonobject.optString("category", SoundCategory.MASTER.getCategoryName()));
|
||||
|
||||
> CHANGE 18 : 19 @ 25 : 26
|
||||
|
||||
~ JSONArray jsonarray = jsonobject.getJSONArray("sounds");
|
||||
|
||||
> CHANGE 20 : 22 @ 27 : 29
|
||||
|
||||
~ for (int i = 0; i < jsonarray.length(); ++i) {
|
||||
~ Object jsonelement = jsonarray.get(i);
|
||||
|
||||
> CHANGE 23 : 28 @ 30 : 35
|
||||
|
||||
~ if (jsonelement instanceof String) {
|
||||
~ soundlist$soundentry.setSoundEntryName((String) jsonelement);
|
||||
~ } else if (jsonelement instanceof JSONObject) {
|
||||
~ JSONObject jsonobject1 = (JSONObject) jsonelement;
|
||||
~ soundlist$soundentry.setSoundEntryName(jsonobject1.getString("name"));
|
||||
|
||||
> CHANGE 30 : 31 @ 37 : 38
|
||||
|
||||
~ .getType(jsonobject1.getString("type"));
|
||||
|
||||
> CHANGE 36 : 37 @ 43 : 44
|
||||
|
||||
~ float f = jsonobject1.getFloat("volume");
|
||||
|
||||
> CHANGE 42 : 43 @ 49 : 50
|
||||
|
||||
~ float f1 = jsonobject1.getFloat("pitch");
|
||||
|
||||
> CHANGE 48 : 49 @ 55 : 56
|
||||
|
||||
~ int j = jsonobject1.getInt("weight");
|
||||
|
||||
> CHANGE 54 : 55 @ 61 : 62
|
||||
|
||||
~ soundlist$soundentry.setStreaming(jsonobject1.getBoolean("stream"));
|
||||
|
||||
> EOF
|
@ -0,0 +1,16 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> CHANGE 3 : 6 @ 4 : 5
|
||||
|
||||
~
|
||||
~ import com.google.common.collect.Maps;
|
||||
~
|
||||
|
||||
> EOF
|
@ -0,0 +1,18 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 3 @ 2 : 4
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
|
||||
|
||||
> DELETE 5 @ 6 : 10
|
||||
|
||||
> DELETE 11 @ 16 : 17
|
||||
|
||||
> DELETE 55 @ 61 : 79
|
||||
|
||||
> EOF
|
@ -0,0 +1,14 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 3 @ 2 : 3
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
|
||||
|
||||
> DELETE 4 @ 4 : 5
|
||||
|
||||
> EOF
|
@ -0,0 +1,26 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 5 @ 5 : 6
|
||||
|
||||
> DELETE 56 @ 57 : 58
|
||||
|
||||
> INSERT 78 : 79 @ 80
|
||||
|
||||
+ private StatFileWriter statWriter;
|
||||
|
||||
> CHANGE 80 : 81 @ 81 : 82
|
||||
|
||||
~ public EntityPlayerSP(Minecraft mcIn, World worldIn, NetHandlerPlayClient netHandler, StatFileWriter statWriter) {
|
||||
|
||||
> DELETE 83 @ 84 : 85
|
||||
|
||||
> INSERT 85 : 86 @ 87
|
||||
|
||||
+ this.statWriter = statWriter;
|
||||
|
||||
> EOF
|
@ -0,0 +1,159 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 6
|
||||
|
||||
> CHANGE 6 : 13 @ 10 : 12
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
|
||||
~
|
||||
~ import net.lax1dude.eaglercraft.v1_8.HString;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.IOUtils;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.ImageData;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
|
||||
|
||||
> DELETE 14 @ 13 : 14
|
||||
|
||||
> DELETE 15 @ 15 : 16
|
||||
|
||||
> DELETE 22 @ 23 : 25
|
||||
|
||||
> CHANGE 24 : 26 @ 27 : 29
|
||||
|
||||
~ protected static final ResourceLocation[] unicodePageLocations = new ResourceLocation[256];
|
||||
~ protected int[] charWidth = new int[256];
|
||||
|
||||
> CHANGE 27 : 46 @ 30 : 49
|
||||
|
||||
~ public EaglercraftRandom fontRandom = new EaglercraftRandom();
|
||||
~ protected byte[] glyphWidth = new byte[65536];
|
||||
~ protected int[] colorCode = new int[32];
|
||||
~ protected final ResourceLocation locationFontTexture;
|
||||
~ protected final TextureManager renderEngine;
|
||||
~ protected float posX;
|
||||
~ protected float posY;
|
||||
~ protected boolean unicodeFlag;
|
||||
~ protected boolean bidiFlag;
|
||||
~ protected float red;
|
||||
~ protected float blue;
|
||||
~ protected float green;
|
||||
~ protected float alpha;
|
||||
~ protected int textColor;
|
||||
~ protected boolean randomStyle;
|
||||
~ protected boolean boldStyle;
|
||||
~ protected boolean italicStyle;
|
||||
~ protected boolean underlineStyle;
|
||||
~ protected boolean strikethroughStyle;
|
||||
|
||||
> CHANGE 89 : 90 @ 92 : 93
|
||||
|
||||
~ ImageData bufferedimage;
|
||||
|
||||
> CHANGE 97 : 100 @ 100 : 104
|
||||
|
||||
~ int i = bufferedimage.width;
|
||||
~ int j = bufferedimage.height;
|
||||
~ int[] aint = bufferedimage.pixels;
|
||||
|
||||
> CHANGE 168 : 187 @ 172 : 182
|
||||
|
||||
~ Tessellator tessellator = Tessellator.getInstance();
|
||||
~ WorldRenderer worldrenderer = tessellator.getWorldRenderer();
|
||||
~
|
||||
~ worldrenderer.begin(Tessellator.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_TEX);
|
||||
~
|
||||
~ worldrenderer.pos(this.posX + (float) k, this.posY, 0.0F).tex((float) i / 128.0F, (float) j / 128.0F)
|
||||
~ .endVertex();
|
||||
~
|
||||
~ worldrenderer.pos(this.posX - (float) k, this.posY + 7.99F, 0.0F)
|
||||
~ .tex((float) i / 128.0F, ((float) j + 7.99F) / 128.0F).endVertex();
|
||||
~
|
||||
~ worldrenderer.pos(this.posX + f - 1.0F + (float) k, this.posY, 0.0F)
|
||||
~ .tex(((float) i + f - 1.0F) / 128.0F, (float) j / 128.0F).endVertex();
|
||||
~
|
||||
~ worldrenderer.pos(this.posX + f - 1.0F - (float) k, this.posY + 7.99F, 0.0F)
|
||||
~ .tex(((float) i + f - 1.0F) / 128.0F, ((float) j + 7.99F) / 128.0F).endVertex();
|
||||
~
|
||||
~ tessellator.draw();
|
||||
~
|
||||
|
||||
> CHANGE 193 : 194 @ 188 : 189
|
||||
|
||||
~ HString.format("textures/font/unicode_page_%02x.png", new Object[] { Integer.valueOf(parInt1) }));
|
||||
|
||||
> CHANGE 217 : 235 @ 212 : 222
|
||||
|
||||
~ Tessellator tessellator = Tessellator.getInstance();
|
||||
~ WorldRenderer worldrenderer = tessellator.getWorldRenderer();
|
||||
~
|
||||
~ worldrenderer.begin(Tessellator.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_TEX);
|
||||
~
|
||||
~ worldrenderer.pos(this.posX + f5, this.posY, 0.0F).tex(f2 / 256.0F, f3 / 256.0F).endVertex();
|
||||
~
|
||||
~ worldrenderer.pos(this.posX - f5, this.posY + 7.99F, 0.0F).tex(f2 / 256.0F, (f3 + 15.98F) / 256.0F)
|
||||
~ .endVertex();
|
||||
~
|
||||
~ worldrenderer.pos(this.posX + f4 / 2.0F + f5, this.posY, 0.0F).tex((f2 + f4) / 256.0F, f3 / 256.0F)
|
||||
~ .endVertex();
|
||||
~
|
||||
~ worldrenderer.pos(this.posX + f4 / 2.0F - f5, this.posY + 7.99F, 0.0F)
|
||||
~ .tex((f2 + f4) / 256.0F, (f3 + 15.98F) / 256.0F).endVertex();
|
||||
~
|
||||
~ tessellator.draw();
|
||||
~
|
||||
|
||||
> CHANGE 262 : 270 @ 249 : 256
|
||||
|
||||
~ // try {
|
||||
~ // Bidi bidi = new Bidi((new ArabicShaping(8)).shape(parString1), 127);
|
||||
~ // bidi.setReorderingMode(0);
|
||||
~ // return bidi.writeReordered(2);
|
||||
~ // } catch (ArabicShapingException var3) {
|
||||
~ // return parString1;
|
||||
~ // }
|
||||
~ return parString1;
|
||||
|
||||
> CHANGE 272 : 273 @ 258 : 259
|
||||
|
||||
~ protected void resetStyles() {
|
||||
|
||||
> CHANGE 280 : 281 @ 266 : 267
|
||||
|
||||
~ protected void renderStringAtPos(String parString1, boolean parFlag) {
|
||||
|
||||
> CHANGE 284 : 285 @ 270 : 271
|
||||
|
||||
~ int i1 = "0123456789abcdefklmnor".indexOf(Character.toLowerCase(parString1.charAt(i + 1)));
|
||||
|
||||
> CHANGE 429 : 431 @ 415 : 416
|
||||
|
||||
~ this.posX = x;
|
||||
~ this.posY = y;
|
||||
|
||||
> DELETE 452 @ 437 : 438
|
||||
|
||||
> INSERT 453 : 454 @ 439
|
||||
|
||||
+ return (int) this.posX;
|
||||
|
||||
> CHANGE 603 : 604 @ 588 : 589
|
||||
|
||||
~ return Arrays.asList(this.wrapFormattedStringToWidth(str, wrapWidth, 0).split("\n"));
|
||||
|
||||
> CHANGE 606 : 610 @ 591 : 592
|
||||
|
||||
~ String wrapFormattedStringToWidth(String str, int wrapWidth, int depthCheck) { // TODO: fix recursive
|
||||
~ if (depthCheck > 20) {
|
||||
~ return str;
|
||||
~ }
|
||||
|
||||
> CHANGE 618 : 619 @ 600 : 601
|
||||
|
||||
~ return s + "\n" + this.wrapFormattedStringToWidth(s1, wrapWidth, ++depthCheck);
|
||||
|
||||
> EOF
|
20
patches/minecraft/net/minecraft/client/gui/Gui.edit.java
Normal file
20
patches/minecraft/net/minecraft/client/gui/Gui.edit.java
Normal file
@ -0,0 +1,20 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 5 @ 2 : 4
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
|
||||
|
||||
> DELETE 6 @ 5 : 7
|
||||
|
||||
> CHANGE 141 : 142 @ 142 : 143
|
||||
|
||||
~ public void drawTexturedModalRect(int xCoord, int yCoord, EaglerTextureAtlasSprite textureSprite, int widthIn,
|
||||
|
||||
> EOF
|
@ -0,0 +1,14 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> INSERT 2 : 3 @ 2
|
||||
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 6 @ 5 : 8
|
||||
|
||||
> EOF
|
@ -0,0 +1,14 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> INSERT 2 : 3 @ 2
|
||||
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 4 @ 3 : 5
|
||||
|
||||
> EOF
|
67
patches/minecraft/net/minecraft/client/gui/GuiChat.edit.java
Normal file
67
patches/minecraft/net/minecraft/client/gui/GuiChat.edit.java
Normal file
@ -0,0 +1,67 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> CHANGE 4 : 15 @ 5 : 7
|
||||
|
||||
~
|
||||
~ import org.apache.commons.lang3.StringUtils;
|
||||
~
|
||||
~ import com.google.common.collect.Lists;
|
||||
~
|
||||
~ import net.lax1dude.eaglercraft.v1_8.Keyboard;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.Mouse;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
~ import net.minecraft.client.resources.I18n;
|
||||
|
||||
> DELETE 21 @ 13 : 18
|
||||
|
||||
> INSERT 33 : 35 @ 30
|
||||
|
||||
+ private GuiButton exitButton;
|
||||
+
|
||||
|
||||
> INSERT 44 : 47 @ 39
|
||||
|
||||
+ if (!(this instanceof GuiSleepMP)) {
|
||||
+ this.buttonList.add(exitButton = new GuiButton(69, this.width - 100, 3, 97, 20, I18n.format("chat.exit")));
|
||||
+ }
|
||||
|
||||
> CHANGE 65 : 66 @ 57 : 58
|
||||
|
||||
~ protected void keyTyped(char parChar1, int parInt1) {
|
||||
|
||||
> CHANGE 73 : 74 @ 65 : 68
|
||||
|
||||
~ if (parInt1 != 28 && parInt1 != 156) {
|
||||
|
||||
> CHANGE 117 : 118 @ 111 : 112
|
||||
|
||||
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
|
||||
|
||||
> INSERT 129 : 135 @ 123
|
||||
|
||||
+ protected void actionPerformed(GuiButton par1GuiButton) {
|
||||
+ if (par1GuiButton.id == 69) {
|
||||
+ this.mc.displayGuiScreen(null);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
|
||||
> INSERT 220 : 221 @ 208
|
||||
|
||||
+ GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
|
||||
|
||||
> INSERT 226 : 228 @ 213
|
||||
|
||||
+ exitButton.yPosition = 3 + mc.guiAchievement.getHeight();
|
||||
+
|
||||
|
||||
> EOF
|
@ -0,0 +1,29 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 6 @ 2 : 7
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.Keyboard;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
|
||||
|
||||
> DELETE 11 @ 12 : 15
|
||||
|
||||
> CHANGE 55 : 56 @ 59 : 60
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> CHANGE 80 : 81 @ 84 : 85
|
||||
|
||||
~ protected void keyTyped(char parChar1, int parInt1) {
|
||||
|
||||
> CHANGE 94 : 95 @ 98 : 99
|
||||
|
||||
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,14 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 6
|
||||
|
||||
> CHANGE 32 : 33 @ 36 : 37
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,26 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> INSERT 3 : 4 @ 3
|
||||
|
||||
+
|
||||
|
||||
> DELETE 5 @ 4 : 9
|
||||
|
||||
> CHANGE 54 : 55 @ 58 : 59
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> CHANGE 71 : 72 @ 75 : 76
|
||||
|
||||
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
|
||||
|
||||
> CHANGE 89 : 90 @ 93 : 94
|
||||
|
||||
~ protected void keyTyped(char parChar1, int parInt1) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,14 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 5
|
||||
|
||||
> CHANGE 32 : 33 @ 35 : 36
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,33 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> CHANGE 3 : 4 @ 4 : 6
|
||||
|
||||
~
|
||||
|
||||
> INSERT 5 : 6 @ 7
|
||||
|
||||
+ import net.minecraft.util.ChatComponentTranslation;
|
||||
|
||||
> CHANGE 21 : 22 @ 22 : 23
|
||||
|
||||
~ protected void keyTyped(char parChar1, int parInt1) {
|
||||
|
||||
> CHANGE 34 : 35 @ 35 : 36
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> INSERT 55 : 59 @ 56
|
||||
|
||||
+
|
||||
+ public static GuiScreen createRateLimitKick(GuiScreen prev) {
|
||||
+ return new GuiDisconnected(prev, "connect.failed", new ChatComponentTranslation("disconnect.tooManyRequests"));
|
||||
+ }
|
||||
|
||||
> EOF
|
@ -0,0 +1,14 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 4
|
||||
|
||||
> CHANGE 14 : 15 @ 16 : 17
|
||||
|
||||
~ protected void keyTyped(char parChar1, int parInt1) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,48 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 4
|
||||
|
||||
> CHANGE 3 : 8 @ 5 : 8
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
|
||||
~
|
||||
~ import com.google.common.collect.Lists;
|
||||
~
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 10 @ 10 : 11
|
||||
|
||||
> DELETE 23 @ 24 : 25
|
||||
|
||||
> CHANGE 31 : 32 @ 33 : 34
|
||||
|
||||
~ private EaglercraftRandom random = new EaglercraftRandom();
|
||||
|
||||
> CHANGE 61 : 62 @ 63 : 64
|
||||
|
||||
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
|
||||
|
||||
> CHANGE 87 : 90 @ 89 : 92
|
||||
|
||||
~ GlStateManager.viewport((scaledresolution.getScaledWidth() - 290 - 110) / 2 * scaledresolution.getScaleFactor(),
|
||||
~ (scaledresolution.getScaledHeight() - 220 + 60) / 2 * scaledresolution.getScaleFactor(),
|
||||
~ 290 * scaledresolution.getScaleFactor(), 220 * scaledresolution.getScaleFactor());
|
||||
|
||||
> CHANGE 91 : 92 @ 93 : 94
|
||||
|
||||
~ GlStateManager.gluPerspective(90.0F, 1.3333334F, 9.0F, 80.0F);
|
||||
|
||||
> INSERT 128 : 129 @ 130
|
||||
|
||||
+ GlStateManager.enableDepth();
|
||||
|
||||
> INSERT 130 : 131 @ 131
|
||||
|
||||
+ GlStateManager.disableDepth();
|
||||
|
||||
> EOF
|
@ -0,0 +1,18 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 5
|
||||
|
||||
> CHANGE 25 : 26 @ 28 : 29
|
||||
|
||||
~ protected void keyTyped(char parChar1, int parInt1) {
|
||||
|
||||
> CHANGE 28 : 29 @ 31 : 32
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,27 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 3 @ 2 : 8
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 4 @ 9 : 10
|
||||
|
||||
> CHANGE 37 : 38 @ 43 : 44
|
||||
|
||||
~ protected void keyTyped(char parChar1, int parInt1) {
|
||||
|
||||
> CHANGE 40 : 41 @ 46 : 47
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> INSERT 48 : 50 @ 54
|
||||
|
||||
+ this.mc.theWorld.sendQuittingDisconnectingPacket();
|
||||
+ this.mc.loadWorld((WorldClient) null);
|
||||
|
||||
> EOF
|
@ -0,0 +1,14 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> INSERT 2 : 3 @ 2
|
||||
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 5 @ 4 : 5
|
||||
|
||||
> EOF
|
@ -0,0 +1,63 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> INSERT 2 : 8 @ 2
|
||||
|
||||
+ import java.util.ArrayList;
|
||||
+ import java.util.Collection;
|
||||
+ import java.util.List;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
|
||||
+
|
||||
|
||||
> CHANGE 11 : 14 @ 5 : 8
|
||||
|
||||
~
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
|
||||
|
||||
> DELETE 16 @ 10 : 19
|
||||
|
||||
> DELETE 18 @ 21 : 22
|
||||
|
||||
> DELETE 19 @ 23 : 24
|
||||
|
||||
> CHANGE 51 : 52 @ 56 : 57
|
||||
|
||||
~ private final EaglercraftRandom rand = new EaglercraftRandom();
|
||||
|
||||
> DELETE 55 @ 60 : 61
|
||||
|
||||
> DELETE 82 @ 88 : 89
|
||||
|
||||
> CHANGE 177 : 178 @ 184 : 187
|
||||
|
||||
~ this.overlayDebug.renderDebugInfo(scaledresolution, partialTicks);
|
||||
|
||||
> INSERT 265 : 268 @ 274
|
||||
|
||||
+ if (this.mc.gameSettings.hudWorld && (mc.currentScreen == null || !(mc.currentScreen instanceof GuiChat))) {
|
||||
+ j -= 10;
|
||||
+ }
|
||||
|
||||
> DELETE 434 @ 440 : 444
|
||||
|
||||
> CHANGE 451 : 452 @ 461 : 462
|
||||
|
||||
~ for (Score score : (List<Score>) arraylist1) {
|
||||
|
||||
> CHANGE 464 : 465 @ 474 : 475
|
||||
|
||||
~ for (Score score1 : (List<Score>) arraylist1) {
|
||||
|
||||
> CHANGE 808 : 809 @ 818 : 819
|
||||
|
||||
~ EaglerTextureAtlasSprite textureatlassprite = this.mc.getBlockRendererDispatcher().getBlockModelShapes()
|
||||
|
||||
> DELETE 866 @ 876 : 877
|
||||
|
||||
> EOF
|
@ -0,0 +1,40 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 3 @ 2 : 9
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.Mouse;
|
||||
|
||||
> DELETE 7 @ 13 : 14
|
||||
|
||||
> DELETE 9 @ 16 : 18
|
||||
|
||||
> DELETE 11 @ 20 : 21
|
||||
|
||||
> CHANGE 31 : 32 @ 41 : 42
|
||||
|
||||
~ guibutton.enabled = false;
|
||||
|
||||
> CHANGE 34 : 35 @ 44 : 45
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> DELETE 41 @ 51 : 52
|
||||
|
||||
> DELETE 46 @ 57 : 60
|
||||
|
||||
> CHANGE 64 : 65 @ 78 : 79
|
||||
|
||||
~ break;
|
||||
|
||||
> CHANGE 71 : 74 @ 85 : 86
|
||||
|
||||
~ if (Mouse.isActuallyGrabbed()) {
|
||||
~ Mouse.setGrabbed(false);
|
||||
~ }
|
||||
|
||||
> EOF
|
@ -0,0 +1,17 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> INSERT 3 : 5 @ 3
|
||||
|
||||
+
|
||||
+ import net.lax1dude.eaglercraft.v1_8.ArrayUtils;
|
||||
|
||||
> DELETE 6 @ 4 : 7
|
||||
|
||||
> DELETE 10 @ 11 : 12
|
||||
|
||||
> EOF
|
@ -0,0 +1,19 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> INSERT 3 : 7 @ 4
|
||||
|
||||
+
|
||||
+ import com.google.common.collect.Lists;
|
||||
+
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 8 @ 5 : 8
|
||||
|
||||
> EOF
|
@ -0,0 +1,32 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 4
|
||||
|
||||
> INSERT 4 : 8 @ 6
|
||||
|
||||
+
|
||||
+ import com.google.common.collect.Lists;
|
||||
+ import com.google.common.collect.Maps;
|
||||
+
|
||||
|
||||
> DELETE 9 @ 7 : 12
|
||||
|
||||
> CHANGE 43 : 44 @ 46 : 47
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> INSERT 100 : 102 @ 103
|
||||
|
||||
+ this.mc.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"),
|
||||
+ I18n.format("resourcePack.load.pleaseWait"));
|
||||
|
||||
> INSERT 111 : 112 @ 112
|
||||
|
||||
+ GuiLanguage.this.mc.displayGuiScreen(GuiLanguage.this);
|
||||
|
||||
> EOF
|
@ -0,0 +1,10 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 3 @ 3 : 5
|
||||
|
||||
> EOF
|
@ -0,0 +1,10 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 3 @ 3 : 4
|
||||
|
||||
> EOF
|
@ -0,0 +1,14 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> INSERT 2 : 3 @ 2
|
||||
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 4 @ 3 : 5
|
||||
|
||||
> EOF
|
294
patches/minecraft/net/minecraft/client/gui/GuiMainMenu.edit.java
Normal file
294
patches/minecraft/net/minecraft/client/gui/GuiMainMenu.edit.java
Normal file
@ -0,0 +1,294 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> DELETE 5 @ 6 : 7
|
||||
|
||||
> INSERT 6 : 7 @ 8
|
||||
|
||||
+ import java.util.Arrays;
|
||||
|
||||
> CHANGE 9 : 26 @ 10 : 12
|
||||
|
||||
~
|
||||
~ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.EaglerInputStream;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion;
|
||||
~
|
||||
~ import com.google.common.base.Charsets;
|
||||
~ import com.google.common.collect.Lists;
|
||||
~
|
||||
~ import net.lax1dude.eaglercraft.v1_8.crypto.MD5Digest;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.crypto.SHA1Digest;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.profile.GuiScreenEditProfile;
|
||||
|
||||
> CHANGE 27 : 28 @ 13 : 25
|
||||
|
||||
~ import net.minecraft.client.audio.PositionedSoundRecord;
|
||||
|
||||
> DELETE 29 @ 26 : 27
|
||||
|
||||
> DELETE 32 @ 30 : 32
|
||||
|
||||
> DELETE 34 @ 34 : 43
|
||||
|
||||
> DELETE 36 @ 45 : 46
|
||||
|
||||
> CHANGE 37 : 38 @ 47 : 48
|
||||
|
||||
~ private static final EaglercraftRandom RANDOM = new EaglercraftRandom();
|
||||
|
||||
> INSERT 39 : 45 @ 49
|
||||
|
||||
+ private boolean isDefault;
|
||||
+ private static final int lendef = 5987;
|
||||
+ private static final byte[] md5def = new byte[] { -61, -53, -36, 27, 24, 27, 103, -31, -58, -116, 113, -60, -67, -8,
|
||||
+ -77, 30 };
|
||||
+ private static final byte[] sha1def = new byte[] { -107, 77, 108, 49, 11, -100, -8, -119, -1, -100, -85, -55, 18,
|
||||
+ -69, -107, 113, -93, -101, -79, 32 };
|
||||
|
||||
> CHANGE 48 : 49 @ 52 : 53
|
||||
|
||||
~ private static DynamicTexture viewportTexture = null;
|
||||
|
||||
> DELETE 50 @ 54 : 55
|
||||
|
||||
> DELETE 52 @ 57 : 58
|
||||
|
||||
> DELETE 62 @ 68 : 70
|
||||
|
||||
> CHANGE 68 : 69 @ 76 : 78
|
||||
|
||||
~ private static ResourceLocation backgroundTexture = null;
|
||||
|
||||
> DELETE 71 @ 80 : 81
|
||||
|
||||
> DELETE 110 @ 120 : 126
|
||||
|
||||
> INSERT 111 : 131 @ 127
|
||||
|
||||
+ MD5Digest md5 = new MD5Digest();
|
||||
+ SHA1Digest sha1 = new SHA1Digest();
|
||||
+ byte[] md5out = new byte[16];
|
||||
+ byte[] sha1out = new byte[20];
|
||||
+ try {
|
||||
+ byte[] bytes = EaglerInputStream.inputStreamToBytesQuiet(
|
||||
+ Minecraft.getMinecraft().getResourceManager().getResource(minecraftTitleTextures).getInputStream());
|
||||
+ if (bytes != null) {
|
||||
+ md5.update(bytes, 0, bytes.length);
|
||||
+ sha1.update(bytes, 0, bytes.length);
|
||||
+ md5.doFinal(md5out, 0);
|
||||
+ sha1.doFinal(sha1out, 0);
|
||||
+ this.isDefault = bytes.length == lendef && Arrays.equals(md5out, md5def)
|
||||
+ && Arrays.equals(sha1out, sha1def);
|
||||
+ } else {
|
||||
+ this.isDefault = false;
|
||||
+ }
|
||||
+ } catch (IOException e) {
|
||||
+ this.isDefault = false;
|
||||
+ }
|
||||
|
||||
> CHANGE 141 : 142 @ 137 : 138
|
||||
|
||||
~ protected void keyTyped(char parChar1, int parInt1) {
|
||||
|
||||
> CHANGE 145 : 149 @ 141 : 144
|
||||
|
||||
~ if (viewportTexture == null) {
|
||||
~ viewportTexture = new DynamicTexture(256, 256);
|
||||
~ backgroundTexture = this.mc.getTextureManager().getDynamicTextureLocation("background", viewportTexture);
|
||||
~ }
|
||||
|
||||
> DELETE 159 @ 154 : 155
|
||||
|
||||
> CHANGE 160 : 165 @ 156 : 160
|
||||
|
||||
~
|
||||
~ boolean isFork = !EaglercraftVersion.projectOriginAuthor.equalsIgnoreCase(EaglercraftVersion.projectForkVendor);
|
||||
~
|
||||
~ if (isFork && EaglercraftVersion.mainMenuStringF != null && EaglercraftVersion.mainMenuStringF.length() > 0) {
|
||||
~ i += 11;
|
||||
|
||||
> INSERT 167 : 169 @ 162
|
||||
|
||||
+ this.addSingleplayerMultiplayerButtons(i, 24);
|
||||
+
|
||||
|
||||
> CHANGE 171 : 174 @ 164 : 166
|
||||
|
||||
~ this.buttonList.add(new GuiButton(4, this.width / 2 + 2, i + 72 + 12, 98, 20,
|
||||
~ I18n.format("menu.editProfile", new Object[0])));
|
||||
~
|
||||
|
||||
> CHANGE 175 : 180 @ 167 : 168
|
||||
|
||||
~
|
||||
~ if (isFork) {
|
||||
~ this.openGLWarning1 = EaglercraftVersion.mainMenuStringE;
|
||||
~ this.openGLWarning2 = EaglercraftVersion.mainMenuStringF;
|
||||
~ boolean line2 = this.openGLWarning2 != null && this.openGLWarning2.length() > 0;
|
||||
|
||||
> CHANGE 184 : 185 @ 172 : 173
|
||||
|
||||
~ this.field_92021_u = ((GuiButton) this.buttonList.get(0)).yPosition - (line2 ? 32 : 21);
|
||||
|
||||
> CHANGE 186 : 187 @ 174 : 175
|
||||
|
||||
~ this.field_92019_w = this.field_92021_u + (line2 ? 24 : 11);
|
||||
|
||||
> CHANGE 193 : 197 @ 181 : 184
|
||||
|
||||
~ // this.buttonList
|
||||
~ // .add(new GuiButton(1, this.width / 2 - 100, parInt1,
|
||||
~ // I18n.format("menu.singleplayer", new Object[0])));
|
||||
~ this.buttonList.add(new GuiButton(2, this.width / 2 - 100, parInt1 + parInt2 * 0,
|
||||
|
||||
> CHANGE 198 : 202 @ 185 : 187
|
||||
|
||||
~ GuiButton btn;
|
||||
~ this.buttonList.add(btn = new GuiButton(14, this.width / 2 - 100, parInt1 + parInt2 * 1,
|
||||
~ I18n.format("menu.forkOnGitlab", new Object[0])));
|
||||
~ btn.enabled = EaglercraftVersion.mainMenuEnableGithubButton;
|
||||
|
||||
> CHANGE 204 : 205 @ 189 : 203
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> CHANGE 214 : 215 @ 212 : 213
|
||||
|
||||
~ logger.error("Singleplayer was removed dumbass");
|
||||
|
||||
> DELETE 221 @ 219 : 223
|
||||
|
||||
> CHANGE 222 : 223 @ 224 : 225
|
||||
|
||||
~ this.mc.displayGuiScreen(new GuiScreenEditProfile(this));
|
||||
|
||||
> CHANGE 225 : 227 @ 227 : 229
|
||||
|
||||
~ if (parGuiButton.id == 14) {
|
||||
~ EagRuntime.openLink(EaglercraftVersion.projectForkURL);
|
||||
|
||||
> DELETE 229 @ 231 : 240
|
||||
|
||||
> DELETE 231 @ 242 : 270
|
||||
|
||||
> CHANGE 237 : 238 @ 276 : 277
|
||||
|
||||
~ GlStateManager.gluPerspective(120.0F, 1.0F, 0.05F, 10.0F);
|
||||
|
||||
> CHANGE 311 : 315 @ 350 : 354
|
||||
|
||||
~ this.mc.getTextureManager().bindTexture(backgroundTexture);
|
||||
~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
||||
~ EaglercraftGPU.glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||
~ EaglercraftGPU.glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, 256, 256);
|
||||
|
||||
> DELETE 345 @ 384 : 385
|
||||
|
||||
> DELETE 354 @ 394 : 395
|
||||
|
||||
> DELETE 378 @ 419 : 421
|
||||
|
||||
> CHANGE 385 : 386 @ 428 : 429
|
||||
|
||||
~ if (this.isDefault || (double) this.updateCounter < 1.0E-4D) {
|
||||
|
||||
> INSERT 396 : 409 @ 439
|
||||
|
||||
+ boolean isForkLabel = ((this.openGLWarning1 != null && this.openGLWarning1.length() > 0)
|
||||
+ || (this.openGLWarning2 != null && this.openGLWarning2.length() > 0));
|
||||
+
|
||||
+ if (isForkLabel) {
|
||||
+ drawRect(this.field_92022_t - 3, this.field_92021_u - 3, this.field_92020_v + 3, this.field_92019_w,
|
||||
+ 1428160512);
|
||||
+ if (this.openGLWarning1 != null)
|
||||
+ this.drawString(this.fontRendererObj, this.openGLWarning1, this.field_92022_t, this.field_92021_u, -1);
|
||||
+ if (this.openGLWarning2 != null)
|
||||
+ this.drawString(this.fontRendererObj, this.openGLWarning2, (this.width - this.field_92024_r) / 2,
|
||||
+ this.field_92021_u + 12, -1);
|
||||
+ }
|
||||
+
|
||||
|
||||
> CHANGE 411 : 412 @ 441 : 442
|
||||
|
||||
~ GlStateManager.rotate(isForkLabel ? -12.0F : -20.0F, 0.0F, 0.0F, 1.0F);
|
||||
|
||||
> INSERT 415 : 418 @ 445
|
||||
|
||||
+ if (isForkLabel) {
|
||||
+ f1 *= 0.8f;
|
||||
+ }
|
||||
|
||||
> DELETE 421 @ 448 : 452
|
||||
|
||||
> INSERT 422 : 425 @ 453
|
||||
|
||||
+ String s = EaglercraftVersion.mainMenuStringA;
|
||||
+ this.drawString(this.fontRendererObj, s, 2, this.height - 20, -1);
|
||||
+ s = EaglercraftVersion.mainMenuStringB;
|
||||
|
||||
> CHANGE 426 : 428 @ 454 : 455
|
||||
|
||||
~
|
||||
~ String s1 = EaglercraftVersion.mainMenuStringC;
|
||||
|
||||
> INSERT 429 : 432 @ 456
|
||||
|
||||
+ this.height - 20, -1);
|
||||
+ s1 = EaglercraftVersion.mainMenuStringD;
|
||||
+ this.drawString(this.fontRendererObj, s1, this.width - this.fontRendererObj.getStringWidth(s1) - 2,
|
||||
|
||||
> CHANGE 433 : 441 @ 457 : 463
|
||||
|
||||
~
|
||||
~ String lbl = "CREDITS.txt";
|
||||
~ int w = fontRendererObj.getStringWidth(lbl) * 3 / 4;
|
||||
~
|
||||
~ if (i >= (this.width - w - 4) && i <= this.width && j >= 0 && j <= 9) {
|
||||
~ drawRect((this.width - w - 4), 0, this.width, 10, 0x55000099);
|
||||
~ } else {
|
||||
~ drawRect((this.width - w - 4), 0, this.width, 10, 0x55200000);
|
||||
|
||||
> INSERT 443 : 449 @ 465
|
||||
|
||||
+ GlStateManager.pushMatrix();
|
||||
+ GlStateManager.translate((this.width - w - 2), 2.0f, 0.0f);
|
||||
+ GlStateManager.scale(0.75f, 0.75f, 0.75f);
|
||||
+ drawString(fontRendererObj, lbl, 0, 0, 16777215);
|
||||
+ GlStateManager.popMatrix();
|
||||
+
|
||||
|
||||
> CHANGE 452 : 464 @ 468 : 476
|
||||
|
||||
~ protected void mouseClicked(int par1, int par2, int par3) {
|
||||
~ if (par3 == 0) {
|
||||
~ String lbl = "CREDITS.txt";
|
||||
~ int w = fontRendererObj.getStringWidth(lbl) * 3 / 4;
|
||||
~ if (par1 >= (this.width - w - 4) && par1 <= this.width && par2 >= 0 && par2 <= 10) {
|
||||
~ String resStr = EagRuntime.getResourceString("/assets/eagler/CREDITS.txt");
|
||||
~ if (resStr != null) {
|
||||
~ EagRuntime.openCreditsPopup(resStr);
|
||||
~ }
|
||||
~ mc.getSoundHandler()
|
||||
~ .playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F));
|
||||
~ return;
|
||||
|
||||
> DELETE 465 @ 477 : 478
|
||||
|
||||
> INSERT 466 : 467 @ 479
|
||||
|
||||
+ super.mouseClicked(par1, par2, par3);
|
||||
|
||||
> EOF
|
@ -0,0 +1,18 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 7
|
||||
|
||||
> CHANGE 13 : 14 @ 18 : 19
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> CHANGE 22 : 23 @ 27 : 28
|
||||
|
||||
~ protected void keyTyped(char parChar1, int parInt1) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,25 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 6 @ 2 : 4
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 7 @ 5 : 6
|
||||
|
||||
> DELETE 8 @ 7 : 8
|
||||
|
||||
> DELETE 21 @ 21 : 23
|
||||
|
||||
> CHANGE 65 : 66 @ 67 : 68
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,114 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> INSERT 2 : 4 @ 2
|
||||
|
||||
+ import java.io.IOException;
|
||||
+
|
||||
|
||||
> CHANGE 6 : 10 @ 4 : 17
|
||||
|
||||
~
|
||||
~ import net.lax1dude.eaglercraft.v1_8.Keyboard;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
|
||||
|
||||
> DELETE 13 @ 20 : 22
|
||||
|
||||
> DELETE 14 @ 23 : 26
|
||||
|
||||
> DELETE 17 @ 29 : 30
|
||||
|
||||
> DELETE 29 @ 42 : 44
|
||||
|
||||
> INSERT 30 : 31 @ 45
|
||||
|
||||
+ private static long lastRefreshCommit = 0l;
|
||||
|
||||
> CHANGE 41 : 42 @ 55 : 56
|
||||
|
||||
~ this.savedServerList = ServerList.getServerList();
|
||||
|
||||
> DELETE 43 @ 57 : 66
|
||||
|
||||
> CHANGE 78 : 79 @ 101 : 108
|
||||
|
||||
~ this.savedServerList.updateServerPing();
|
||||
|
||||
> DELETE 83 @ 112 : 118
|
||||
|
||||
> CHANGE 85 : 86 @ 120 : 121
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> CHANGE 122 : 127 @ 157 : 158
|
||||
|
||||
~ long millis = System.currentTimeMillis();
|
||||
~ if (millis - lastRefreshCommit > 700l) {
|
||||
~ lastRefreshCommit = millis;
|
||||
~ this.refreshServerList();
|
||||
~ }
|
||||
|
||||
> CHANGE 132 : 133 @ 163 : 164
|
||||
|
||||
~ public void refreshServerList() {
|
||||
|
||||
> CHANGE 147 : 152 @ 178 : 180
|
||||
|
||||
~ long millis = System.currentTimeMillis();
|
||||
~ if (millis - lastRefreshCommit > 700l) {
|
||||
~ lastRefreshCommit = millis;
|
||||
~ this.refreshServerList();
|
||||
~ }
|
||||
|
||||
> CHANGE 167 : 172 @ 195 : 197
|
||||
|
||||
~ long millis = System.currentTimeMillis();
|
||||
~ if (millis - lastRefreshCommit > 700l) {
|
||||
~ lastRefreshCommit = millis;
|
||||
~ this.refreshServerList();
|
||||
~ }
|
||||
|
||||
> CHANGE 182 : 187 @ 207 : 209
|
||||
|
||||
~ long millis = System.currentTimeMillis();
|
||||
~ if (millis - lastRefreshCommit > 700l) {
|
||||
~ lastRefreshCommit = millis;
|
||||
~ this.refreshServerList();
|
||||
~ }
|
||||
|
||||
> DELETE 188 @ 210 : 211
|
||||
|
||||
> CHANGE 190 : 191 @ 213 : 214
|
||||
|
||||
~ protected void keyTyped(char parChar1, int parInt1) {
|
||||
|
||||
> DELETE 209 @ 232 : 241
|
||||
|
||||
> CHANGE 220 : 221 @ 252 : 253
|
||||
|
||||
~ } else if (i < this.serverListSelector.getSize() - 1) {
|
||||
|
||||
> DELETE 223 @ 255 : 264
|
||||
|
||||
> DELETE 256 @ 297 : 302
|
||||
|
||||
> DELETE 257 @ 303 : 304
|
||||
|
||||
> CHANGE 270 : 271 @ 317 : 319
|
||||
|
||||
~ if (guilistextended$iguilistentry != null) {
|
||||
|
||||
> DELETE 277 @ 325 : 326
|
||||
|
||||
> DELETE 279 @ 328 : 332
|
||||
|
||||
> CHANGE 283 : 284 @ 336 : 337
|
||||
|
||||
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,27 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> INSERT 4 : 10 @ 5
|
||||
|
||||
+
|
||||
+ import com.google.common.collect.Lists;
|
||||
+
|
||||
+ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 11 @ 6 : 12
|
||||
|
||||
> DELETE 15 @ 16 : 18
|
||||
|
||||
> CHANGE 123 : 124 @ 126 : 127
|
||||
|
||||
~ for (IChatComponent ichatcomponent : (List<IChatComponent>) list) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,10 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> EOF
|
@ -0,0 +1,14 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> INSERT 2 : 3 @ 2
|
||||
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 4 @ 3 : 5
|
||||
|
||||
> EOF
|
@ -0,0 +1,69 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 4 @ 2 : 3
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.vfs.SYS;
|
||||
|
||||
> DELETE 8 @ 7 : 24
|
||||
|
||||
> DELETE 10 @ 26 : 27
|
||||
|
||||
> INSERT 22 : 24 @ 39
|
||||
|
||||
+ private GuiButton notSoSuperSecret;
|
||||
+ private GuiButton broadcastSettings;
|
||||
|
||||
> CHANGE 70 : 72 @ 85 : 87
|
||||
|
||||
~ this.buttonList.add(notSoSuperSecret = new GuiButton(8675309, this.width / 2 + 5, this.height / 6 + 48 - 6, 150,
|
||||
~ 20, "Super Secret Settings...") {
|
||||
|
||||
> CHANGE 85 : 88 @ 100 : 102
|
||||
|
||||
~ this.buttonList.add(broadcastSettings = new GuiButton(107, this.width / 2 + 5, this.height / 6 + 72 - 6, 150,
|
||||
~ 20, I18n.format(EagRuntime.getRecText(), new Object[0])));
|
||||
~ broadcastSettings.enabled = EagRuntime.recSupported();
|
||||
|
||||
> CHANGE 96 : 98 @ 110 : 111
|
||||
|
||||
~ GuiButton rp;
|
||||
~ this.buttonList.add(rp = new GuiButton(105, this.width / 2 - 155, this.height / 6 + 144 - 6, 150, 20,
|
||||
|
||||
> CHANGE 99 : 101 @ 112 : 113
|
||||
|
||||
~ GuiButton b;
|
||||
~ this.buttonList.add(b = new GuiButton(104, this.width / 2 + 5, this.height / 6 + 144 - 6, 150, 20,
|
||||
|
||||
> INSERT 102 : 103 @ 114
|
||||
|
||||
+ b.enabled = false;
|
||||
|
||||
> INSERT 105 : 107 @ 116
|
||||
|
||||
+
|
||||
+ rp.enabled = SYS.VFS != null;
|
||||
|
||||
> CHANGE 129 : 130 @ 138 : 139
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> CHANGE 162 : 163 @ 171 : 172
|
||||
|
||||
~ notSoSuperSecret.displayString = "Nope!";
|
||||
|
||||
> DELETE 185 @ 194 : 199
|
||||
|
||||
> CHANGE 201 : 203 @ 215 : 222
|
||||
|
||||
~ EagRuntime.toggleRec();
|
||||
~ broadcastSettings.displayString = I18n.format(EagRuntime.getRecText(), new Object[0]);
|
||||
|
||||
> DELETE 204 @ 223 : 224
|
||||
|
||||
> EOF
|
@ -0,0 +1,18 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> INSERT 3 : 6 @ 4
|
||||
|
||||
+
|
||||
+ import com.google.common.collect.Lists;
|
||||
+
|
||||
|
||||
> DELETE 7 @ 5 : 9
|
||||
|
||||
> EOF
|
@ -0,0 +1,384 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 3 @ 2 : 4
|
||||
|
||||
~ import java.text.SimpleDateFormat;
|
||||
|
||||
> INSERT 4 : 6 @ 5
|
||||
|
||||
+ import java.util.Calendar;
|
||||
+ import java.util.Iterator;
|
||||
|
||||
> INSERT 7 : 8 @ 6
|
||||
|
||||
+ import java.util.Locale;
|
||||
|
||||
> INSERT 9 : 21 @ 7
|
||||
|
||||
+ import java.util.TimeZone;
|
||||
+
|
||||
+ import com.google.common.base.Strings;
|
||||
+ import com.google.common.collect.Lists;
|
||||
+
|
||||
+ import net.lax1dude.eaglercraft.v1_8.Display;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.HString;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.internal.EnumPlatformType;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
|
||||
|
||||
> CHANGE 26 : 29 @ 12 : 17
|
||||
|
||||
~ import net.minecraft.client.renderer.RenderHelper;
|
||||
~ import net.minecraft.client.renderer.entity.RenderManager;
|
||||
~ import net.minecraft.client.resources.I18n;
|
||||
|
||||
> CHANGE 30 : 32 @ 18 : 19
|
||||
|
||||
~ import net.minecraft.entity.EntityLivingBase;
|
||||
~ import net.minecraft.potion.PotionEffect;
|
||||
|
||||
> CHANGE 40 : 41 @ 27 : 28
|
||||
|
||||
~ import net.minecraft.world.biome.BiomeGenBase;
|
||||
|
||||
> DELETE 42 @ 29 : 31
|
||||
|
||||
> CHANGE 52 : 55 @ 41 : 42
|
||||
|
||||
~ public void renderDebugInfo(ScaledResolution scaledResolutionIn, float partialTicks) {
|
||||
~ int ww = scaledResolutionIn.getScaledWidth();
|
||||
~ int hh = scaledResolutionIn.getScaledHeight();
|
||||
|
||||
> CHANGE 56 : 79 @ 43 : 49
|
||||
|
||||
~ if (this.mc.gameSettings.showDebugInfo) {
|
||||
~ GlStateManager.pushMatrix();
|
||||
~ this.renderDebugInfoLeft();
|
||||
~ this.renderDebugInfoRight(scaledResolutionIn);
|
||||
~ GlStateManager.popMatrix();
|
||||
~ if (this.mc.gameSettings.field_181657_aC) {
|
||||
~ this.func_181554_e();
|
||||
~ }
|
||||
~ } else {
|
||||
~ int i = 2;
|
||||
~
|
||||
~ if (this.mc.gameSettings.hudFps) {
|
||||
~ drawFPS(2, i);
|
||||
~ i += 9;
|
||||
~ }
|
||||
~
|
||||
~ if (this.mc.gameSettings.hudCoords) {
|
||||
~ drawXYZ(2, i);
|
||||
~ }
|
||||
~
|
||||
~ if (this.mc.gameSettings.hudPlayer) {
|
||||
~ drawPlayer(ww - 3, 3, partialTicks);
|
||||
~ }
|
||||
|
||||
> INSERT 81 : 105 @ 51
|
||||
|
||||
+ if (this.mc.currentScreen == null || !(this.mc.currentScreen instanceof GuiChat)) {
|
||||
+ if (this.mc.gameSettings.hudStats) {
|
||||
+ drawStatsHUD(ww - 2, hh - 2);
|
||||
+ }
|
||||
+
|
||||
+ if (this.mc.gameSettings.hudWorld) {
|
||||
+ drawWorldHUD(2, hh - 2);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (this.mc.gameSettings.hudCoords && this.mc.joinWorldTickCounter < 80) {
|
||||
+ if (this.mc.joinWorldTickCounter > 70) {
|
||||
+ GlStateManager.enableBlend();
|
||||
+ GlStateManager.blendFunc(770, 771);
|
||||
+ }
|
||||
+ int i = this.mc.joinWorldTickCounter - 70;
|
||||
+ if (i < 0)
|
||||
+ i = 0;
|
||||
+ drawHideHUD(ww / 2, hh - 70, (10 - i) * 0xFF / 10);
|
||||
+ if (this.mc.joinWorldTickCounter > 70) {
|
||||
+ GlStateManager.disableBlend();
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
|
||||
> INSERT 108 : 300 @ 54
|
||||
|
||||
+ private void drawFPS(int x, int y) {
|
||||
+ this.fontRenderer.drawStringWithShadow(this.mc.renderGlobal.getDebugInfoShort(), x, y, 0xFFFFFF);
|
||||
+ }
|
||||
+
|
||||
+ private void drawXYZ(int x, int y) {
|
||||
+ Entity e = mc.getRenderViewEntity();
|
||||
+ BlockPos blockpos = new BlockPos(e.posX, e.getEntityBoundingBox().minY, e.posZ);
|
||||
+ this.fontRenderer.drawStringWithShadow(
|
||||
+ "x: " + blockpos.getX() + ", y: " + blockpos.getY() + ", z: " + blockpos.getZ(), x, y, 0xFFFFFF);
|
||||
+ }
|
||||
+
|
||||
+ private void drawStatsHUD(int x, int y) {
|
||||
+ int i = 9;
|
||||
+
|
||||
+ String line = "Walk: " + EnumChatFormatting.YELLOW + HString.format("%.2f", mc.thePlayer.getAIMoveSpeed())
|
||||
+ + EnumChatFormatting.WHITE + " Flight: "
|
||||
+ + (mc.thePlayer.capabilities.allowFlying
|
||||
+ ? ("" + EnumChatFormatting.YELLOW + mc.thePlayer.capabilities.getFlySpeed())
|
||||
+ : EnumChatFormatting.RED + "No");
|
||||
+ int lw = fontRenderer.getStringWidth(line);
|
||||
+ this.fontRenderer.drawStringWithShadow(line, x - lw, y - i, 0xFFFFFF);
|
||||
+ i += 11;
|
||||
+
|
||||
+ line = "Food: " + EnumChatFormatting.YELLOW + mc.thePlayer.getFoodStats().getFoodLevel()
|
||||
+ + EnumChatFormatting.WHITE + ", Sat: " + EnumChatFormatting.YELLOW
|
||||
+ + HString.format("%.1f", mc.thePlayer.getFoodStats().getSaturationLevel());
|
||||
+ lw = fontRenderer.getStringWidth(line);
|
||||
+ this.fontRenderer.drawStringWithShadow(line, x - lw, y - i, 0xFFFFFF);
|
||||
+ i += 11;
|
||||
+
|
||||
+ line = "Amr: " + EnumChatFormatting.YELLOW + mc.thePlayer.getTotalArmorValue() + EnumChatFormatting.WHITE
|
||||
+ + ", Health: " + EnumChatFormatting.RED + HString.format("%.1f", mc.thePlayer.getHealth());
|
||||
+ lw = fontRenderer.getStringWidth(line);
|
||||
+ this.fontRenderer.drawStringWithShadow(line, x - lw, y - i, 0xFFFFFF);
|
||||
+ i += 11;
|
||||
+
|
||||
+ int xpc = mc.thePlayer.xpBarCap();
|
||||
+ line = "XP: " + EnumChatFormatting.GREEN + MathHelper.floor_float(mc.thePlayer.experience * xpc)
|
||||
+ + EnumChatFormatting.WHITE + " / " + EnumChatFormatting.GREEN + xpc;
|
||||
+ lw = fontRenderer.getStringWidth(line);
|
||||
+ this.fontRenderer.drawStringWithShadow(line, x - lw, y - i, 0xFFFFFF);
|
||||
+ i += 11;
|
||||
+
|
||||
+ Iterator<PotionEffect> potions = mc.thePlayer.getActivePotionEffects().iterator();
|
||||
+ if (potions.hasNext()) {
|
||||
+ while (potions.hasNext()) {
|
||||
+ i += 11;
|
||||
+ PotionEffect e = potions.next();
|
||||
+ int t = e.getDuration() / 20;
|
||||
+ int m = t / 60;
|
||||
+ int s = t % 60;
|
||||
+ int j = e.getAmplifier();
|
||||
+ if (j > 0) {
|
||||
+ line = I18n.format(e.getEffectName())
|
||||
+ + (j > 0 ? (" " + EnumChatFormatting.YELLOW + EnumChatFormatting.BOLD
|
||||
+ + I18n.format("potion.potency." + j) + EnumChatFormatting.RESET) : "")
|
||||
+ + " [" + EnumChatFormatting.YELLOW + HString.format("%02d:%02d", m, s)
|
||||
+ + EnumChatFormatting.RESET + "]";
|
||||
+ } else {
|
||||
+ line = I18n.format(e.getEffectName()) + " [" + EnumChatFormatting.YELLOW
|
||||
+ + HString.format("%02d:%02d", m, s) + EnumChatFormatting.RESET + "]";
|
||||
+ }
|
||||
+ lw = fontRenderer.getStringWidth(line);
|
||||
+ this.fontRenderer.drawStringWithShadow(line, x - lw, y - i, 0xFFFFFF);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ }
|
||||
+
|
||||
+ public static final int ticksAtMidnight = 18000;
|
||||
+ public static final int ticksPerDay = 24000;
|
||||
+ public static final int ticksPerHour = 1000;
|
||||
+ public static final double ticksPerMinute = 1000d / 60d;
|
||||
+ public static final double ticksPerSecond = 1000d / 60d / 60d;
|
||||
+ private static final SimpleDateFormat SDFTwentyFour = new SimpleDateFormat("HH:mm", Locale.ENGLISH);
|
||||
+ private static final SimpleDateFormat SDFTwelve = new SimpleDateFormat("h:mm aa", Locale.ENGLISH);
|
||||
+
|
||||
+ private void drawWorldHUD(int x, int y) {
|
||||
+ /*
|
||||
+ * Math was taken from: https://github.com/EssentialsX/Essentials/blob/
|
||||
+ * dc7fb919391d62de45e17b51ae1e6fe3e66d7ac6/Essentials/src/main/java/com/
|
||||
+ * earth2me/essentials/utils/DescParseTickFormat.java
|
||||
+ */
|
||||
+ long totalTicks = mc.theWorld.getWorldTime();
|
||||
+ long ticks = totalTicks;
|
||||
+ ticks = ticks - ticksAtMidnight + ticksPerDay;
|
||||
+ final long days = ticks / ticksPerDay;
|
||||
+ ticks -= days * ticksPerDay;
|
||||
+ final long hours = ticks / ticksPerHour;
|
||||
+ ticks -= hours * ticksPerHour;
|
||||
+ final long minutes = (long) Math.floor(ticks / ticksPerMinute);
|
||||
+ final double dticks = ticks - minutes * ticksPerMinute;
|
||||
+ final long seconds = (long) Math.floor(dticks / ticksPerSecond);
|
||||
+
|
||||
+ // TODO: why does desktop JRE not apply "GMT" correctly?
|
||||
+ final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"), Locale.ENGLISH);
|
||||
+
|
||||
+ cal.setLenient(true);
|
||||
+ cal.set(0, Calendar.JANUARY, 1, 0, 0, 0);
|
||||
+ cal.add(Calendar.DAY_OF_YEAR, (int) days);
|
||||
+ cal.add(Calendar.HOUR_OF_DAY, (int) hours);
|
||||
+ cal.add(Calendar.MINUTE, (int) minutes);
|
||||
+ cal.add(Calendar.SECOND, (int) seconds + 1);
|
||||
+
|
||||
+ String timeString = EnumChatFormatting.WHITE + "Day " + ((totalTicks + 30000l) / 24000l) + " ("
|
||||
+ + EnumChatFormatting.YELLOW
|
||||
+ + (this.mc.gameSettings.hud24h ? SDFTwentyFour : SDFTwelve).format(cal.getTime())
|
||||
+ + EnumChatFormatting.WHITE + ")";
|
||||
+
|
||||
+ Entity e = mc.getRenderViewEntity();
|
||||
+ BlockPos blockpos = new BlockPos(e.posX, MathHelper.clamp_double(e.getEntityBoundingBox().minY, 0.0D, 254.0D),
|
||||
+ e.posZ);
|
||||
+ BiomeGenBase biome = mc.theWorld.getBiomeGenForCoords(blockpos);
|
||||
+
|
||||
+ Chunk c = mc.theWorld.getChunkFromBlockCoords(blockpos);
|
||||
+ int blockLight = c.getLightFor(EnumSkyBlock.BLOCK, blockpos);
|
||||
+ int skyLight = c.getLightFor(EnumSkyBlock.SKY, blockpos) - mc.theWorld.calculateSkylightSubtracted(1.0f);
|
||||
+ int totalLight = Math.max(blockLight, skyLight);
|
||||
+ EnumChatFormatting lightColor = blockLight < 8
|
||||
+ ? ((skyLight < 8 || !mc.theWorld.isDaytime()) ? EnumChatFormatting.RED : EnumChatFormatting.YELLOW)
|
||||
+ : EnumChatFormatting.GREEN;
|
||||
+ String lightString = "Light: " + lightColor + totalLight + EnumChatFormatting.WHITE;
|
||||
+
|
||||
+ float temp = biome.getFloatTemperature(blockpos);
|
||||
+
|
||||
+ String tempString = "Temp: "
|
||||
+ + ((blockLight > 11 || temp > 0.15f) ? EnumChatFormatting.YELLOW : EnumChatFormatting.AQUA)
|
||||
+ + HString.format("%.2f", temp) + EnumChatFormatting.WHITE;
|
||||
+
|
||||
+ this.fontRenderer.drawStringWithShadow(timeString, x, y - 30, 0xFFFFFF);
|
||||
+ this.fontRenderer.drawStringWithShadow("Biome: " + EnumChatFormatting.AQUA + biome.biomeName, x, y - 19,
|
||||
+ 0xFFFFFF);
|
||||
+ this.fontRenderer.drawStringWithShadow(lightString + " " + tempString, x, y - 8, 0xFFFFFF);
|
||||
+ }
|
||||
+
|
||||
+ private void drawPlayer(int x, int y, float partialTicks) {
|
||||
+ Entity e = mc.getRenderViewEntity();
|
||||
+ if (e != null && e instanceof EntityLivingBase) {
|
||||
+ EntityLivingBase ent = (EntityLivingBase) e;
|
||||
+ GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
|
||||
+ GlStateManager.enableDepth();
|
||||
+ GlStateManager.enableColorMaterial();
|
||||
+ GlStateManager.pushMatrix();
|
||||
+ GlStateManager.translate((float) x - 10, (float) y + 36, 50.0F);
|
||||
+ GlStateManager.scale(-17.0F, 17.0F, 17.0F);
|
||||
+ GlStateManager.rotate(180.0F, 0.0F, 0.0F, 1.0F);
|
||||
+ float f = ent.renderYawOffset;
|
||||
+ float f1 = ent.rotationYaw;
|
||||
+ float f2 = ent.prevRotationYaw;
|
||||
+ float f3 = ent.prevRotationYawHead;
|
||||
+ float f4 = ent.rotationYawHead;
|
||||
+ float f5 = ent.prevRenderYawOffset;
|
||||
+ GlStateManager.rotate(115.0F, 0.0F, 1.0F, 0.0F);
|
||||
+ RenderHelper.enableStandardItemLighting();
|
||||
+ float f6 = ent.prevRenderYawOffset + (ent.renderYawOffset - ent.prevRenderYawOffset) * partialTicks;
|
||||
+ ent.rotationYawHead -= f6;
|
||||
+ ent.prevRotationYawHead -= f6;
|
||||
+ ent.rotationYawHead *= 0.5f;
|
||||
+ ent.prevRotationYawHead *= 0.5f;
|
||||
+ ent.renderYawOffset = 0.0f;
|
||||
+ ent.prevRenderYawOffset = 0.0f;
|
||||
+ ent.prevRotationYaw = 0.0f;
|
||||
+ ent.rotationYaw = 0.0f;
|
||||
+ GlStateManager.rotate(-135.0F
|
||||
+ - (ent.prevRotationYawHead + (ent.rotationYawHead - ent.prevRotationYawHead) * partialTicks) * 0.5F,
|
||||
+ 0.0F, 1.0F, 0.0F);
|
||||
+ GlStateManager.rotate(ent.rotationPitch * 0.2f, 1.0F, 0.0F, 0.0F);
|
||||
+ RenderManager rendermanager = Minecraft.getMinecraft().getRenderManager();
|
||||
+ rendermanager.setPlayerViewY(180.0F);
|
||||
+ rendermanager.setRenderShadow(false);
|
||||
+ rendermanager.renderEntityWithPosYaw(ent, 0.0D, 0.0D, 0.0D, 0.0F, partialTicks);
|
||||
+ rendermanager.setRenderShadow(true);
|
||||
+ ent.renderYawOffset = f;
|
||||
+ ent.rotationYaw = f1;
|
||||
+ ent.prevRotationYaw = f2;
|
||||
+ ent.prevRotationYawHead = f3;
|
||||
+ ent.rotationYawHead = f4;
|
||||
+ ent.prevRenderYawOffset = f5;
|
||||
+ GlStateManager.popMatrix();
|
||||
+ RenderHelper.disableStandardItemLighting();
|
||||
+ GlStateManager.disableDepth();
|
||||
+ GlStateManager.disableRescaleNormal();
|
||||
+ GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit);
|
||||
+ GlStateManager.disableTexture2D();
|
||||
+ GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ private void drawHideHUD(int x, int y, int fade) {
|
||||
+ drawCenteredString(fontRenderer, I18n.format("options.hud.note"), x, y, 0xEECC00 | (fade << 24));
|
||||
+ }
|
||||
+
|
||||
|
||||
> INSERT 339 : 346 @ 93
|
||||
|
||||
+ if (!this.mc.gameSettings.showDebugInfo) {
|
||||
+ BlockPos blockpos = new BlockPos(this.mc.getRenderViewEntity().posX,
|
||||
+ this.mc.getRenderViewEntity().getEntityBoundingBox().minY, this.mc.getRenderViewEntity().posZ);
|
||||
+ return Lists.newArrayList(new String[] { this.mc.renderGlobal.getDebugInfoShort(),
|
||||
+ "x: " + blockpos.getX() + ", y: " + blockpos.getY() + ", z: " + blockpos.getZ() });
|
||||
+ }
|
||||
+
|
||||
|
||||
> CHANGE 356 : 357 @ 103 : 104
|
||||
|
||||
~ HString.format("Chunk-relative: %d %d %d", new Object[] { Integer.valueOf(blockpos.getX() & 15),
|
||||
|
||||
> CHANGE 382 : 383 @ 129 : 130
|
||||
|
||||
~ HString.format("XYZ: %.3f / %.5f / %.3f",
|
||||
|
||||
> CHANGE 386 : 387 @ 133 : 134
|
||||
|
||||
~ HString.format("Block: %d %d %d",
|
||||
|
||||
> CHANGE 389 : 390 @ 136 : 137
|
||||
|
||||
~ HString.format("Chunk: %d %d %d in %d %d %d",
|
||||
|
||||
> CHANGE 393 : 394 @ 140 : 141
|
||||
|
||||
~ HString.format("Facing: %s (%s) (%.1f / %.1f)",
|
||||
|
||||
> CHANGE 399 : 400 @ 146 : 147
|
||||
|
||||
~ arraylist.add("Biome: " + chunk.getBiome(blockpos).biomeName);
|
||||
|
||||
> CHANGE 404 : 405 @ 151 : 161
|
||||
|
||||
~ arraylist.add(HString.format("Local Difficulty: %.2f (Day %d)",
|
||||
|
||||
> DELETE 409 @ 165 : 169
|
||||
|
||||
> CHANGE 413 : 414 @ 173 : 174
|
||||
|
||||
~ arraylist.add(HString.format("Looking at: %d %d %d", new Object[] { Integer.valueOf(blockpos1.getX()),
|
||||
|
||||
> CHANGE 422 : 450 @ 182 : 199
|
||||
|
||||
~ ArrayList arraylist;
|
||||
~ if (EagRuntime.getPlatformType() != EnumPlatformType.JAVASCRIPT) {
|
||||
~ long i = EagRuntime.maxMemory();
|
||||
~ long j = EagRuntime.totalMemory();
|
||||
~ long k = EagRuntime.freeMemory();
|
||||
~ long l = j - k;
|
||||
~ arraylist = Lists.newArrayList(new String[] {
|
||||
~ HString.format("Java: %s %dbit",
|
||||
~ new Object[] { System.getProperty("java.version"),
|
||||
~ Integer.valueOf(this.mc.isJava64bit() ? 64 : 32) }),
|
||||
~ HString.format("Mem: % 2d%% %03d/%03dMB",
|
||||
~ new Object[] { Long.valueOf(l * 100L / i), Long.valueOf(bytesToMb(l)),
|
||||
~ Long.valueOf(bytesToMb(i)) }),
|
||||
~ HString.format("Allocated: % 2d%% %03dMB",
|
||||
~ new Object[] { Long.valueOf(j * 100L / i), Long.valueOf(bytesToMb(j)) }),
|
||||
~ "", HString.format("CPU: %s", new Object[] { "eaglercraft" }), "",
|
||||
~ HString.format("Display: %dx%d (%s)",
|
||||
~ new Object[] { Integer.valueOf(Display.getWidth()), Integer.valueOf(Display.getHeight()),
|
||||
~ EaglercraftGPU.glGetString(7936) }),
|
||||
~ EaglercraftGPU.glGetString(7937), EaglercraftGPU.glGetString(7938) });
|
||||
~ } else {
|
||||
~ arraylist = Lists.newArrayList(
|
||||
~ new String[] { "Java: TeaVM", "", HString.format("CPU: %s", new Object[] { "eaglercraft" }), "",
|
||||
~ HString.format("Display: %dx%d (%s)",
|
||||
~ new Object[] { Integer.valueOf(Display.getWidth()),
|
||||
~ Integer.valueOf(Display.getHeight()), EaglercraftGPU.glGetString(7936) }),
|
||||
~ EaglercraftGPU.glGetString(7937), EaglercraftGPU.glGetString(7938) });
|
||||
~ }
|
||||
|
||||
> DELETE 458 @ 207 : 211
|
||||
|
||||
> EOF
|
@ -0,0 +1,19 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> INSERT 2 : 4 @ 2
|
||||
|
||||
+ import java.util.List;
|
||||
+
|
||||
|
||||
> CHANGE 8 : 9 @ 6 : 7
|
||||
|
||||
~
|
||||
|
||||
> DELETE 10 @ 8 : 16
|
||||
|
||||
> EOF
|
@ -0,0 +1,51 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 5
|
||||
|
||||
> INSERT 4 : 10 @ 7
|
||||
|
||||
+
|
||||
+ import com.google.common.collect.ComparisonChain;
|
||||
+ import com.google.common.collect.Ordering;
|
||||
+
|
||||
+ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 11 @ 8 : 10
|
||||
|
||||
> DELETE 13 @ 12 : 13
|
||||
|
||||
> CHANGE 59 : 60 @ 59 : 60
|
||||
|
||||
~ for (NetworkPlayerInfo networkplayerinfo : (List<NetworkPlayerInfo>) list) {
|
||||
|
||||
> CHANGE 80 : 81 @ 80 : 82
|
||||
|
||||
~ boolean flag = true;
|
||||
|
||||
> CHANGE 101 : 102 @ 102 : 103
|
||||
|
||||
~ for (String s : (List<String>) list1) {
|
||||
|
||||
> CHANGE 109 : 110 @ 110 : 111
|
||||
|
||||
~ for (String s2 : (List<String>) list2) {
|
||||
|
||||
> CHANGE 118 : 119 @ 119 : 120
|
||||
|
||||
~ for (String s3 : (List<String>) list1) {
|
||||
|
||||
> CHANGE 151 : 152 @ 152 : 153
|
||||
|
||||
~ if (entityplayer == null || entityplayer.isWearing(EnumPlayerModelParts.HAT)) {
|
||||
|
||||
> CHANGE 185 : 186 @ 186 : 187
|
||||
|
||||
~ for (String s4 : (List<String>) list2) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,31 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 4
|
||||
|
||||
> INSERT 3 : 7 @ 5
|
||||
|
||||
+
|
||||
+ import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.Keyboard;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 8 @ 6 : 7
|
||||
|
||||
> DELETE 9 @ 8 : 9
|
||||
|
||||
> DELETE 21 @ 21 : 22
|
||||
|
||||
> CHANGE 91 : 92 @ 92 : 93
|
||||
|
||||
~ protected void keyTyped(char parChar1, int parInt1) {
|
||||
|
||||
> CHANGE 113 : 114 @ 114 : 115
|
||||
|
||||
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,14 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> INSERT 3 : 4 @ 3
|
||||
|
||||
+
|
||||
|
||||
> DELETE 5 @ 4 : 5
|
||||
|
||||
> EOF
|
@ -0,0 +1,14 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> INSERT 3 : 4 @ 3
|
||||
|
||||
+
|
||||
|
||||
> DELETE 5 @ 4 : 5
|
||||
|
||||
> EOF
|
@ -0,0 +1,14 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> INSERT 3 : 4 @ 3
|
||||
|
||||
+
|
||||
|
||||
> DELETE 5 @ 4 : 5
|
||||
|
||||
> EOF
|
149
patches/minecraft/net/minecraft/client/gui/GuiScreen.edit.java
Normal file
149
patches/minecraft/net/minecraft/client/gui/GuiScreen.edit.java
Normal file
@ -0,0 +1,149 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 11
|
||||
|
||||
> DELETE 3 @ 12 : 14
|
||||
|
||||
> INSERT 7 : 22 @ 18
|
||||
|
||||
+
|
||||
+ import org.apache.commons.lang3.StringUtils;
|
||||
+
|
||||
+ import com.google.common.base.Splitter;
|
||||
+ import com.google.common.collect.Lists;
|
||||
+ import com.google.common.collect.Sets;
|
||||
+
|
||||
+ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.Keyboard;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.Mouse;
|
||||
+ 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.opengl.GlStateManager;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
|
||||
|
||||
> CHANGE 23 : 24 @ 19 : 27
|
||||
|
||||
~ import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
|
||||
> DELETE 26 @ 29 : 30
|
||||
|
||||
> INSERT 28 : 29 @ 32
|
||||
|
||||
+ import net.minecraft.client.resources.I18n;
|
||||
|
||||
> DELETE 42 @ 45 : 51
|
||||
|
||||
> CHANGE 59 : 61 @ 68 : 69
|
||||
|
||||
~ private String clickedLinkURI;
|
||||
~ protected long showingCloseKey = 0;
|
||||
|
||||
> INSERT 71 : 101 @ 79
|
||||
|
||||
+ long millis = System.currentTimeMillis();
|
||||
+ long closeKeyTimeout = millis - showingCloseKey;
|
||||
+ if (closeKeyTimeout < 3000l) {
|
||||
+ int alpha1 = 0xC0000000;
|
||||
+ int alpha2 = 0xFF000000;
|
||||
+ if (closeKeyTimeout > 2500l) {
|
||||
+ float f = (float) (3000l - closeKeyTimeout) * 0.002f;
|
||||
+ if (f < 0.03f)
|
||||
+ f = 0.03f;
|
||||
+ alpha1 = (int) (f * 192.0f) << 24;
|
||||
+ alpha2 = (int) (f * 255.0f) << 24;
|
||||
+ }
|
||||
+ String str;
|
||||
+ int k = getCloseKey();
|
||||
+ if (k == KeyboardConstants.KEY_GRAVE) {
|
||||
+ str = I18n.format("gui.exitKeyRetarded");
|
||||
+ } else {
|
||||
+ str = I18n.format("gui.exitKey", Keyboard.getKeyName(k));
|
||||
+ }
|
||||
+ int w = fontRendererObj.getStringWidth(str);
|
||||
+ int x = (width - w - 4) / 2;
|
||||
+ int y = 10;
|
||||
+ drawRect(x, y, x + w + 4, y + 12, alpha1);
|
||||
+ if (closeKeyTimeout > 2500l)
|
||||
+ GlStateManager.enableBlend();
|
||||
+ fontRendererObj.drawStringWithShadow(str, x + 2, y + 2, 0xFFAAAA | alpha2);
|
||||
+ if (closeKeyTimeout > 2500l)
|
||||
+ GlStateManager.disableBlend();
|
||||
+ }
|
||||
+
|
||||
|
||||
> CHANGE 103 : 115 @ 81 : 83
|
||||
|
||||
~ protected int getCloseKey() {
|
||||
~ if (this instanceof GuiContainer) {
|
||||
~ return this.mc.gameSettings.keyBindInventory.getKeyCode();
|
||||
~ } else {
|
||||
~ return this.mc.gameSettings.keyBindClose.getKeyCode();
|
||||
~ }
|
||||
~ }
|
||||
~
|
||||
~ protected void keyTyped(char parChar1, int parInt1) {
|
||||
~ if (((this.mc.theWorld == null || this.mc.thePlayer.getHealth() <= 0.0F) && parInt1 == 1)
|
||||
~ || parInt1 == this.mc.gameSettings.keyBindClose.getKeyCode()
|
||||
~ || (parInt1 == 1 && this.mc.gameSettings.keyBindClose.getKeyCode() == 0)) {
|
||||
|
||||
> INSERT 119 : 121 @ 87
|
||||
|
||||
+ } else if (parInt1 == 1) {
|
||||
+ showingCloseKey = System.currentTimeMillis();
|
||||
|
||||
> DELETE 122 @ 88 : 89
|
||||
|
||||
> CHANGE 125 : 126 @ 92 : 102
|
||||
|
||||
~ return EagRuntime.getClipboard();
|
||||
|
||||
> CHANGE 130 : 131 @ 106 : 113
|
||||
|
||||
~ EagRuntime.setClipboard(copyText);
|
||||
|
||||
> INSERT 307 : 308 @ 289
|
||||
|
||||
+ String uri = clickevent.getValue();
|
||||
|
||||
> CHANGE 309 : 314 @ 290 : 311
|
||||
|
||||
~ if (this.mc.gameSettings.chatLinksPrompt) {
|
||||
~ this.clickedLinkURI = uri;
|
||||
~ this.mc.displayGuiScreen(new GuiConfirmOpenLink(this, clickevent.getValue(), 31102009, false));
|
||||
~ } else {
|
||||
~ this.openWebLink(uri);
|
||||
|
||||
> CHANGE 316 : 317 @ 313 : 315
|
||||
|
||||
~ // rip
|
||||
|
||||
> CHANGE 322 : 329 @ 320 : 326
|
||||
|
||||
~ /*
|
||||
~ * ChatUserInfo chatuserinfo =
|
||||
~ * this.mc.getTwitchStream().func_152926_a(clickevent.getValue()); if
|
||||
~ * (chatuserinfo != null) { this.mc.displayGuiScreen(new
|
||||
~ * GuiTwitchUserMode(this.mc.getTwitchStream(), chatuserinfo)); } else { }
|
||||
~ */
|
||||
~ LOGGER.error("Tried to handle twitch user but couldn\'t find them!");
|
||||
|
||||
> CHANGE 352 : 353 @ 349 : 350
|
||||
|
||||
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
|
||||
|
||||
> CHANGE 377 : 378 @ 374 : 375
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> CHANGE 497 : 499 @ 494 : 503
|
||||
|
||||
~ private void openWebLink(String parURI) {
|
||||
~ EagRuntime.openLink(parURI);
|
||||
|
||||
> EOF
|
@ -0,0 +1,91 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 4 @ 2 : 8
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.Keyboard;
|
||||
|
||||
> DELETE 6 @ 10 : 11
|
||||
|
||||
> CHANGE 13 : 14 @ 18 : 37
|
||||
|
||||
~ private GuiButton hideAddress;
|
||||
|
||||
> INSERT 27 : 28 @ 50
|
||||
|
||||
+ int i = 80;
|
||||
|
||||
> CHANGE 29 : 32 @ 51 : 52
|
||||
|
||||
~ GuiButton done;
|
||||
~ GuiButton cancel;
|
||||
~ this.buttonList.add(done = new GuiButton(0, this.width / 2 - 100, i + 96 + 12,
|
||||
|
||||
> CHANGE 33 : 34 @ 53 : 54
|
||||
|
||||
~ this.buttonList.add(cancel = new GuiButton(1, this.width / 2 - 100, i + 120 + 12,
|
||||
|
||||
> CHANGE 35 : 42 @ 55 : 56
|
||||
|
||||
~ if (EagRuntime.requireSSL()) {
|
||||
~ done.yPosition = cancel.yPosition;
|
||||
~ done.width = (done.width / 2) - 2;
|
||||
~ cancel.width = (cancel.width / 2) - 2;
|
||||
~ done.xPosition += cancel.width + 4;
|
||||
~ }
|
||||
~ this.buttonList.add(this.serverResourcePacks = new GuiButton(2, this.width / 2 - 100, i + 54,
|
||||
|
||||
> INSERT 44 : 47 @ 58
|
||||
|
||||
+ this.buttonList.add(this.hideAddress = new GuiButton(3, this.width / 2 - 100, i + 78,
|
||||
+ I18n.format("addServer.hideAddress", new Object[0]) + ": "
|
||||
+ + I18n.format(this.serverData.hideAddress ? "gui.yes" : "gui.no", new Object[0])));
|
||||
|
||||
> CHANGE 53 : 54 @ 64 : 67
|
||||
|
||||
~ ((GuiButton) this.buttonList.get(0)).enabled = this.serverIPField.getText().trim().length() > 0;
|
||||
|
||||
> CHANGE 60 : 61 @ 73 : 74
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> CHANGE 62 : 67 @ 75 : 76
|
||||
|
||||
~ if (parGuiButton.id == 3) {
|
||||
~ this.serverData.hideAddress = !this.serverData.hideAddress;
|
||||
~ this.hideAddress.displayString = I18n.format("addServer.hideAddress", new Object[0]) + ": "
|
||||
~ + I18n.format(this.serverData.hideAddress ? "gui.yes" : "gui.no", new Object[0]);
|
||||
~ } else if (parGuiButton.id == 2) {
|
||||
|
||||
> CHANGE 75 : 77 @ 84 : 86
|
||||
|
||||
~ this.serverData.serverName = this.serverNameField.getText().trim();
|
||||
~ this.serverData.serverIP = this.serverIPField.getText().trim();
|
||||
|
||||
> CHANGE 83 : 84 @ 92 : 93
|
||||
|
||||
~ protected void keyTyped(char parChar1, int parInt1) {
|
||||
|
||||
> CHANGE 95 : 96 @ 104 : 106
|
||||
|
||||
~ ((GuiButton) this.buttonList.get(0)).enabled = this.serverIPField.getText().trim().length() > 0;
|
||||
|
||||
> CHANGE 98 : 99 @ 108 : 109
|
||||
|
||||
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
|
||||
|
||||
> INSERT 112 : 118 @ 122
|
||||
|
||||
+ if (EagRuntime.requireSSL()) {
|
||||
+ this.drawCenteredString(this.fontRendererObj, I18n.format("addServer.SSLWarn1"), this.width / 2, 184,
|
||||
+ 0xccccff);
|
||||
+ this.drawCenteredString(this.fontRendererObj, I18n.format("addServer.SSLWarn2"), this.width / 2, 196,
|
||||
+ 0xccccff);
|
||||
+ }
|
||||
|
||||
> EOF
|
@ -0,0 +1,43 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 6
|
||||
|
||||
> INSERT 3 : 13 @ 7
|
||||
|
||||
+
|
||||
+ import org.json.JSONException;
|
||||
+
|
||||
+ import com.google.common.collect.Lists;
|
||||
+
|
||||
+ import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.Keyboard;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 14 @ 8 : 12
|
||||
|
||||
> DELETE 30 @ 28 : 31
|
||||
|
||||
> CHANGE 169 : 170 @ 170 : 171
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> CHANGE 208 : 209 @ 209 : 210
|
||||
|
||||
~ protected void keyTyped(char parChar1, int parInt1) {
|
||||
|
||||
> CHANGE 346 : 347 @ 347 : 348
|
||||
|
||||
~ } catch (JSONException var13) {
|
||||
|
||||
> CHANGE 381 : 382 @ 382 : 383
|
||||
|
||||
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,18 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 3 @ 2 : 3
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 7 @ 7 : 10
|
||||
|
||||
> CHANGE 44 : 45 @ 47 : 48
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,104 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 3 @ 2 : 4
|
||||
|
||||
~ import java.io.ByteArrayInputStream;
|
||||
|
||||
> DELETE 4 @ 5 : 6
|
||||
|
||||
> CHANGE 7 : 15 @ 9 : 14
|
||||
|
||||
~
|
||||
~ import com.google.common.collect.Lists;
|
||||
~
|
||||
~ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.vfs.SYS;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.internal.FileChooserResult;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
|
||||
|
||||
> DELETE 20 @ 19 : 23
|
||||
|
||||
> CHANGE 35 : 37 @ 38 : 39
|
||||
|
||||
~ GuiButton btn;
|
||||
~ this.buttonList.add(btn = new GuiOptionButton(2, this.width / 2 - 154, this.height - 48,
|
||||
|
||||
> INSERT 38 : 39 @ 40
|
||||
|
||||
+ btn.enabled = SYS.VFS != null;
|
||||
|
||||
> CHANGE 49 : 50 @ 50 : 51
|
||||
|
||||
~ for (ResourcePackRepository.Entry resourcepackrepository$entry : (List<ResourcePackRepository.Entry>) arraylist) {
|
||||
|
||||
> CHANGE 94 : 95 @ 95 : 96
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> CHANGE 97 : 100 @ 98 : 135
|
||||
|
||||
~ if (SYS.VFS == null)
|
||||
~ return;
|
||||
~ EagRuntime.displayFileChooser("application/zip", "zip");
|
||||
|
||||
> CHANGE 115 : 116 @ 150 : 151
|
||||
|
||||
~ for (ResourcePackRepository.Entry resourcepackrepository$entry : (List<ResourcePackRepository.Entry>) arraylist) {
|
||||
|
||||
> INSERT 122 : 124 @ 157
|
||||
|
||||
+ this.mc.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"),
|
||||
+ I18n.format("resourcePack.load.pleaseWait"));
|
||||
|
||||
> DELETE 127 @ 160 : 161
|
||||
|
||||
> CHANGE 133 : 173 @ 167 : 168
|
||||
|
||||
~ public void updateScreen() {
|
||||
~ FileChooserResult packFile = null;
|
||||
~ if (EagRuntime.fileChooserHasResult()) {
|
||||
~ packFile = EagRuntime.getFileChooserResult();
|
||||
~ }
|
||||
~ if (packFile == null)
|
||||
~ return;
|
||||
~ logger.info("Loading resource pack: {}", packFile.fileName);
|
||||
~ mc.loadingScreen.eaglerShow(I18n.format("resourcePack.load.loading"), packFile.fileName);
|
||||
~ SYS.loadResourcePack(packFile.fileName, new ByteArrayInputStream(packFile.fileData), null);
|
||||
~
|
||||
~ ArrayList arraylist = Lists.newArrayList();
|
||||
~
|
||||
~ for (ResourcePackListEntry resourcepacklistentry : this.selectedResourcePacks) {
|
||||
~ if (resourcepacklistentry instanceof ResourcePackListEntryFound) {
|
||||
~ arraylist.add(((ResourcePackListEntryFound) resourcepacklistentry).func_148318_i());
|
||||
~ }
|
||||
~ }
|
||||
~
|
||||
~ Collections.reverse(arraylist);
|
||||
~ this.mc.getResourcePackRepository().setRepositories(arraylist);
|
||||
~ this.mc.gameSettings.resourcePacks.clear();
|
||||
~ this.mc.gameSettings.field_183018_l.clear();
|
||||
~
|
||||
~ for (ResourcePackRepository.Entry resourcepackrepository$entry : (List<ResourcePackRepository.Entry>) arraylist) {
|
||||
~ this.mc.gameSettings.resourcePacks.add(resourcepackrepository$entry.getResourcePackName());
|
||||
~ if (resourcepackrepository$entry.func_183027_f() != 1) {
|
||||
~ this.mc.gameSettings.field_183018_l.add(resourcepackrepository$entry.getResourcePackName());
|
||||
~ }
|
||||
~ }
|
||||
~
|
||||
~ this.mc.gameSettings.saveOptions();
|
||||
~
|
||||
~ boolean wasChanged = this.changed;
|
||||
~ this.changed = false;
|
||||
~ this.initGui();
|
||||
~ this.changed = wasChanged;
|
||||
~ }
|
||||
~
|
||||
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,62 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 4 @ 2 : 6
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.EagRuntime;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.Keyboard;
|
||||
|
||||
> DELETE 6 @ 8 : 9
|
||||
|
||||
> CHANGE 28 : 34 @ 31 : 32
|
||||
|
||||
~ if (EagRuntime.requireSSL()) {
|
||||
~ this.field_146302_g = new GuiTextField(2, this.fontRendererObj, this.width / 2 - 100, this.height / 4 + 35,
|
||||
~ 200, 20);
|
||||
~ } else {
|
||||
~ this.field_146302_g = new GuiTextField(2, this.fontRendererObj, this.width / 2 - 100, 116, 200, 20);
|
||||
~ }
|
||||
|
||||
> CHANGE 37 : 38 @ 35 : 37
|
||||
|
||||
~ ((GuiButton) this.buttonList.get(0)).enabled = this.field_146302_g.getText().trim().length() > 0;
|
||||
|
||||
> CHANGE 46 : 47 @ 45 : 46
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> CHANGE 51 : 52 @ 50 : 51
|
||||
|
||||
~ this.field_146301_f.serverIP = this.field_146302_g.getText().trim();
|
||||
|
||||
> CHANGE 58 : 59 @ 57 : 58
|
||||
|
||||
~ protected void keyTyped(char parChar1, int parInt1) {
|
||||
|
||||
> CHANGE 60 : 61 @ 59 : 61
|
||||
|
||||
~ ((GuiButton) this.buttonList.get(0)).enabled = this.field_146302_g.getText().trim().length() > 0;
|
||||
|
||||
> CHANGE 67 : 68 @ 67 : 68
|
||||
|
||||
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
|
||||
|
||||
> CHANGE 76 : 87 @ 76 : 78
|
||||
|
||||
~ if (EagRuntime.requireSSL()) {
|
||||
~ this.drawString(this.fontRendererObj, I18n.format("addServer.enterIp", new Object[0]), this.width / 2 - 100,
|
||||
~ this.height / 4 + 19, 10526880);
|
||||
~ this.drawCenteredString(this.fontRendererObj, I18n.format("addServer.SSLWarn1"), this.width / 2,
|
||||
~ this.height / 4 + 30 + 37, 0xccccff);
|
||||
~ this.drawCenteredString(this.fontRendererObj, I18n.format("addServer.SSLWarn2"), this.width / 2,
|
||||
~ this.height / 4 + 30 + 49, 0xccccff);
|
||||
~ } else {
|
||||
~ this.drawString(this.fontRendererObj, I18n.format("addServer.enterIp", new Object[0]), this.width / 2 - 100,
|
||||
~ 100, 10526880);
|
||||
~ }
|
||||
|
||||
> EOF
|
@ -0,0 +1,10 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> EOF
|
@ -0,0 +1,18 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 5
|
||||
|
||||
> CHANGE 13 : 14 @ 16 : 17
|
||||
|
||||
~ protected void keyTyped(char parChar1, int parInt1) {
|
||||
|
||||
> CHANGE 30 : 31 @ 33 : 34
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,14 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> INSERT 2 : 3 @ 2
|
||||
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 4 @ 3 : 6
|
||||
|
||||
> EOF
|
38
patches/minecraft/net/minecraft/client/gui/GuiSlot.edit.java
Normal file
38
patches/minecraft/net/minecraft/client/gui/GuiSlot.edit.java
Normal file
@ -0,0 +1,38 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> INSERT 2 : 7 @ 2
|
||||
|
||||
+ import net.lax1dude.eaglercraft.v1_8.Mouse;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
|
||||
|
||||
> DELETE 8 @ 3 : 6
|
||||
|
||||
> DELETE 9 @ 7 : 8
|
||||
|
||||
> DELETE 11 @ 10 : 11
|
||||
|
||||
> INSERT 13 : 16 @ 13
|
||||
|
||||
+
|
||||
+ private static final Logger excLogger = LogManager.getLogger("GuiSlotRenderer");
|
||||
+
|
||||
|
||||
> CHANGE 397 : 404 @ 394 : 395
|
||||
|
||||
~ try {
|
||||
~ this.drawSlot(j, mouseXIn, k, l, parInt3, parInt4);
|
||||
~ } catch (Throwable t) {
|
||||
~ excLogger.error(
|
||||
~ "Exception caught rendering a slot of a list on the screen! Game will continue running due to the suspicion that this could be an intentional crash attempt, and therefore it would be inconvenient if the user were to be locked out of this gui due to repeatedly triggering a full crash report");
|
||||
~ excLogger.error(t);
|
||||
~ }
|
||||
|
||||
> EOF
|
@ -0,0 +1,16 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> INSERT 2 : 3 @ 2
|
||||
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 4 @ 3 : 5
|
||||
|
||||
> DELETE 8 @ 9 : 10
|
||||
|
||||
> EOF
|
@ -0,0 +1,47 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 4 : 7 @ 4 : 9
|
||||
|
||||
~
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
|
||||
|
||||
> DELETE 8 @ 10 : 11
|
||||
|
||||
> CHANGE 19 : 20 @ 22 : 23
|
||||
|
||||
~ protected String text = "";
|
||||
|
||||
> INSERT 64 : 76 @ 67
|
||||
|
||||
+ public void updateText(String parString1) {
|
||||
+ if (this.field_175209_y.apply(parString1)) {
|
||||
+ if (parString1.length() > this.maxStringLength) {
|
||||
+ this.text = parString1.substring(0, this.maxStringLength);
|
||||
+ } else {
|
||||
+ this.text = parString1;
|
||||
+ }
|
||||
+
|
||||
+ this.setCursorPosition(cursorPosition);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
|
||||
> CHANGE 429 : 432 @ 420 : 421
|
||||
|
||||
~ GlStateManager.color(0.2F, 0.2F, 1.0F, 1.0F);
|
||||
~ GlStateManager.enableBlend();
|
||||
~ GlStateManager.blendFunc(775, 770);
|
||||
|
||||
> DELETE 433 @ 422 : 424
|
||||
|
||||
> CHANGE 439 : 440 @ 430 : 431
|
||||
|
||||
~ GlStateManager.disableBlend();
|
||||
|
||||
> EOF
|
@ -0,0 +1,18 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> INSERT 4 : 7 @ 5
|
||||
|
||||
+
|
||||
+ import com.google.common.collect.Lists;
|
||||
+
|
||||
|
||||
> DELETE 8 @ 6 : 7
|
||||
|
||||
> EOF
|
@ -0,0 +1,44 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 3 : 4 @ 3 : 9
|
||||
|
||||
~
|
||||
|
||||
> CHANGE 16 : 20 @ 21 : 24
|
||||
|
||||
~ GameSettings.Options.PARTICLES, GameSettings.Options.MIPMAP_LEVELS, GameSettings.Options.BLOCK_ALTERNATIVES,
|
||||
~ GameSettings.Options.ENTITY_SHADOWS, GameSettings.Options.FOG, GameSettings.Options.HUD_FPS,
|
||||
~ GameSettings.Options.HUD_COORDS, GameSettings.Options.HUD_PLAYER, GameSettings.Options.HUD_STATS,
|
||||
~ GameSettings.Options.HUD_WORLD, GameSettings.Options.HUD_24H, GameSettings.Options.CHUNK_FIX };
|
||||
|
||||
> CHANGE 31 : 33 @ 35 : 38
|
||||
|
||||
~ GameSettings.Options[] agamesettings$options = new GameSettings.Options[videoOptions.length];
|
||||
~ int i = 0;
|
||||
|
||||
> CHANGE 34 : 37 @ 39 : 53
|
||||
|
||||
~ for (GameSettings.Options gamesettings$options : videoOptions) {
|
||||
~ agamesettings$options[i] = gamesettings$options;
|
||||
~ ++i;
|
||||
|
||||
> INSERT 39 : 42 @ 55
|
||||
|
||||
+ this.optionsRowList = new GuiOptionsRowList(this.mc, this.width, this.height, 32, this.height - 32, 25,
|
||||
+ agamesettings$options);
|
||||
+
|
||||
|
||||
> CHANGE 49 : 50 @ 62 : 63
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> CHANGE 59 : 60 @ 72 : 73
|
||||
|
||||
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,47 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> DELETE 3 @ 4 : 5
|
||||
|
||||
> CHANGE 6 : 16 @ 8 : 9
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
|
||||
~
|
||||
~ import com.google.common.base.Charsets;
|
||||
~ import com.google.common.collect.Lists;
|
||||
~
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile;
|
||||
|
||||
> DELETE 18 @ 11 : 14
|
||||
|
||||
> DELETE 19 @ 15 : 16
|
||||
|
||||
> DELETE 23 @ 20 : 23
|
||||
|
||||
> CHANGE 51 : 52 @ 51 : 52
|
||||
|
||||
~ protected void keyTyped(char parChar1, int parInt1) {
|
||||
|
||||
> CHANGE 80 : 81 @ 80 : 81
|
||||
|
||||
~ EaglercraftRandom random = new EaglercraftRandom(8124371L);
|
||||
|
||||
> CHANGE 85 : 86 @ 85 : 86
|
||||
|
||||
~ for (s = s.replaceAll("PLAYERNAME", EaglerProfile.getName()); s
|
||||
|
||||
> CHANGE 108 : 109 @ 108 : 109
|
||||
|
||||
~ s = s.replaceAll("PLAYERNAME", EaglerProfile.getName());
|
||||
|
||||
> EOF
|
@ -0,0 +1,40 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 4
|
||||
|
||||
> CHANGE 3 : 6 @ 5 : 9
|
||||
|
||||
~
|
||||
~ import com.google.common.collect.Lists;
|
||||
~
|
||||
|
||||
> INSERT 17 : 18 @ 20
|
||||
|
||||
+ private boolean opaqueBackground = false;
|
||||
|
||||
> CHANGE 46 : 47 @ 48 : 49
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> CHANGE 51 : 56 @ 53 : 54
|
||||
|
||||
~ if (opaqueBackground) {
|
||||
~ this.drawBackground(0);
|
||||
~ } else {
|
||||
~ this.drawDefaultBackground();
|
||||
~ }
|
||||
|
||||
> INSERT 85 : 90 @ 83
|
||||
|
||||
+
|
||||
+ public GuiYesNo withOpaqueBackground() {
|
||||
+ opaqueBackground = true;
|
||||
+ return this;
|
||||
+ }
|
||||
|
||||
> EOF
|
@ -0,0 +1,38 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> INSERT 3 : 8 @ 4
|
||||
|
||||
+
|
||||
+ import com.google.common.collect.Maps;
|
||||
+
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
|
||||
|
||||
> DELETE 9 @ 5 : 6
|
||||
|
||||
> DELETE 10 @ 7 : 8
|
||||
|
||||
> INSERT 75 : 76 @ 73
|
||||
|
||||
+ int c;
|
||||
|
||||
> CHANGE 77 : 78 @ 74 : 75
|
||||
|
||||
~ c = (i + i / 128 & 1) * 8 + 16 << 24;
|
||||
|
||||
> CHANGE 79 : 80 @ 76 : 77
|
||||
|
||||
~ c = MapColor.mapColorArray[j / 4].func_151643_b(j & 3);
|
||||
|
||||
> INSERT 81 : 82 @ 78
|
||||
|
||||
+ this.mapTextureData[i] = (c & 0xFF00FF00) | ((c & 0x00FF0000) >> 16) | ((c & 0x000000FF) << 16);
|
||||
|
||||
> EOF
|
@ -0,0 +1,14 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 7
|
||||
|
||||
> CHANGE 41 : 42 @ 46 : 47
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,76 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 10
|
||||
|
||||
> CHANGE 3 : 7 @ 11 : 13
|
||||
|
||||
~
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 8 @ 14 : 18
|
||||
|
||||
> CHANGE 9 : 10 @ 19 : 22
|
||||
|
||||
~ import net.minecraft.client.resources.I18n;
|
||||
|
||||
> DELETE 12 @ 24 : 27
|
||||
|
||||
> DELETE 15 @ 30 : 32
|
||||
|
||||
> DELETE 21 @ 38 : 39
|
||||
|
||||
> DELETE 22 @ 40 : 41
|
||||
|
||||
> DELETE 28 @ 47 : 49
|
||||
|
||||
> DELETE 36 @ 57 : 74
|
||||
|
||||
> CHANGE 44 : 54 @ 82 : 85
|
||||
|
||||
~ for (int k1 = 0; k1 < 2; ++k1) {
|
||||
~ if (k1 < list.size()) {
|
||||
~ this.mc.fontRendererObj.drawString((String) list.get(k1), j + 32 + 3,
|
||||
~ k + 12 + this.mc.fontRendererObj.FONT_HEIGHT * k1, 8421504);
|
||||
~ } else if (k1 == 1) {
|
||||
~ this.mc.fontRendererObj.drawString(
|
||||
~ this.field_148301_e.hideAddress ? I18n.format("selectServer.hiddenAddress", new Object[0])
|
||||
~ : this.field_148301_e.serverIP,
|
||||
~ j + 32 + 3, k + 12 + this.mc.fontRendererObj.FONT_HEIGHT * k1 + k1, 0x444444);
|
||||
~ }
|
||||
|
||||
> CHANGE 103 : 107 @ 134 : 139
|
||||
|
||||
~ if (this.mc.gameSettings.touchscreen || flag) {
|
||||
~ GlStateManager.enableShaderBlendAdd();
|
||||
~ GlStateManager.setShaderBlendSrc(0.6f, 0.6f, 0.6f, 1.0f);
|
||||
~ GlStateManager.setShaderBlendAdd(0.3f, 0.3f, 0.3f, 0.0f);
|
||||
|
||||
> CHANGE 108 : 110 @ 140 : 143
|
||||
|
||||
~ if (field_148301_e.iconTextureObject != null) {
|
||||
~ this.func_178012_a(j, k, field_148301_e.iconResourceLocation);
|
||||
|
||||
> INSERT 113 : 116 @ 146
|
||||
|
||||
+ if (this.mc.gameSettings.touchscreen || flag) {
|
||||
+ GlStateManager.disableShaderBlendAdd();
|
||||
+ }
|
||||
|
||||
> CHANGE 127 : 128 @ 157 : 158
|
||||
|
||||
~ // Gui.drawRect(j, k, j + 32, k + 32, -1601138544);
|
||||
|
||||
> INSERT 161 : 162 @ 191
|
||||
|
||||
+ GlStateManager.blendFunc(770, 771);
|
||||
|
||||
> DELETE 170 @ 199 : 238
|
||||
|
||||
> EOF
|
@ -0,0 +1,32 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> INSERT 3 : 6 @ 4
|
||||
|
||||
+
|
||||
+ import com.google.common.collect.Lists;
|
||||
+
|
||||
|
||||
> DELETE 7 @ 5 : 10
|
||||
|
||||
> DELETE 8 @ 11 : 12
|
||||
|
||||
> DELETE 12 @ 16 : 18
|
||||
|
||||
> CHANGE 21 : 22 @ 27 : 38
|
||||
|
||||
~ return (GuiListExtended.IGuiListEntry) this.field_148198_l.get(i);
|
||||
|
||||
> CHANGE 25 : 26 @ 41 : 42
|
||||
|
||||
~ return this.field_148198_l.size();
|
||||
|
||||
> DELETE 49 @ 65 : 74
|
||||
|
||||
> EOF
|
@ -0,0 +1,49 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> INSERT 2 : 3 @ 2
|
||||
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 6 @ 5 : 6
|
||||
|
||||
> INSERT 120 : 152 @ 120
|
||||
|
||||
+ public int getHeight() {
|
||||
+ if (this.theAchievement != null && this.notificationTime != 0L && Minecraft.getMinecraft().thePlayer != null) {
|
||||
+ double d0 = (double) (Minecraft.getSystemTime() - this.notificationTime) / 3000.0D;
|
||||
+ if (!this.permanentNotification) {
|
||||
+ if (d0 < 0.0D || d0 > 1.0D) {
|
||||
+ this.notificationTime = 0L;
|
||||
+ return 0;
|
||||
+ }
|
||||
+ } else if (d0 > 0.5D) {
|
||||
+ d0 = 0.5D;
|
||||
+ }
|
||||
+
|
||||
+ double d1 = d0 * 2.0D;
|
||||
+ if (d1 > 1.0D) {
|
||||
+ d1 = 2.0D - d1;
|
||||
+ }
|
||||
+
|
||||
+ d1 = d1 * 4.0D;
|
||||
+ d1 = 1.0D - d1;
|
||||
+ if (d1 < 0.0D) {
|
||||
+ d1 = 0.0D;
|
||||
+ }
|
||||
+
|
||||
+ d1 = d1 * d1;
|
||||
+ d1 = d1 * d1;
|
||||
+
|
||||
+ return 32 - (int) (d1 * 32.0D);
|
||||
+ } else {
|
||||
+ return 0;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
|
||||
> EOF
|
@ -0,0 +1,65 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 7 @ 2 : 4
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom;
|
||||
~
|
||||
~ import net.lax1dude.eaglercraft.v1_8.Mouse;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 13 @ 10 : 11
|
||||
|
||||
> DELETE 14 @ 12 : 13
|
||||
|
||||
> DELETE 24 @ 23 : 24
|
||||
|
||||
> CHANGE 67 : 68 @ 67 : 68
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> CHANGE 76 : 78 @ 76 : 84
|
||||
|
||||
~ protected int getCloseKey() {
|
||||
~ return this.mc.gameSettings.keyBindInventory.getKeyCode();
|
||||
|
||||
> CHANGE 154 : 155 @ 160 : 161
|
||||
|
||||
~ GlStateManager.disableLighting();
|
||||
|
||||
> INSERT 216 : 220 @ 222
|
||||
|
||||
+ GlStateManager.enableDepth();
|
||||
+ GlStateManager.clearDepth(0.0f);
|
||||
+ GlStateManager.clear(256);
|
||||
+ GlStateManager.clearDepth(1.0f);
|
||||
|
||||
> CHANGE 237 : 238 @ 239 : 240
|
||||
|
||||
~ EaglercraftRandom random = new EaglercraftRandom();
|
||||
|
||||
> CHANGE 246 : 248 @ 248 : 249
|
||||
|
||||
~ random.setSeed(
|
||||
~ (long) (this.mc.getSession().getProfile().getId().hashCode() + k1 + l2 + (l1 + k2) * 16));
|
||||
|
||||
> CHANGE 249 : 250 @ 250 : 251
|
||||
|
||||
~ EaglerTextureAtlasSprite textureatlassprite = this.func_175371_a(Blocks.sand);
|
||||
|
||||
> DELETE 276 @ 277 : 278
|
||||
|
||||
> CHANGE 434 : 435 @ 436 : 437
|
||||
|
||||
~ GlStateManager.disableBlend();
|
||||
|
||||
> CHANGE 438 : 439 @ 440 : 441
|
||||
|
||||
~ private EaglerTextureAtlasSprite func_175371_a(Block parBlock) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,29 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> INSERT 6 : 12 @ 7
|
||||
|
||||
+
|
||||
+ import com.google.common.collect.Lists;
|
||||
+
|
||||
+ import net.lax1dude.eaglercraft.v1_8.Mouse;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
|
||||
|
||||
> DELETE 18 @ 13 : 14
|
||||
|
||||
> DELETE 20 @ 16 : 17
|
||||
|
||||
> DELETE 31 @ 28 : 29
|
||||
|
||||
> CHANGE 102 : 103 @ 100 : 101
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,12 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> INSERT 3 : 4 @ 3
|
||||
|
||||
+
|
||||
|
||||
> EOF
|
@ -0,0 +1,23 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 6 @ 2 : 4
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.netty.Unpooled;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 9 @ 7 : 9
|
||||
|
||||
> DELETE 21 @ 21 : 23
|
||||
|
||||
> CHANGE 101 : 102 @ 103 : 104
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,12 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 3 @ 2 : 4
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> EOF
|
@ -0,0 +1,14 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> INSERT 2 : 3 @ 2
|
||||
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 4 @ 3 : 5
|
||||
|
||||
> EOF
|
@ -0,0 +1,63 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 4
|
||||
|
||||
> INSERT 3 : 11 @ 5
|
||||
|
||||
+
|
||||
+ import com.google.common.collect.Sets;
|
||||
+
|
||||
+ import net.lax1dude.eaglercraft.v1_8.Keyboard;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.internal.KeyboardConstants;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.minecraft.EaglerTextureAtlasSprite;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
|
||||
|
||||
> DELETE 13 @ 7 : 9
|
||||
|
||||
> DELETE 14 @ 10 : 11
|
||||
|
||||
> DELETE 22 @ 19 : 20
|
||||
|
||||
> CHANGE 210 : 211 @ 208 : 209
|
||||
|
||||
~ EaglerTextureAtlasSprite textureatlassprite = this.mc.getTextureMapBlocks().getAtlasSprite(s1);
|
||||
|
||||
> CHANGE 267 : 268 @ 265 : 266
|
||||
|
||||
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
|
||||
|
||||
> CHANGE 503 : 507 @ 501 : 503
|
||||
|
||||
~ protected void keyTyped(char parChar1, int parInt1) {
|
||||
~ if (parInt1 == this.mc.gameSettings.keyBindClose.getKeyCode()
|
||||
~ || parInt1 == this.mc.gameSettings.keyBindInventory.getKeyCode()
|
||||
~ || (parInt1 == 1 && this.mc.gameSettings.keyBindClose.getKeyCode() == 0)) {
|
||||
|
||||
> CHANGE 508 : 510 @ 504 : 512
|
||||
|
||||
~ if (this.mc.currentScreen == null) {
|
||||
~ this.mc.setIngameFocus();
|
||||
|
||||
> INSERT 511 : 522 @ 513
|
||||
|
||||
+ } else if (parInt1 == 1) {
|
||||
+ showingCloseKey = System.currentTimeMillis();
|
||||
+ } else {
|
||||
+ this.checkHotbarKeys(parInt1);
|
||||
+ if (this.theSlot != null && this.theSlot.getHasStack()) {
|
||||
+ if (parInt1 == this.mc.gameSettings.keyBindPickBlock.getKeyCode()) {
|
||||
+ this.handleMouseClick(this.theSlot, this.theSlot.slotNumber, 0, 3);
|
||||
+ } else if (parInt1 == this.mc.gameSettings.keyBindDrop.getKeyCode()) {
|
||||
+ this.handleMouseClick(this.theSlot, this.theSlot.slotNumber, isCtrlKeyDown() ? 1 : 0, 4);
|
||||
+ }
|
||||
+ }
|
||||
|
||||
> DELETE 523 @ 514 : 515
|
||||
|
||||
> EOF
|
@ -0,0 +1,49 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> INSERT 6 : 12 @ 7
|
||||
|
||||
+
|
||||
+ import com.google.common.collect.Lists;
|
||||
+
|
||||
+ import net.lax1dude.eaglercraft.v1_8.Keyboard;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.Mouse;
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 16 @ 11 : 14
|
||||
|
||||
> DELETE 35 @ 33 : 35
|
||||
|
||||
> CHANGE 221 : 222 @ 221 : 222
|
||||
|
||||
~ protected void keyTyped(char parChar1, int parInt1) {
|
||||
|
||||
> CHANGE 235 : 238 @ 235 : 236
|
||||
|
||||
~ if (parInt1 == getCloseKey()) {
|
||||
~ mc.displayGuiScreen(null);
|
||||
~ } else if (!this.checkHotbarKeys(parInt1)) {
|
||||
|
||||
> INSERT 248 : 253 @ 246
|
||||
|
||||
+ protected int getCloseKey() {
|
||||
+ return selectedTabIndex != CreativeTabs.tabAllSearch.getTabIndex() ? super.getCloseKey()
|
||||
+ : mc.gameSettings.keyBindClose.getKeyCode();
|
||||
+ }
|
||||
+
|
||||
|
||||
> CHANGE 302 : 303 @ 295 : 296
|
||||
|
||||
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
|
||||
|
||||
> CHANGE 625 : 626 @ 618 : 619
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,12 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 3 @ 2 : 4
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> EOF
|
@ -0,0 +1,12 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 3 @ 2 : 4
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> EOF
|
@ -0,0 +1,25 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 4 @ 2 : 3
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.Keyboard;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 8 @ 7 : 8
|
||||
|
||||
> DELETE 15 @ 15 : 16
|
||||
|
||||
> CHANGE 49 : 50 @ 50 : 51
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> CHANGE 59 : 60 @ 60 : 61
|
||||
|
||||
~ protected void keyTyped(char parChar1, int parInt1) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,12 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 3 @ 2 : 4
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> EOF
|
@ -0,0 +1,29 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 4 @ 2 : 3
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.OpenGlHelper;
|
||||
|
||||
> DELETE 8 @ 7 : 9
|
||||
|
||||
> DELETE 9 @ 10 : 11
|
||||
|
||||
> INSERT 58 : 59 @ 60
|
||||
|
||||
+ GlStateManager.enableDepth();
|
||||
|
||||
> INSERT 61 : 62 @ 62
|
||||
|
||||
+ GlStateManager.disableDepth();
|
||||
|
||||
> CHANGE 104 : 105 @ 104 : 105
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> EOF
|
@ -0,0 +1,14 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> INSERT 2 : 3 @ 2
|
||||
|
||||
+ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 4 @ 3 : 6
|
||||
|
||||
> EOF
|
@ -0,0 +1,16 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> CHANGE 3 : 6 @ 4 : 6
|
||||
|
||||
~
|
||||
~ import com.google.common.collect.Lists;
|
||||
~
|
||||
|
||||
> EOF
|
@ -0,0 +1,10 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 3
|
||||
|
||||
> EOF
|
@ -0,0 +1,10 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> DELETE 2 @ 2 : 4
|
||||
|
||||
> EOF
|
@ -0,0 +1,12 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 3 : 4 @ 3 : 4
|
||||
|
||||
~
|
||||
|
||||
> EOF
|
@ -0,0 +1,24 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2022 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
|
||||
> CHANGE 2 : 4 @ 2 : 3
|
||||
|
||||
~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
|
||||
|
||||
> DELETE 7 @ 6 : 9
|
||||
|
||||
> DELETE 14 @ 16 : 17
|
||||
|
||||
> DELETE 17 @ 20 : 22
|
||||
|
||||
> CHANGE 28 : 30 @ 33 : 34
|
||||
|
||||
~ Minecraft.getMinecraft().getTextureManager().bindTexture(
|
||||
~ Minecraft.getMinecraft().getNetHandler().getSkinCache().getSkin(profile).getResourceLocation());
|
||||
|
||||
> EOF
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user