mirror of
https://github.com/Eaglercraft-Archive/Eaglercraftx-1.8.8-src.git
synced 2025-06-27 18:38:14 -05:00
Update #22 - Singleplayer and shared worlds, shader fixes
This commit is contained in:
lax1dude
@ -1,6 +1,6 @@
|
||||
|
||||
# Eagler Context Redacted Diff
|
||||
# Copyright (c) 2023 lax1dude. All rights reserved.
|
||||
# Copyright (c) 2024 lax1dude. All rights reserved.
|
||||
|
||||
# Version: 1.0
|
||||
# Author: lax1dude
|
||||
@ -10,34 +10,85 @@
|
||||
+ import java.io.IOException;
|
||||
+
|
||||
|
||||
> CHANGE 2 : 6 @ 2 : 15
|
||||
> CHANGE 2 : 16 @ 2 : 15
|
||||
|
||||
~
|
||||
~ import net.lax1dude.eaglercraft.v1_8.EaglerXBungeeVersion;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.Keyboard;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.Mouse;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.internal.EnumCursorType;
|
||||
~ 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.sp.gui.GuiNetworkSettingsButton;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.sp.gui.GuiScreenConnectOption;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.sp.gui.GuiScreenLANConnecting;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.sp.lan.LANServerList;
|
||||
~ import net.lax1dude.eaglercraft.v1_8.sp.relay.RelayServer;
|
||||
~ import net.minecraft.client.audio.PositionedSoundRecord;
|
||||
|
||||
> DELETE 3 @ 3 : 5
|
||||
|
||||
> DELETE 1 @ 1 : 4
|
||||
> CHANGE 1 : 3 @ 1 : 4
|
||||
|
||||
~ import net.minecraft.util.EnumChatFormatting;
|
||||
~ import net.minecraft.util.ResourceLocation;
|
||||
|
||||
> DELETE 3 @ 3 : 4
|
||||
|
||||
> DELETE 12 @ 12 : 14
|
||||
> INSERT 11 : 16 @ 11
|
||||
|
||||
+
|
||||
+ public ServerData getSelectedServer() {
|
||||
+ return selectedServer;
|
||||
+ }
|
||||
+
|
||||
|
||||
> DELETE 1 @ 1 : 3
|
||||
|
||||
> INSERT 1 : 2 @ 1
|
||||
|
||||
+ private static long lastRefreshCommit = 0l;
|
||||
|
||||
> CHANGE 10 : 11 @ 10 : 11
|
||||
> INSERT 1 : 7 @ 1
|
||||
|
||||
+ private static LANServerList lanServerList = null;
|
||||
+
|
||||
+ public int ticksOpened;
|
||||
+
|
||||
+ private final GuiNetworkSettingsButton relaysButton;
|
||||
+
|
||||
|
||||
> INSERT 2 : 6 @ 2
|
||||
|
||||
+ this.relaysButton = new GuiNetworkSettingsButton(this);
|
||||
+ if (lanServerList != null) {
|
||||
+ lanServerList.forceRefresh();
|
||||
+ }
|
||||
|
||||
> CHANGE 7 : 8 @ 7 : 8
|
||||
|
||||
~ this.savedServerList = ServerList.getServerList();
|
||||
|
||||
> DELETE 1 @ 1 : 10
|
||||
|
||||
> CHANGE 35 : 36 @ 35 : 42
|
||||
> INSERT 3 : 8 @ 3
|
||||
|
||||
+ if (lanServerList == null) {
|
||||
+ lanServerList = new LANServerList();
|
||||
+ } else {
|
||||
+ lanServerList.forceRefresh();
|
||||
+ }
|
||||
|
||||
> CHANGE 32 : 35 @ 32 : 36
|
||||
|
||||
~ this.savedServerList.updateServerPing();
|
||||
~ if (lanServerList.update()) {
|
||||
~ this.selectServer(-1);
|
||||
|
||||
> CHANGE 1 : 2 @ 1 : 3
|
||||
|
||||
~ ++ticksOpened;
|
||||
|
||||
> DELETE 4 @ 4 : 10
|
||||
|
||||
@ -45,7 +96,20 @@
|
||||
|
||||
~ protected void actionPerformed(GuiButton parGuiButton) {
|
||||
|
||||
> CHANGE 36 : 41 @ 36 : 37
|
||||
> CHANGE 19 : 21 @ 19 : 22
|
||||
|
||||
~ this.selectedServer = new ServerData(I18n.format("selectServer.defaultName", new Object[0]), "", false);
|
||||
~ this.mc.displayGuiScreen(new GuiScreenConnectOption(this));
|
||||
|
||||
> CHANGE 8 : 13 @ 8 : 11
|
||||
|
||||
~ if (serverdata != null) {
|
||||
~ this.selectedServer = new ServerData(serverdata.serverName, serverdata.serverIP, false);
|
||||
~ this.selectedServer.copyFrom(serverdata);
|
||||
~ this.mc.displayGuiScreen(new GuiScreenAddServer(this, this.selectedServer));
|
||||
~ }
|
||||
|
||||
> CHANGE 3 : 8 @ 3 : 4
|
||||
|
||||
~ long millis = System.currentTimeMillis();
|
||||
~ if (millis - lastRefreshCommit > 700l) {
|
||||
@ -95,20 +159,97 @@
|
||||
|
||||
> DELETE 2 @ 2 : 11
|
||||
|
||||
> DELETE 33 @ 33 : 38
|
||||
> INSERT 25 : 28 @ 25
|
||||
|
||||
> DELETE 1 @ 1 : 2
|
||||
+ relaysButton.drawScreen(i, j);
|
||||
+ drawPluginDownloadLink(i, j);
|
||||
+ }
|
||||
|
||||
> CHANGE 13 : 14 @ 13 : 15
|
||||
> INSERT 1 : 17 @ 1
|
||||
|
||||
+ private void drawPluginDownloadLink(int xx, int yy) {
|
||||
+ GlStateManager.pushMatrix();
|
||||
+ GlStateManager.scale(0.75f, 0.75f, 0.75f);
|
||||
+ GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
|
||||
+
|
||||
+ String text = EaglerXBungeeVersion.getPluginButton();
|
||||
+ int w = mc.fontRendererObj.getStringWidth(text);
|
||||
+ boolean hover = xx > width - 5 - (w + 5) * 3 / 4 && yy > 1 && xx < width - 2 && yy < 12;
|
||||
+ if (hover) {
|
||||
+ Mouse.showCursor(EnumCursorType.HAND);
|
||||
+ }
|
||||
+
|
||||
+ drawString(mc.fontRendererObj, EnumChatFormatting.UNDERLINE + text, (width - 1) * 4 / 3 - w - 5, 5,
|
||||
+ hover ? 0xFFEEEE22 : 0xFFCCCCCC);
|
||||
+
|
||||
+ GlStateManager.popMatrix();
|
||||
|
||||
> CHANGE 3 : 12 @ 3 : 13
|
||||
|
||||
~ if (this.serverListSelector.func_148193_k() < this.serverListSelector.getOrigSize()) {
|
||||
~ GuiListExtended.IGuiListEntry guilistextended$iguilistentry = this.serverListSelector.func_148193_k() < 0
|
||||
~ ? null
|
||||
~ : this.serverListSelector.getListEntry(this.serverListSelector.func_148193_k());
|
||||
~ if (guilistextended$iguilistentry instanceof ServerListEntryNormal) {
|
||||
~ this.connectToServer(((ServerListEntryNormal) guilistextended$iguilistentry).getServerData());
|
||||
~ }
|
||||
~ } else {
|
||||
~ int par1 = this.serverListSelector.func_148193_k() - this.serverListSelector.getOrigSize();
|
||||
|
||||
> INSERT 1 : 7 @ 1
|
||||
|
||||
+ if (par1 < lanServerList.countServers()) {
|
||||
+ LANServerList.LanServer var2 = lanServerList.getServer(par1);
|
||||
+ connectToLAN("Connecting to '" + var2.getLanServerMotd() + "'...", var2.getLanServerCode(),
|
||||
+ var2.getLanServerRelay());
|
||||
+ }
|
||||
+ }
|
||||
|
||||
> INSERT 6 : 11 @ 6
|
||||
|
||||
+ private void connectToLAN(String text, String code, RelayServer uri) {
|
||||
+ this.mc.loadingScreen.resetProgressAndMessage(text);
|
||||
+ this.mc.displayGuiScreen(new GuiScreenLANConnecting(this, code, uri));
|
||||
+ }
|
||||
+
|
||||
|
||||
> CHANGE 7 : 8 @ 7 : 9
|
||||
|
||||
~ if (guilistextended$iguilistentry != null) {
|
||||
|
||||
> DELETE 6 @ 6 : 7
|
||||
> CHANGE 1 : 3 @ 1 : 2
|
||||
|
||||
~ if (guilistextended$iguilistentry instanceof ServerListEntryNormal
|
||||
~ && ((ServerListEntryNormal) guilistextended$iguilistentry).getServerData() != null) {
|
||||
|
||||
> DELETE 4 @ 4 : 5
|
||||
|
||||
> DELETE 2 @ 2 : 6
|
||||
|
||||
> CHANGE 4 : 5 @ 4 : 5
|
||||
> CHANGE 4 : 6 @ 4 : 5
|
||||
|
||||
~ protected void mouseClicked(int parInt1, int parInt2, int parInt3) {
|
||||
~ relaysButton.mouseClicked(parInt1, parInt2, parInt3);
|
||||
|
||||
> INSERT 2 : 9 @ 2
|
||||
|
||||
+ String text = EaglerXBungeeVersion.getPluginButton();
|
||||
+ int w = mc.fontRendererObj.getStringWidth(text);
|
||||
+ if (parInt1 > width - 5 - (w + 5) * 3 / 4 && parInt2 > 1 && parInt1 < width - 2 && parInt2 < 12) {
|
||||
+ this.mc.getSoundHandler()
|
||||
+ .playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F));
|
||||
+ EaglerXBungeeVersion.startPluginDownload();
|
||||
+ }
|
||||
|
||||
> INSERT 11 : 15 @ 11
|
||||
|
||||
+ static LANServerList getLanServerList() {
|
||||
+ return lanServerList;
|
||||
+ }
|
||||
+
|
||||
|
||||
> CHANGE 5 : 6 @ 5 : 6
|
||||
|
||||
~ return parInt1 < this.savedServerList.countServers();
|
||||
|
||||
> EOF
|
||||
|
||||
Reference in New Issue
Block a user