+ 1.11 Update

+ changed Spigot to PaperSpigot, forgot to add that to the other 1.11 Update messages
master
Johannes Theiner 6 years ago
parent 0f3b8cb9a0
commit bb8c5db798

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<module com.demonwav.mcdev.MinecraftModuleTypes="PAPER_MODULE_TYPE" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
@ -11,38 +11,34 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:craftbukkit:1.10-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.10-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.destroystokyo.paper:paper-api:1.11-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:17.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.2.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.avaje:ebean:2.8.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.persistence:persistence-api:1.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.15" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.10-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.9-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.10-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-all:5.0.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:craftbukkit:1.11-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.11-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.11-R0.1-SNAPSHOT" level="project" />
<orderEntry type="module" module-name="Core" scope="PROVIDED" />
<orderEntry type="module" module-name="CloudCommons" scope="PROVIDED" />
<orderEntry type="module" module-name="Commons" scope="PROVIDED" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.8" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.mongodb:mongo-java-driver:3.2.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.mongodb:mongodb-driver-async:3.2.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.mongodb:mongodb-driver-core:3.2.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.mongodb:bson:3.2.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.mongodb.morphia:morphia:1.2.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: cglib:cglib-nodep:2.2.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.thoughtworks.proxytoys:proxytoys:1.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.zaxxer:HikariCP:2.4.5" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.7.16" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-all:4.0.36.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-api:2.6.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-core:2.6.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-io:commons-io:2.5" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: joda-time:joda-time:2.9.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.github.theholywaffle:teamspeak3-api:1.0.14-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.github.TheHolyWaffle:TeamSpeak-3-Java-API:v1.0.13" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-api:2.6.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-core:2.6.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.gpedro.integrations.slack:slack-webhook:1.2.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.10" level="project" />
</component>
</module>

@ -1,8 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) univento.eu 2016. Any attempt to use these program(s) without permission may result in a penalty of up to 1.000€
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@ -61,22 +57,28 @@
</repositories>
<dependencies>
<dependency>
<groupId>com.destroystokyo.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.11-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId>
<version>1.10-R0.1-SNAPSHOT</version>
<version>1.11-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.10-R0.1-SNAPSHOT</version>
<version>1.11-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.10-R0.1-SNAPSHOT</version>
<version>1.11-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>

@ -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;

@ -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<WoolGet> {
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());

@ -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;

@ -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;
/**

@ -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;

@ -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--;
}

@ -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");
});

@ -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;

@ -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;

@ -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);

@ -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");
}

@ -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;

@ -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;

@ -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;

Loading…
Cancel
Save