From 9fe3f693f1d6d015f45898818b7958b3a57a9f4a Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Fri, 26 Jul 2019 04:23:36 +0100
Subject: + Added config option to adjust ingame BGM delays. (Should be
 working) + Added a Pest Killer for quick removal of Butterflies and Bats. +
 Added Hydrogen Cyanide. % Replaced existing assets for the Bat King. %
 Replaced Bat King Logic, it's now an offensive mob. $ Fixed Bat King model
 scaling.

---
 .../fixes/vanilla/VanillaBackgroundMusicFix.java   | 59 ++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java

(limited to 'src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java')

diff --git a/src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java b/src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java
new file mode 100644
index 0000000000..0039de7da2
--- /dev/null
+++ b/src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java
@@ -0,0 +1,59 @@
+package gtPlusPlus.plugin.fixes.vanilla;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+import gtPlusPlus.api.interfaces.IPlugin;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.plugin.fixes.interfaces.IBugFix;
+import gtPlusPlus.plugin.fixes.vanilla.music.MusicTocker;
+import gtPlusPlus.preloader.CORE_Preloader;
+
+public class VanillaBackgroundMusicFix implements IBugFix {
+
+	private final IPlugin mParent;
+	private final boolean enabled;
+	private MusicTocker mFixInstance;
+
+	public VanillaBackgroundMusicFix(IPlugin minstance) {
+		mParent = minstance;
+		if (CORE_Preloader.enableWatchdogBGM > 0 && Utils.isClient()) {
+			mParent.log("[BGM] Registering BGM delay Fix.");
+			enabled = true;
+			mFixInstance = new MusicTocker(mParent);
+		} else if (CORE_Preloader.enableWatchdogBGM > 0 && Utils.isServer()) {
+			mParent.log("[BGM] Tried registering BGM delay Fix on Server, disabling.");
+			enabled = false;
+		} else {
+			mParent.log("[BGM] Not registering BGM delay Fix.");
+			enabled = false;
+		}
+	}
+
+	public boolean isFixValid() {
+		return enabled;
+	}
+
+	public void manage() {
+		TimerTask task = new ManageTask(this.mFixInstance);
+		Timer timer = new Timer("BGM-WatchDog");
+		long delay = 1000 * 60;
+		timer.scheduleAtFixedRate(task, delay, 5000);
+	}
+
+	private static class ManageTask extends TimerTask {
+		private final MusicTocker A;
+
+		public ManageTask(MusicTocker a) {
+			A = a;
+		}
+
+		@Override
+		public void run() {
+			if (!A.mVanillaManager) {
+				A.run();
+			}
+		}
+	}
+
+}
-- 
cgit 


From 5adad05da2f1182d90ed5c596932b4b583ece73e Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Sun, 18 Aug 2019 00:07:08 +0100
Subject: $ Fixed NPE in Music Fix.

---
 .../plugin/fixes/vanilla/VanillaBackgroundMusicFix.java  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java')

diff --git a/src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java b/src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java
index 0039de7da2..bfd73407f7 100644
--- a/src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java
+++ b/src/Java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java
@@ -35,10 +35,12 @@ public class VanillaBackgroundMusicFix implements IBugFix {
 	}
 
 	public void manage() {
-		TimerTask task = new ManageTask(this.mFixInstance);
-		Timer timer = new Timer("BGM-WatchDog");
-		long delay = 1000 * 60;
-		timer.scheduleAtFixedRate(task, delay, 5000);
+		if (CORE_Preloader.enableWatchdogBGM > 0 && Utils.isClient()) {
+			TimerTask task = new ManageTask(this.mFixInstance);
+			Timer timer = new Timer("BGM-WatchDog");
+			long delay = 1000 * 60;
+			timer.scheduleAtFixedRate(task, delay, 5000);
+		}
 	}
 
 	private static class ManageTask extends TimerTask {
@@ -50,8 +52,10 @@ public class VanillaBackgroundMusicFix implements IBugFix {
 
 		@Override
 		public void run() {
-			if (!A.mVanillaManager) {
-				A.run();
+			if (CORE_Preloader.enableWatchdogBGM > 0 && Utils.isClient()) {
+				if (!A.mVanillaManager) {
+					A.run();
+				}
 			}
 		}
 	}
-- 
cgit