oldanimations notification (#98)

4 files changed, 122 insertions, 73 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
index 0ed68e06..e60ff666 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java
@@ -1,17 +1,5 @@
 package io.github.moulberry.notenoughupdates;
 
-import java.awt.Color;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Set;
-
 import com.google.common.collect.Sets;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -23,10 +11,12 @@ import io.github.moulberry.notenoughupdates.dungeons.DungeonMap;
 import io.github.moulberry.notenoughupdates.listener.ChatListener;
 import io.github.moulberry.notenoughupdates.listener.ItemTooltipListener;
 import io.github.moulberry.notenoughupdates.listener.NEUEventListener;
+import io.github.moulberry.notenoughupdates.listener.OldAnimationChecker;
 import io.github.moulberry.notenoughupdates.listener.RenderListener;
 import io.github.moulberry.notenoughupdates.miscfeatures.CrystalOverlay;
 import io.github.moulberry.notenoughupdates.miscfeatures.CrystalWishingCompassSolver;
 import io.github.moulberry.notenoughupdates.miscfeatures.CustomItemEffects;
+import io.github.moulberry.notenoughupdates.miscfeatures.CustomSkulls;
 import io.github.moulberry.notenoughupdates.miscfeatures.DwarvenMinesWaypoints;
 import io.github.moulberry.notenoughupdates.miscfeatures.EnchantingSolvers;
 import io.github.moulberry.notenoughupdates.miscfeatures.FairySouls;
@@ -34,12 +24,14 @@ import io.github.moulberry.notenoughupdates.miscfeatures.FishingHelper;
 import io.github.moulberry.notenoughupdates.miscfeatures.ItemCooldowns;
 import io.github.moulberry.notenoughupdates.miscfeatures.ItemCustomizeManager;
 import io.github.moulberry.notenoughupdates.miscfeatures.MiningStuff;
+import io.github.moulberry.notenoughupdates.miscfeatures.NPCRetexturing;
 import io.github.moulberry.notenoughupdates.miscfeatures.NullzeeSphere;
 import io.github.moulberry.notenoughupdates.miscfeatures.PetInfoOverlay;
 import io.github.moulberry.notenoughupdates.miscfeatures.SlotLocking;
 import io.github.moulberry.notenoughupdates.miscfeatures.StorageManager;
 import io.github.moulberry.notenoughupdates.miscfeatures.SunTzu;
 import io.github.moulberry.notenoughupdates.miscfeatures.customblockzones.CustomBiomes;
+import io.github.moulberry.notenoughupdates.miscfeatures.customblockzones.CustomBlockSounds;
 import io.github.moulberry.notenoughupdates.miscfeatures.customblockzones.DwarvenMinesTextures;
 import io.github.moulberry.notenoughupdates.miscgui.CalendarOverlay;
 import io.github.moulberry.notenoughupdates.miscgui.InventoryStorageSelector;
@@ -53,6 +45,7 @@ import io.github.moulberry.notenoughupdates.util.Utils;
 import io.github.moulberry.notenoughupdates.util.XPInformation;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.IReloadableResourceManager;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.event.ClickEvent;
 import net.minecraft.scoreboard.ScoreObjective;
@@ -72,6 +65,18 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 
+import java.awt.*;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Set;
+
 @Mod(modid = NotEnoughUpdates.MODID, version = NotEnoughUpdates.VERSION, clientSideOnly = true)
 public class NotEnoughUpdates {
 	public static final String MODID = "notenoughupdates";
@@ -79,60 +84,6 @@ public class NotEnoughUpdates {
 	public static final String PRE_VERSION = "0.0";
 	public static final int VERSION_ID = 20100;
 	public static final int PRE_VERSION_ID = 0;
-
-	public static NotEnoughUpdates INSTANCE = null;
-
-	public NEUManager manager;
-	public NEUOverlay overlay;
-	public NEUConfig config;
-
-	private File configFile;
-
-	public File getConfigFile() {
-		return this.configFile;
-	}
-
-	public void newConfigFile() {
-		this.configFile = new File(NotEnoughUpdates.INSTANCE.getNeuDir(), "configNew.json");
-	}
-
-	private static final long CHAT_MSG_COOLDOWN = 200;
-	private long lastChatMessage = 0;
-	private long secondLastChatMessage = 0;
-	private String currChatMessage = null;
-
-	//Stolen from Biscut and used for detecting whether in skyblock
-	private static final Set<String> SKYBLOCK_IN_ALL_LANGUAGES =
-		Sets.newHashSet("SKYBLOCK", "\u7A7A\u5C9B\u751F\u5B58", "\u7A7A\u5CF6\u751F\u5B58");
-
-	public GuiScreen openGui = null;
-	public long lastOpenedGui = 0;
-
-	public Commands commands;
-
-	public static HashMap<String, String> petRarityToColourMap = new HashMap<String, String>() {{
-		put("UNKNOWN", EnumChatFormatting.RED.toString());
-		put("COMMON", EnumChatFormatting.WHITE.toString());
-		put("UNCOMMON", EnumChatFormatting.GREEN.toString());
-		put("RARE", EnumChatFormatting.BLUE.toString());
-		put("EPIC", EnumChatFormatting.DARK_PURPLE.toString());
-		put("LEGENDARY", EnumChatFormatting.GOLD.toString());
-		put("MYTHIC", EnumChatFormatting.LIGHT_PURPLE.toString());
-	}};
-
-	public static ProfileViewer profileViewer;
-
-	public boolean packDevEnabled = false;
-
-	private final Gson gson = new GsonBuilder().setPrettyPrinting().excludeFieldsWithoutExposeAnnotation().create();
-	private File neuDir;
-
-	public File getNeuDir() {
-		return this.neuDir;
-	}
-
-	public Color[][] colourMap = null;
-
 	/**
 	 * Registers the biomes for the crystal hollows here so optifine knows they exists
 	 */
@@ -166,6 +117,48 @@ public class NotEnoughUpdates {
 			.setBiomeName("NeuCrystalHollowsCrystalNucleus")
 			.setFillerBlockMetadata(5470985)
 			.setTemperatureRainfall(0.95F, 0.9F);
+	private static final long CHAT_MSG_COOLDOWN = 200;
+	//Stolen from Biscut and used for detecting whether in skyblock
+	private static final Set<String> SKYBLOCK_IN_ALL_LANGUAGES =
+		Sets.newHashSet("SKYBLOCK", "\u7A7A\u5C9B\u751F\u5B58", "\u7A7A\u5CF6\u751F\u5B58");
+	public static NotEnoughUpdates INSTANCE = null;
+	public static HashMap<String, String> petRarityToColourMap = new HashMap<String, String>() {{
+		put("UNKNOWN", EnumChatFormatting.RED.toString());
+		put("COMMON", EnumChatFormatting.WHITE.toString());
+		put("UNCOMMON", EnumChatFormatting.GREEN.toString());
+		put("RARE", EnumChatFormatting.BLUE.toString());
+		put("EPIC", EnumChatFormatting.DARK_PURPLE.toString());
+		put("LEGENDARY", EnumChatFormatting.GOLD.toString());
+		put("MYTHIC", EnumChatFormatting.LIGHT_PURPLE.toString());
+	}};
+	public static ProfileViewer profileViewer;
+	private final Gson gson = new GsonBuilder().setPrettyPrinting().excludeFieldsWithoutExposeAnnotation().create();
+	public NEUManager manager;
+	public NEUOverlay overlay;
+	public NEUConfig config;
+	public GuiScreen openGui = null;
+	public long lastOpenedGui = 0;
+	public Commands commands;
+	public boolean packDevEnabled = false;
+	public Color[][] colourMap = null;
+	private File configFile;
+	private long lastChatMessage = 0;
+	private long secondLastChatMessage = 0;
+	private String currChatMessage = null;
+	private File neuDir;
+	private boolean hasSkyblockScoreboard;
+
+	public File getConfigFile() {
+		return this.configFile;
+	}
+
+	public void newConfigFile() {
+		this.configFile = new File(NotEnoughUpdates.INSTANCE.getNeuDir(), "configNew.json");
+	}
+
+	public File getNeuDir() {
+		return this.neuDir;
+	}
 
 	/**
 	 * Instantiates NEUIo, NEUManager and NEUOverlay instances. Registers keybinds and adds a shutdown hook to clear tmp folder.
@@ -236,6 +229,7 @@ public class NotEnoughUpdates {
 		MinecraftForge.EVENT_BUS.register(new ChatListener(this));
 		MinecraftForge.EVENT_BUS.register(new ItemTooltipListener(this));
 		MinecraftForge.EVENT_BUS.register(new RenderListener(this));
+		MinecraftForge.EVENT_BUS.register(new OldAnimationChecker());
 		MinecraftForge.EVENT_BUS.register(new RecipeGenerator(this));
 		MinecraftForge.EVENT_BUS.register(CapeManager.getInstance());
 		MinecraftForge.EVENT_BUS.register(new EnchantingSolvers());
@@ -249,6 +243,14 @@ public class NotEnoughUpdates {
 		MinecraftForge.EVENT_BUS.register(new CrystalOverlay());
 		MinecraftForge.EVENT_BUS.register(new ItemCooldowns());
 
+		if (Minecraft.getMinecraft().getResourceManager() instanceof IReloadableResourceManager) {
+			IReloadableResourceManager manager = (IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager();
+			manager.registerReloadListener(CustomSkulls.getInstance());
+			manager.registerReloadListener(NPCRetexturing.getInstance());
+			manager.registerReloadListener(new ItemCustomizeManager.ReloadListener());
+			manager.registerReloadListener(new CustomBlockSounds.ReloaderListener());
+		}
+
 		this.commands = new Commands();
 
 		BackgroundBlur.registerListener();
@@ -410,8 +412,6 @@ public class NotEnoughUpdates {
 		return hasSkyblockScoreboard();
 	}
 
-	private boolean hasSkyblockScoreboard;
-
 	public boolean hasSkyblockScoreboard() {
 		return hasSkyblockScoreboard;
 	}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/listener/OldAnimationChecker.java b/src/main/java/io/github/moulberry/notenoughupdates/listener/OldAnimationChecker.java
new file mode 100644
index 00000000..e537b2b7
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/listener/OldAnimationChecker.java
@@ -0,0 +1,49 @@
+package io.github.moulberry.notenoughupdates.listener;
+
+import com.google.common.collect.Lists;
+import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
+import io.github.moulberry.notenoughupdates.util.NotificationHandler;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.world.WorldEvent;
+import net.minecraftforge.fml.common.Loader;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+
+public class OldAnimationChecker {
+
+	private void unregister() {
+		MinecraftForge.EVENT_BUS.unregister(this);
+	}
+
+	@SubscribeEvent
+	public void onWorldLoad(WorldEvent.Load event) {
+		if (!NotEnoughUpdates.INSTANCE.config.notifications.doOamNotif) {
+			unregister();
+			return;
+		}
+		boolean oldAnimations = false;
+		if (Loader.isModLoaded("animations")) {
+			oldAnimations = true;
+		} else {
+			try {
+				Class.forName("com.spiderfrog.oldanimations.OldAnimationsMod");
+				//previous statement would throw if not present
+				oldAnimations = true;
+			} catch (ClassNotFoundException ignored) {
+			}
+		}
+
+		if (oldAnimations) {
+			NotificationHandler.displayNotification(Lists.newArrayList(
+				"\u00a74Old animations warning",
+				"\u00a77You use a old animations mod from Orange or spiderfrog",
+				"\u00a77These mods break features in NEU and other mods",
+				"\u00a77Please remove them and optionally replace them with the OldAnimations mod from Sk1er",
+				"\u00a77It can be found at the following website: \u00a79sk1er.club/beta",
+				"\u00a77For more information join the discord at \u00a79discord.gg/moulberry\u00a77 and message in \u00a79#neu-support",
+				"\u00a77",
+				"\u00a77Press X on your keyboard to close this notification or turn it off in the config"
+			), true, true);
+			unregister();
+		}
+	}
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/StorageOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/StorageOverlay.java
index 2d4d4382..0d8cb6ec 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/StorageOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/StorageOverlay.java
@@ -2313,7 +2313,7 @@ public class StorageOverlay extends GuiElement {
 				"\u00a77ESC > Options > Video Settings > Performance > Fast Render",
 				"\u00a77This can't be fixed.",
 				"\u00a77",
-				"\u00a77Press X on your keyboard to close this notifcation"
+				"\u00a77Press X on your keyboard to close this notification"
 			), true, true);
 			return;
 		}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Notifications.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Notifications.java
index 0c222aa9..fd934330 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Notifications.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Notifications.java
@@ -22,11 +22,11 @@ public class Notifications {
 	@ConfigEditorBoolean
 	public boolean doRamNotif = true;
 
-	/*@Expose
+	@Expose
 	@ConfigOption(
-		name = "Wrong Pet",
-		desc = "Gives a notification in chat whenever you're using a pet that doesnt match the same xp you're gathering."
+		name = "OldAnimations warning",
+		desc = "Warning when an unsupported OldAnimations mod is used"
 	)
 	@ConfigEditorBoolean
-	public boolean showWrongPetMsg = false;*/
+	public boolean doOamNotif = true;
 }