Fix broken GameAPI imports and Start(GameStateManager) signature
This commit is contained in:
@@ -11,7 +11,8 @@ import org.bukkit.entity.Player;
|
|||||||
|
|
||||||
import com.softwarerat.API.builder.SpigotInventory;
|
import com.softwarerat.API.builder.SpigotInventory;
|
||||||
import com.softwarerat.API.builder.SpigotItem;
|
import com.softwarerat.API.builder.SpigotItem;
|
||||||
import com.softwarerat.API.gameState.IGameState;
|
import com.softwarerat.API.data.gameState.GameStateManager;
|
||||||
|
import com.softwarerat.API.data.gameState.IGameState;
|
||||||
import com.softwarerat.MLGRush.MLGRush.MLGRush;
|
import com.softwarerat.MLGRush.MLGRush.MLGRush;
|
||||||
import com.softwarerat.MLGRush.MLGRush.data.Scores;
|
import com.softwarerat.MLGRush.MLGRush.data.Scores;
|
||||||
|
|
||||||
@@ -34,7 +35,7 @@ public class IngameState implements IGameState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void Start() {
|
public void Start(GameStateManager manager) {
|
||||||
|
|
||||||
Location redSpawn = getLocation("spawn.red");
|
Location redSpawn = getLocation("spawn.red");
|
||||||
Location blueSpawn = getLocation("spawn.blue");
|
Location blueSpawn = getLocation("spawn.blue");
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
package com.softwarerat.MLGRush.MLGRush.GameState;
|
package com.softwarerat.MLGRush.MLGRush.GameState;
|
||||||
|
|
||||||
import com.softwarerat.API.gameState.IGameState;
|
import com.softwarerat.API.data.gameState.GameStateManager;
|
||||||
import com.softwarerat.API.world.WorldAPI;
|
import com.softwarerat.API.data.gameState.IGameState;
|
||||||
|
import com.softwarerat.API.data.world.WorldAPI;
|
||||||
|
|
||||||
public class LobbyState implements IGameState {
|
public class LobbyState implements IGameState {
|
||||||
IngameState ingameState;
|
IngameState ingameState;
|
||||||
@@ -13,13 +14,13 @@ public class LobbyState implements IGameState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void Start() {
|
public void Start(GameStateManager manager) {
|
||||||
worldAPI.loadWorld("ingame");
|
worldAPI.loadWorld("ingame");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void Stop() {
|
public void Stop() {
|
||||||
|
|
||||||
ingameState.Start();
|
ingameState.Start(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ package com.softwarerat.MLGRush.MLGRush;
|
|||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import com.softwarerat.API.prefix.PrefixAPI;
|
import com.softwarerat.API.data.prefix.PrefixAPI;
|
||||||
|
|
||||||
public class IPrefix {
|
public class IPrefix {
|
||||||
PrefixAPI prefixAPI;
|
PrefixAPI prefixAPI;
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ import org.bukkit.plugin.java.JavaPlugin;
|
|||||||
import org.bukkit.scoreboard.Scoreboard;
|
import org.bukkit.scoreboard.Scoreboard;
|
||||||
|
|
||||||
import com.softwarerat.API.data.GameData;
|
import com.softwarerat.API.data.GameData;
|
||||||
import com.softwarerat.API.prefix.PrefixAPI;
|
import com.softwarerat.API.data.prefix.PrefixAPI;
|
||||||
import com.softwarerat.API.world.WorldAPI;
|
import com.softwarerat.API.data.world.WorldAPI;
|
||||||
import com.softwarerat.GameAPI;
|
import com.softwarerat.GameAPI;
|
||||||
import com.softwarerat.MLGRush.MLGRush.GameState.IngameState;
|
import com.softwarerat.MLGRush.MLGRush.GameState.IngameState;
|
||||||
import com.softwarerat.MLGRush.MLGRush.GameState.LobbyState;
|
import com.softwarerat.MLGRush.MLGRush.GameState.LobbyState;
|
||||||
@@ -96,6 +96,6 @@ public final class MLGRush extends JavaPlugin {
|
|||||||
scores = new Scores();
|
scores = new Scores();
|
||||||
ingameState = new IngameState(this,scores);
|
ingameState = new IngameState(this,scores);
|
||||||
lobbyState = new LobbyState(ingameState,new WorldAPI());
|
lobbyState = new LobbyState(ingameState,new WorldAPI());
|
||||||
lobbyState.Start();
|
lobbyState.Start(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,3 +0,0 @@
|
|||||||
artifactId=mlgrush
|
|
||||||
groupId=com.softwarerat
|
|
||||||
version=1.0.24-SNAPSHOT
|
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
com\softwarerat\MLGRush\MLGRush\IPrefix.class
|
||||||
|
com\softwarerat\MLGRush\MLGRush\MLGRush.class
|
||||||
|
com\softwarerat\MLGRush\MLGRush\listener\JoinListener.class
|
||||||
|
com\softwarerat\MLGRush\MLGRush\GameState\LobbyState.class
|
||||||
|
com\softwarerat\MLGRush\MLGRush\listener\BlockBreakListener.class
|
||||||
|
com\softwarerat\MLGRush\MLGRush\data\Yaml.class
|
||||||
|
com\softwarerat\MLGRush\MLGRush\listener\OutOfAreaListener.class
|
||||||
|
com\softwarerat\MLGRush\MLGRush\data\Scores.class
|
||||||
|
com\softwarerat\MLGRush\MLGRush\GameState\IngameState.class
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user