sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

character selector

Browse source
This commit is contained in:
Sen 2025-03-27 17:54:03 +01:00
parent 0af8ca57d1
commit 74f730e450
24 changed files with 554 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

12
java/src/game/Game.java
View file

@ -72,6 +72,7 @@ import game.gui.GuiGameOver;
import game.gui.GuiInfo;
import game.gui.GuiLoading;
import game.gui.GuiMenu;
import game.gui.GuiSkin;
import game.gui.Style;
import game.gui.container.GuiContainer;
import game.gui.container.GuiInventory;
@ -280,6 +281,7 @@ public class Game implements IThreadListener {
public boolean dayCycle = true;
public boolean debugPlayer;
public boolean cameraUsed;
public boolean charEditor;
private int leftClickCounter;
private int rightClickTimer;
@ -489,6 +491,7 @@ public class Game implements IThreadListener {
if(netHandler != null)
netHandler.cleanup();
this.debugWorld = false;
this.charEditor = false;
this.viewEntity = null;
this.connection = null;
this.theWorld = null;
@ -1483,7 +1486,8 @@ public class Game implements IThreadListener {
// if (this.open instanceof GuiGameOver)
// {
this.displayGuiScreen(null);
// if(!this.charEditor)
// this.displayGuiScreen(null);
// }
}
@ -2222,15 +2226,15 @@ public class Game implements IThreadListener {
// this.displayGuiScreen(GuiChat.INSTANCE);
// }
if(this.theWorld != null && Bind.MENU.isPressed()) {
if(this.open != null)
this.displayGuiScreen(null);
if(this.open != (this.charEditor ? GuiSkin.INSTANCE : null))
this.displayGuiScreen(this.charEditor ? GuiSkin.INSTANCE : null);
else
this.displayGuiScreen(GuiMenu.INSTANCE);
}
else if(this.theWorld == null && !(this.open instanceof GuiMenu) && Bind.MENU.isPressed()) {
this.displayGuiScreen(GuiMenu.INSTANCE);
}
if(this.theWorld != null && Bind.INVENTORY.isPressed()) {
if(this.theWorld != null && !this.charEditor && Bind.INVENTORY.isPressed()) {
if(this.open instanceof GuiContainer) {
this.displayGuiScreen(null);
}