LiteLoader 1.6.2_02 - fix for sound issue

Mumfrey
1 parent a954e687
Showing 4 changed files with 159 additions and 12 deletions
java/com/mumfrey/liteloader/core/LiteLoader.java
java/com/mumfrey/liteloader/core/LiteLoaderVersion.java
java/com/mumfrey/liteloader/core/SoundManagerReloadInhibitor.java
java/com/mumfrey/liteloader/util/PrivateFields.java
@@ -294,6 +294,12 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	 */
 	private static PermissionsManagerClient permissionsManager = PermissionsManagerClient.getInstance();
+	private boolean pendingResourceReload;
+	
+	private boolean inhibitSoundManagerReload = true;
+	
+	private SoundManagerReloadInhibitor soundManagerReloadInhibitor;
+
 	public static final void init(File gameDirectory, File assetsDirectory, String profile, List<String> modNameFilter)
 	{
 		if (instance == null)
@@ -419,7 +425,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 			return this.modsFolder;
 		}
-		return new File(this.configBaseFolder, String.format("config.%s", version.getLoaderVersion()));
+		return new File(this.configBaseFolder, String.format("config.%s", version.getMinecraftVersion()));
 	}
 	/**
@@ -433,7 +439,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		// Set up loader, initialises any reflection methods needed
 		if (this.prepareLoader())
 		{
-			logger.info(String.format("LiteLoader %s starting up...", VERSION));
+			logger.info(String.format("LiteLoader %s starting up...", VERSION.getLoaderVersion()));
 			// Print the branding version if any was provided
 			if (this.branding != null)
@@ -495,6 +501,9 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 			this.paginateControls = this.localProperties.getProperty("controls.pages", "true").equalsIgnoreCase("true");
 			this.localProperties.setProperty("controls.pages", String.valueOf(this.paginateControls));
+			this.inhibitSoundManagerReload = this.localProperties.getProperty("soundManagerFix", "true").equalsIgnoreCase("true");
+			this.localProperties.setProperty("soundManagerFix", String.valueOf(this.inhibitSoundManagerReload));
+			
 			this.branding = this.internalProperties.getProperty("brand", null);
 			if (this.branding != null && this.branding.length() < 1)
 				this.branding = null;
@@ -616,6 +625,8 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	{
 		if (!this.registeredResourcePacks.containsKey(resourcePack.func_130077_b())) // TODO adamsrc -> getName()
 		{
+			this.pendingResourceReload = true;
+
 			List<ResourcePack> defaultResourcePacks = PrivateFields.defaultResourcePacks.get(this.minecraft);
 			if (!defaultResourcePacks.contains(resourcePack))
 			{
@@ -636,6 +647,8 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	{
 		if (this.registeredResourcePacks.containsValue(resourcePack))
 		{
+			this.pendingResourceReload = true;
+
 			List<ResourcePack> defaultResourcePacks = PrivateFields.defaultResourcePacks.get(this.minecraft);
 			this.registeredResourcePacks.remove(resourcePack.func_130077_b()); // TODO adamsrc -> getName()
 			defaultResourcePacks.remove(resourcePack);
@@ -1178,7 +1191,9 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 		logger.info("Discovered " + this.modsToLoad.size() + " total mod(s)");
-		boolean addedResources = false;
+		this.pendingResourceReload = false;
+		this.soundManagerReloadInhibitor = new SoundManagerReloadInhibitor((SimpleReloadableResourceManager)minecraft.getResourceManager(), minecraft.sndManager);
+		if (this.inhibitSoundManagerReload) this.soundManagerReloadInhibitor.inhibit();
 		for (Class<? extends LiteMod> mod : this.modsToLoad.values())
 		{
@@ -1198,7 +1213,6 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 					if (modFile != null && modFile.registerAsResourcePack(newMod.getName()))
 					{
 						logger.info("Adding " + modFile.getAbsolutePath() + " to resources list");
-						addedResources = true;
 					}
 				}
 				else
@@ -1212,11 +1226,6 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 				th.printStackTrace();
 			}
 		}
-		
-		if (addedResources)
-		{
-			this.minecraft.func_110436_a(); // TODO adamsrc -> refreshResourcePacks
-		}
 	}
 	/**
@@ -1264,7 +1273,7 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 					if (LiteLoader.VERSION.getLoaderRevision() > lastModVersion.getLoaderRevision())
 					{
 						logger.info("Performing config upgrade for mod " + modName + ". Upgrading " + lastModVersion + " to " + LiteLoader.VERSION + "...");
-						mod.upgradeSettings(LiteLoader.getVersion(), this.versionConfigFolder, this.inflectVersionedConfigPath(lastModVersion));
+						mod.upgradeSettings(VERSION.getMinecraftVersion(), this.versionConfigFolder, this.inflectVersionedConfigPath(lastModVersion));
 						this.storeLastKnownModRevision(modKey);
 						logger.info("Config upgrade succeeded for mod " + modName);
@@ -1724,6 +1733,12 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 	 */
 	public void onInit()
 	{
+		if (this.pendingResourceReload)
+		{
+			this.pendingResourceReload = false;
+			this.minecraft.func_110436_a(); // TODO adamsrc -> refreshResourcePacks
+		}
+		
 		if (!this.lateInitDone)
 		{
 			this.lateInitDone = true;
@@ -1741,6 +1756,11 @@ public final class LiteLoader implements FilenameFilter, IPlayerUsage
 				}
 			}
 		}
+
+		if (this.soundManagerReloadInhibitor != null && this.soundManagerReloadInhibitor.isInhibited())
+		{
+			this.soundManagerReloadInhibitor.unInhibit(true);
+		}
 	}
 	/**
@@ -7,7 +7,7 @@ import java.util.Set;
  * LiteLoader version table
  *
  * @author Adam Mummery-Smith
- * @version 1.6.2_01
+ * @version 1.6.2_02
  */
 public enum LiteLoaderVersion
 {
@@ -16,7 +16,7 @@ public enum LiteLoaderVersion
 	MC_1_5_2_R2(10, "1.5.2", "1.5.2", "1.5.2"),
 	MC_1_6_1_R0(11, "1.6.1", "1.6.1", "1.6.1", "1.6.r1"),
 	MC_1_6_2_R0(12, "1.6.2", "1.6.2", "1.6.2", "1.6.r2"),
-	MC_1_6_2_R1(13, "1.6.2", "1.6.2", "1.6.2", "1.6.r2");
+	MC_1_6_2_R1(13, "1.6.2", "1.6.2_02", "1.6.2", "1.6.r2");
 	private int revision;
+package com.mumfrey.liteloader.core;
+
+import java.util.List;
+
+import com.mumfrey.liteloader.util.PrivateFields;
+
+import net.minecraft.src.ResourceManagerReloadListener;
+import net.minecraft.src.SimpleReloadableResourceManager;
+import net.minecraft.src.SoundManager;
+
+/**
+ * Manager object which handles inhibiting the sound manager's reload notification at startup
+ *
+ * @author Adam Mummery-Smith
+ */
+public class SoundManagerReloadInhibitor
+{
+	/**
+	 * Resource Manager
+	 */
+	private SimpleReloadableResourceManager resourceManager;
+	
+	/**
+	 * Sound manager
+	 */
+	private SoundManager soundManager;
+	
+	/**
+	 * True if inhibition is currently active
+	 */
+	private boolean inhibited;
+	
+	/**
+	 * So that we can re-insert the sound manager at the same index, we store the index we remove it from
+	 */
+	private int storedIndex;
+	
+	public SoundManagerReloadInhibitor(SimpleReloadableResourceManager resourceManager, SoundManager soundManager)
+	{
+		this.resourceManager = resourceManager;
+		this.soundManager = soundManager;
+	}
+	
+	/**
+	 * Inhibit the sound manager reload notification
+	 * 
+	 * @return true if inhibit was applied
+	 */
+	public boolean inhibit()
+	{
+		try
+		{
+			if (!this.inhibited)
+			{
+				List<ResourceManagerReloadListener> reloadListeners = PrivateFields.reloadListeners.get(this.resourceManager);
+				if (reloadListeners != null)
+				{
+					this.storedIndex = reloadListeners.indexOf(this.soundManager);
+					if (this.storedIndex > -1)
+					{
+						LiteLoader.getLogger().info("Inhibiting sound manager reload");
+						reloadListeners.remove(this.soundManager);
+						this.inhibited = true;
+						return true;
+					}
+				}
+			}
+		}
+		catch (Exception ex)
+		{
+			LiteLoader.getLogger().warning("Error inhibiting sound manager reload");
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Remove the sound manager reload inhibit
+	 * 
+	 * @param reload True to reload the sound manager now
+	 * @return true if the sound manager was successfully restored
+	 */
+	public boolean unInhibit(boolean reload)
+	{
+		try
+		{
+			if (this.inhibited)
+			{
+				List<ResourceManagerReloadListener> reloadListeners = PrivateFields.reloadListeners.get(this.resourceManager);
+				if (reloadListeners != null)
+				{
+					if (this.storedIndex > -1)
+					{
+						reloadListeners.add(this.storedIndex, this.soundManager);
+					}
+					else
+					{
+						reloadListeners.add(this.soundManager);
+					}
+
+					LiteLoader.getLogger().info("Sound manager reload inhibit removed");
+					
+					if (reload)
+					{
+						LiteLoader.getLogger().info("Reloading sound manager");
+						this.soundManager.onReload(this.resourceManager);
+					}
+
+					this.inhibited = false;
+					return true;
+				}
+			}
+		}
+		catch (Exception ex)
+		{
+			LiteLoader.getLogger().warning("Error removing sound manager reload inhibit");
+		}
+		
+		return false;
+	}
+
+	public boolean isInhibited()
+	{
+		return this.inhibited;
+	}
+}
@@ -147,5 +147,6 @@ public class PrivateFields&lt;P, T&gt;
 	public static final PrivateFields<RenderManager, Map>                    entityRenderMap = new PrivateFields<RenderManager, Map>              (RenderManager.class,      "entityRenderMap",      "q",  "field_78729_o");   // RenderManager/entityRenderMap
 	public static final PrivateFields<GuiControls, GuiScreen>        guiControlsParentScreen = new PrivateFields<GuiControls, GuiScreen>          (GuiControls.class,        "parentScreen",         "b",  "field_73909_b");   // GuiControls/parentScreen
 	public static final PrivateFields<PlayerUsageSnooper, IPlayerUsage> playerStatsCollector = new PrivateFields<PlayerUsageSnooper, IPlayerUsage>(PlayerUsageSnooper.class, "playerStatsCollector", "d",  "field_76478_d");   // PlayerUsageSnooper/playerStatsCollector
+	public static final PrivateFields<SimpleReloadableResourceManager, List<ResourceManagerReloadListener>> reloadListeners = new PrivateFields<SimpleReloadableResourceManager, List<ResourceManagerReloadListener>>(SimpleReloadableResourceManager.class, "field_110546_b", "c", "field_110546_b");   // SimpleReloadableResourceManager/field_110546_b
 }