stephenseo/TurnBasedMinecraftMod
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 6 Wiki Activity Actions

Fixes, change how BattleManager is initialized

Browse source
This commit is contained in:
Stephen Seo 2018-09-20 15:15:34 +09:00
parent 74abaa76c0
commit bdb090f74b
6 changed files with 66 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/seodisparate/TurnBasedMinecraft/client/ClientProxy.java
View file

@ -17,13 +17,13 @@ public class ClientProxy extends CommonProxy
private Logger logger;
private Config config;
public ClientProxy()
@Override
public void initialize()
{
super();
battleGui = new BattleGui();
battleMusic = null; // will be initialized in postInit()
}
@Override
public void setBattleGuiTime(int timeRemaining)
{

4
src/main/java/com/seodisparate/TurnBasedMinecraft/common/AttackEventHandler.java
View file

@ -63,10 +63,6 @@ public class AttackEventHandler
{
return;
}
else if(TurnBasedMinecraftMod.battleManager == null)
{
TurnBasedMinecraftMod.battleManager = new BattleManager(TurnBasedMinecraftMod.logger);
}
if(!isAttackerValid(event) && event.getEntity() != null && event.getSource().getTrueSource() != null && TurnBasedMinecraftMod.battleManager.checkAttack(event))
{

12
src/main/java/com/seodisparate/TurnBasedMinecraft/common/BattleManager.java
View file

@ -16,13 +16,15 @@ public class BattleManager
private int IDCounter = 0;
protected Map<Integer, Battle> battleMap;
private Thread updaterThread;
private BattleUpdater battleUpdater;
private Logger logger;
public BattleManager(Logger logger)
{
this.logger = logger;
battleMap = new Hashtable<Integer, Battle>();
updaterThread = new Thread(new BattleUpdater(this));
battleUpdater = new BattleUpdater(this);
updaterThread = new Thread(battleUpdater);
updaterThread.start();
}
@ -169,4 +171,12 @@ public class BattleManager
{
return battleMap.get(id);
}
public void cleanup()
{
battleUpdater.setIsRunning(false);
battleUpdater = null;
updaterThread = null;
battleMap.clear();
}
}

13
src/main/java/com/seodisparate/TurnBasedMinecraft/common/BattleUpdater.java
View file

@ -2,16 +2,17 @@ package com.seodisparate.TurnBasedMinecraft.common;
import java.util.ArrayDeque;
import java.util.Queue;
import java.util.concurrent.atomic.AtomicBoolean;
public class BattleUpdater implements Runnable
{
private BattleManager manager;
private boolean isRunning;
private AtomicBoolean isRunning;
public BattleUpdater(BattleManager manager)
{
this.manager = manager;
isRunning = true;
isRunning = new AtomicBoolean(true);
}
@Override
@ -19,7 +20,7 @@ public class BattleUpdater implements Runnable
{
Queue<Integer> endedQueue = new ArrayDeque<Integer>();
Integer ended;
while(isRunning)
while(isRunning.get())
{
for(Battle e : manager.battleMap.values())
{
@ -28,11 +29,9 @@ public class BattleUpdater implements Runnable
endedQueue.add(e.getId());
}
}
ended = endedQueue.poll();
while(ended != null)
for(ended = endedQueue.poll(); ended != null; ended = endedQueue.poll())
{
manager.battleMap.remove(ended);
ended = endedQueue.poll();
}
try { Thread.sleep(250); } catch (Exception e) { /* ignored */ }
}
@ -40,6 +39,6 @@ public class BattleUpdater implements Runnable
public void setIsRunning(boolean isRunning)
{
this.isRunning = isRunning;
this.isRunning.set(isRunning);
}
}

23
src/main/java/com/seodisparate/TurnBasedMinecraft/common/CommonProxy.java
View file

@ -7,6 +7,29 @@ import net.minecraftforge.fml.common.FMLCommonHandler;
public class CommonProxy
{
public void initialize() {}
public boolean initializeBattleManager()
{
if(TurnBasedMinecraftMod.battleManager == null)
{
TurnBasedMinecraftMod.battleManager = new BattleManager(TurnBasedMinecraftMod.logger);
return true;
}
return false;
}
public boolean cleanupBattleManager ()
{
if(TurnBasedMinecraftMod.battleManager != null)
{
TurnBasedMinecraftMod.battleManager.cleanup();
TurnBasedMinecraftMod.battleManager = null;
return true;
}
return false;
}
public void setBattleGuiTime(int timeRemaining) {}
public void setBattleGuiBattleChanged() {}

26
src/main/java/com/seodisparate/TurnBasedMinecraft/common/TurnBasedMinecraftMod.java
View file

@ -19,6 +19,8 @@ import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import net.minecraftforge.fml.relauncher.Side;
@ -59,12 +61,12 @@ public class TurnBasedMinecraftMod
public void preInit(FMLPreInitializationEvent event)
{
logger = event.getModLog();
logger.debug("PREINIT");
}
@EventHandler
public void init(FMLInitializationEvent event)
{
commonProxy.initialize();
currentBattle = null;
battleManager = null;
attackerViaBow = new HashSet<AttackerViaBow>();
@ -91,7 +93,6 @@ public class TurnBasedMinecraftMod
PacketBattleMessage.class,
packetHandlerID++,
Side.CLIENT);
logger.debug("INIT");
// register event handler(s)
MinecraftForge.EVENT_BUS.register(new AttackEventHandler());
@ -103,7 +104,26 @@ public class TurnBasedMinecraftMod
config = new Config(logger);
commonProxy.setConfig(config);
commonProxy.postInit();
logger.debug("POSTINIT");
}
@EventHandler
public void serverStarting(FMLServerStartingEvent event)
{
logger.debug("About to initialize BattleManager");
if(commonProxy.initializeBattleManager())
{
logger.debug("Initialized BattleManager");
}
}
@EventHandler
public void serverStopping(FMLServerStoppingEvent event)
{
logger.debug("About to cleanup BattleManager");
if(commonProxy.cleanupBattleManager())
{
logger.debug("Cleaned up BattleManager");
}
}
public static BattleManager getBattleManager()