provider ServerData and RealmsServer in onJoinGame

Mumfrey
1 parent 189931b8
Showing 10 changed files with 92 additions and 33 deletions
.classpath
java/common/com/mumfrey/liteloader/JoinGameListener.java → java/client/com/mumfrey/liteloader/JoinGameListener.java
java/client/com/mumfrey/liteloader/client/PacketEventsClient.java
java/client/com/mumfrey/liteloader/client/transformers/LiteLoaderEventInjectionTransformer.java
java/common/com/mumfrey/liteloader/PacketHandler.java
java/common/com/mumfrey/liteloader/PluginChannelListener.java
java/common/com/mumfrey/liteloader/core/PacketEvents.java
java/common/com/mumfrey/liteloader/core/runtime/Methods.java
java/common/com/mumfrey/liteloader/core/runtime/Obf.java
java/common/com/mumfrey/liteloader/permissions/PermissionsManagerClient.java
@@ -20,5 +20,6 @@
 	<classpathentry exported="true" kind="lib" path="/Client/jars/libraries/org/lwjgl/lwjgl/lwjgl/2.9.1/lwjgl-2.9.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/asm-debug-all-5.0.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="/Client/jars/libraries/org/lwjgl/lwjgl/lwjgl_util/2.9.1/lwjgl_util-2.9.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="/Client/jars/libraries/com/mojang/realms/1.5.5/realms-1.5.5.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
 package com.mumfrey.liteloader;
+import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.network.INetHandler;
 import net.minecraft.network.play.server.S01PacketJoinGame;
+import com.mojang.realmsclient.dto.RealmsServer;
+
 /**
  * Interface for mods which wish to be notified when the player connects to a server (or local game)
@@ -16,6 +19,8 @@ public interface JoinGameListener extends LiteMod
 	 * 
 	 * @param netHandler Net handler
 	 * @param joinGamePacket Join game packet
+	 * @param serverData ServerData object representing the server being connected to
+	 * @param realmsServer If connecting to a realm, a reference to the RealmsServer object
 	 */
-	public abstract void onJoinGame(INetHandler netHandler, S01PacketJoinGame joinGamePacket);
+	public abstract void onJoinGame(INetHandler netHandler, S01PacketJoinGame joinGamePacket, ServerData serverData, RealmsServer realmsServer);
 }
 package com.mumfrey.liteloader.client;
+import net.minecraft.client.Minecraft;
 import net.minecraft.network.INetHandler;
 import net.minecraft.network.Packet;
 import net.minecraft.network.login.INetHandlerLoginClient;
@@ -10,8 +11,11 @@ import net.minecraft.network.play.server.S02PacketChat;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.IChatComponent;
+import com.mojang.realmsclient.RealmsMainScreen;
+import com.mojang.realmsclient.dto.RealmsServer;
 import com.mumfrey.liteloader.ChatFilter;
 import com.mumfrey.liteloader.ChatListener;
+import com.mumfrey.liteloader.JoinGameListener;
 import com.mumfrey.liteloader.PostLoginListener;
 import com.mumfrey.liteloader.PreJoinGameListener;
 import com.mumfrey.liteloader.common.transformers.PacketEventInfo;
@@ -20,9 +24,11 @@ import com.mumfrey.liteloader.core.LiteLoaderEventBroker.ReturnValue;
 import com.mumfrey.liteloader.core.InterfaceRegistrationDelegate;
 import com.mumfrey.liteloader.core.LiteLoader;
 import com.mumfrey.liteloader.core.PacketEvents;
+import com.mumfrey.liteloader.core.event.EventCancellationException;
 import com.mumfrey.liteloader.core.event.HandlerList;
 import com.mumfrey.liteloader.core.event.HandlerList.ReturnLogicOp;
 import com.mumfrey.liteloader.interfaces.FastIterableDeque;
+import com.mumfrey.liteloader.transformers.event.EventInfo;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 /**
@@ -32,6 +38,9 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  */
 public class PacketEventsClient extends PacketEvents
 {
+	private static RealmsServer joiningRealm;
+	
+	private FastIterableDeque<JoinGameListener> joinGameListeners = new HandlerList<JoinGameListener>(JoinGameListener.class);
 	private FastIterableDeque<ChatListener> chatListeners = new HandlerList<ChatListener>(ChatListener.class);
 	private FastIterableDeque<ChatFilter> chatFilters = new HandlerList<ChatFilter>(ChatFilter.class, ReturnLogicOp.AND_BREAK_ON_FALSE);
 	private FastIterableDeque<PreJoinGameListener> preJoinGameListeners = new HandlerList<PreJoinGameListener>(PreJoinGameListener.class, ReturnLogicOp.OR);
@@ -42,11 +51,20 @@ public class PacketEventsClient extends PacketEvents
 	{
 		super.registerInterfaces(delegate);
+		delegate.registerInterface(JoinGameListener.class);
 		delegate.registerInterface(ChatListener.class);
 		delegate.registerInterface(ChatFilter.class);
 		delegate.registerInterface(PreJoinGameListener.class);
 		delegate.registerInterface(PostLoginListener.class);
 	}
+	
+	/**
+	 * @param joinGameListener
+	 */
+	public void registerJoinGameListener(JoinGameListener joinGameListener)
+	{
+		this.joinGameListeners.add(joinGameListener);
+	}
 	/**
 	 * @param chatFilter
@@ -86,28 +104,56 @@ public class PacketEventsClient extends PacketEvents
 	{
 		this.postLoginListeners.add(postLoginListener);
 	}
-	
+
+	public static void onJoinRealm(EventInfo<RealmsMainScreen> e, long arg1, RealmsServer server)
+	{
+		PacketEventsClient.joiningRealm = server;
+	}
+
 	/* (non-Javadoc)
 	 * @see com.mumfrey.liteloader.core.PacketEvents#handlePacket(com.mumfrey.liteloader.common.transformers.PacketEventInfo, net.minecraft.network.INetHandler, net.minecraft.network.play.server.S01PacketJoinGame)
 	 */
 	@Override
 	protected void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, S01PacketJoinGame packet)
 	{
-		if (!(netHandler instanceof INetHandlerPlayClient))
+		if (this.preJoinGame(e, netHandler, packet))
 		{
 			return;
 		}
-		e.cancel();
+		((INetHandlerPlayClient)netHandler).handleJoinGame(packet);
+		super.handlePacket(e, netHandler, packet);
+		
+		this.postJoinGame(e, netHandler, packet);
+	}
-		if (this.preJoinGameListeners.all().onPreJoinGame(netHandler, packet))
+	/**
+	 * @param e
+	 * @param netHandler
+	 * @param packet
+	 * @throws EventCancellationException
+	 */
+	private boolean preJoinGame(PacketEventInfo<Packet> e, INetHandler netHandler, S01PacketJoinGame packet) throws EventCancellationException
+	{
+		if (!(netHandler instanceof INetHandlerPlayClient))
 		{
-			return;
+			return true;
 		}
-		((INetHandlerPlayClient)netHandler).handleJoinGame(packet);
-		
-		super.handlePacket(e, netHandler, packet);
+		e.cancel();
+
+		return this.preJoinGameListeners.all().onPreJoinGame(netHandler, packet);
+	}
+
+	/**
+	 * @param e
+	 * @param netHandler
+	 * @param packet
+	 */
+	private void postJoinGame(PacketEventInfo<Packet> e, INetHandler netHandler, S01PacketJoinGame packet)
+	{
+		this.joinGameListeners.all().onJoinGame(netHandler, packet, Minecraft.getMinecraft().getCurrentServerData(), PacketEventsClient.joiningRealm);
+		PacketEventsClient.joiningRealm = null;
 		ClientPluginChannels clientPluginChannels = LiteLoader.getClientPluginChannels();
 		if (clientPluginChannels instanceof ClientPluginChannelsClient)
@@ -54,6 +54,7 @@ public class LiteLoaderEventInjectionTransformer extends EventInjectionTransform
 		Event onSaveScreenshot                 = Event.getOrCreate("onSaveScreenshot",             true);
 		Event onRenderEntity                   = Event.getOrCreate("onRenderEntity",               false);
 		Event onPostRenderEntity               = Event.getOrCreate("onPostRenderEntity",           false);
+		Event onJoinRealm                      = Event.getOrCreate("onJoinRealm",                  false);
 		// Injection Points
 		InjectionPoint methodHead              = new MethodHead();
@@ -67,6 +68,7 @@ public class LiteLoaderEventInjectionTransformer extends EventInjectionTransform
 		InjectionPoint beforeEndProfiler       = new BeforeInvoke(endSection);
 		InjectionPoint beforeIsFBOEnabled      = new BeforeInvoke(isFramebufferEnabled);
 		InjectionPoint beforeRenderEntity      = new BeforeInvoke(doRender).setCaptureLocals(true);
+		InjectionPoint beforeStopRealsmFetcher = new BeforeInvoke(realmsStopFetcher).setCaptureLocals(true);
 		InjectionPoint beforeTickProfiler      = new BeforeStringInvoke("tick",         startSection);
 		InjectionPoint beforeCenterProfiler    = new BeforeStringInvoke("center",       startSection);
 		InjectionPoint beforeRenderProfiler    = new BeforeStringInvoke("gameRenderer", endStartSection);
@@ -106,10 +108,26 @@ public class LiteLoaderEventInjectionTransformer extends EventInjectionTransform
 		// Compatibility handlers
 		this.add(onSessionProfileBad,          getProfile,                 (beforeNewGameProfile),    "generateOfflineUUID");
+		
+		// Protocol handlers
+		this.add(onJoinRealm,                  realmsPlay,                 (beforeStopRealsmFetcher), "onJoinRealm", Obf.PacketEventsClient);
 	}
 	protected final Event add(Event event, MethodInfo targetMethod, InjectionPoint injectionPoint, String callback)
 	{
-		return this.addEvent(event, targetMethod, injectionPoint).addListener(new MethodInfo(Obf.CallbackProxyClient, callback));
+		return this.add(event, targetMethod, injectionPoint, callback, Obf.CallbackProxyClient);
+	}
+
+	/**
+	 * @param event
+	 * @param targetMethod
+	 * @param injectionPoint
+	 * @param callback
+	 * @param proxy
+	 * @return
+	 */
+	private Event add(Event event, MethodInfo targetMethod, InjectionPoint injectionPoint, String callback, Obf proxy)
+	{
+		return this.addEvent(event, targetMethod, injectionPoint).addListener(new MethodInfo(proxy, callback));
 	}
 }
@@ -18,9 +18,11 @@ public interface PacketHandler extends LiteMod
 	public List<Class<? extends Packet>> getHandledPackets(); 
 	/**
-	 * @param netHandler
-	 * @param packet
-	 * @return
+	 * @param netHandler The vanilla nethandler which will handle this packet if not cancelled
+	 * @param packet Incoming packet
+	 * @return True to allow further processing of this packet, including other PacketHandlers and eventually the vanilla netHandler, to inhibit further
+	 *     processing return false. You may choose to return false and then invoke the vanilla handler method on the supplied INetHandler if you wish to
+	 *     inhibit later PacketHandlers but preserve vanilla behaviour.
 	 */
 	public abstract boolean handlePacket(INetHandler netHandler, Packet packet);
 }
@@ -9,7 +9,7 @@ import com.mumfrey.liteloader.core.CommonPluginChannelListener;
  *
  * @author Adam Mummery-Smith
  */
-public interface PluginChannelListener extends CommonPluginChannelListener, JoinGameListener
+public interface PluginChannelListener extends LiteMod, CommonPluginChannelListener
 {
 	/**
 	 * Called when a custom payload packet arrives on a channel this mod has registered
@@ -13,7 +13,6 @@ import net.minecraft.network.play.server.S01PacketJoinGame;
 import net.minecraft.network.play.server.S02PacketChat;
 import net.minecraft.network.play.server.S3FPacketCustomPayload;
-import com.mumfrey.liteloader.JoinGameListener;
 import com.mumfrey.liteloader.PacketHandler;
 import com.mumfrey.liteloader.ServerChatFilter;
 import com.mumfrey.liteloader.api.InterfaceProvider;
@@ -23,7 +22,6 @@ import com.mumfrey.liteloader.core.event.HandlerList;
 import com.mumfrey.liteloader.core.event.HandlerList.ReturnLogicOp;
 import com.mumfrey.liteloader.core.runtime.Packets;
 import com.mumfrey.liteloader.interfaces.FastIterable;
-import com.mumfrey.liteloader.interfaces.FastIterableDeque;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 /**
@@ -34,7 +32,7 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 public abstract class PacketEvents implements InterfaceProvider
 {
 	protected static PacketEvents instance;
-	
+
 	class PacketHandlerList extends HandlerList<PacketHandler>
 	{
 		private static final long serialVersionUID = 1L;
@@ -49,7 +47,6 @@ public abstract class PacketEvents implements InterfaceProvider
 	private PacketHandlerList packetHandlers[] = new PacketHandlerList[Packets.count()];
 	private FastIterable<ServerChatFilter> serverChatFilters = new HandlerList<ServerChatFilter>(ServerChatFilter.class, ReturnLogicOp.AND_BREAK_ON_FALSE);
-	private FastIterableDeque<JoinGameListener> joinGameListeners = new HandlerList<JoinGameListener>(JoinGameListener.class);
 	private final int loginSuccessPacketId  = Packets.S02PacketLoginSuccess.getIndex();
 	private final int serverChatPacketId    = Packets.S02PacketChat.getIndex();
@@ -74,7 +71,6 @@ public abstract class PacketEvents implements InterfaceProvider
 	public void registerInterfaces(InterfaceRegistrationDelegate delegate)
 	{
 		delegate.registerInterface(PacketHandler.class);
-		delegate.registerInterface(JoinGameListener.class);
 		delegate.registerInterface(ServerChatFilter.class);
 	}
@@ -82,14 +78,6 @@ public abstract class PacketEvents implements InterfaceProvider
 	public void initProvider()
 	{
 	}
-	
-	/**
-	 * @param joinGameListener
-	 */
-	public void registerJoinGameListener(JoinGameListener joinGameListener)
-	{
-		this.joinGameListeners.add(joinGameListener);
-	}
 	/**
 	 * @param serverChatFilter
@@ -123,7 +111,7 @@ public abstract class PacketEvents implements InterfaceProvider
 			}
 		}
 	}
-	
+
 	public static void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler)
 	{
 		PacketEvents.instance.handlePacket(e, netHandler, e.getPacketId());
@@ -235,7 +223,6 @@ public abstract class PacketEvents implements InterfaceProvider
 	protected void handlePacket(PacketEventInfo<Packet> e, INetHandler netHandler, S01PacketJoinGame packet)
 	{
 		this.loader.onJoinGame(netHandler, packet);
-		this.joinGameListeners.all().onJoinGame(netHandler, packet);
 	}
 	/**
@@ -36,6 +36,8 @@ public abstract class Methods
 	public static final MethodInfo doRenderEntity         = new MethodInfo(Obf.RenderManager,              Obf.doRenderEntity,               Boolean.TYPE, Obf.Entity, Double.TYPE, Double.TYPE, Double.TYPE, Float.TYPE, Float.TYPE, Boolean.TYPE);
 	public static final MethodInfo doRender               = new MethodInfo(Obf.Render,                     Obf.doRender,                     Void.TYPE, Obf.Entity, Double.TYPE, Double.TYPE, Double.TYPE, Float.TYPE, Float.TYPE);
 	public static final MethodInfo doRenderShadowAndFire  = new MethodInfo(Obf.Render,                     Obf.doRenderShadowAndFire,        Void.TYPE, Obf.Entity, Double.TYPE, Double.TYPE, Double.TYPE, Float.TYPE, Float.TYPE);
+	public static final MethodInfo realmsPlay             = new MethodInfo(Obf.RealmsMainScreen,           "play",                           Void.TYPE, Long.TYPE);
+	public static final MethodInfo realmsStopFetcher      = new MethodInfo(Obf.RealmsMainScreen,           "stopRealmsFetcherAndPinger",     Void.TYPE);
 	public static final MethodInfo startSection           = new MethodInfo(Obf.Profiler,                   Obf.startSection,                 Void.TYPE, String.class);
 	public static final MethodInfo endSection             = new MethodInfo(Obf.Profiler,                   Obf.endSection,                   Void.TYPE);
@@ -23,11 +23,13 @@ public class Obf
 	public static final Obf                  HandlerList = new Obf("com.mumfrey.liteloader.core.event.HandlerList"                     );
 	public static final Obf             BakedHandlerList = new Obf("com.mumfrey.liteloader.core.event.HandlerList$BakedHandlerList"    );
 	public static final Obf                 PacketEvents = new Obf("com.mumfrey.liteloader.core.PacketEvents"                          );
+	public static final Obf           PacketEventsClient = new Obf("com.mumfrey.liteloader.client.PacketEventsClient"                  );
 	public static final Obf                   LoadingBar = new Obf("com.mumfrey.liteloader.client.gui.startup.LoadingBar"              );
 	public static final Obf                  GameProfile = new Obf("com.mojang.authlib.GameProfile"                                    );
 	public static final Obf                MinecraftMain = new Obf("net.minecraft.client.main.Main"                                    );
 	public static final Obf              MinecraftServer = new Obf("net.minecraft.server.MinecraftServer"                              );
 	public static final Obf                         GL11 = new Obf("org.lwjgl.opengl.GL11"                                             );
+	public static final Obf             RealmsMainScreen = new Obf("com.mojang.realmsclient.RealmsMainScreen"                          );
 	public static final Obf                  constructor = new Obf("<init>"                                                            );
 	// Classes
@@ -178,10 +178,6 @@ public class PermissionsManagerClient implements PermissionsManager, PluginChann
 		this.registeredClientPermissions.put(mod, new TreeSet<String>());
 	}
-	/* (non-Javadoc)
-	 * @see com.mumfrey.liteloader.JoinGameListener#onJoinGame(net.minecraft.network.INetHandler, net.minecraft.network.play.server.S01PacketJoinGame)
-	 */
-	@Override
 	public void onJoinGame(INetHandler netHandler, S01PacketJoinGame joinGamePacket)
 	{
 		this.clearServerPermissions();