From f265dab938b5163ffad9f638040eb6472ae7d67d Mon Sep 17 00:00:00 2001
From: Kamesuta <kamesuta@gmail.com>
Date: Sun, 4 Nov 2018 17:25:46 +0900
Subject: [PATCH] compat

---
 .../java/net/teamfruit/serverobserver/ServerObserver.java | 2 +-
 .../main/java/net/teamfruit/serverobserver/Compat.java    | 1 -
 .../java/net/teamfruit/serverobserver/ServerObserver.java | 2 +-
 .../main/java/net/teamfruit/serverobserver/Compat.java    | 1 -
 .../java/net/teamfruit/serverobserver/ServerObserver.java | 2 +-
 .../main/java/net/teamfruit/serverobserver/Compat.java    | 1 -
 .../java/net/teamfruit/serverobserver/ServerObserver.java | 2 +-
 .../main/java/net/teamfruit/serverobserver/Compat.java    | 1 -
 .../java/net/teamfruit/serverobserver/ServerObserver.java | 2 +-
 .../main/java/net/teamfruit/serverobserver/Compat.java    | 1 -
 .../java/net/teamfruit/serverobserver/ServerObserver.java | 2 +-
 .../main/java/net/teamfruit/serverobserver/Compat.java    | 1 -
 .../java/net/teamfruit/serverobserver/ServerObserver.java | 2 +-
 .../net/teamfruit/serverobserver/ServerObserverL.java     | 2 +-
 .../main/java/net/teamfruit/serverobserver/Compat.java    | 1 -
 .../main/java/net/teamfruit/serverobserver/ICompat.java   | 1 -
 .../serverobserver/SkeletonButtonDrawInside.java          | 8 ++++++++
 .../java/net/teamfruit/serverobserver/GuiHandler.java     | 4 ----
 18 files changed, 16 insertions(+), 20 deletions(-)
 rename sources/{universal => base}/src/main/java/net/teamfruit/serverobserver/ICompat.java (93%)
 create mode 100644 sources/base/src/main/java/net/teamfruit/serverobserver/SkeletonButtonDrawInside.java

diff --git a/1.10.2/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java b/1.10.2/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
index 5a6e5a6..2393dd2 100644
--- a/1.10.2/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
+++ b/1.10.2/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
@@ -23,7 +23,7 @@
 @Mod(modid = Reference.MODID, name = Reference.NAME, version = Reference.VERSION, guiFactory = Reference.GUI_FACTORY)
 public class ServerObserver {
 	@SidedProxy(serverSide = Reference.PROXY_SERVER, clientSide = Reference.PROXY_CLIENT)
-	private static @Nullable CommonProxy proxy;
+	private static @Nullable CompatProxy proxy;
 
 	@NetworkCheckHandler
 	public boolean checkModList(final @Nonnull Map<String, String> versions, final @Nonnull Side side) {
diff --git a/1.10.2/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java b/1.10.2/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
index f6bd5c5..5cd5d0a 100644
--- a/1.10.2/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
+++ b/1.10.2/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
@@ -26,7 +26,6 @@
 import net.minecraftforge.client.event.GuiScreenEvent.ActionPerformedEvent;
 import net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent;
 import net.minecraftforge.fml.client.FMLClientHandler;
-import net.teamfruit.serverobserver.GuiHandler.SkeletonButtonDrawInside;
 
 public class Compat implements ICompat {
 	public static final @Nonnull ICompat compat = new Compat();
diff --git a/1.11.2/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java b/1.11.2/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
index 5a6e5a6..2393dd2 100644
--- a/1.11.2/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
+++ b/1.11.2/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
@@ -23,7 +23,7 @@
 @Mod(modid = Reference.MODID, name = Reference.NAME, version = Reference.VERSION, guiFactory = Reference.GUI_FACTORY)
 public class ServerObserver {
 	@SidedProxy(serverSide = Reference.PROXY_SERVER, clientSide = Reference.PROXY_CLIENT)
-	private static @Nullable CommonProxy proxy;
+	private static @Nullable CompatProxy proxy;
 
 	@NetworkCheckHandler
 	public boolean checkModList(final @Nonnull Map<String, String> versions, final @Nonnull Side side) {
diff --git a/1.11.2/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java b/1.11.2/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
index f6bd5c5..5cd5d0a 100644
--- a/1.11.2/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
+++ b/1.11.2/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
@@ -26,7 +26,6 @@
 import net.minecraftforge.client.event.GuiScreenEvent.ActionPerformedEvent;
 import net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent;
 import net.minecraftforge.fml.client.FMLClientHandler;
-import net.teamfruit.serverobserver.GuiHandler.SkeletonButtonDrawInside;
 
 public class Compat implements ICompat {
 	public static final @Nonnull ICompat compat = new Compat();
diff --git a/1.12.2/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java b/1.12.2/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
index 5a6e5a6..2393dd2 100644
--- a/1.12.2/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
+++ b/1.12.2/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
@@ -23,7 +23,7 @@
 @Mod(modid = Reference.MODID, name = Reference.NAME, version = Reference.VERSION, guiFactory = Reference.GUI_FACTORY)
 public class ServerObserver {
 	@SidedProxy(serverSide = Reference.PROXY_SERVER, clientSide = Reference.PROXY_CLIENT)
-	private static @Nullable CommonProxy proxy;
+	private static @Nullable CompatProxy proxy;
 
 	@NetworkCheckHandler
 	public boolean checkModList(final @Nonnull Map<String, String> versions, final @Nonnull Side side) {
diff --git a/1.12.2/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java b/1.12.2/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
index 8039b37..77bce75 100644
--- a/1.12.2/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
+++ b/1.12.2/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
@@ -26,7 +26,6 @@
 import net.minecraftforge.client.event.GuiScreenEvent.ActionPerformedEvent;
 import net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent;
 import net.minecraftforge.fml.client.FMLClientHandler;
-import net.teamfruit.serverobserver.GuiHandler.SkeletonButtonDrawInside;
 
 public class Compat implements ICompat {
 	public static final @Nonnull ICompat compat = new Compat();
diff --git a/1.7.10/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java b/1.7.10/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
index 5b9b41c..d279a01 100644
--- a/1.7.10/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
+++ b/1.7.10/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
@@ -23,7 +23,7 @@
 @Mod(modid = Reference.MODID, name = Reference.NAME, version = Reference.VERSION, guiFactory = Reference.GUI_FACTORY)
 public class ServerObserver {
 	@SidedProxy(serverSide = Reference.PROXY_SERVER, clientSide = Reference.PROXY_CLIENT)
-	private static @Nullable CommonProxy proxy;
+	private static @Nullable CompatProxy proxy;
 
 	@NetworkCheckHandler
 	public boolean checkModList(final @Nonnull Map<String, String> versions, final @Nonnull Side side) {
diff --git a/1.7.10/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java b/1.7.10/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
index a901b71..b673398 100644
--- a/1.7.10/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
+++ b/1.7.10/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
@@ -24,7 +24,6 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.event.GuiScreenEvent.ActionPerformedEvent;
 import net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent;
-import net.teamfruit.serverobserver.GuiHandler.SkeletonButtonDrawInside;
 
 public class Compat implements ICompat {
 	public static final @Nonnull ICompat compat = new Compat();
diff --git a/1.8.9/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java b/1.8.9/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
index 5a6e5a6..2393dd2 100644
--- a/1.8.9/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
+++ b/1.8.9/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
@@ -23,7 +23,7 @@
 @Mod(modid = Reference.MODID, name = Reference.NAME, version = Reference.VERSION, guiFactory = Reference.GUI_FACTORY)
 public class ServerObserver {
 	@SidedProxy(serverSide = Reference.PROXY_SERVER, clientSide = Reference.PROXY_CLIENT)
-	private static @Nullable CommonProxy proxy;
+	private static @Nullable CompatProxy proxy;
 
 	@NetworkCheckHandler
 	public boolean checkModList(final @Nonnull Map<String, String> versions, final @Nonnull Side side) {
diff --git a/1.8.9/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java b/1.8.9/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
index b58c4ce..f79267b 100644
--- a/1.8.9/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
+++ b/1.8.9/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
@@ -23,7 +23,6 @@
 import net.minecraftforge.client.event.GuiScreenEvent.ActionPerformedEvent;
 import net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent;
 import net.minecraftforge.fml.client.FMLClientHandler;
-import net.teamfruit.serverobserver.GuiHandler.SkeletonButtonDrawInside;
 
 public class Compat implements ICompat {
 	public static final @Nonnull ICompat compat = new Compat();
diff --git a/1.9.4/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java b/1.9.4/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
index 5a6e5a6..2393dd2 100644
--- a/1.9.4/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
+++ b/1.9.4/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
@@ -23,7 +23,7 @@
 @Mod(modid = Reference.MODID, name = Reference.NAME, version = Reference.VERSION, guiFactory = Reference.GUI_FACTORY)
 public class ServerObserver {
 	@SidedProxy(serverSide = Reference.PROXY_SERVER, clientSide = Reference.PROXY_CLIENT)
-	private static @Nullable CommonProxy proxy;
+	private static @Nullable CompatProxy proxy;
 
 	@NetworkCheckHandler
 	public boolean checkModList(final @Nonnull Map<String, String> versions, final @Nonnull Side side) {
diff --git a/1.9.4/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java b/1.9.4/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
index 452ebd2..555f3e8 100644
--- a/1.9.4/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
+++ b/1.9.4/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
@@ -26,7 +26,6 @@
 import net.minecraftforge.client.event.GuiScreenEvent.ActionPerformedEvent;
 import net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent;
 import net.minecraftforge.fml.client.FMLClientHandler;
-import net.teamfruit.serverobserver.GuiHandler.SkeletonButtonDrawInside;
 
 public class Compat implements ICompat {
 	public static final @Nonnull ICompat compat = new Compat();
diff --git a/common/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java b/common/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
index 3713a05..0ba678b 100644
--- a/common/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
+++ b/common/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
@@ -23,7 +23,7 @@
 @Mod(modid = Reference.MODID, name = Reference.NAME, version = Reference.VERSION, guiFactory = Reference.GUI_FACTORY)
 public class ServerObserver {
 	@SidedProxy(serverSide = Reference.PROXY_SERVER, clientSide = Reference.PROXY_CLIENT)
-	private static @Nullable CommonProxy proxy;
+	private static @Nullable CompatProxy proxy;
 
 	static {
 		UniversalVersioner.loadVersionFromFMLMod();
diff --git a/common/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserverL.java b/common/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserverL.java
index d410016..f26501f 100644
--- a/common/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserverL.java
+++ b/common/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserverL.java
@@ -23,7 +23,7 @@
 @Mod(modid = Reference.MODID, name = Reference.NAME, version = Reference.VERSION, guiFactory = Reference.GUI_FACTORY)
 public class ServerObserverL {
 	@SidedProxy(serverSide = Reference.PROXY_SERVER, clientSide = Reference.PROXY_CLIENT)
-	private static @Nullable CommonProxy proxy;
+	private static @Nullable CompatProxy proxy;
 
 	static {
 		UniversalVersioner.loadVersionFromFMLMod();
diff --git a/common/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java b/common/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
index 8039b37..77bce75 100644
--- a/common/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
+++ b/common/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
@@ -26,7 +26,6 @@
 import net.minecraftforge.client.event.GuiScreenEvent.ActionPerformedEvent;
 import net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent;
 import net.minecraftforge.fml.client.FMLClientHandler;
-import net.teamfruit.serverobserver.GuiHandler.SkeletonButtonDrawInside;
 
 public class Compat implements ICompat {
 	public static final @Nonnull ICompat compat = new Compat();
diff --git a/sources/universal/src/main/java/net/teamfruit/serverobserver/ICompat.java b/sources/base/src/main/java/net/teamfruit/serverobserver/ICompat.java
similarity index 93%
rename from sources/universal/src/main/java/net/teamfruit/serverobserver/ICompat.java
rename to sources/base/src/main/java/net/teamfruit/serverobserver/ICompat.java
index 966b1f5..6506729 100644
--- a/sources/universal/src/main/java/net/teamfruit/serverobserver/ICompat.java
+++ b/sources/base/src/main/java/net/teamfruit/serverobserver/ICompat.java
@@ -18,7 +18,6 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.event.GuiScreenEvent.ActionPerformedEvent;
 import net.minecraftforge.client.event.GuiScreenEvent.InitGuiEvent;
-import net.teamfruit.serverobserver.GuiHandler.SkeletonButtonDrawInside;
 
 public interface ICompat {
 
diff --git a/sources/base/src/main/java/net/teamfruit/serverobserver/SkeletonButtonDrawInside.java b/sources/base/src/main/java/net/teamfruit/serverobserver/SkeletonButtonDrawInside.java
new file mode 100644
index 0000000..0dae828
--- /dev/null
+++ b/sources/base/src/main/java/net/teamfruit/serverobserver/SkeletonButtonDrawInside.java
@@ -0,0 +1,8 @@
+package net.teamfruit.serverobserver;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+
+public interface SkeletonButtonDrawInside {
+	void drawInside(GuiButton button, final Minecraft mc, final int mouseX, final int mouseY, final int x, final int y);
+}
diff --git a/sources/universal/src/main/java/net/teamfruit/serverobserver/GuiHandler.java b/sources/universal/src/main/java/net/teamfruit/serverobserver/GuiHandler.java
index 2f9dfa3..78e2c2d 100644
--- a/sources/universal/src/main/java/net/teamfruit/serverobserver/GuiHandler.java
+++ b/sources/universal/src/main/java/net/teamfruit/serverobserver/GuiHandler.java
@@ -53,10 +53,6 @@ public GuiHandler(final ICompat compat) {
 		this.compat = compat;
 	}
 
-	public interface SkeletonButtonDrawInside {
-		void drawInside(GuiButton button, final Minecraft mc, final int mouseX, final int mouseY, final int x, final int y);
-	}
-
 	private boolean isFirstOpen = true;
 
 	private boolean isMainMenu(final GuiScreen screen) {