diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index 201209d72..2dad63af3 100644 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -33,13 +33,13 @@ import cpw.mods.fml.common.registry.GameRegistry.Type; import forestry.api.core.ForestryAPI; import forestry.core.EventHandlerCore; -import forestry.core.GuiHandler; import forestry.core.config.Config; import forestry.core.config.Constants; import forestry.core.config.GameMode; import forestry.core.config.Version; import forestry.core.errors.EnumErrorCode; import forestry.core.errors.ErrorStateRegistry; +import forestry.core.gui.GuiHandler; import forestry.core.multiblock.MultiblockEventHandler; import forestry.core.network.PacketHandler; import forestry.core.proxy.Proxies; diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java b/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java index b8085a231..ee1da4304 100644 --- a/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java +++ b/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java @@ -35,12 +35,11 @@ import forestry.core.entities.EntityMinecartContainerForestry; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IForestryPacketServer; -import forestry.core.network.IGuiHandlerEntity; import forestry.core.network.IStreamableGui; import forestry.core.proxy.Proxies; import forestry.core.tiles.IClimatised; -public abstract class EntityMinecartBeeHousingBase extends EntityMinecartContainerForestry implements IBeeHousing, IGuiBeeHousingInventory, IClimatised, IStreamableGui, IGuiHandlerEntity { +public abstract class EntityMinecartBeeHousingBase extends EntityMinecartContainerForestry implements IBeeHousing, IGuiBeeHousingInventory, IClimatised, IStreamableGui { private static final Random random = new Random(); private static final int beeFXInterval = 4; private static final int pollenFXInterval = 50; diff --git a/src/main/java/forestry/core/GuiHandler.java b/src/main/java/forestry/core/GuiHandler.java deleted file mode 100755 index bf25aa25c..000000000 --- a/src/main/java/forestry/core/GuiHandler.java +++ /dev/null @@ -1,114 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import cpw.mods.fml.common.network.IGuiHandler; - -import forestry.core.network.GuiId; -import forestry.core.network.IGuiHandlerEntity; -import forestry.core.network.IGuiHandlerItem; -import forestry.core.network.IGuiHandlerTile; - -public class GuiHandler implements IGuiHandler { - - public static int encodeGuiData(GuiId guiId, int data) { - return data << 8 | guiId.ordinal(); - } - - public static int decodeGuiID(int guiId) { - return guiId & 0xFF; - } - - public static int decodeGuiData(int guiId) { - return guiId >> 8; - } - - @Override - public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { - int cleanId = decodeGuiID(id); - int data = decodeGuiData(id); - - if (cleanId >= GuiId.values().length) { - return null; - } - - switch (GuiId.values()[cleanId]) { - case ItemGui: { - ItemStack heldItem = player.getCurrentEquippedItem(); - if (heldItem != null) { - Item item = heldItem.getItem(); - if (item instanceof IGuiHandlerItem) { - return ((IGuiHandlerItem) item).getGui(player, heldItem, data); - } - } - break; - } - case TileGui: { - TileEntity tileEntity = world.getTileEntity(x, y, z); - if (tileEntity instanceof IGuiHandlerTile) { - return ((IGuiHandlerTile) tileEntity).getGui(player, data); - } - break; - } - case EntityGui: { - Entity entity = world.getEntityByID(x); - if (entity instanceof IGuiHandlerEntity) { - return ((IGuiHandlerEntity) entity).getGui(player, data); - } - } - } - return null; - } - - @Override - public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { - int cleanId = decodeGuiID(id); - int data = decodeGuiData(id); - - if (cleanId >= GuiId.values().length) { - return null; - } - - switch (GuiId.values()[cleanId]) { - case ItemGui: { - ItemStack heldItem = player.getCurrentEquippedItem(); - if (heldItem != null) { - Item item = heldItem.getItem(); - if (item instanceof IGuiHandlerItem) { - return ((IGuiHandlerItem) item).getContainer(player, heldItem, data); - } - } - break; - } - case TileGui: { - TileEntity tileEntity = world.getTileEntity(x, y, z); - if (tileEntity instanceof IGuiHandlerTile) { - return ((IGuiHandlerTile) tileEntity).getContainer(player, data); - } - break; - } - case EntityGui: { - Entity entity = world.getEntityByID(x); - if (entity instanceof IGuiHandlerEntity) { - return ((IGuiHandlerEntity) entity).getContainer(player, data); - } - } - } - return null; - } -} diff --git a/src/main/java/forestry/core/entities/EntityMinecartForestry.java b/src/main/java/forestry/core/entities/EntityMinecartForestry.java index 2fcc25674..347cb1f09 100644 --- a/src/main/java/forestry/core/entities/EntityMinecartForestry.java +++ b/src/main/java/forestry/core/entities/EntityMinecartForestry.java @@ -24,16 +24,16 @@ import com.mojang.authlib.GameProfile; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.minecart.MinecartInteractEvent; -import forestry.api.core.ForestryAPI; import forestry.core.access.AccessHandler; import forestry.core.access.EnumAccess; import forestry.core.access.IAccessHandler; import forestry.core.access.IRestrictedAccess; +import forestry.core.gui.GuiHandler; +import forestry.core.gui.IGuiHandlerEntity; import forestry.core.gui.IHintSource; -import forestry.core.network.GuiId; import forestry.core.tiles.ITitled; -public abstract class EntityMinecartForestry extends EntityMinecart implements ITitled, IRestrictedAccess, IHintSource { +public abstract class EntityMinecartForestry extends EntityMinecart implements ITitled, IRestrictedAccess, IHintSource, IGuiHandlerEntity { private final AccessHandler accessHandler = new AccessHandler(this); @SuppressWarnings("unused") @@ -54,7 +54,7 @@ public abstract class EntityMinecartForestry extends EntityMinecart implements I } if (!worldObj.isRemote) { - player.openGui(ForestryAPI.instance, GuiId.EntityGui.ordinal(), worldObj, getEntityId(), -1, 0); + GuiHandler.openGui(player, this); } return true; } diff --git a/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java b/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java index 4fcb6ecb1..d7a74044c 100755 --- a/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java +++ b/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java @@ -34,7 +34,7 @@ public class ContainerNaturalistInventory extends ContainerTile> 16); + } + + @Override + public Object getClientGuiElement(int guiData, EntityPlayer player, World world, int x, int y, int z) { + GuiId guiId = decodeGuiID(guiData); + if (guiId == null) { + return null; + } + short data = decodeGuiData(guiData); + + switch (guiId.getGuiType()) { + case Item: { + ItemStack heldItem = player.getCurrentEquippedItem(); + if (heldItem != null) { + Item item = heldItem.getItem(); + if (guiId.getGuiHandlerClass().isInstance(item)) { + return ((IGuiHandlerItem) item).getGui(player, heldItem, data); + } + } + break; + } + case Tile: { + TileEntity tileEntity = world.getTileEntity(x, y, z); + if (guiId.getGuiHandlerClass().isInstance(tileEntity)) { + return ((IGuiHandlerTile) tileEntity).getGui(player, data); + } + break; + } + case Entity: { + Entity entity = world.getEntityByID(x); + if (guiId.getGuiHandlerClass().isInstance(entity)) { + return ((IGuiHandlerEntity) entity).getGui(player, data); + } + break; + } + } + return null; + } + + @Override + public Object getServerGuiElement(int guiData, EntityPlayer player, World world, int x, int y, int z) { + GuiId guiId = decodeGuiID(guiData); + if (guiId == null) { + return null; + } + short data = decodeGuiData(guiData); + + switch (guiId.getGuiType()) { + case Item: { + ItemStack heldItem = player.getCurrentEquippedItem(); + if (heldItem != null) { + Item item = heldItem.getItem(); + if (guiId.getGuiHandlerClass().isInstance(item)) { + return ((IGuiHandlerItem) item).getContainer(player, heldItem, data); + } + } + break; + } + case Tile: { + TileEntity tileEntity = world.getTileEntity(x, y, z); + if (guiId.getGuiHandlerClass().isInstance(tileEntity)) { + return ((IGuiHandlerTile) tileEntity).getContainer(player, data); + } + break; + } + case Entity: { + Entity entity = world.getEntityByID(x); + if (guiId.getGuiHandlerClass().isInstance(entity)) { + return ((IGuiHandlerEntity) entity).getContainer(player, data); + } + break; + } + } + return null; + } +} diff --git a/src/main/java/forestry/core/gui/GuiId.java b/src/main/java/forestry/core/gui/GuiId.java new file mode 100644 index 000000000..7b5f2a429 --- /dev/null +++ b/src/main/java/forestry/core/gui/GuiId.java @@ -0,0 +1,35 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.gui; + +public class GuiId { + private final int id; + private final GuiType guiType; + private final Class guiHandlerClass; + + GuiId(int id, GuiType guiType, Class guiHandlerClass) { + this.id = id; + this.guiType = guiType; + this.guiHandlerClass = guiHandlerClass; + } + + public GuiType getGuiType() { + return guiType; + } + + public Class getGuiHandlerClass() { + return guiHandlerClass; + } + + public int getId() { + return id; + } +} diff --git a/src/main/java/forestry/core/gui/GuiIdRegistry.java b/src/main/java/forestry/core/gui/GuiIdRegistry.java new file mode 100644 index 000000000..d341e4ec6 --- /dev/null +++ b/src/main/java/forestry/core/gui/GuiIdRegistry.java @@ -0,0 +1,142 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.gui; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import forestry.apiculture.entities.EntityMinecartApiary; +import forestry.apiculture.entities.EntityMinecartBeehouse; +import forestry.apiculture.items.ItemBeealyzer; +import forestry.apiculture.items.ItemHabitatLocator; +import forestry.apiculture.items.ItemImprinter; +import forestry.apiculture.multiblock.TileAlveary; +import forestry.apiculture.multiblock.TileAlvearyHygroregulator; +import forestry.apiculture.multiblock.TileAlvearySieve; +import forestry.arboriculture.items.ItemTreealyzer; +import forestry.core.items.ItemSolderingIron; +import forestry.core.tiles.TileAnalyzer; +import forestry.core.tiles.TileEscritoire; +import forestry.core.tiles.TileNaturalistChest; +import forestry.energy.tiles.TileEngineBiogas; +import forestry.energy.tiles.TileEngineElectric; +import forestry.energy.tiles.TileEnginePeat; +import forestry.energy.tiles.TileGenerator; +import forestry.factory.tiles.TileBottler; +import forestry.factory.tiles.TileCarpenter; +import forestry.factory.tiles.TileCentrifuge; +import forestry.factory.tiles.TileFabricator; +import forestry.factory.tiles.TileFermenter; +import forestry.factory.tiles.TileMoistener; +import forestry.factory.tiles.TileRaintank; +import forestry.factory.tiles.TileSqueezer; +import forestry.factory.tiles.TileStill; +import forestry.factory.tiles.TileWorktable; +import forestry.farming.tiles.TileFarm; +import forestry.food.items.ItemInfuser; +import forestry.lepidopterology.items.ItemFlutterlyzer; +import forestry.mail.items.ItemCatalogue; +import forestry.mail.items.ItemLetter; +import forestry.mail.tiles.TileMailbox; +import forestry.mail.tiles.TileStampCollector; +import forestry.mail.tiles.TileTrader; +import forestry.storage.items.ItemBackpack; +import forestry.storage.items.ItemBackpackNaturalist; + +public class GuiIdRegistry { + private static final Map, GuiId> classMap = new HashMap<>(); + private static final Map idMap = new HashMap<>(); + private static int nextId = 0; + + static { + registerGuiHandlers(GuiType.Tile, Arrays.>asList( + TileAlveary.class, + TileAlvearyHygroregulator.class, + TileAlvearySieve.class, + + TileAnalyzer.class, + TileEscritoire.class, + TileNaturalistChest.class, + TileRaintank.class, + TileWorktable.class, + + TileBottler.class, + TileCarpenter.class, + TileCentrifuge.class, + TileFabricator.class, + TileFermenter.class, + TileMoistener.class, + TileSqueezer.class, + TileStill.class, + + TileFarm.class, + + TileEngineBiogas.class, + TileEngineElectric.class, + TileEnginePeat.class, + TileGenerator.class, + + TileMailbox.class, + TileStampCollector.class, + TileTrader.class + )); + + registerGuiHandlers(GuiType.Item, Arrays.>asList( + ItemBackpack.class, + ItemBackpackNaturalist.class, + ItemBeealyzer.class, + ItemCatalogue.class, + ItemFlutterlyzer.class, + ItemHabitatLocator.class, + ItemImprinter.class, + ItemInfuser.class, + ItemLetter.class, + ItemSolderingIron.class, + ItemTreealyzer.class + )); + + registerGuiHandlers(GuiType.Entity, Arrays.>asList( + EntityMinecartApiary.class, + EntityMinecartBeehouse.class + )); + } + + private static void registerGuiHandlers(GuiType guiType, List> guiHandlerClasses) { + for (Class tileGuiHandlerClass : guiHandlerClasses) { + GuiId guiId = new GuiId(nextId++, guiType, tileGuiHandlerClass); + classMap.put(tileGuiHandlerClass, guiId); + idMap.put(guiId.getId(), guiId); + } + } + + public static GuiId getGuiIdForGuiHandler(IGuiHandlerForestry guiHandler) { + Class guiHandlerClass = guiHandler.getClass(); + GuiId guiId = classMap.get(guiHandlerClass); + if (guiId == null) { + for (Map.Entry, GuiId> classGuiIdEntry : classMap.entrySet()) { + if (classGuiIdEntry.getKey().isAssignableFrom(guiHandlerClass)) { + guiId = classGuiIdEntry.getValue(); + break; + } + } + } + if (guiId == null) { + throw new IllegalStateException("No gui ID for gui handler: " + guiHandler); + } + return guiId; + } + + public static GuiId getGuiId(int id) { + return idMap.get(id); + } +} diff --git a/src/main/java/forestry/core/network/GuiId.java b/src/main/java/forestry/core/gui/GuiType.java old mode 100755 new mode 100644 similarity index 87% rename from src/main/java/forestry/core/network/GuiId.java rename to src/main/java/forestry/core/gui/GuiType.java index 755c28e0d..f413b701c --- a/src/main/java/forestry/core/network/GuiId.java +++ b/src/main/java/forestry/core/gui/GuiType.java @@ -8,10 +8,10 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.network; +package forestry.core.gui; -public enum GuiId { - ItemGui, - TileGui, - EntityGui; +public enum GuiType { + Item, + Tile, + Entity; } diff --git a/src/main/java/forestry/core/network/IGuiHandlerEntity.java b/src/main/java/forestry/core/gui/IGuiHandlerEntity.java similarity index 84% rename from src/main/java/forestry/core/network/IGuiHandlerEntity.java rename to src/main/java/forestry/core/gui/IGuiHandlerEntity.java index f3fad4e3d..f7473d873 100644 --- a/src/main/java/forestry/core/network/IGuiHandlerEntity.java +++ b/src/main/java/forestry/core/gui/IGuiHandlerEntity.java @@ -8,12 +8,14 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.network; +package forestry.core.gui; import net.minecraft.entity.player.EntityPlayer; -public interface IGuiHandlerEntity { +public interface IGuiHandlerEntity extends IGuiHandlerForestry { Object getGui(EntityPlayer player, int data); Object getContainer(EntityPlayer player, int data); + + int getEntityId(); } diff --git a/src/main/java/forestry/core/gui/IGuiHandlerForestry.java b/src/main/java/forestry/core/gui/IGuiHandlerForestry.java new file mode 100644 index 000000000..29b4731f6 --- /dev/null +++ b/src/main/java/forestry/core/gui/IGuiHandlerForestry.java @@ -0,0 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.gui; + +public interface IGuiHandlerForestry { +} diff --git a/src/main/java/forestry/core/network/IGuiHandlerItem.java b/src/main/java/forestry/core/gui/IGuiHandlerItem.java similarity index 88% rename from src/main/java/forestry/core/network/IGuiHandlerItem.java rename to src/main/java/forestry/core/gui/IGuiHandlerItem.java index dcf78bc6e..05bf7bc89 100644 --- a/src/main/java/forestry/core/network/IGuiHandlerItem.java +++ b/src/main/java/forestry/core/gui/IGuiHandlerItem.java @@ -8,12 +8,12 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.network; +package forestry.core.gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -public interface IGuiHandlerItem { +public interface IGuiHandlerItem extends IGuiHandlerForestry { Object getGui(EntityPlayer player, ItemStack heldItem, int data); Object getContainer(EntityPlayer player, ItemStack heldItem, int data); diff --git a/src/main/java/forestry/core/network/IGuiHandlerTile.java b/src/main/java/forestry/core/gui/IGuiHandlerTile.java similarity index 81% rename from src/main/java/forestry/core/network/IGuiHandlerTile.java rename to src/main/java/forestry/core/gui/IGuiHandlerTile.java index 0c7f75403..21319613f 100644 --- a/src/main/java/forestry/core/network/IGuiHandlerTile.java +++ b/src/main/java/forestry/core/gui/IGuiHandlerTile.java @@ -8,11 +8,13 @@ * Various Contributors including, but not limited to: * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges ******************************************************************************/ -package forestry.core.network; +package forestry.core.gui; import net.minecraft.entity.player.EntityPlayer; -public interface IGuiHandlerTile { +import forestry.core.tiles.ILocatable; + +public interface IGuiHandlerTile extends IGuiHandlerForestry, ILocatable { Object getGui(EntityPlayer player, int data); Object getContainer(EntityPlayer player, int data); diff --git a/src/main/java/forestry/core/gui/IPagedInventory.java b/src/main/java/forestry/core/gui/IPagedInventory.java index 024f41917..b396f12b9 100755 --- a/src/main/java/forestry/core/gui/IPagedInventory.java +++ b/src/main/java/forestry/core/gui/IPagedInventory.java @@ -18,5 +18,5 @@ import net.minecraft.inventory.IInventory; */ public interface IPagedInventory extends IInventory { - void flipPage(EntityPlayer player, int page); + void flipPage(EntityPlayer player, short page); } diff --git a/src/main/java/forestry/core/items/ItemWithGui.java b/src/main/java/forestry/core/items/ItemWithGui.java index 2e836a597..0058120fd 100644 --- a/src/main/java/forestry/core/items/ItemWithGui.java +++ b/src/main/java/forestry/core/items/ItemWithGui.java @@ -16,10 +16,9 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import forestry.api.core.ForestryAPI; import forestry.core.gui.ContainerItemInventory; -import forestry.core.network.GuiId; -import forestry.core.network.IGuiHandlerItem; +import forestry.core.gui.GuiHandler; +import forestry.core.gui.IGuiHandlerItem; public abstract class ItemWithGui extends ItemForestry implements IGuiHandlerItem { public ItemWithGui() { @@ -33,14 +32,14 @@ public abstract class ItemWithGui extends ItemForestry implements IGuiHandlerIte @Override public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { if (!world.isRemote) { - openGui(world, entityplayer); + openGui(entityplayer); } return itemstack; } - protected void openGui(World world, EntityPlayer entityplayer) { - entityplayer.openGui(ForestryAPI.instance, GuiId.ItemGui.ordinal(), world, (int) entityplayer.posX, (int) entityplayer.posY, (int) entityplayer.posZ); + protected void openGui(EntityPlayer entityplayer) { + GuiHandler.openGui(entityplayer, this); } @Override diff --git a/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java b/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java index 7208838de..b6849870c 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java +++ b/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java @@ -19,14 +19,13 @@ import net.minecraft.world.World; import com.mojang.authlib.GameProfile; -import forestry.api.core.ForestryAPI; import forestry.api.multiblock.IMultiblockLogic; import forestry.api.multiblock.MultiblockTileEntityBase; import forestry.core.config.Constants; +import forestry.core.gui.GuiHandler; +import forestry.core.gui.IGuiHandlerTile; import forestry.core.inventory.FakeInventoryAdapter; import forestry.core.inventory.IInventoryAdapter; -import forestry.core.network.GuiId; -import forestry.core.network.IGuiHandlerTile; import forestry.core.tiles.IFilterSlotDelegate; import forestry.core.tiles.ILocatable; @@ -41,7 +40,7 @@ public abstract class MultiblockTileEntityForestry e * Called by a structure block when it is right clicked by a player. */ public void openGui(EntityPlayer player) { - player.openGui(ForestryAPI.instance, GuiId.TileGui.ordinal(), worldObj, xCoord, yCoord, zCoord); + GuiHandler.openGui(player, this); } @Override diff --git a/src/main/java/forestry/core/tiles/TileBase.java b/src/main/java/forestry/core/tiles/TileBase.java index a1159865c..2aa38ad39 100644 --- a/src/main/java/forestry/core/tiles/TileBase.java +++ b/src/main/java/forestry/core/tiles/TileBase.java @@ -15,10 +15,9 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import forestry.api.core.ForestryAPI; import forestry.core.config.Config; +import forestry.core.gui.GuiHandler; import forestry.core.gui.IHintSource; -import forestry.core.network.GuiId; public abstract class TileBase extends TileForestry implements IHintSource { protected final List hints; @@ -28,7 +27,7 @@ public abstract class TileBase extends TileForestry implements IHintSource { } public void openGui(EntityPlayer player) { - player.openGui(ForestryAPI.instance, GuiId.TileGui.ordinal(), worldObj, xCoord, yCoord, zCoord); + GuiHandler.openGui(player, this); } public boolean canDrainWithBucket() { diff --git a/src/main/java/forestry/core/tiles/TileForestry.java b/src/main/java/forestry/core/tiles/TileForestry.java index 6d9a086be..d06c3264f 100644 --- a/src/main/java/forestry/core/tiles/TileForestry.java +++ b/src/main/java/forestry/core/tiles/TileForestry.java @@ -36,11 +36,11 @@ import forestry.core.access.EnumAccess; import forestry.core.access.IAccessHandler; import forestry.core.access.IRestrictedAccess; import forestry.core.errors.ErrorLogic; +import forestry.core.gui.IGuiHandlerTile; import forestry.core.inventory.FakeInventoryAdapter; import forestry.core.inventory.IInventoryAdapter; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; -import forestry.core.network.IGuiHandlerTile; import forestry.core.network.IStreamable; import forestry.core.network.packets.PacketTileStream; import forestry.core.proxy.Proxies; diff --git a/src/main/java/forestry/core/tiles/TileMill.java b/src/main/java/forestry/core/tiles/TileMill.java index 23f8344e5..7804885e2 100644 --- a/src/main/java/forestry/core/tiles/TileMill.java +++ b/src/main/java/forestry/core/tiles/TileMill.java @@ -14,7 +14,6 @@ import java.io.IOException; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; -import forestry.core.network.GuiId; public abstract class TileMill extends TileBase { @@ -23,7 +22,7 @@ public abstract class TileMill extends TileBase { public int charge = 0; public float progress; - protected TileMill(GuiId guiId, String hintKey) { + protected TileMill(String hintKey) { super(hintKey); speed = 0.01F; } diff --git a/src/main/java/forestry/core/tiles/TileNaturalistChest.java b/src/main/java/forestry/core/tiles/TileNaturalistChest.java index 0c18b5ed9..e1198bf10 100644 --- a/src/main/java/forestry/core/tiles/TileNaturalistChest.java +++ b/src/main/java/forestry/core/tiles/TileNaturalistChest.java @@ -14,16 +14,14 @@ import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; -import forestry.api.core.ForestryAPI; import forestry.api.genetics.ISpeciesRoot; -import forestry.core.GuiHandler; import forestry.core.gui.ContainerNaturalistInventory; +import forestry.core.gui.GuiHandler; import forestry.core.gui.GuiNaturalistInventory; import forestry.core.gui.IPagedInventory; import forestry.core.inventory.InventoryNaturalistChest; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; -import forestry.core.network.GuiId; public abstract class TileNaturalistChest extends TileBase implements IPagedInventory { private static final float lidAngleVariationPerTick = 0.1F; @@ -91,8 +89,8 @@ public abstract class TileNaturalistChest extends TileBase implements IPagedInve } @Override - public void flipPage(EntityPlayer player, int page) { - player.openGui(ForestryAPI.instance, GuiHandler.encodeGuiData(GuiId.TileGui, page), player.worldObj, xCoord, yCoord, zCoord); + public void flipPage(EntityPlayer player, short page) { + GuiHandler.openGui(player, this, page); } /* IStreamable */ diff --git a/src/main/java/forestry/factory/tiles/TileMillRainmaker.java b/src/main/java/forestry/factory/tiles/TileMillRainmaker.java index b52b6e889..fa89768b8 100644 --- a/src/main/java/forestry/factory/tiles/TileMillRainmaker.java +++ b/src/main/java/forestry/factory/tiles/TileMillRainmaker.java @@ -24,7 +24,7 @@ public class TileMillRainmaker extends TileMill { private boolean reverse; public TileMillRainmaker() { - super(null, null); + super(null); speed = 0.01f; setInternalInventory(new InventoryRainmaker(this)); } diff --git a/src/main/java/forestry/farming/blocks/BlockFarm.java b/src/main/java/forestry/farming/blocks/BlockFarm.java index 3c57fa686..750a0fb6b 100644 --- a/src/main/java/forestry/farming/blocks/BlockFarm.java +++ b/src/main/java/forestry/farming/blocks/BlockFarm.java @@ -36,12 +36,12 @@ import forestry.core.blocks.BlockStructure; import forestry.core.render.ParticleHelper; import forestry.core.utils.ItemStackUtil; import forestry.farming.render.EnumFarmBlockTexture; -import forestry.farming.tiles.TileControl; import forestry.farming.tiles.TileFarm; +import forestry.farming.tiles.TileFarmControl; +import forestry.farming.tiles.TileFarmGearbox; +import forestry.farming.tiles.TileFarmHatch; import forestry.farming.tiles.TileFarmPlain; -import forestry.farming.tiles.TileGearbox; -import forestry.farming.tiles.TileHatch; -import forestry.farming.tiles.TileValve; +import forestry.farming.tiles.TileFarmValve; import forestry.plugins.PluginFarming; public class BlockFarm extends BlockStructure { @@ -133,13 +133,13 @@ public class BlockFarm extends BlockStructure { public TileEntity createTileEntity(World world, int metadata) { switch (metadata) { case 2: - return new TileGearbox(); + return new TileFarmGearbox(); case 3: - return new TileHatch(); + return new TileFarmHatch(); case 4: - return new TileValve(); + return new TileFarmValve(); case 5: - return new TileControl(); + return new TileFarmControl(); default: return new TileFarmPlain(); } diff --git a/src/main/java/forestry/farming/multiblock/FarmController.java b/src/main/java/forestry/farming/multiblock/FarmController.java index a233876ad..a4bbb7baa 100644 --- a/src/main/java/forestry/farming/multiblock/FarmController.java +++ b/src/main/java/forestry/farming/multiblock/FarmController.java @@ -75,8 +75,8 @@ import forestry.farming.FarmHelper; import forestry.farming.FarmTarget; import forestry.farming.gui.IFarmLedgerDelegate; import forestry.farming.logic.FarmLogicArboreal; +import forestry.farming.tiles.TileFarmGearbox; import forestry.farming.tiles.TileFarmPlain; -import forestry.farming.tiles.TileGearbox; public class FarmController extends RectangularMultiblockControllerBase implements IFarmControllerInternal, ILiquidTankTile { @@ -212,7 +212,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen boolean hasGearbox = false; for (IMultiblockComponent part : connectedParts) { - if (part instanceof TileGearbox) { + if (part instanceof TileFarmGearbox) { hasGearbox = true; break; } @@ -264,8 +264,8 @@ public class FarmController extends RectangularMultiblockControllerBase implemen boolean hasPower = false; for (Map.Entry entry : farmActiveComponents.entrySet()) { IFarmComponent.Active farmComponent = entry.getKey(); - if (farmComponent instanceof TileGearbox) { - hasPower |= ((TileGearbox) farmComponent).getEnergyManager().getTotalEnergyStored() > 0; + if (farmComponent instanceof TileFarmGearbox) { + hasPower |= ((TileFarmGearbox) farmComponent).getEnergyManager().getTotalEnergyStored() > 0; } int tickOffset = entry.getValue(); diff --git a/src/main/java/forestry/farming/tiles/TileControl.java b/src/main/java/forestry/farming/tiles/TileFarmControl.java similarity index 90% rename from src/main/java/forestry/farming/tiles/TileControl.java rename to src/main/java/forestry/farming/tiles/TileFarmControl.java index 0600d18af..2a517be2b 100644 --- a/src/main/java/forestry/farming/tiles/TileControl.java +++ b/src/main/java/forestry/farming/tiles/TileFarmControl.java @@ -21,11 +21,11 @@ import forestry.api.farming.IFarmLogic; import forestry.api.multiblock.IFarmComponent; import forestry.core.utils.vect.Vect; -public class TileControl extends TileFarm implements IFarmComponent.Listener { +public class TileFarmControl extends TileFarm implements IFarmComponent.Listener { private final IFarmListener farmListener; - public TileControl() { + public TileFarmControl() { this.farmListener = new ControlFarmListener(this); } @@ -35,9 +35,9 @@ public class TileControl extends TileFarm implements IFarmComponent.Listener { } private static class ControlFarmListener extends DefaultFarmListener { - private final TileControl tile; + private final TileFarmControl tile; - public ControlFarmListener(TileControl tile) { + public ControlFarmListener(TileFarmControl tile) { this.tile = tile; } diff --git a/src/main/java/forestry/farming/tiles/TileGearbox.java b/src/main/java/forestry/farming/tiles/TileFarmGearbox.java similarity index 96% rename from src/main/java/forestry/farming/tiles/TileGearbox.java rename to src/main/java/forestry/farming/tiles/TileFarmGearbox.java index 6e9e712e0..3f40ac3de 100644 --- a/src/main/java/forestry/farming/tiles/TileGearbox.java +++ b/src/main/java/forestry/farming/tiles/TileFarmGearbox.java @@ -19,7 +19,7 @@ import forestry.api.multiblock.IFarmController; import forestry.core.tiles.IPowerHandler; import forestry.energy.EnergyManager; -public class TileGearbox extends TileFarm implements IPowerHandler, IFarmComponent.Active { +public class TileFarmGearbox extends TileFarm implements IPowerHandler, IFarmComponent.Active { private static final int WORK_CYCLES = 4; private static final int ENERGY_PER_OPERATION = WORK_CYCLES * 50; @@ -30,7 +30,7 @@ public class TileGearbox extends TileFarm implements IPowerHandler, IFarmCompone private int previousDelays = 0; private int workCounter; - public TileGearbox() { + public TileFarmGearbox() { energyManager = new EnergyManager(200, 10000); } diff --git a/src/main/java/forestry/farming/tiles/TileHatch.java b/src/main/java/forestry/farming/tiles/TileFarmHatch.java similarity index 95% rename from src/main/java/forestry/farming/tiles/TileHatch.java rename to src/main/java/forestry/farming/tiles/TileFarmHatch.java index 1bf45440a..68b5b4bec 100644 --- a/src/main/java/forestry/farming/tiles/TileHatch.java +++ b/src/main/java/forestry/farming/tiles/TileFarmHatch.java @@ -33,14 +33,14 @@ import buildcraft.api.statements.ITriggerInternal; import buildcraft.api.statements.ITriggerProvider; @Optional.Interface(iface = "buildcraft.api.statements.ITriggerProvider", modid = "BuildCraftAPI|statements") -public class TileHatch extends TileFarm implements ISidedInventory, IFarmComponent.Active, ITriggerProvider { +public class TileFarmHatch extends TileFarm implements ISidedInventory, IFarmComponent.Active, ITriggerProvider { private static final ForgeDirection[] dumpDirections = new ForgeDirection[]{ForgeDirection.DOWN}; private final AdjacentTileCache tileCache; private final AdjacentInventoryCache inventoryCache; - public TileHatch() { + public TileFarmHatch() { this.tileCache = new AdjacentTileCache(this); this.inventoryCache = new AdjacentInventoryCache(this, tileCache, new AdjacentInventoryCache.ITileFilter() { @Override diff --git a/src/main/java/forestry/farming/tiles/TileValve.java b/src/main/java/forestry/farming/tiles/TileFarmValve.java similarity index 95% rename from src/main/java/forestry/farming/tiles/TileValve.java rename to src/main/java/forestry/farming/tiles/TileFarmValve.java index 4a19e7db7..8ea631a90 100644 --- a/src/main/java/forestry/farming/tiles/TileValve.java +++ b/src/main/java/forestry/farming/tiles/TileFarmValve.java @@ -19,7 +19,7 @@ import net.minecraftforge.fluids.IFluidHandler; import forestry.core.fluids.ITankManager; import forestry.core.tiles.ILiquidTankTile; -public class TileValve extends TileFarm implements ILiquidTankTile, IFluidHandler { +public class TileFarmValve extends TileFarm implements ILiquidTankTile, IFluidHandler { /* ILIQUIDTANKCONTAINER */ @Override diff --git a/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java b/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java index e273faabb..09ae52748 100755 --- a/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java @@ -17,7 +17,7 @@ import net.minecraftforge.common.util.ForgeDirection; import forestry.core.triggers.Trigger; import forestry.core.utils.InventoryUtil; -import forestry.farming.tiles.TileHatch; +import forestry.farming.tiles.TileFarmHatch; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; @@ -38,11 +38,11 @@ public class TriggerLowFertilizer extends Trigger { @Override public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { - if (!(tile instanceof TileHatch)) { + if (!(tile instanceof TileFarmHatch)) { return false; } - TileHatch tileHatch = (TileHatch) tile; + TileFarmHatch tileHatch = (TileFarmHatch) tile; IInventory fertilizerInventory = tileHatch.getMultiblockLogic().getController().getFarmInventory().getFertilizerInventory(); return InventoryUtil.containsPercent(fertilizerInventory, threshold); } diff --git a/src/main/java/forestry/farming/triggers/TriggerLowGermlings.java b/src/main/java/forestry/farming/triggers/TriggerLowGermlings.java index 38eaed399..4759ff32e 100644 --- a/src/main/java/forestry/farming/triggers/TriggerLowGermlings.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowGermlings.java @@ -17,7 +17,7 @@ import net.minecraftforge.common.util.ForgeDirection; import forestry.core.triggers.Trigger; import forestry.core.utils.InventoryUtil; -import forestry.farming.tiles.TileHatch; +import forestry.farming.tiles.TileFarmHatch; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; @@ -41,11 +41,11 @@ public class TriggerLowGermlings extends Trigger { */ @Override public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { - if (!(tile instanceof TileHatch)) { + if (!(tile instanceof TileFarmHatch)) { return false; } - TileHatch tileHatch = (TileHatch) tile; + TileFarmHatch tileHatch = (TileFarmHatch) tile; IInventory germlingsInventory = tileHatch.getMultiblockLogic().getController().getFarmInventory().getGermlingsInventory(); return InventoryUtil.containsPercent(germlingsInventory, threshold); } diff --git a/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java b/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java index e62f0f4f7..9d077ca8f 100755 --- a/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java @@ -17,7 +17,7 @@ import net.minecraftforge.fluids.IFluidTank; import forestry.core.fluids.ITankManager; import forestry.core.triggers.Trigger; -import forestry.farming.tiles.TileHatch; +import forestry.farming.tiles.TileFarmHatch; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; @@ -42,11 +42,11 @@ public class TriggerLowLiquid extends Trigger { */ @Override public boolean isTriggerActive(TileEntity tile, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters) { - if (!(tile instanceof TileHatch)) { + if (!(tile instanceof TileFarmHatch)) { return false; } - TileHatch tileHatch = (TileHatch) tile; + TileFarmHatch tileHatch = (TileFarmHatch) tile; ITankManager tankManager = tileHatch.getMultiblockLogic().getController().getTankManager(); IFluidTank tank = tankManager.getTank(0); diff --git a/src/main/java/forestry/farming/triggers/TriggerLowSoil.java b/src/main/java/forestry/farming/triggers/TriggerLowSoil.java index 394ae641d..5b7d3e366 100755 --- a/src/main/java/forestry/farming/triggers/TriggerLowSoil.java +++ b/src/main/java/forestry/farming/triggers/TriggerLowSoil.java @@ -20,7 +20,7 @@ import forestry.api.farming.IFarmInventory; import forestry.api.multiblock.IFarmController; import forestry.core.triggers.Trigger; import forestry.core.utils.InventoryUtil; -import forestry.farming.tiles.TileHatch; +import forestry.farming.tiles.TileFarmHatch; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; @@ -60,11 +60,11 @@ public class TriggerLowSoil extends Trigger { parameter = parameters[0]; } - if (!(tile instanceof TileHatch)) { + if (!(tile instanceof TileFarmHatch)) { return false; } - TileHatch tileHatch = (TileHatch) tile; + TileFarmHatch tileHatch = (TileFarmHatch) tile; IFarmController farmController = tileHatch.getMultiblockLogic().getController(); IFarmInventory farmInventory = farmController.getFarmInventory(); diff --git a/src/main/java/forestry/mail/items/ItemLetter.java b/src/main/java/forestry/mail/items/ItemLetter.java index 3fb602d09..c2f564da6 100755 --- a/src/main/java/forestry/mail/items/ItemLetter.java +++ b/src/main/java/forestry/mail/items/ItemLetter.java @@ -43,7 +43,7 @@ public class ItemLetter extends ItemWithGui { public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer) { if (!world.isRemote) { if (itemstack.stackSize == 1) { - openGui(world, entityplayer); + openGui(entityplayer); } else { entityplayer.addChatMessage(new ChatComponentTranslation("for.chat.mail.wrongstacksize")); } diff --git a/src/main/java/forestry/mail/tiles/TileTrader.java b/src/main/java/forestry/mail/tiles/TileTrader.java index b540b8574..1dc852f74 100644 --- a/src/main/java/forestry/mail/tiles/TileTrader.java +++ b/src/main/java/forestry/mail/tiles/TileTrader.java @@ -25,17 +25,15 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Optional; -import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; import forestry.api.mail.IMailAddress; import forestry.api.mail.IStamps; import forestry.api.mail.PostManager; -import forestry.core.GuiHandler; import forestry.core.errors.EnumErrorCode; +import forestry.core.gui.GuiHandler; import forestry.core.inventory.IInventoryAdapter; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; -import forestry.core.network.GuiId; import forestry.core.proxy.Proxies; import forestry.core.tiles.TileBase; import forestry.core.utils.ItemStackUtil; @@ -63,8 +61,8 @@ public class TileTrader extends TileBase { @Override public void openGui(EntityPlayer player) { - int data = isLinked() ? 0 : 1; - player.openGui(ForestryAPI.instance, GuiHandler.encodeGuiData(GuiId.TileGui, data), worldObj, xCoord, yCoord, zCoord); + short data = (short) (isLinked() ? 0 : 1); + GuiHandler.openGui(player, this, data); } @Override diff --git a/src/main/java/forestry/plugins/PluginFactory.java b/src/main/java/forestry/plugins/PluginFactory.java index 5f58a43ae..623e15707 100644 --- a/src/main/java/forestry/plugins/PluginFactory.java +++ b/src/main/java/forestry/plugins/PluginFactory.java @@ -69,19 +69,6 @@ import forestry.factory.triggers.FactoryTriggers; @Plugin(pluginID = "Factory", name = "Factory", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.factory.description") public class PluginFactory extends ForestryPlugin { - - private static MachineDefinition definitionBottler; - private static MachineDefinition definitionCarpenter; - private static MachineDefinition definitionCentrifuge; - private static MachineDefinition definitionFermenter; - private static MachineDefinition definitionMoistener; - private static MachineDefinition definitionSqueezer; - private static MachineDefinition definitionStill; - private static MachineDefinition definitionRainmaker; - private static MachineDefinition definitionFabricator; - private static MachineDefinition definitionRaintank; - private static MachineDefinition definitionWorktable; - public static BlockRegistryFactory blocks; @Override diff --git a/src/main/java/forestry/plugins/PluginFarming.java b/src/main/java/forestry/plugins/PluginFarming.java index f48e88b1f..2d4b78e6c 100644 --- a/src/main/java/forestry/plugins/PluginFarming.java +++ b/src/main/java/forestry/plugins/PluginFarming.java @@ -63,11 +63,11 @@ import forestry.farming.logic.FarmableVanillaMushroom; import forestry.farming.logic.FarmableVanillaSapling; import forestry.farming.proxy.ProxyFarming; import forestry.farming.render.EnumFarmBlockTexture; -import forestry.farming.tiles.TileControl; +import forestry.farming.tiles.TileFarmControl; +import forestry.farming.tiles.TileFarmGearbox; +import forestry.farming.tiles.TileFarmHatch; import forestry.farming.tiles.TileFarmPlain; -import forestry.farming.tiles.TileGearbox; -import forestry.farming.tiles.TileHatch; -import forestry.farming.tiles.TileValve; +import forestry.farming.tiles.TileFarmValve; import forestry.farming.triggers.FarmingTriggers; @Plugin(pluginID = "Farming", name = "Farming", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.farming.description") @@ -143,10 +143,10 @@ public class PluginFarming extends ForestryPlugin { super.doInit(); GameRegistry.registerTileEntity(TileFarmPlain.class, "forestry.Farm"); - GameRegistry.registerTileEntity(TileGearbox.class, "forestry.FarmGearbox"); - GameRegistry.registerTileEntity(TileHatch.class, "forestry.FarmHatch"); - GameRegistry.registerTileEntity(TileValve.class, "forestry.FarmValve"); - GameRegistry.registerTileEntity(TileControl.class, "forestry.FarmControl"); + GameRegistry.registerTileEntity(TileFarmGearbox.class, "forestry.FarmGearbox"); + GameRegistry.registerTileEntity(TileFarmHatch.class, "forestry.FarmHatch"); + GameRegistry.registerTileEntity(TileFarmValve.class, "forestry.FarmValve"); + GameRegistry.registerTileEntity(TileFarmControl.class, "forestry.FarmControl"); Circuit.farmArborealManaged = new CircuitFarmLogic("managedArboreal", FarmLogicArboreal.class); Circuit.farmShroomManaged = new CircuitFarmLogic("managedShroom", FarmLogicShroom.class); diff --git a/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java b/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java index 799e8260a..c237d6c5f 100755 --- a/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java +++ b/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java @@ -34,6 +34,6 @@ public class ContainerNaturalistBackpack extends ContainerItemInventory