start and login

Team-Fruit · Jan 27, 2018 · 898cb60 · 898cb60
1 parent 0f49bde
commit 898cb60
Show file tree

Hide file tree

Showing 19 changed files with 194 additions and 125 deletions.
diff --git a/1.10.2/src/main/java/net/teamfruit/serverobserver/Compat.java b/1.10.2/src/main/java/net/teamfruit/serverobserver/Compat.java
@@ -1,6 +1,7 @@
 package net.teamfruit.serverobserver;
 
 import java.util.List;
+import java.util.concurrent.ThreadPoolExecutor;
 
 import javax.annotation.Nonnull;
 
@@ -12,11 +13,11 @@
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiDisconnected;
-import net.minecraft.client.gui.GuiListExtended.IGuiListEntry;
 import net.minecraft.client.gui.GuiMultiplayer;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.ServerListEntryNormal;
 import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.client.multiplayer.ServerList;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundCategory;
@@ -77,6 +78,11 @@ public void setPinged(final ServerData serverData, final boolean pinged) {
 		serverData.pinged = pinged;
 	}
 
+	@Override
+	public void ping(final GuiMultiplayer mpgui, final ServerData serverData) throws Exception {
+		mpgui.getOldServerPinger().ping(serverData);
+	}
+
 	@Override
 	public String getDefaultSound() {
 		return SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP.getSoundName().toString();
@@ -92,29 +98,24 @@ public void selectServer(final GuiMultiplayer mpgui, final int index) {
 		mpgui.selectServer(index);
 	}
 
-	@Override
-	public int countServers(final GuiMultiplayer mpgui) {
-		return mpgui.getServerList().countServers();
-	}
-
 	@Override
 	public ServerData getServerData(final GuiMultiplayer mpgui, final int index) {
 		return mpgui.getServerList().getServerData(index);
 	}
 
 	@Override
-	public IGuiListEntry getListEntry(final GuiMultiplayer mpgui, final int index) {
-		return mpgui.serverListSelector.getListEntry(index);
+	public ServerList getServerList(final GuiMultiplayer mpgui) {
+		return mpgui.getServerList();
 	}
 
 	@Override
-	public ServerData getServerData(final ServerListEntryNormal entry) {
-		return entry.getServerData();
+	public GuiButton createSkeletonButton(final int buttonId, final int x, final int y, final int widthIn, final int heightIn, final String buttonText, final SkeletonButtonDrawInside inside) {
+		return new SkeletonButton(this, buttonId, x, y, widthIn, heightIn, buttonText, inside);
 	}
 
 	@Override
-	public GuiButton createSkeletonButton(final int buttonId, final int x, final int y, final int widthIn, final int heightIn, final String buttonText, final SkeletonButtonDrawInside inside) {
-		return new SkeletonButton(this, buttonId, x, y, widthIn, heightIn, buttonText, inside);
+	public ThreadPoolExecutor getThreadPool() {
+		return ServerListEntryNormal.EXECUTOR;
 	}
 
 	public static class SkeletonButton extends GuiButton {

diff --git a/1.10.2/src/main/resources/META-INF/serverobserver_at.cfg b/1.10.2/src/main/resources/META-INF/serverobserver_at.cfg
@@ -1,4 +1,5 @@
 public net.minecraft.client.gui.GuiMultiplayer field_146803_h # serverListSelector
 public net.minecraft.client.gui.GuiDisconnected field_175353_i # textHeight
 public net.minecraft.client.gui.GuiDisconnected field_146307_h # parentScreen
-public net.minecraft.client.gui.GuiMultiplayer func_146791_a(Lnet/minecraft/client/multiplayer/ServerData;)V # connectToServer
+public net.minecraft.client.gui.GuiMultiplayer func_146791_a(Lnet/minecraft/client/multiplayer/ServerData;)V # connectToServer
+public net.minecraft.client.gui.ServerListEntryNormal field_148302_b # threadPool
diff --git a/1.11.2/src/main/java/net/teamfruit/serverobserver/Compat.java b/1.11.2/src/main/java/net/teamfruit/serverobserver/Compat.java
@@ -1,6 +1,7 @@
 package net.teamfruit.serverobserver;
 
 import java.util.List;
+import java.util.concurrent.ThreadPoolExecutor;
 
 import javax.annotation.Nonnull;
 
@@ -12,11 +13,11 @@
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiDisconnected;
-import net.minecraft.client.gui.GuiListExtended.IGuiListEntry;
 import net.minecraft.client.gui.GuiMultiplayer;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.ServerListEntryNormal;
 import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.client.multiplayer.ServerList;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundCategory;
@@ -77,6 +78,11 @@ public void setPinged(final ServerData serverData, final boolean pinged) {
 		serverData.pinged = pinged;
 	}
 
+	@Override
+	public void ping(final GuiMultiplayer mpgui, final ServerData serverData) throws Exception {
+		mpgui.getOldServerPinger().ping(serverData);
+	}
+
 	@Override
 	public String getDefaultSound() {
 		return SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP.getSoundName().toString();
@@ -92,29 +98,24 @@ public void selectServer(final GuiMultiplayer mpgui, final int index) {
 		mpgui.selectServer(index);
 	}
 
-	@Override
-	public int countServers(final GuiMultiplayer mpgui) {
-		return mpgui.getServerList().countServers();
-	}
-
 	@Override
 	public ServerData getServerData(final GuiMultiplayer mpgui, final int index) {
 		return mpgui.getServerList().getServerData(index);
 	}
 
 	@Override
-	public IGuiListEntry getListEntry(final GuiMultiplayer mpgui, final int index) {
-		return mpgui.serverListSelector.getListEntry(index);
+	public ServerList getServerList(final GuiMultiplayer mpgui) {
+		return mpgui.getServerList();
 	}
 
 	@Override
-	public ServerData getServerData(final ServerListEntryNormal entry) {
-		return entry.getServerData();
+	public GuiButton createSkeletonButton(final int buttonId, final int x, final int y, final int widthIn, final int heightIn, final String buttonText, final SkeletonButtonDrawInside inside) {
+		return new SkeletonButton(this, buttonId, x, y, widthIn, heightIn, buttonText, inside);
 	}
 
 	@Override
-	public GuiButton createSkeletonButton(final int buttonId, final int x, final int y, final int widthIn, final int heightIn, final String buttonText, final SkeletonButtonDrawInside inside) {
-		return new SkeletonButton(this, buttonId, x, y, widthIn, heightIn, buttonText, inside);
+	public ThreadPoolExecutor getThreadPool() {
+		return ServerListEntryNormal.EXECUTOR;
 	}
 
 	public static class SkeletonButton extends GuiButton {

diff --git a/1.11.2/src/main/resources/META-INF/serverobserver_at.cfg b/1.11.2/src/main/resources/META-INF/serverobserver_at.cfg
@@ -1,4 +1,5 @@
 public net.minecraft.client.gui.GuiMultiplayer field_146803_h # serverListSelector
 public net.minecraft.client.gui.GuiDisconnected field_175353_i # textHeight
 public net.minecraft.client.gui.GuiDisconnected field_146307_h # parentScreen
-public net.minecraft.client.gui.GuiMultiplayer func_146791_a(Lnet/minecraft/client/multiplayer/ServerData;)V # connectToServer
+public net.minecraft.client.gui.GuiMultiplayer func_146791_a(Lnet/minecraft/client/multiplayer/ServerData;)V # connectToServer
+public net.minecraft.client.gui.ServerListEntryNormal field_148302_b # threadPool
diff --git a/1.12.2/src/main/java/net/teamfruit/serverobserver/Compat.java b/1.12.2/src/main/java/net/teamfruit/serverobserver/Compat.java
@@ -1,6 +1,7 @@
 package net.teamfruit.serverobserver;
 
 import java.util.List;
+import java.util.concurrent.ThreadPoolExecutor;
 
 import javax.annotation.Nonnull;
 
@@ -12,11 +13,11 @@
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiDisconnected;
-import net.minecraft.client.gui.GuiListExtended.IGuiListEntry;
 import net.minecraft.client.gui.GuiMultiplayer;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.ServerListEntryNormal;
 import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.client.multiplayer.ServerList;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundCategory;
@@ -77,6 +78,11 @@ public void setPinged(final ServerData serverData, final boolean pinged) {
 		serverData.pinged = pinged;
 	}
 
+	@Override
+	public void ping(final GuiMultiplayer mpgui, final ServerData serverData) throws Exception {
+		mpgui.getOldServerPinger().ping(serverData);
+	}
+
 	@Override
 	public String getDefaultSound() {
 		return SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP.getSoundName().toString();
@@ -92,29 +98,24 @@ public void selectServer(final GuiMultiplayer mpgui, final int index) {
 		mpgui.selectServer(index);
 	}
 
-	@Override
-	public int countServers(final GuiMultiplayer mpgui) {
-		return mpgui.getServerList().countServers();
-	}
-
 	@Override
 	public ServerData getServerData(final GuiMultiplayer mpgui, final int index) {
 		return mpgui.getServerList().getServerData(index);
 	}
 
 	@Override
-	public IGuiListEntry getListEntry(final GuiMultiplayer mpgui, final int index) {
-		return mpgui.serverListSelector.getListEntry(index);
+	public ServerList getServerList(final GuiMultiplayer mpgui) {
+		return mpgui.getServerList();
 	}
 
 	@Override
-	public ServerData getServerData(final ServerListEntryNormal entry) {
-		return entry.getServerData();
+	public GuiButton createSkeletonButton(final int buttonId, final int x, final int y, final int widthIn, final int heightIn, final String buttonText, final SkeletonButtonDrawInside inside) {
+		return new SkeletonButton(this, buttonId, x, y, widthIn, heightIn, buttonText, inside);
 	}
 
 	@Override
-	public GuiButton createSkeletonButton(final int buttonId, final int x, final int y, final int widthIn, final int heightIn, final String buttonText, final SkeletonButtonDrawInside inside) {
-		return new SkeletonButton(this, buttonId, x, y, widthIn, heightIn, buttonText, inside);
+	public ThreadPoolExecutor getThreadPool() {
+		return ServerListEntryNormal.EXECUTOR;
 	}
 
 	public static class SkeletonButton extends GuiButton {

diff --git a/1.12.2/src/main/resources/META-INF/serverobserver_at.cfg b/1.12.2/src/main/resources/META-INF/serverobserver_at.cfg
@@ -1,4 +1,5 @@
 public net.minecraft.client.gui.GuiMultiplayer field_146803_h # serverListSelector
 public net.minecraft.client.gui.GuiDisconnected field_175353_i # textHeight
 public net.minecraft.client.gui.GuiDisconnected field_146307_h # parentScreen
-public net.minecraft.client.gui.GuiMultiplayer func_146791_a(Lnet/minecraft/client/multiplayer/ServerData;)V # connectToServer
+public net.minecraft.client.gui.GuiMultiplayer func_146791_a(Lnet/minecraft/client/multiplayer/ServerData;)V # connectToServer
+public net.minecraft.client.gui.ServerListEntryNormal field_148302_b # threadPool
diff --git a/1.7.10/src/main/java/net/teamfruit/serverobserver/Compat.java b/1.7.10/src/main/java/net/teamfruit/serverobserver/Compat.java
@@ -1,6 +1,7 @@
 package net.teamfruit.serverobserver;
 
 import java.util.List;
+import java.util.concurrent.ThreadPoolExecutor;
 
 import javax.annotation.Nonnull;
 
@@ -11,11 +12,11 @@
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiDisconnected;
-import net.minecraft.client.gui.GuiListExtended.IGuiListEntry;
 import net.minecraft.client.gui.GuiMultiplayer;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.ServerListEntryNormal;
 import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.client.multiplayer.ServerList;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.event.GuiScreenEvent.ActionPerformedEvent;
 import net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent;
@@ -75,6 +76,11 @@ public void setPinged(final ServerData serverData, final boolean pinged) {
 		serverData.field_78841_f = pinged;
 	}
 
+	@Override
+	public void ping(final GuiMultiplayer mpgui, final ServerData serverData) throws Exception {
+		mpgui.func_146789_i().func_147224_a(serverData);
+	}
+
 	private final String defaultSound = "minecraft:random.orb";
 
 	@Override
@@ -93,8 +99,8 @@ public void selectServer(final GuiMultiplayer mpgui, final int index) {
 	}
 
 	@Override
-	public int countServers(final GuiMultiplayer mpgui) {
-		return mpgui.func_146795_p().countServers();
+	public ServerList getServerList(final GuiMultiplayer mpgui) {
+		return mpgui.func_146795_p();
 	}
 
 	@Override
@@ -103,13 +109,8 @@ public ServerData getServerData(final GuiMultiplayer mpgui, final int index) {
 	}
 
 	@Override
-	public IGuiListEntry getListEntry(final GuiMultiplayer mpgui, final int index) {
-		return mpgui.field_146803_h.getListEntry(index);
-	}
-
-	@Override
-	public ServerData getServerData(final ServerListEntryNormal entry) {
-		return entry.func_148296_a();
+	public ThreadPoolExecutor getThreadPool() {
+		return ServerListEntryNormal.field_148302_b;
 	}
 
 	@Override

diff --git a/1.7.10/src/main/resources/META-INF/serverobserver_at.cfg b/1.7.10/src/main/resources/META-INF/serverobserver_at.cfg
@@ -1,4 +1,5 @@
 public net.minecraft.client.gui.GuiMultiplayer field_146803_h # serverListSelector
 public net.minecraft.client.gui.GuiDisconnected field_175353_i # textHeight
 public net.minecraft.client.gui.GuiDisconnected field_146307_h # parentScreen
-public net.minecraft.client.gui.GuiMultiplayer func_146791_a(Lnet/minecraft/client/multiplayer/ServerData;)V # connectToServer
+public net.minecraft.client.gui.GuiMultiplayer func_146791_a(Lnet/minecraft/client/multiplayer/ServerData;)V # connectToServer
+public net.minecraft.client.gui.ServerListEntryNormal field_148302_b # threadPool
diff --git a/1.8.9/src/main/java/net/teamfruit/serverobserver/Compat.java b/1.8.9/src/main/java/net/teamfruit/serverobserver/Compat.java
@@ -1,6 +1,7 @@
 package net.teamfruit.serverobserver;
 
 import java.util.List;
+import java.util.concurrent.ThreadPoolExecutor;
 
 import javax.annotation.Nonnull;
 
@@ -11,11 +12,11 @@
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiDisconnected;
-import net.minecraft.client.gui.GuiListExtended.IGuiListEntry;
 import net.minecraft.client.gui.GuiMultiplayer;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.ServerListEntryNormal;
 import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.client.multiplayer.ServerList;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.event.GuiScreenEvent.ActionPerformedEvent;
 import net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent;
@@ -74,6 +75,11 @@ public void setPinged(final ServerData serverData, final boolean pinged) {
 		serverData.field_78841_f = pinged;
 	}
 
+	@Override
+	public void ping(final GuiMultiplayer mpgui, final ServerData serverData) throws Exception {
+		mpgui.getOldServerPinger().ping(serverData);
+	}
+
 	private final String defaultSound = "minecraft:random.orb";
 
 	@Override
@@ -91,29 +97,24 @@ public void selectServer(final GuiMultiplayer mpgui, final int index) {
 		mpgui.selectServer(index);
 	}
 
-	@Override
-	public int countServers(final GuiMultiplayer mpgui) {
-		return mpgui.getServerList().countServers();
-	}
-
 	@Override
 	public ServerData getServerData(final GuiMultiplayer mpgui, final int index) {
 		return mpgui.getServerList().getServerData(index);
 	}
 
 	@Override
-	public IGuiListEntry getListEntry(final GuiMultiplayer mpgui, final int index) {
-		return mpgui.serverListSelector.getListEntry(index);
+	public ServerList getServerList(final GuiMultiplayer mpgui) {
+		return mpgui.getServerList();
 	}
 
 	@Override
-	public ServerData getServerData(final ServerListEntryNormal entry) {
-		return entry.getServerData();
+	public GuiButton createSkeletonButton(final int buttonId, final int x, final int y, final int widthIn, final int heightIn, final String buttonText, final SkeletonButtonDrawInside inside) {
+		return new SkeletonButton(this, buttonId, x, y, widthIn, heightIn, buttonText, inside);
 	}
 
 	@Override
-	public GuiButton createSkeletonButton(final int buttonId, final int x, final int y, final int widthIn, final int heightIn, final String buttonText, final SkeletonButtonDrawInside inside) {
-		return new SkeletonButton(this, buttonId, x, y, widthIn, heightIn, buttonText, inside);
+	public ThreadPoolExecutor getThreadPool() {
+		return ServerListEntryNormal.field_148302_b;
 	}
 
 	public static class SkeletonButton extends GuiButton {

diff --git a/1.8.9/src/main/resources/META-INF/serverobserver_at.cfg b/1.8.9/src/main/resources/META-INF/serverobserver_at.cfg
@@ -1,4 +1,5 @@
 public net.minecraft.client.gui.GuiMultiplayer field_146803_h # serverListSelector
 public net.minecraft.client.gui.GuiDisconnected field_175353_i # textHeight
 public net.minecraft.client.gui.GuiDisconnected field_146307_h # parentScreen
-public net.minecraft.client.gui.GuiMultiplayer func_146791_a(Lnet/minecraft/client/multiplayer/ServerData;)V # connectToServer
+public net.minecraft.client.gui.GuiMultiplayer func_146791_a(Lnet/minecraft/client/multiplayer/ServerData;)V # connectToServer
+public net.minecraft.client.gui.ServerListEntryNormal field_148302_b # threadPool