tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Fix a few bugs in Factory and Configuration GUI

Browse source
This commit is contained in:
Aidan C. Brady 2013-11-24 07:53:14 -06:00
parent 009ee3a885
commit d5af842037
2 changed files with 41 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
common/mekanism/common/network/PacketSimpleGui.java
View file

@ -4,7 +4,10 @@ import java.io.DataOutputStream;
import mekanism.api.Object3D;
import mekanism.common.Mekanism;
import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.tileentity.TileEntityBasicBlock;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.world.World;
@ -12,6 +15,8 @@ import net.minecraft.world.World;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class PacketSimpleGui implements IMekanismPacket
{
@ -41,17 +46,43 @@ public class PacketSimpleGui implements IMekanismPacket
guiId = dataStream.readInt();
World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(object3D.dimensionId);
if(worldServer != null && object3D.getTileEntity(worldServer) instanceof TileEntityBasicBlock)
if(!world.isRemote)
{
if(guiId == -1)
{
return;
}
World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(object3D.dimensionId);
player.openGui(Mekanism.instance, guiId, worldServer, object3D.xCoord, object3D.yCoord, object3D.zCoord);
if(worldServer != null && object3D.getTileEntity(worldServer) instanceof TileEntityBasicBlock)
{
if(guiId == -1)
{
return;
}
openServerGui(guiId, (EntityPlayerMP)player, world, object3D);
}
}
else {
FMLCommonHandler.instance().showGuiScreen(getGui(guiId, player, world, object3D));
}
}
public static void openServerGui(int id, EntityPlayerMP playerMP, World world, Object3D obj)
{
playerMP.closeContainer();
playerMP.incrementWindowID();
int window = playerMP.currentWindowId;
PacketHandler.sendPacket(Transmission.SINGLE_CLIENT, new PacketSimpleGui().setParams(obj, id), playerMP);
playerMP.openContainer = Mekanism.proxy.getServerGui(id, playerMP, world, obj.xCoord, obj.yCoord, obj.zCoord);
playerMP.openContainer.windowId = window;
playerMP.openContainer.addCraftingToCrafters(playerMP);
}
@SideOnly(Side.CLIENT)
public GuiScreen getGui(int id, EntityPlayer player, World world, Object3D obj)
{
return (GuiScreen)Mekanism.proxy.getClientGui(id, player, world, obj.xCoord, obj.yCoord, obj.zCoord);
}
@Override

4
common/mekanism/common/tileentity/TileEntityFactory.java
View file

@ -228,7 +228,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IEnerg
}
}
if(MekanismUtils.canFunction(this) && hasOperation && getEnergy() >= MekanismUtils.getEnergyPerTick(getSpeedMultiplier(), getEnergyMultiplier(), ENERGY_PER_TICK))
if(MekanismUtils.canFunction(this) && hasOperation && getEnergy() >= MekanismUtils.getEnergyPerTick(getSpeedMultiplier(), getEnergyMultiplier(), ENERGY_PER_TICK) && secondaryEnergyStored >= getSecondaryEnergyPerTick())
{
setActive(true);
}
@ -261,7 +261,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IEnerg
{
if(inventory[4].getItem() instanceof IStorageTank)
{
if(((IStorageTank)inventory[4].getItem()).getGasType(inventory[1]) == EnumGas.OXYGEN)
if(((IStorageTank)inventory[4].getItem()).getGasType(inventory[4]) == EnumGas.OXYGEN)
{
IStorageTank item = (IStorageTank)inventory[4].getItem();