loganmagnan/bed-wars
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some more shit

Browse Source
This commit is contained in:
Trixkz 2021-11-21 18:19:23 -05:00
parent 6c9b0c51cd
commit 3eed8f07ef
6 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
.idea/workspace.xml
View File

@ -23,32 +23,11 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="998d5e92-ac1f-4423-8aef-5f389ab213de" name="Changes" comment=""> <list default="true" id="998d5e92-ac1f-4423-8aef-5f389ab213de" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/src/main/java/assemble/Assemble.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/listeners/GameStartListener.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/assemble/AssembleAdapter.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/assemble/AssembleBoard.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/assemble/AssembleBoardEntry.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/assemble/AssembleException.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/assemble/AssembleListener.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/assemble/AssembleStyle.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/assemble/AssembleThread.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/assemble/events/AssembleBoardCreateEvent.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/assemble/events/AssembleBoardCreatedEvent.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/assemble/events/AssembleBoardDestroyEvent.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/managers/ScoreboardManager.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/BedWars.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/BedWars.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/BedWars.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/BedWars.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/level/LevelCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/level/LevelCommand.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/game/GameState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/game/GameState.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/level/RemoveCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/level/RemoveCommand.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/game/events/GameStartEvent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/game/events/GameStartEvent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/level/SetCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/level/SetCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/setspawn/SpawnCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/setspawn/SpawnCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/xp/AddCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/xp/AddCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/xp/RemoveCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/xp/RemoveCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/xp/SetCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/xp/SetCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/xp/XpCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/commands/xp/XpCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/managers/CommandManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/managers/CommandManager.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/player/PlayerData.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/player/PlayerData.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/player/PlayerDataManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/rip/tilly/bedwars/player/PlayerDataManager.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/plugin.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/plugin.yml" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -186,5 +165,21 @@
<screen x="0" y="0" width="1536" height="824" /> <screen x="0" y="0" width="1536" height="824" />
</state> </state>
<state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1536.824/1920.0.800.560@0.0.1536.824" timestamp="1637505947686" /> <state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1536.824/1920.0.800.560@0.0.1536.824" timestamp="1637505947686" />
<state width="1493" height="204" key="GridCell.Tab.0.bottom" timestamp="1637531590753">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1493" height="204" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.800.560@0.0.1536.824" timestamp="1637531590753" />
<state width="1493" height="204" key="GridCell.Tab.0.center" timestamp="1637531590753">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1493" height="204" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.800.560@0.0.1536.824" timestamp="1637531590753" />
<state width="1493" height="204" key="GridCell.Tab.0.left" timestamp="1637531590753">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1493" height="204" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.800.560@0.0.1536.824" timestamp="1637531590753" />
<state width="1493" height="204" key="GridCell.Tab.0.right" timestamp="1637531590753">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1493" height="204" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.800.560@0.0.1536.824" timestamp="1637531590753" />
</component> </component>
</project> </project>

3
src/main/java/rip/tilly/bedwars/BedWars.java
View File

@ -7,6 +7,7 @@ import org.bukkit.World;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import rip.tilly.bedwars.listeners.GameStartListener;
import rip.tilly.bedwars.listeners.InteractListener; import rip.tilly.bedwars.listeners.InteractListener;
import rip.tilly.bedwars.listeners.PlayerDataListener; import rip.tilly.bedwars.listeners.PlayerDataListener;
import rip.tilly.bedwars.listeners.RandomListeners; import rip.tilly.bedwars.listeners.RandomListeners;
@ -117,7 +118,7 @@ public final class BedWars extends JavaPlugin {
private void loadListeners() { private void loadListeners() {
Arrays.asList( Arrays.asList(
new PlayerDataListener(), new RandomListeners(), new InteractListener() new PlayerDataListener(), new RandomListeners(), new InteractListener(), new GameStartListener()
).forEach(listener -> this.getServer().getPluginManager().registerEvents(listener, this)); ).forEach(listener -> this.getServer().getPluginManager().registerEvents(listener, this));
} }
} }

1
src/main/java/rip/tilly/bedwars/game/GameState.java
View File

@ -1,6 +1,7 @@
package rip.tilly.bedwars.game; package rip.tilly.bedwars.game;
public enum GameState { public enum GameState {
STARTING, STARTING,
FIGHTING, FIGHTING,
ENDING ENDING

1
src/main/java/rip/tilly/bedwars/game/events/GameStartEvent.java
View File

@ -3,6 +3,7 @@ package rip.tilly.bedwars.game.events;
import rip.tilly.bedwars.game.Game; import rip.tilly.bedwars.game.Game;
public class GameStartEvent extends GameEvent { public class GameStartEvent extends GameEvent {
public GameStartEvent(Game game) { public GameStartEvent(Game game) {
super(game); super(game);
} }

17
src/main/java/rip/tilly/bedwars/listeners/GameStartListener.java Normal file
View File

@ -0,0 +1,17 @@
package rip.tilly.bedwars.listeners;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import rip.tilly.bedwars.BedWars;
import rip.tilly.bedwars.game.Game;
import rip.tilly.bedwars.game.events.GameStartEvent;
public class GameStartListener implements Listener {
private BedWars main = BedWars.getInstance();
@EventHandler
public void onGameStart(GameStartEvent event) {
Game game = event.getGame();
}
}

5
src/main/java/rip/tilly/bedwars/providers/scoreboard/ScoreboardProvider.java
View File

@ -42,15 +42,18 @@ public class ScoreboardProvider implements AssembleAdapter {
private List<String> spawnScoreboard(PlayerData playerData) { private List<String> spawnScoreboard(PlayerData playerData) {
List<String> lines = new ArrayList<String>(); List<String> lines = new ArrayList<String>();
boolean inParty = this.main.getPartyManager().getParty(playerData.getUniqueId()) != null; boolean inParty = this.main.getPartyManager().getParty(playerData.getUniqueId()) != null;
lines.add(CC.scoreboardBar); lines.add(CC.scoreboardBar);
if (inParty) { if (inParty) {
Party party = this.main.getPartyManager().getParty(playerData.getUniqueId()); Party party = this.main.getPartyManager().getParty(playerData.getUniqueId());
lines.add("&9Party Leader: &d" + Bukkit.getPlayer(party.getLeader()).getName()); lines.add("&9Party Leader: &d" + Bukkit.getPlayer(party.getLeader()).getName());
lines.add("&9Party Members: &d" + party.getMembers().size()); lines.add("&9Party Members: &d" + party.getMembers().size() + "&7/&d" + party.getLimit());
lines.add(CC.scoreboardBar); lines.add(CC.scoreboardBar);
} }
lines.add("&fOnline: &d" + this.main.getServer().getOnlinePlayers().size()); lines.add("&fOnline: &d" + this.main.getServer().getOnlinePlayers().size());
lines.add("&fPlaying: &d" + this.main.getGameManager().getFighters()); lines.add("&fPlaying: &d" + this.main.getGameManager().getFighters());
lines.add(" "); lines.add(" ");