From bb8c5db7986c104db12e7f29bb40cd5aedc1aed8 Mon Sep 17 00:00:00 2001 From: joethei Date: Thu, 24 Nov 2016 20:04:53 +0100 Subject: [PATCH] + 1.11 Update + changed Spigot to PaperSpigot, forgot to add that to the other 1.11 Update messages --- WoolGet.iml | 32 ++++++++----------- pom.xml | 16 ++++++---- .../java/eu/univento/woolget/WoolGet.java | 2 +- .../woolget/commands/SetPositions.java | 8 ++--- .../eu/univento/woolget/game/GameCounter.java | 4 --- .../eu/univento/woolget/game/GameStage.java | 4 --- .../univento/woolget/game/LobbyCounter.java | 4 --- .../univento/woolget/game/RestartCounter.java | 8 ----- .../univento/woolget/game/WarmupCounter.java | 12 +++---- .../eu/univento/woolget/listeners/Blocks.java | 4 --- .../woolget/listeners/Inventorys.java | 4 --- .../univento/woolget/listeners/JoinQuit.java | 25 +++++++-------- .../woolget/listeners/PlayerEvents.java | 24 +++++++------- .../java/eu/univento/woolget/utils/Shop.java | 5 --- .../univento/woolget/utils/TeamChooser.java | 4 --- .../java/eu/univento/woolget/utils/Utils.java | 4 --- 16 files changed, 54 insertions(+), 106 deletions(-) diff --git a/WoolGet.iml b/WoolGet.iml index 1fdb703..db2bf3c 100644 --- a/WoolGet.iml +++ b/WoolGet.iml @@ -1,5 +1,5 @@ - + @@ -11,38 +11,34 @@ - - + + - - - + + + + + + - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index dafdfc7..bac0f0b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,8 +1,4 @@ - - @@ -61,22 +57,28 @@ + + com.destroystokyo.paper + paper-api + 1.11-R0.1-SNAPSHOT + provided + org.bukkit craftbukkit - 1.10-R0.1-SNAPSHOT + 1.11-R0.1-SNAPSHOT provided org.bukkit bukkit - 1.10-R0.1-SNAPSHOT + 1.11-R0.1-SNAPSHOT provided org.spigotmc spigot-api - 1.10-R0.1-SNAPSHOT + 1.11-R0.1-SNAPSHOT provided diff --git a/src/main/java/eu/univento/woolget/WoolGet.java b/src/main/java/eu/univento/woolget/WoolGet.java index 97ed097..0262538 100644 --- a/src/main/java/eu/univento/woolget/WoolGet.java +++ b/src/main/java/eu/univento/woolget/WoolGet.java @@ -1,6 +1,6 @@ package eu.univento.woolget; -import eu.univento.cloud.commons.server.ServerType; +import eu.univento.commons.server.ServerType; import eu.univento.core.api.map.Map; import eu.univento.core.api.map.MapDatabase; import eu.univento.core.api.map.MapVoting; diff --git a/src/main/java/eu/univento/woolget/commands/SetPositions.java b/src/main/java/eu/univento/woolget/commands/SetPositions.java index 3a2a69e..2e5905c 100644 --- a/src/main/java/eu/univento/woolget/commands/SetPositions.java +++ b/src/main/java/eu/univento/woolget/commands/SetPositions.java @@ -1,14 +1,10 @@ -/* - * Copyright (c) univento.eu 2016. Any attempt to use these program(s) without permission may result in a penalty of up to 1.000€ - */ - package eu.univento.woolget.commands; +import eu.univento.commons.player.Rank; import eu.univento.core.api.AutoCommand; import eu.univento.core.api.Config; import eu.univento.core.api.languages.Messages; import eu.univento.core.api.player.CustomPlayer; -import eu.univento.core.api.player.Rank; import eu.univento.woolget.WoolGet; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -30,7 +26,7 @@ public class SetPositions extends AutoCommand { public boolean execute(CommandSender sender, String label, String[] args) { if(sender instanceof Player) { CustomPlayer p = CustomPlayer.getPlayer(sender.getName()); - if(p.isAllowed(Rank.SrDeveloper)) { + if(p.getDatabasePlayer().isAllowed(Rank.SrDeveloper)) { if(args.length == 1) { Config.write("Strive." + args[0], p.getLocation()); p.sendMessage(p.getMessages().PREFIX() + p.getMessages().Lobby_SET_LOCATION()); diff --git a/src/main/java/eu/univento/woolget/game/GameCounter.java b/src/main/java/eu/univento/woolget/game/GameCounter.java index 2e3443e..98cb947 100644 --- a/src/main/java/eu/univento/woolget/game/GameCounter.java +++ b/src/main/java/eu/univento/woolget/game/GameCounter.java @@ -1,7 +1,3 @@ -/* - * Copyright (c) univento.eu 2016. Any attempt to use these program(s) without permission may result in a penalty of up to 1.000€ - */ - package eu.univento.woolget.game; import eu.univento.woolget.WoolGet; diff --git a/src/main/java/eu/univento/woolget/game/GameStage.java b/src/main/java/eu/univento/woolget/game/GameStage.java index 9886e92..2473221 100644 --- a/src/main/java/eu/univento/woolget/game/GameStage.java +++ b/src/main/java/eu/univento/woolget/game/GameStage.java @@ -1,7 +1,3 @@ -/* - * Copyright (c) univento.eu 2016. Any attempt to use these program(s) without permission may result in a penalty of up to 1.000€ - */ - package eu.univento.woolget.game; /** diff --git a/src/main/java/eu/univento/woolget/game/LobbyCounter.java b/src/main/java/eu/univento/woolget/game/LobbyCounter.java index fc300b0..798eaa4 100644 --- a/src/main/java/eu/univento/woolget/game/LobbyCounter.java +++ b/src/main/java/eu/univento/woolget/game/LobbyCounter.java @@ -1,7 +1,3 @@ -/* - * Copyright (c) univento.eu 2016. Any attempt to use these program(s) without permission may result in a penalty of up to 1.000€ - */ - package eu.univento.woolget.game; import eu.univento.core.Core; diff --git a/src/main/java/eu/univento/woolget/game/RestartCounter.java b/src/main/java/eu/univento/woolget/game/RestartCounter.java index b54786a..180d068 100644 --- a/src/main/java/eu/univento/woolget/game/RestartCounter.java +++ b/src/main/java/eu/univento/woolget/game/RestartCounter.java @@ -1,12 +1,6 @@ -/* - * Copyright (c) univento.eu 2016. Any attempt to use these program(s) without permission may result in a penalty of up to 1.000€ - */ - package eu.univento.woolget.game; -import eu.univento.core.api.server.Servers; import eu.univento.core.api.Utils; -import eu.univento.core.api.server.ServerSettings; import eu.univento.woolget.WoolGet; import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitRunnable; @@ -27,8 +21,6 @@ public class RestartCounter extends BukkitRunnable{ if(time == 0) { Bukkit.getScheduler().cancelTask(WoolGet.restartID); Utils.restart(); - ServerSettings.setPlayedGame(null); - Servers.connectAllToServer("Lobby01"); } time--; } diff --git a/src/main/java/eu/univento/woolget/game/WarmupCounter.java b/src/main/java/eu/univento/woolget/game/WarmupCounter.java index a9e9d47..c4f8b9c 100644 --- a/src/main/java/eu/univento/woolget/game/WarmupCounter.java +++ b/src/main/java/eu/univento/woolget/game/WarmupCounter.java @@ -1,17 +1,15 @@ -/* - * Copyright (c) univento.eu 2016. Any attempt to use these program(s) without permission may result in a penalty of up to 1.000€ - */ - package eu.univento.woolget.game; import eu.univento.core.api.Config; import eu.univento.core.api.game.TeamManager; -import eu.univento.core.api.schematic.Cuboid; import eu.univento.core.api.map.Map; import eu.univento.core.api.player.Spectator; +import eu.univento.core.api.schematic.Cuboid; import eu.univento.woolget.WoolGet; import eu.univento.woolget.listeners.Blocks; -import org.bukkit.*; +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; @@ -60,7 +58,7 @@ class WarmupCounter extends BukkitRunnable{ WoolGet.getPlayers().stream().filter(players -> !Blocks.placedBlocksBlue.containsKey(players) || !Blocks.placedBlocksYellow.containsKey(players)).forEach(players -> { WoolGet.getPlayers().remove(players); - Spectator.add(players); + new Spectator(players); TeamManager.getTeam(players).removePlayer(players); Bukkit.broadcastMessage(players.getDisplayName() + "hat seinen Block nicht platziert"); }); diff --git a/src/main/java/eu/univento/woolget/listeners/Blocks.java b/src/main/java/eu/univento/woolget/listeners/Blocks.java index 51a7709..9ffe004 100644 --- a/src/main/java/eu/univento/woolget/listeners/Blocks.java +++ b/src/main/java/eu/univento/woolget/listeners/Blocks.java @@ -1,7 +1,3 @@ -/* - * Copyright (c) univento.eu 2016. Any attempt to use these program(s) without permission may result in a penalty of up to 1.000€ - */ - package eu.univento.woolget.listeners; import eu.univento.core.Core; diff --git a/src/main/java/eu/univento/woolget/listeners/Inventorys.java b/src/main/java/eu/univento/woolget/listeners/Inventorys.java index b063518..7cbb0b2 100644 --- a/src/main/java/eu/univento/woolget/listeners/Inventorys.java +++ b/src/main/java/eu/univento/woolget/listeners/Inventorys.java @@ -1,7 +1,3 @@ -/* - * Copyright (c) univento.eu 2016. Any attempt to use these program(s) without permission may result in a penalty of up to 1.000€ - */ - package eu.univento.woolget.listeners; import eu.univento.core.api.player.CustomPlayer; diff --git a/src/main/java/eu/univento/woolget/listeners/JoinQuit.java b/src/main/java/eu/univento/woolget/listeners/JoinQuit.java index 6e1d38b..1e9efc5 100644 --- a/src/main/java/eu/univento/woolget/listeners/JoinQuit.java +++ b/src/main/java/eu/univento/woolget/listeners/JoinQuit.java @@ -1,12 +1,9 @@ -/* - * Copyright (c) univento.eu 2016. Any attempt to use these program(s) without permission may result in a penalty of up to 1.000€ - */ - package eu.univento.woolget.listeners; import eu.univento.core.api.Config; import eu.univento.core.api.game.TeamManager; import eu.univento.core.api.player.CustomPlayer; +import eu.univento.core.api.player.SpectateManager; import eu.univento.core.api.player.Spectator; import eu.univento.woolget.WoolGet; import eu.univento.woolget.game.GameStage; @@ -55,23 +52,23 @@ public class JoinQuit implements Listener{ p.setLevel(0); - e.setJoinMessage(p.getMessages().PREFIX() + p.getColor() + p.getDisplayName() + " §6hat das Spiel betreteten"); + e.setJoinMessage(p.getMessages().PREFIX() + p.getDatabasePlayer().getRank().getColor() + p.getDisplayName() + " §6hat das Spiel betreteten"); WoolGet.getPlayers().add(p); p.teleport(Config.readLocation("Strive.Spawn")); } if(WoolGet.getGameStage() == GameStage.Warmup) { e.setJoinMessage(null); - Spectator.add(p); + new Spectator(p); p.setScoreboard(Bukkit.getScoreboardManager().getMainScoreboard()); } if(WoolGet.getGameStage() == GameStage.Game) { e.setJoinMessage(null); - Spectator.add(p); + new Spectator(p); p.setScoreboard(Bukkit.getScoreboardManager().getMainScoreboard()); } if(WoolGet.getGameStage() == GameStage.Restart) { e.setJoinMessage(null); - Spectator.add(p); + new Spectator(p); p.setScoreboard(Bukkit.getScoreboardManager().getMainScoreboard()); } } @@ -81,28 +78,28 @@ public class JoinQuit implements Listener{ CustomPlayer p = CustomPlayer.getPlayer(e.getPlayer()); if(WoolGet.getGameStage() == GameStage.Lobby) { if(WoolGet.getPlayers().contains(p)) { - e.setQuitMessage(p.getMessages().PREFIX() + p.getColor() + p.getDisplayName() + " §chat die Lobby verlassen"); + e.setQuitMessage(p.getMessages().PREFIX() + p.getDatabasePlayer().getRank().getColor() + p.getDisplayName() + " §chat die Lobby verlassen"); }else{ e.setQuitMessage(null); } } if(WoolGet.getGameStage() == GameStage.Warmup) { if(WoolGet.getPlayers().contains(p)) { - e.setQuitMessage(p.getMessages().PREFIX() + p.getColor() + p.getDisplayName() + " §chat das Spiel verlassen"); + e.setQuitMessage(p.getMessages().PREFIX() + p.getDatabasePlayer().getRank().getColor() + p.getDisplayName() + " §chat das Spiel verlassen"); }else{ e.setQuitMessage(null); } } if(WoolGet.getGameStage() == GameStage.Game) { if(WoolGet.getPlayers().contains(p)) { - e.setQuitMessage(p.getMessages().PREFIX() + p.getColor() + p.getDisplayName() + " §chat das Spiel verlassen"); + e.setQuitMessage(p.getMessages().PREFIX() + p.getDatabasePlayer().getRank().getColor() + p.getDisplayName() + " §chat das Spiel verlassen"); }else{ e.setQuitMessage(null); } } if(WoolGet.getGameStage() == GameStage.Restart) { if(WoolGet.getPlayers().contains(p)) { - e.setQuitMessage(p.getMessages().PREFIX() + p.getColor() + p.getDisplayName() + " §chat den Server verlassen"); + e.setQuitMessage(p.getMessages().PREFIX() + p.getDatabasePlayer().getRank().getColor() + p.getDisplayName() + " §chat den Server verlassen"); }else{ e.setQuitMessage(null); } @@ -110,8 +107,8 @@ public class JoinQuit implements Listener{ if(WoolGet.getPlayers().contains(p)) { WoolGet.getPlayers().remove(p); } - if(Spectator.is(p)) { - Spectator.remove(p); + if(SpectateManager.contains(p)) { + SpectateManager.get(p).remove(); } if(TeamManager.getTeam(p) != null) { TeamManager.getTeam(p).removePlayer(p); diff --git a/src/main/java/eu/univento/woolget/listeners/PlayerEvents.java b/src/main/java/eu/univento/woolget/listeners/PlayerEvents.java index f9dccdf..2c5dec5 100644 --- a/src/main/java/eu/univento/woolget/listeners/PlayerEvents.java +++ b/src/main/java/eu/univento/woolget/listeners/PlayerEvents.java @@ -1,21 +1,23 @@ -/* - * Copyright (c) univento.eu 2016. Any attempt to use these program(s) without permission may result in a penalty of up to 1.000€ - */ - package eu.univento.woolget.listeners; +import eu.univento.commons.server.ServerType; import eu.univento.core.api.Config; import eu.univento.core.api.game.Team; import eu.univento.core.api.game.TeamManager; -import eu.univento.core.api.schematic.Cuboid; import eu.univento.core.api.map.Map; import eu.univento.core.api.player.CustomPlayer; -import eu.univento.core.api.server.Game; +import eu.univento.core.api.schematic.Cuboid; import eu.univento.woolget.WoolGet; import eu.univento.woolget.game.GameStage; import eu.univento.woolget.utils.Shop; -import org.bukkit.*; -import org.bukkit.entity.*; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.TreeType; +import org.bukkit.World; +import org.bukkit.entity.Item; +import org.bukkit.entity.Player; +import org.bukkit.entity.Snowball; +import org.bukkit.entity.Villager; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.Action; @@ -35,12 +37,12 @@ import java.util.List; */ public class PlayerEvents implements Listener { - private Game game = Game.WoolGet; + private static ServerType serverType = ServerType.GAME_WOOLGET; private static Team blue; private static Team yellow; public static void setTeams() { - blue = TeamManager.getTeam("blue"); + blue = yellow = TeamManager.getTeam("yellow"); } @@ -54,8 +56,6 @@ public class PlayerEvents implements Listener { e.setDeathMessage(p.getDisplayName() + " wurde von " + killer.getDisplayName() + " gebasht"); e.getDrops().clear(); e.setDroppedExp(0); - p.getStatistics(game).addDeath(); - killer.getStatistics(game).addKill(); } else { e.setDeathMessage(p.getDisplayName() + " ist nun tot"); } diff --git a/src/main/java/eu/univento/woolget/utils/Shop.java b/src/main/java/eu/univento/woolget/utils/Shop.java index d6c7d38..992cb3b 100644 --- a/src/main/java/eu/univento/woolget/utils/Shop.java +++ b/src/main/java/eu/univento/woolget/utils/Shop.java @@ -1,14 +1,9 @@ -/* - * Copyright (c) univento.eu 2016. Any attempt to use these program(s) without permission may result in a penalty of up to 1.000€ - */ - package eu.univento.woolget.utils; import eu.univento.core.api.game.TeamManager; import eu.univento.core.api.player.CustomPlayer; import org.bukkit.Bukkit; import org.bukkit.Material; -import org.bukkit.entity.Villager; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; diff --git a/src/main/java/eu/univento/woolget/utils/TeamChooser.java b/src/main/java/eu/univento/woolget/utils/TeamChooser.java index e301ce1..262beb3 100644 --- a/src/main/java/eu/univento/woolget/utils/TeamChooser.java +++ b/src/main/java/eu/univento/woolget/utils/TeamChooser.java @@ -1,7 +1,3 @@ -/* - * Copyright (c) univento.eu 2016. Any attempt to use these program(s) without permission may result in a penalty of up to 1.000€ - */ - package eu.univento.woolget.utils; import eu.univento.core.api.game.TeamManager; diff --git a/src/main/java/eu/univento/woolget/utils/Utils.java b/src/main/java/eu/univento/woolget/utils/Utils.java index b01dbad..2cc66a1 100644 --- a/src/main/java/eu/univento/woolget/utils/Utils.java +++ b/src/main/java/eu/univento/woolget/utils/Utils.java @@ -1,7 +1,3 @@ -/* - * Copyright (c) univento.eu 2016. Any attempt to use these program(s) without permission may result in a penalty of up to 1.000€ - */ - package eu.univento.woolget.utils; import eu.univento.woolget.WoolGet;