Minor fixes/changes

This commit is contained in:
Stephen Seo 2018-09-18 16:58:01 +09:00
parent efa65da721
commit 24749b8ccc
3 changed files with 10 additions and 2 deletions

View file

@ -60,6 +60,12 @@ public class ClientProxy extends CommonProxy
battleGui.turnEnd(); battleGui.turnEnd();
} }
@Override
public void battleStarted()
{
setBattleGuiAsGui();
}
@Override @Override
public void battleEnded() public void battleEnded()
{ {
@ -68,6 +74,7 @@ public class ClientProxy extends CommonProxy
Minecraft.getMinecraft().displayGuiScreen(null); Minecraft.getMinecraft().displayGuiScreen(null);
Minecraft.getMinecraft().setIngameFocus(); Minecraft.getMinecraft().setIngameFocus();
}); });
stopMusic();
} }
@Override @Override

View file

@ -17,6 +17,8 @@ public class CommonProxy
public void battleGuiTurnEnd() {} public void battleGuiTurnEnd() {}
public void battleStarted() {}
public void battleEnded() {} public void battleEnded() {}
public void postInit() {} public void postInit() {}

View file

@ -232,7 +232,7 @@ public class PacketBattleMessage implements IMessage
{ {
TurnBasedMinecraftMod.currentBattle = new Battle(message.amount, null, null, false); TurnBasedMinecraftMod.currentBattle = new Battle(message.amount, null, null, false);
} }
TurnBasedMinecraftMod.commonProxy.setBattleGuiAsGui(); TurnBasedMinecraftMod.commonProxy.battleStarted();
if(message.custom.isEmpty()) if(message.custom.isEmpty())
{ {
TurnBasedMinecraftMod.commonProxy.typeEnteredBattle(null); TurnBasedMinecraftMod.commonProxy.typeEnteredBattle(null);
@ -258,7 +258,6 @@ public class PacketBattleMessage implements IMessage
case ENDED: case ENDED:
TurnBasedMinecraftMod.commonProxy.displayString("Battle has ended!"); TurnBasedMinecraftMod.commonProxy.displayString("Battle has ended!");
TurnBasedMinecraftMod.commonProxy.battleEnded(); TurnBasedMinecraftMod.commonProxy.battleEnded();
TurnBasedMinecraftMod.commonProxy.stopMusic();
break; break;
case ATTACK: case ATTACK:
TurnBasedMinecraftMod.commonProxy.displayString(from + " attacked " + to + " and dealt " + message.amount + " damage!"); TurnBasedMinecraftMod.commonProxy.displayString(from + " attacked " + to + " and dealt " + message.amount + " damage!");