simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-04-20 02:56:44 +00:00
Code Issues Projects Releases Wiki Activity

Code style

Browse Source
This commit is contained in:
simon987 2019-04-11 18:34:05 -04:00
parent 95217b2fdf
commit f0b3d781b2
5 changed files with 25 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Plugin Cubot/src/main/java/net/simon987/cubotplugin/Cubot.java
View File

@ -1,5 +1,7 @@
package net.simon987.cubotplugin;
import net.simon987.cubotplugin.event.CubotWalkEvent;
import net.simon987.cubotplugin.event.DeathEvent;
import net.simon987.server.GameServer;
import net.simon987.server.IServerConfiguration;
import net.simon987.server.assembly.CPU;
@ -7,12 +9,11 @@ import net.simon987.server.assembly.HardwareModule;
import net.simon987.server.assembly.Memory;
import net.simon987.server.assembly.Status;
import net.simon987.server.assembly.exception.CancelledException;
import net.simon987.server.event.GameEvent;
import net.simon987.server.game.item.Item;
import net.simon987.server.game.item.ItemVoid;
import net.simon987.server.game.objects.*;
import net.simon987.server.user.User;
import net.simon987.server.event.GameEvent;
import net.simon987.cubotplugin.event.*;
import org.bson.Document;
import org.json.simple.JSONObject;
@ -154,9 +155,6 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me
return MAP_INFO;
}
/**
* Called every tick
*/
@Override
public void update() {
if (currentAction == Action.WALKING) {
@ -165,8 +163,7 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me
//Couldn't walk
currentAction = Action.IDLE;
}else{
GameEvent event2 = new WalkEvent(this);
GameServer.INSTANCE.getEventDispatcher().dispatch(event2);
GameServer.INSTANCE.getEventDispatcher().dispatch(new CubotWalkEvent(this));
}
} else {
currentAction = Action.IDLE;

17
Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/CubotWalkEvent.java Normal file
View File

@ -0,0 +1,17 @@
package net.simon987.cubotplugin.event;
import net.simon987.cubotplugin.Cubot;
import net.simon987.server.event.GameEvent;
public class CubotWalkEvent extends GameEvent {
public CubotWalkEvent(Cubot cubot) {
setSource(cubot);
}
@Override
public Cubot getSource() {
return (Cubot) super.getSource();
}
}

4
Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/DeathListener.java
View File

@ -4,7 +4,6 @@ import net.simon987.server.event.GameEvent;
import net.simon987.server.event.GameEventListener;
import net.simon987.server.game.objects.ControllableUnit;
import net.simon987.server.game.objects.GameObject;
import net.simon987.server.logging.LogManager;
public class DeathListener implements GameEventListener {
@ -18,8 +17,7 @@ public class DeathListener implements GameEventListener {
DeathEvent DeathEvent = (DeathEvent) event;
GameObject object = DeathEvent.getSource();
if (object instanceof ControllableUnit) {
((ControllableUnit) object).getParent().getStats().incrementStat("death",
1);
((ControllableUnit) object).getParent().getStats().incrementStat("death", 1);
}
}
}

17
Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/WalkEvent.java
View File

@ -1,17 +0,0 @@
package net.simon987.cubotplugin.event;
import net.simon987.server.event.GameEvent;
import net.simon987.server.game.objects.GameObject;
public class WalkEvent extends GameEvent {
public WalkEvent(GameObject object) {
setSource(object);
}
@Override
public GameObject getSource() {
return (GameObject) super.getSource();
}
}

14
Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/WalkListener.java
View File

@ -2,25 +2,17 @@ package net.simon987.cubotplugin.event;
import net.simon987.server.event.GameEvent;
import net.simon987.server.event.GameEventListener;
import net.simon987.server.game.objects.ControllableUnit;
import net.simon987.server.game.objects.GameObject;
import net.simon987.server.logging.LogManager;
import net.simon987.server.user.UserStats;
public class WalkListener implements GameEventListener {
@Override
public Class getListenedEventType() {
return WalkEvent.class;
return CubotWalkEvent.class;
}
@Override
public void handle(GameEvent event) {
WalkEvent WalkEvent = (WalkEvent) event;
GameObject object = WalkEvent.getSource();
if (object instanceof ControllableUnit) {
((ControllableUnit) object).getParent().getStats().incrementStat("walkDistance",
1);
}
CubotWalkEvent walkEvent = (CubotWalkEvent) event;
walkEvent.getSource().getParent().getStats().incrementStat("walkDistance", 1);
}
}