mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-21 12:42:10 +00:00
Made gamemode cycling with creative+ inventory as smooth as possible
This commit is contained in:
1 parent
583c8dc7a7
commit
e34189ae9c
3 files changed
+8
-5
No files matched your search
@@ -573,9 +573,8 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
|
||||
|
||||
NEIController.load(gui);
|
||||
|
||||
if (checkCreativeInv(gui) &&
|
||||
gui.mc.currentScreen instanceof GuiContainerCreative)//makes cycle transitions seamless. Only closes if we are opening from fresh
|
||||
gui.mc.displayGuiScreen(null);
|
||||
if (checkCreativeInv(gui) && gui.mc.currentScreen instanceof GuiContainerCreative)//override creative with creative+
|
||||
gui.mc.displayGuiScreen(null);//close the screen and wait for the server to open it for us
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -119,7 +119,7 @@ public class NEISPH implements IServerPacketHandler
|
||||
NEIServerConfig.disableAction(sender.dimension, name, packet.readBoolean());
|
||||
}
|
||||
|
||||
private void processCreativeInv(EntityPlayerMP sender, boolean open) {
|
||||
public static void processCreativeInv(EntityPlayerMP sender, boolean open) {
|
||||
if (open) {
|
||||
ServerUtils.openSMPContainer(sender, new ContainerCreativeInv(sender, new ExtendedCreativeInv(NEIServerConfig.forPlayer(sender.getCommandSenderName()), Side.SERVER)), new IGuiPacketSender()
|
||||
{
|
||||
|
||||
@@ -239,9 +239,13 @@ public class NEIServerUtils
|
||||
!NEIServerConfig.canPlayerPerformAction(player.getCommandSenderName(), NEIActions.gameModes[mode]))
|
||||
return;
|
||||
|
||||
//creative+
|
||||
NEIServerConfig.forPlayer(player.getCommandSenderName()).enableAction("creative+", mode == 2);
|
||||
if(mode == 2 && !(player.openContainer instanceof ContainerCreativeInv))//open the container immediately for the client
|
||||
NEISPH.processCreativeInv(player, true);
|
||||
|
||||
//change it on the server
|
||||
player.theItemInWorldManager.setGameType(getGameType(mode));
|
||||
NEIServerConfig.forPlayer(player.getCommandSenderName()).enableAction("creative+", mode == 2);
|
||||
|
||||
//tell the client to change it
|
||||
new PacketCustom(NEISPH.channel, 14).writeByte(mode).sendToPlayer(player);
|
||||
|
||||
Reference in new issue
Block a user