Remove Baritone casts

This commit is contained in:
Brady
2018-11-14 16:29:15 -06:00
parent f6dee1ecb7
commit 237f1846d3
13 changed files with 68 additions and 48 deletions

View File

@@ -20,7 +20,7 @@ package baritone;
import baritone.api.BaritoneAPI;
import baritone.api.IBaritone;
import baritone.api.Settings;
import baritone.api.event.listener.IGameEventListener;
import baritone.api.event.listener.IEventBus;
import baritone.api.utils.IPlayerContext;
import baritone.behavior.Behavior;
import baritone.behavior.LookBehavior;
@@ -125,7 +125,7 @@ public class Baritone implements IBaritone {
this.worldProvider = new WorldProvider();
if (BaritoneAutoTest.ENABLE_AUTO_TEST) {
registerEventListener(BaritoneAutoTest.INSTANCE);
this.gameEventHandler.registerEventListener(BaritoneAutoTest.INSTANCE);
}
this.initialized = true;
@@ -135,17 +135,13 @@ public class Baritone implements IBaritone {
return this.pathingControlManager;
}
public IGameEventListener getGameEventHandler() {
return this.gameEventHandler;
}
public List<Behavior> getBehaviors() {
return this.behaviors;
}
public void registerBehavior(Behavior behavior) {
this.behaviors.add(behavior);
this.registerEventListener(behavior);
this.gameEventHandler.registerEventListener(behavior);
}
@Override
@@ -199,8 +195,8 @@ public class Baritone implements IBaritone {
}
@Override
public void registerEventListener(IGameEventListener listener) {
this.gameEventHandler.registerEventListener(listener);
public IEventBus getGameEventHandler() {
return this.gameEventHandler;
}
public static Settings settings() {

View File

@@ -20,6 +20,7 @@ package baritone.event;
import baritone.Baritone;
import baritone.api.event.events.*;
import baritone.api.event.events.type.EventState;
import baritone.api.event.listener.IEventBus;
import baritone.api.event.listener.IGameEventListener;
import baritone.cache.WorldProvider;
import baritone.utils.Helper;
@@ -33,7 +34,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
* @author Brady
* @since 7/31/2018
*/
public final class GameEventHandler implements IGameEventListener, Helper {
public final class GameEventHandler implements IEventBus, Helper {
private final Baritone baritone;
@@ -140,8 +141,8 @@ public final class GameEventHandler implements IGameEventListener, Helper {
listeners.forEach(l -> l.onPathEvent(event));
}
@Override
public final void registerEventListener(IGameEventListener listener) {
this.listeners.add(listener);
}
}

View File

@@ -43,7 +43,7 @@ public class PathingControlManager {
public PathingControlManager(Baritone baritone) {
this.baritone = baritone;
this.processes = new HashSet<>();
baritone.registerEventListener(new AbstractGameEventListener() { // needs to be after all behavior ticks
baritone.getGameEventHandler().registerEventListener(new AbstractGameEventListener() { // needs to be after all behavior ticks
@Override
public void onTick(TickEvent event) {
if (event.getType() == TickEvent.Type.OUT) {