LiteLoader 1.6.4_02 - experimental - force permissions query packet on world cha…

…nge for BungeeCord multi-server support

LiteLoader 1.6.4_02 - experimental - force permissions query packet on world cha…
…nge for BungeeCord multi-server support
Mumfrey
1 parent 6f0192d2
Showing 5 changed files with 109 additions and 14 deletions
java/com/mumfrey/liteloader/core/Events.java
java/com/mumfrey/liteloader/core/LiteLoader.java
java/com/mumfrey/liteloader/core/LiteLoaderEnumerator.java
java/com/mumfrey/liteloader/core/exceptions/OutdatedLoaderException.java
java/com/mumfrey/liteloader/permissions/PermissionsManagerClient.java
@@ -22,17 +22,17 @@ public class Events implements IPlayerUsage
 	/**
 	 * Reference to the loader instance
 	 */
-	private LiteLoader loader;
+	private final LiteLoader loader;
 	/**
 	 * Reference to the game
 	 */
-	private Minecraft minecraft;
+	private final Minecraft minecraft;
 	/**
 	 * Plugin channel manager
 	 */
-	private PluginChannels pluginChannels;
+	private final PluginChannels pluginChannels;
 	/**
 	 * Reference to the minecraft timer
@@ -47,7 +47,7 @@ public class Events implements IPlayerUsage
 	/**
 	 * Profiler hook objects
 	 */
-	private HookProfiler profilerHook = new HookProfiler(this);
+	private final HookProfiler profilerHook = new HookProfiler(this);
 	/**
 	 * ScaledResolution used by the pre-chat and post-chat render callbacks
@@ -128,6 +128,12 @@ public class Events implements IPlayerUsage
 	 * client login events
 	 */
 	private LinkedList<PreLoginListener> preLoginListeners = new LinkedList<PreLoginListener>();
+	
+	/**
+	 * Hash code of the current world. We don't store the world reference here because we don't want
+	 * to mess with world GC by mistake
+	 */
+	private int worldHashCode = 0;
 	/**
 	 * Package private ctor
@@ -585,6 +591,21 @@ public class Events implements IPlayerUsage
 			tickable.onTick(this.minecraft, partialTicks, inGame, clock);
 			profiler.endSection();
 		}
+		
+		// Detected world change
+		if (this.minecraft.theWorld != null)
+		{
+			if (this.minecraft.theWorld.hashCode() != this.worldHashCode)
+			{
+				this.worldHashCode = this.minecraft.theWorld.hashCode();
+				this.loader.onWorldChanged(this.minecraft.theWorld);
+			}
+		}
+		else
+		{
+			this.worldHashCode = 0;
+			this.loader.onWorldChanged(null);
+		}
 	}
 	/**
@@ -29,6 +29,7 @@ import net.minecraft.src.NetHandler;
 import net.minecraft.src.Packet1Login;
 import net.minecraft.src.ResourcePack;
 import net.minecraft.src.SimpleReloadableResourceManager;
+import net.minecraft.src.World;
 import com.mumfrey.liteloader.*;
 import com.mumfrey.liteloader.crashreport.CallableLiteLoaderBrand;
@@ -639,8 +640,8 @@ public final class LiteLoader
 	 * @param metaDataKey
 	 * @param defaultValue
 	 * @return
-	 * @throws InvalidActivityException
-	 * @throws IllegalArgumentException
+	 * @throws InvalidActivityException Thrown by getMod if init is not complete 
+	 * @throws IllegalArgumentException Thrown by getMod if argument is null
 	 */
 	public String getModMetaData(String mod, String metaDataKey, String defaultValue) throws InvalidActivityException, IllegalArgumentException
 	{
@@ -846,7 +847,24 @@ public final class LiteLoader
 	{
 		this.permissionsManager.onLogin(netHandler, loginPacket);
 	}
+	
+	/**
+	 * Called when the world reference is changed
+	 * 
+	 * @param world
+	 */
+	void onWorldChanged(World world)
+	{
+		if (world != null)
+		{
+			// For bungeecord
+			this.permissionsManager.scheduleRefresh();
+		}
+	}
+	/**
+	 * On render callback
+	 */
 	void onRender()
 	{
 		if (this.paginateControls && this.minecraft.currentScreen != null && this.minecraft.currentScreen.getClass().equals(GuiControls.class))
@@ -863,6 +881,10 @@ public final class LiteLoader
 		}
 	}
+	/**
+	 * @param partialTicks
+	 * @param inGame
+	 */
 	void onTick(float partialTicks, boolean inGame)
 	{
 		// Tick the permissions manager
@@ -871,6 +893,11 @@ public final class LiteLoader
 		this.checkAndStoreKeyBindings();
 	}
+	/**
+	 * Register a key for a mod
+	 * 
+	 * @param binding
+	 */
 	public void registerModKey(KeyBinding binding)
 	{
 		LinkedList<KeyBinding> keyBindings = new LinkedList<KeyBinding>();
@@ -32,6 +32,7 @@ import java.util.zip.ZipInputStream;
 import net.minecraft.launchwrapper.LaunchClassLoader;
 import com.mumfrey.liteloader.LiteMod;
+import com.mumfrey.liteloader.core.exceptions.OutdatedLoaderException;
 import com.mumfrey.liteloader.launch.LiteLoaderTweaker;
 /**
@@ -645,6 +646,11 @@ class LiteLoaderEnumerator implements FilenameFilter
 				LiteLoaderEnumerator.enumerateCompressedPackage(prefix, superClass, classloader, classes, packagePath);
 			}
 		}
+		catch (OutdatedLoaderException ex)
+		{
+			classes.clear();
+			LiteLoaderEnumerator.logWarning("Error searching in '%s', missing API component '%s', your loader is probably out of date", packagePath, ex.getMessage());
+		}
 		catch (Throwable th)
 		{
 			LiteLoaderEnumerator.logger.log(Level.WARNING, "Enumeration error", th);
@@ -700,8 +706,9 @@ class LiteLoaderEnumerator implements FilenameFilter
 	 * @param classes
 	 * @param packagePath
 	 * @param packageName
+	 * @throws OutdatedLoaderException 
 	 */
-	private static void enumerateDirectory(String prefix, Class<?> superClass, ClassLoader classloader, LinkedList<Class<?>> classes, File packagePath)
+	private static void enumerateDirectory(String prefix, Class<?> superClass, ClassLoader classloader, LinkedList<Class<?>> classes, File packagePath) throws OutdatedLoaderException
 	{
 		LiteLoaderEnumerator.enumerateDirectory(prefix, superClass, classloader, classes, packagePath, "", 0);
 	}
@@ -714,8 +721,9 @@ class LiteLoaderEnumerator implements FilenameFilter
 	 * @param classes
 	 * @param packagePath
 	 * @param packageName
+	 * @throws OutdatedLoaderException 
 	 */
-	private static void enumerateDirectory(String prefix, Class<?> superClass, ClassLoader classloader, LinkedList<Class<?>> classes, File packagePath, String packageName, int depth)
+	private static void enumerateDirectory(String prefix, Class<?> superClass, ClassLoader classloader, LinkedList<Class<?>> classes, File packagePath, String packageName, int depth) throws OutdatedLoaderException
 	{
 		// Prevent crash due to broken recursion
 		if (depth > MAX_DISCOVERY_DEPTH)
@@ -746,8 +754,9 @@ class LiteLoaderEnumerator implements FilenameFilter
 	 * @param superClass
 	 * @param classes
 	 * @param className
+	 * @throws OutdatedLoaderException 
 	 */
-	private static void checkAndAddClass(ClassLoader classloader, Class<?> superClass, LinkedList<Class<?>> classes, String className)
+	private static void checkAndAddClass(ClassLoader classloader, Class<?> superClass, LinkedList<Class<?>> classes, String className) throws OutdatedLoaderException
 	{
 		if (className.indexOf('$') > -1)
 			return;
@@ -763,6 +772,15 @@ class LiteLoaderEnumerator implements FilenameFilter
 		}
 		catch (Throwable th)
 		{
+			String missingClassName = th.getCause().getMessage();
+			if (th.getCause() instanceof NoClassDefFoundError && missingClassName != null)
+			{
+				if (missingClassName.startsWith("com/mumfrey/liteloader/"))
+				{
+					throw new OutdatedLoaderException(missingClassName.substring(missingClassName.lastIndexOf('/') + 1));
+				}
+			}
+			
 			LiteLoaderEnumerator.logger.log(Level.WARNING, "checkAndAddClass error", th);
 		}
 	}
+package com.mumfrey.liteloader.core.exceptions;
+
+/**
+ * Exception thrown when a mod class references a liteloader interface which does not exist,
+ * which more than likely means that it requires a more up-to-date version of the loader than
+ * is currently installed.
+ *
+ * @author Adam Mummery-Smith
+ */
+public class OutdatedLoaderException extends Exception
+{
+	private static final long serialVersionUID = 8770358290208830747L;
+
+	/**
+	 * @param missingAPI Name of the referenced class which is missing
+	 */
+	public OutdatedLoaderException(String missingAPI)
+	{
+		super(missingAPI);
+	}
+}
@@ -75,7 +75,7 @@ public class PermissionsManagerClient implements PermissionsManager, PluginChann
 	/**
 	 * Delay counter for when joining a server
 	 */
-	private int loginRegisterTicks = 0;
+	private int pendingRefreshTicks = 0;
 	private int menuTicks = 0;
@@ -166,11 +166,19 @@ public class PermissionsManagerClient implements PermissionsManager, PluginChann
 	@Override
 	public void onLogin(NetHandler netHandler, Packet1Login loginPacket)
 	{
-		this.loginRegisterTicks = 2;
 		this.clearServerPermissions();
+		this.scheduleRefresh();
 	}
 	/**
+	 * Schedule a permissions refresh
+	 */
+	public void scheduleRefresh()
+	{
+		this.pendingRefreshTicks = 2;
+	}
+	
+	/**
 	 * Clears the current replicated server permissions 
 	 */
 	protected void clearServerPermissions()
@@ -239,11 +247,11 @@ public class PermissionsManagerClient implements PermissionsManager, PluginChann
 		this.minecraft = minecraft;
 		this.lastTickTime = System.currentTimeMillis();
-		if (this.loginRegisterTicks > 0)
+		if (this.pendingRefreshTicks > 0)
 		{
-			this.loginRegisterTicks--;
+			this.pendingRefreshTicks--;
-			if (this.loginRegisterTicks == 0 && inGame)
+			if (this.pendingRefreshTicks == 0 && inGame)
 			{
 				this.sendPermissionQueries();
 				return;