diff --git a/src/main/java/forestry/apiculture/GuiHandlerApiculture.java b/src/main/java/forestry/apiculture/GuiHandlerApiculture.java index 61c46ef6c..314d2aa87 100755 --- a/src/main/java/forestry/apiculture/GuiHandlerApiculture.java +++ b/src/main/java/forestry/apiculture/GuiHandlerApiculture.java @@ -17,6 +17,9 @@ import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import forestry.api.apiculture.BeeManager; import forestry.apiculture.entities.EntityMinecartApiary; import forestry.apiculture.entities.EntityMinecartBeehouse; @@ -52,6 +55,7 @@ import forestry.core.tiles.TileUtil; public class GuiHandlerApiculture extends GuiHandlerBase { + @SideOnly(Side.CLIENT) @Override public Gui getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { int cleanId = decodeGuiID(id); diff --git a/src/main/java/forestry/arboriculture/GuiHandlerArboriculture.java b/src/main/java/forestry/arboriculture/GuiHandlerArboriculture.java index 16e6d8827..3cbd03b0c 100755 --- a/src/main/java/forestry/arboriculture/GuiHandlerArboriculture.java +++ b/src/main/java/forestry/arboriculture/GuiHandlerArboriculture.java @@ -10,10 +10,15 @@ ******************************************************************************/ package forestry.arboriculture; +import net.minecraft.client.gui.Gui; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import forestry.api.arboriculture.TreeManager; import forestry.arboriculture.gui.GuiTreealyzer; import forestry.arboriculture.inventory.ItemInventoryTreealyzer; @@ -24,7 +29,7 @@ import forestry.core.network.GuiId; public class GuiHandlerArboriculture extends GuiHandlerBase { @Override - public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + public Container getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { int cleanId = decodeGuiID(id); if (cleanId >= GuiId.values().length) { @@ -51,8 +56,9 @@ public class GuiHandlerArboriculture extends GuiHandlerBase { } + @SideOnly(Side.CLIENT) @Override - public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + public Gui getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { int cleanId = decodeGuiID(id); if (cleanId >= GuiId.values().length) { diff --git a/src/main/java/forestry/core/GuiHandler.java b/src/main/java/forestry/core/GuiHandler.java index 4ca41581a..849a8c399 100755 --- a/src/main/java/forestry/core/GuiHandler.java +++ b/src/main/java/forestry/core/GuiHandler.java @@ -10,11 +10,14 @@ ******************************************************************************/ package forestry.core; +import net.minecraft.client.gui.Gui; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import forestry.core.circuits.ContainerSolderingIron; import forestry.core.circuits.GuiSolderingIron; @@ -31,8 +34,9 @@ import forestry.plugins.PluginManager; public class GuiHandler extends GuiHandlerBase { + @SideOnly(Side.CLIENT) @Override - public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + public Gui getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { int cleanId = decodeGuiID(id); if (cleanId < GuiId.values().length) { @@ -52,8 +56,8 @@ public class GuiHandler extends GuiHandlerBase { return new GuiSolderingIron(player, new ItemInventorySolderingIron(player, equipped)); default: - for (IGuiHandler handler : PluginManager.guiHandlers) { - Object element = handler.getClientGuiElement(id, player, world, x, y, z); + for (GuiHandlerBase handler : PluginManager.guiHandlers) { + Gui element = handler.getClientGuiElement(id, player, world, x, y, z); if (element != null) { return element; } @@ -67,7 +71,7 @@ public class GuiHandler extends GuiHandlerBase { } @Override - public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + public Container getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { int cleanId = decodeGuiID(id); if (cleanId < GuiId.values().length) { @@ -87,8 +91,8 @@ public class GuiHandler extends GuiHandlerBase { return new ContainerSolderingIron(player, new ItemInventorySolderingIron(player, equipped)); default: - for (IGuiHandler handler : PluginManager.guiHandlers) { - Object element = handler.getServerGuiElement(id, player, world, x, y, z); + for (GuiHandlerBase handler : PluginManager.guiHandlers) { + Container element = handler.getServerGuiElement(id, player, world, x, y, z); if (element != null) { return element; } diff --git a/src/main/java/forestry/core/GuiHandlerBase.java b/src/main/java/forestry/core/GuiHandlerBase.java index ed2e8c2a5..80342d089 100755 --- a/src/main/java/forestry/core/GuiHandlerBase.java +++ b/src/main/java/forestry/core/GuiHandlerBase.java @@ -10,10 +10,14 @@ ******************************************************************************/ package forestry.core; +import net.minecraft.client.gui.Gui; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.world.World; import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import forestry.api.genetics.ISpeciesRoot; import forestry.core.gui.ContainerNaturalistInventory; @@ -24,6 +28,13 @@ import forestry.core.tiles.TileUtil; public abstract class GuiHandlerBase implements IGuiHandler { + @Override + public abstract Container getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z); + + @SideOnly(Side.CLIENT) + @Override + public abstract Gui getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z); + protected GuiNaturalistInventory getNaturalistChestGui(ISpeciesRoot speciesRoot, EntityPlayer player, World world, int x, int y, int z, int page) { TileNaturalistChest tile = TileUtil.getTile(world, x, y, z, TileNaturalistChest.class); return new GuiNaturalistInventory(speciesRoot, player, new ContainerNaturalistInventory(player.inventory, tile, page), tile, page, 5); diff --git a/src/main/java/forestry/energy/GuiHandlerEnergy.java b/src/main/java/forestry/energy/GuiHandlerEnergy.java index ba6b5f79d..736072e5b 100755 --- a/src/main/java/forestry/energy/GuiHandlerEnergy.java +++ b/src/main/java/forestry/energy/GuiHandlerEnergy.java @@ -10,9 +10,14 @@ ******************************************************************************/ package forestry.energy; +import net.minecraft.client.gui.Gui; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import forestry.core.GuiHandlerBase; import forestry.core.network.GuiId; import forestry.core.network.PacketSocketUpdate; @@ -33,8 +38,9 @@ import forestry.energy.tiles.TileGenerator; public class GuiHandlerEnergy extends GuiHandlerBase { + @SideOnly(Side.CLIENT) @Override - public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + public Gui getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { if (id >= GuiId.values().length) { return null; @@ -60,7 +66,7 @@ public class GuiHandlerEnergy extends GuiHandlerBase { } @Override - public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + public Container getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { if (id >= GuiId.values().length) { return null; diff --git a/src/main/java/forestry/factory/GuiHandlerFactory.java b/src/main/java/forestry/factory/GuiHandlerFactory.java index 32b0fe4a2..572239abf 100755 --- a/src/main/java/forestry/factory/GuiHandlerFactory.java +++ b/src/main/java/forestry/factory/GuiHandlerFactory.java @@ -10,9 +10,14 @@ ******************************************************************************/ package forestry.factory; +import net.minecraft.client.gui.Gui; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import forestry.core.GuiHandlerBase; import forestry.core.network.GuiId; import forestry.core.tiles.TileUtil; @@ -49,8 +54,9 @@ import forestry.factory.tiles.TileWorktable; public class GuiHandlerFactory extends GuiHandlerBase { + @SideOnly(Side.CLIENT) @Override - public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + public Gui getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { if (id >= GuiId.values().length) { return null; @@ -95,7 +101,7 @@ public class GuiHandlerFactory extends GuiHandlerBase { } @Override - public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + public Container getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { if (id >= GuiId.values().length) { return null; diff --git a/src/main/java/forestry/farming/GuiHandlerFarming.java b/src/main/java/forestry/farming/GuiHandlerFarming.java index eae4f69ef..4c8bba931 100755 --- a/src/main/java/forestry/farming/GuiHandlerFarming.java +++ b/src/main/java/forestry/farming/GuiHandlerFarming.java @@ -10,9 +10,14 @@ ******************************************************************************/ package forestry.farming; +import net.minecraft.client.gui.Gui; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import forestry.core.GuiHandlerBase; import forestry.core.network.GuiId; import forestry.core.network.PacketSocketUpdate; @@ -25,7 +30,7 @@ import forestry.farming.tiles.TileFarm; public class GuiHandlerFarming extends GuiHandlerBase { @Override - public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + public Container getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { if (id >= GuiId.values().length) { return null; @@ -42,8 +47,9 @@ public class GuiHandlerFarming extends GuiHandlerBase { } } + @SideOnly(Side.CLIENT) @Override - public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + public Gui getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { if (id >= GuiId.values().length) { return null; } diff --git a/src/main/java/forestry/food/GuiHandlerFood.java b/src/main/java/forestry/food/GuiHandlerFood.java index be0528cae..57a2b9438 100755 --- a/src/main/java/forestry/food/GuiHandlerFood.java +++ b/src/main/java/forestry/food/GuiHandlerFood.java @@ -10,10 +10,15 @@ ******************************************************************************/ package forestry.food; +import net.minecraft.client.gui.Gui; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import forestry.core.GuiHandlerBase; import forestry.core.network.GuiId; import forestry.food.gui.ContainerInfuser; @@ -21,8 +26,9 @@ import forestry.food.gui.GuiInfuser; import forestry.food.inventory.ItemInventoryInfuser; public class GuiHandlerFood extends GuiHandlerBase { + @SideOnly(Side.CLIENT) @Override - public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + public Gui getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { if (id >= GuiId.values().length) { return null; @@ -43,7 +49,7 @@ public class GuiHandlerFood extends GuiHandlerBase { } @Override - public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + public Container getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { if (id >= GuiId.values().length) { return null; diff --git a/src/main/java/forestry/lepidopterology/GuiHandlerLepidopterology.java b/src/main/java/forestry/lepidopterology/GuiHandlerLepidopterology.java index 2087d8b16..6d0e229f2 100755 --- a/src/main/java/forestry/lepidopterology/GuiHandlerLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/GuiHandlerLepidopterology.java @@ -10,10 +10,15 @@ ******************************************************************************/ package forestry.lepidopterology; +import net.minecraft.client.gui.Gui; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import forestry.api.lepidopterology.ButterflyManager; import forestry.core.GuiHandlerBase; import forestry.core.gui.ContainerAlyzer; @@ -24,7 +29,7 @@ import forestry.lepidopterology.inventory.ItemInventoryFlutterlyzer; public class GuiHandlerLepidopterology extends GuiHandlerBase { @Override - public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + public Container getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { int cleanId = decodeGuiID(id); int guiData = decodeGuiData(id); @@ -50,8 +55,9 @@ public class GuiHandlerLepidopterology extends GuiHandlerBase { } } + @SideOnly(Side.CLIENT) @Override - public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + public Gui getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { int cleanId = decodeGuiID(id); int guiData = decodeGuiData(id); diff --git a/src/main/java/forestry/mail/GuiHandlerMail.java b/src/main/java/forestry/mail/GuiHandlerMail.java index bfbbbadf4..35f3d227a 100755 --- a/src/main/java/forestry/mail/GuiHandlerMail.java +++ b/src/main/java/forestry/mail/GuiHandlerMail.java @@ -10,10 +10,15 @@ ******************************************************************************/ package forestry.mail; +import net.minecraft.client.gui.Gui; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import forestry.core.GuiHandlerBase; import forestry.core.config.ForestryItem; import forestry.core.network.GuiId; @@ -38,8 +43,9 @@ import forestry.mail.tiles.TileTrader; public class GuiHandlerMail extends GuiHandlerBase { + @SideOnly(Side.CLIENT) @Override - public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + public Gui getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { if (id >= GuiId.values().length) { return null; @@ -85,7 +91,7 @@ public class GuiHandlerMail extends GuiHandlerBase { } @Override - public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { + public Container getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { if (id >= GuiId.values().length) { return null; diff --git a/src/main/java/forestry/plugins/ForestryPlugin.java b/src/main/java/forestry/plugins/ForestryPlugin.java index 4a174d64b..f38a55d99 100755 --- a/src/main/java/forestry/plugins/ForestryPlugin.java +++ b/src/main/java/forestry/plugins/ForestryPlugin.java @@ -19,8 +19,8 @@ import net.minecraft.world.chunk.IChunkProvider; import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; -import cpw.mods.fml.common.network.IGuiHandler; +import forestry.core.GuiHandlerBase; import forestry.core.IPickupHandler; import forestry.core.IResupplyHandler; import forestry.core.ISaveEventHandler; @@ -94,7 +94,7 @@ public abstract class ForestryPlugin { Log.warning(invalidIMCMessageText); } - public IGuiHandler getGuiHandler() { + public GuiHandlerBase getGuiHandler() { return null; } diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index 6a4fee7aa..404088451 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -43,7 +43,6 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.VillagerRegistry; @@ -121,6 +120,7 @@ import forestry.apiculture.worldgen.HiveDecorator; import forestry.apiculture.worldgen.HiveDescription; import forestry.apiculture.worldgen.HiveGenHelper; import forestry.apiculture.worldgen.HiveRegistry; +import forestry.core.GuiHandlerBase; import forestry.core.ISaveEventHandler; import forestry.core.blocks.BlockBase; import forestry.core.config.Config; @@ -515,7 +515,7 @@ public class PluginApiculture extends ForestryPlugin { } @Override - public IGuiHandler getGuiHandler() { + public GuiHandlerBase getGuiHandler() { return new GuiHandlerApiculture(); } diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index 207c74a44..644608752 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -27,7 +27,6 @@ import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; -import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.VillagerRegistry; @@ -73,6 +72,7 @@ import forestry.arboriculture.tiles.TileFruitPod; import forestry.arboriculture.tiles.TileLeaves; import forestry.arboriculture.tiles.TileSapling; import forestry.arboriculture.tiles.TileWood; +import forestry.core.GuiHandlerBase; import forestry.core.blocks.BlockBase; import forestry.core.config.Config; import forestry.core.config.Constants; @@ -378,7 +378,7 @@ public class PluginArboriculture extends ForestryPlugin { } @Override - public IGuiHandler getGuiHandler() { + public GuiHandlerBase getGuiHandler() { return new GuiHandlerArboriculture(); } diff --git a/src/main/java/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java index fb4157cda..0cda8f0b6 100644 --- a/src/main/java/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -25,7 +25,6 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.RecipeSorter; import cpw.mods.fml.common.IFuelHandler; -import cpw.mods.fml.common.network.IGuiHandler; import forestry.api.circuits.ChipsetManager; import forestry.api.core.ForestryAPI; @@ -34,6 +33,7 @@ import forestry.api.genetics.AlleleManager; import forestry.api.storage.ICrateRegistry; import forestry.api.storage.StorageManager; import forestry.core.CreativeTabForestry; +import forestry.core.GuiHandlerBase; import forestry.core.IPickupHandler; import forestry.core.ISaveEventHandler; import forestry.core.PickupHandlerCore; @@ -284,7 +284,7 @@ public class PluginCore extends ForestryPlugin { } @Override - public IGuiHandler getGuiHandler() { + public GuiHandlerBase getGuiHandler() { return null; } diff --git a/src/main/java/forestry/plugins/PluginEnergy.java b/src/main/java/forestry/plugins/PluginEnergy.java index ff85ce0a6..be3335d5c 100755 --- a/src/main/java/forestry/plugins/PluginEnergy.java +++ b/src/main/java/forestry/plugins/PluginEnergy.java @@ -15,9 +15,9 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.network.IGuiHandler; import forestry.api.core.ForestryAPI; +import forestry.core.GuiHandlerBase; import forestry.core.blocks.BlockBase; import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; @@ -101,7 +101,7 @@ public class PluginEnergy extends ForestryPlugin { } @Override - public IGuiHandler getGuiHandler() { + public GuiHandlerBase getGuiHandler() { return new GuiHandlerEnergy(); } } diff --git a/src/main/java/forestry/plugins/PluginFactory.java b/src/main/java/forestry/plugins/PluginFactory.java index 1565f1f61..3a0dde92a 100644 --- a/src/main/java/forestry/plugins/PluginFactory.java +++ b/src/main/java/forestry/plugins/PluginFactory.java @@ -21,8 +21,6 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.network.IGuiHandler; - import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.CircuitSocketType; import forestry.api.circuits.ICircuitLayout; @@ -35,6 +33,7 @@ import forestry.api.fuels.MoistenerFuel; import forestry.api.fuels.RainSubstrate; import forestry.api.recipes.ICraftingProvider; import forestry.api.recipes.RecipeManagers; +import forestry.core.GuiHandlerBase; import forestry.core.blocks.BlockBase; import forestry.core.circuits.Circuit; import forestry.core.circuits.CircuitLayout; @@ -564,7 +563,7 @@ public class PluginFactory extends ForestryPlugin { } @Override - public IGuiHandler getGuiHandler() { + public GuiHandlerBase getGuiHandler() { return new GuiHandlerFactory(); } diff --git a/src/main/java/forestry/plugins/PluginFarming.java b/src/main/java/forestry/plugins/PluginFarming.java index 24e397566..09279ea19 100644 --- a/src/main/java/forestry/plugins/PluginFarming.java +++ b/src/main/java/forestry/plugins/PluginFarming.java @@ -27,7 +27,6 @@ import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; -import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.common.registry.GameRegistry; @@ -36,6 +35,7 @@ import forestry.api.circuits.CircuitSocketType; import forestry.api.circuits.ICircuitLayout; import forestry.api.farming.Farmables; import forestry.api.farming.IFarmable; +import forestry.core.GuiHandlerBase; import forestry.core.circuits.Circuit; import forestry.core.circuits.CircuitLayout; import forestry.core.config.Constants; @@ -284,7 +284,7 @@ public class PluginFarming extends ForestryPlugin { } @Override - public IGuiHandler getGuiHandler() { + public GuiHandlerBase getGuiHandler() { return new GuiHandlerFarming(); } diff --git a/src/main/java/forestry/plugins/PluginFood.java b/src/main/java/forestry/plugins/PluginFood.java index 1b6c60b6b..f69d1d0a1 100755 --- a/src/main/java/forestry/plugins/PluginFood.java +++ b/src/main/java/forestry/plugins/PluginFood.java @@ -16,9 +16,8 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.network.IGuiHandler; - import forestry.api.food.BeverageManager; +import forestry.core.GuiHandlerBase; import forestry.core.config.Constants; import forestry.core.config.ForestryItem; import forestry.core.fluids.Fluids; @@ -91,7 +90,7 @@ public class PluginFood extends ForestryPlugin { } @Override - public IGuiHandler getGuiHandler() { + public GuiHandlerBase getGuiHandler() { return new GuiHandlerFood(); } } diff --git a/src/main/java/forestry/plugins/PluginLepidopterology.java b/src/main/java/forestry/plugins/PluginLepidopterology.java index 395ac11dd..16e09a36f 100755 --- a/src/main/java/forestry/plugins/PluginLepidopterology.java +++ b/src/main/java/forestry/plugins/PluginLepidopterology.java @@ -21,7 +21,6 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.RecipeSorter; import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.network.IGuiHandler; import forestry.Forestry; import forestry.api.arboriculture.TreeManager; @@ -30,6 +29,7 @@ import forestry.api.genetics.AlleleManager; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.recipes.RecipeManagers; +import forestry.core.GuiHandlerBase; import forestry.core.blocks.BlockBase; import forestry.core.config.Constants; import forestry.core.config.ForestryBlock; @@ -155,7 +155,7 @@ public class PluginLepidopterology extends ForestryPlugin { } @Override - public IGuiHandler getGuiHandler() { + public GuiHandlerBase getGuiHandler() { return new GuiHandlerLepidopterology(); } diff --git a/src/main/java/forestry/plugins/PluginMail.java b/src/main/java/forestry/plugins/PluginMail.java index dee87dd6c..ed01a4604 100755 --- a/src/main/java/forestry/plugins/PluginMail.java +++ b/src/main/java/forestry/plugins/PluginMail.java @@ -18,12 +18,12 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.IGuiHandler; import forestry.api.mail.EnumAddressee; import forestry.api.mail.EnumPostage; import forestry.api.mail.PostManager; import forestry.api.recipes.RecipeManagers; +import forestry.core.GuiHandlerBase; import forestry.core.ISaveEventHandler; import forestry.core.blocks.BlockBase; import forestry.core.config.Config; @@ -154,7 +154,7 @@ public class PluginMail extends ForestryPlugin { } @Override - public IGuiHandler getGuiHandler() { + public GuiHandlerBase getGuiHandler() { return new GuiHandlerMail(); } diff --git a/src/main/java/forestry/plugins/PluginManager.java b/src/main/java/forestry/plugins/PluginManager.java index 7896aaf8d..9065461e6 100644 --- a/src/main/java/forestry/plugins/PluginManager.java +++ b/src/main/java/forestry/plugins/PluginManager.java @@ -34,11 +34,11 @@ import net.minecraftforge.common.config.Property; import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameRegistry; import forestry.Forestry; import forestry.api.core.ForestryAPI; +import forestry.core.GuiHandlerBase; import forestry.core.IPickupHandler; import forestry.core.IResupplyHandler; import forestry.core.ISaveEventHandler; @@ -49,7 +49,7 @@ public class PluginManager { private static final String MODULE_CONFIG_FILE_NAME = "modules.cfg"; private static final String CATEGORY_MODULES = "modules"; - public static final ArrayList guiHandlers = Lists.newArrayList(); + public static final ArrayList guiHandlers = Lists.newArrayList(); public static final ArrayList pickupHandlers = Lists.newArrayList(); public static final ArrayList saveEventHandlers = Lists.newArrayList(); public static final ArrayList resupplyHandlers = Lists.newArrayList(); @@ -149,7 +149,7 @@ public class PluginManager { private static void registerHandlers(ForestryPlugin plugin) { Log.fine("Registering Handlers for Plugin: {0}", plugin); - IGuiHandler guiHandler = plugin.getGuiHandler(); + GuiHandlerBase guiHandler = plugin.getGuiHandler(); if (guiHandler != null) { guiHandlers.add(guiHandler); } diff --git a/src/main/java/forestry/plugins/PluginStorage.java b/src/main/java/forestry/plugins/PluginStorage.java index 049ac2bd3..f01bfaa8a 100755 --- a/src/main/java/forestry/plugins/PluginStorage.java +++ b/src/main/java/forestry/plugins/PluginStorage.java @@ -49,7 +49,6 @@ import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; -import cpw.mods.fml.common.network.IGuiHandler; import forestry.Forestry; import forestry.api.core.Tabs; @@ -58,6 +57,7 @@ import forestry.api.storage.BackpackManager; import forestry.api.storage.EnumBackpackType; import forestry.api.storage.IBackpackDefinition; import forestry.api.storage.StorageManager; +import forestry.core.GuiHandlerBase; import forestry.core.IPickupHandler; import forestry.core.IResupplyHandler; import forestry.core.config.Constants; @@ -526,7 +526,7 @@ public class PluginStorage extends ForestryPlugin { } @Override - public IGuiHandler getGuiHandler() { + public GuiHandlerBase getGuiHandler() { return new GuiHandlerStorage(); } diff --git a/src/main/java/forestry/storage/GuiHandlerStorage.java b/src/main/java/forestry/storage/GuiHandlerStorage.java index 77be9e801..040b5a6cf 100755 --- a/src/main/java/forestry/storage/GuiHandlerStorage.java +++ b/src/main/java/forestry/storage/GuiHandlerStorage.java @@ -16,6 +16,9 @@ import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import forestry.api.apiculture.BeeManager; import forestry.api.genetics.ISpeciesRoot; import forestry.api.lepidopterology.ButterflyManager; @@ -32,6 +35,7 @@ import forestry.storage.items.ItemBackpack; public class GuiHandlerStorage extends GuiHandlerBase { + @SideOnly(Side.CLIENT) @Override public Gui getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { int cleanId = decodeGuiID(id); @@ -71,6 +75,7 @@ public class GuiHandlerStorage extends GuiHandlerBase { } } + @SideOnly(Side.CLIENT) private static Gui getNaturalistGui(ISpeciesRoot root, EntityPlayer player, GuiId guiId, int guiData) { ItemStack equipped = getBackpackItem(player); if (equipped == null) {