Merge my branch into the main one, initial work on the thaumic apiary

Might have messed something up. Not quite sure
This commit is contained in:
Arkandos committed 2015-01-16 22:06:02 +01:00
1 parent 33b0af6682
commit 016049ef67
12 files changed
+339 -37

No files matched your search

@@ -1,9 +1,11 @@
package magicbees.client.gui;
import cpw.mods.fml.common.network.IGuiHandler;
import magicbees.tileentity.TileEntityEffectJar;
import magicbees.tileentity.TileEntityThaumicApiary;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.IGuiHandler;
public class GUIHandler implements IGuiHandler
{
@@ -12,15 +14,16 @@ public class GUIHandler implements IGuiHandler
public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
{
Object value = null;
if (ID == UIScreens.EFFECT_JAR.ordinal())
{
value = new ContainerEffectJar((TileEntityEffectJar)world.getTileEntity(x, y, z), player);
}
else if (ID == UIScreens.THAUMIC_APIARY.ordinal())
{
//value = new Container((TileEntityThaumicApiary)world.getTileEntity(x, y, z), player);
}
else if (ID == UIScreens.THAUMIC_APIARY.ordinal())
{
TileEntityThaumicApiary tileEntityThaumicApiary = (TileEntityThaumicApiary) world.getTileEntity(x, y, z);
value = new ContainerThaumicApiary(player.inventory, tileEntityThaumicApiary);
}
return value;
}
@@ -33,7 +36,11 @@ public class GUIHandler implements IGuiHandler
if (ID == UIScreens.EFFECT_JAR.ordinal())
{
value = new GUIEffectJar((TileEntityEffectJar)world.getTileEntity(x, y, z), player);
}
}else if (ID == UIScreens.THAUMIC_APIARY.ordinal())
{
TileEntityThaumicApiary tileEntityThaumicApiary = (TileEntityThaumicApiary) world.getTileEntity(x, y, z);
value = new GuiThaumicApiary(player.inventory, tileEntityThaumicApiary);
}
return value;
}