Skip to content

Commit

Permalink
compat
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kamesuta
Kamesuta committed Nov 4, 2018
1 parent dcb062b commit f265dab
Show file tree
Hide file tree
Showing 18 changed files with 16 additions and 20 deletions.
2 changes: 1 addition & 1 deletion 1.10.2/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion 1.10.2/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion 1.11.2/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion 1.11.2/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion 1.12.2/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion 1.12.2/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion 1.7.10/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion 1.7.10/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion 1.8.9/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion 1.8.9/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion 1.9.4/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion 1.9.4/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion common/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion common/sources/bootstrap/src/main/java/net/teamfruit/serverobserver/ServerObserverL.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion common/sources/compat/src/main/java/net/teamfruit/serverobserver/Compat.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion ...net/teamfruit/serverobserver/ICompat.java → ...net/teamfruit/serverobserver/ICompat.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
8 changes: 8 additions & 0 deletions sources/base/src/main/java/net/teamfruit/serverobserver/SkeletonButtonDrawInside.java
View file
Original file line number Diff line number Diff line change
@@ -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);
}
4 changes: 0 additions & 4 deletions sources/universal/src/main/java/net/teamfruit/serverobserver/GuiHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit f265dab

Please sign in to comment.