mirror of
https://github.com/taoneill/war.git
synced 2024-09-27 22:18:11 +02:00
Fixing the pom.xml so plugin.yml - which I moved a couple of commits ago - makes it into the final jar in the maven build. Still messing around with namespaces while everything is broken.
This commit is contained in:
parent
e8e2c0c472
commit
4ffaadf3da
13
war/pom.xml
13
war/pom.xml
@ -18,6 +18,17 @@
|
||||
<url>http://mvn2.sk89q.com/repo</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
<issueManagement>
|
||||
<system>Github issues</system>
|
||||
<url>https://github.com/taoneill/war/issues</url>
|
||||
</issueManagement>
|
||||
<ciManagement>
|
||||
<system>Jenkins</system>
|
||||
<url>http://ci.tommytony.com</url>
|
||||
</ciManagement>
|
||||
<scm>
|
||||
<url>https://github.com/taoneill/war</url>
|
||||
</scm>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
@ -34,7 +45,7 @@
|
||||
<resource>
|
||||
<targetPath>.</targetPath>
|
||||
<filtering>true</filtering>
|
||||
<directory>${basedir}/src/main/java/</directory>
|
||||
<directory>${basedir}/src/main/resources/</directory>
|
||||
<includes>
|
||||
<include>plugin.yml</include>
|
||||
</includes>
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.tommytony.war.game;
|
||||
package com.tommytony.war;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
@ -15,10 +15,12 @@ import org.getspout.spoutapi.SpoutManager;
|
||||
import org.getspout.spoutapi.player.SpoutPlayer;
|
||||
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.config.InventoryBag;
|
||||
import com.tommytony.war.config.TeamConfig;
|
||||
import com.tommytony.war.config.TeamConfigBag;
|
||||
import com.tommytony.war.structure.Bomb;
|
||||
import com.tommytony.war.structure.Cake;
|
||||
import com.tommytony.war.structure.TeamSpawnStyle;
|
||||
import com.tommytony.war.utility.SignHelper;
|
||||
import com.tommytony.war.volume.Volume;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.tommytony.war.game;
|
||||
package com.tommytony.war;
|
||||
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Material;
|
@ -31,18 +31,15 @@ import com.tommytony.war.event.WarBlockListener;
|
||||
import com.tommytony.war.event.WarEntityListener;
|
||||
import com.tommytony.war.event.WarPlayerListener;
|
||||
import com.tommytony.war.event.WarServerListener;
|
||||
import com.tommytony.war.game.FlagReturn;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.TeamKind;
|
||||
import com.tommytony.war.game.TeamSpawnStyle;
|
||||
import com.tommytony.war.game.WarHub;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.game.ZoneLobby;
|
||||
import com.tommytony.war.job.HelmetProtectionTask;
|
||||
import com.tommytony.war.job.SpoutFadeOutMessageJob;
|
||||
import com.tommytony.war.mapper.WarYmlMapper;
|
||||
import com.tommytony.war.mapper.WarzoneYmlMapper;
|
||||
import com.tommytony.war.spout.SpoutMessenger;
|
||||
import com.tommytony.war.structure.FlagReturn;
|
||||
import com.tommytony.war.structure.TeamSpawnStyle;
|
||||
import com.tommytony.war.structure.WarHub;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
import com.tommytony.war.utility.ChatFixUtil;
|
||||
import com.tommytony.war.utility.PlayerState;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.tommytony.war.game;
|
||||
package com.tommytony.war;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
@ -24,7 +24,6 @@ import org.getspout.spoutapi.SpoutManager;
|
||||
import org.getspout.spoutapi.player.SpoutPlayer;
|
||||
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.config.InventoryBag;
|
||||
import com.tommytony.war.config.TeamConfig;
|
||||
import com.tommytony.war.config.TeamConfigBag;
|
||||
@ -35,7 +34,14 @@ import com.tommytony.war.job.LoadoutResetJob;
|
||||
import com.tommytony.war.job.ScoreCapReachedJob;
|
||||
import com.tommytony.war.mapper.LoadoutYmlMapper;
|
||||
import com.tommytony.war.spout.SpoutMessenger;
|
||||
import com.tommytony.war.structure.Bomb;
|
||||
import com.tommytony.war.structure.Cake;
|
||||
import com.tommytony.war.structure.Monument;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
import com.tommytony.war.structure.ZoneWallGuard;
|
||||
import com.tommytony.war.utility.LoadoutSelection;
|
||||
import com.tommytony.war.utility.PlayerState;
|
||||
import com.tommytony.war.utility.PotionEffect;
|
||||
import com.tommytony.war.volume.ZoneVolume;
|
||||
|
||||
/**
|
@ -1,14 +1,14 @@
|
||||
package com.tommytony.war.game;
|
||||
package com.tommytony.war;
|
||||
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.block.BlockFace;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.config.WarConfig;
|
||||
import com.tommytony.war.mapper.WarYmlMapper;
|
||||
import com.tommytony.war.mapper.WarzoneYmlMapper;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
import com.tommytony.war.volume.NotNorthwestException;
|
||||
import com.tommytony.war.volume.NotSoutheastException;
|
||||
import com.tommytony.war.volume.TooBigException;
|
@ -6,7 +6,7 @@ import org.bukkit.entity.Player;
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Warzone;
|
||||
|
||||
|
||||
/**
|
||||
|
@ -5,10 +5,10 @@ import org.bukkit.entity.Player;
|
||||
|
||||
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Bomb;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.game.ZoneLobby;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.mapper.WarzoneYmlMapper;
|
||||
import com.tommytony.war.structure.Bomb;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
|
||||
/**
|
||||
* Deletes a bomb.
|
||||
|
@ -5,10 +5,10 @@ import org.bukkit.entity.Player;
|
||||
|
||||
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Cake;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.game.ZoneLobby;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.mapper.WarzoneYmlMapper;
|
||||
import com.tommytony.war.structure.Cake;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
|
||||
/**
|
||||
* Deletes a cake.
|
||||
|
@ -5,10 +5,10 @@ import org.bukkit.entity.Player;
|
||||
|
||||
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Monument;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.game.ZoneLobby;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.mapper.WarzoneYmlMapper;
|
||||
import com.tommytony.war.structure.Monument;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
|
||||
/**
|
||||
* Deletes a monument.
|
||||
|
@ -4,12 +4,12 @@ import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.TeamKind;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.TeamKind;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.game.ZoneLobby;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.mapper.WarzoneYmlMapper;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
|
||||
/**
|
||||
* Deletes a team.
|
||||
|
@ -4,11 +4,11 @@ import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.game.ZoneLobby;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.mapper.WarzoneYmlMapper;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
|
||||
/**
|
||||
* Deletes a monument.
|
||||
|
@ -5,10 +5,10 @@ import org.bukkit.command.CommandSender;
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.WarHub;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.mapper.VolumeMapper;
|
||||
import com.tommytony.war.mapper.WarYmlMapper;
|
||||
import com.tommytony.war.structure.WarHub;
|
||||
|
||||
/**
|
||||
* Deletes the warhub.
|
||||
|
@ -4,14 +4,14 @@ import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Monument;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.game.ZoneLobby;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.mapper.WarYmlMapper;
|
||||
import com.tommytony.war.mapper.WarzoneYmlMapper;
|
||||
import com.tommytony.war.structure.Monument;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
|
||||
/**
|
||||
* Deletes a warzone.
|
||||
|
@ -6,14 +6,14 @@ import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.TeamKind;
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.config.TeamConfig;
|
||||
import com.tommytony.war.config.WarzoneConfig;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.TeamKind;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.game.ZoneLobby;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
|
||||
/**
|
||||
* Joins a team.
|
||||
|
@ -5,7 +5,7 @@ import org.bukkit.entity.Player;
|
||||
|
||||
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Warzone;
|
||||
|
||||
/**
|
||||
* Leaves a game.
|
||||
|
@ -3,10 +3,10 @@ package com.tommytony.war.command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.game.ZoneLobby;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
|
||||
|
||||
public class NextBattleCommand extends AbstractZoneMakerCommand {
|
||||
|
@ -9,12 +9,12 @@ import org.bukkit.entity.Player;
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.config.WarzoneConfig;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.game.ZoneLobby;
|
||||
import com.tommytony.war.mapper.PropertiesFile;
|
||||
import com.tommytony.war.mapper.WarYmlMapper;
|
||||
import com.tommytony.war.mapper.WarzoneYmlMapper;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
|
||||
public class RenameZoneCommand extends AbstractZoneMakerCommand {
|
||||
public RenameZoneCommand(WarCommandHandler handler, CommandSender sender, String[] args) throws NotZoneMakerException {
|
||||
|
@ -3,11 +3,11 @@ package com.tommytony.war.command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.game.ZoneLobby;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
|
||||
|
||||
public class ResetZoneCommand extends AbstractZoneMakerCommand {
|
||||
|
@ -6,9 +6,9 @@ import org.bukkit.entity.Player;
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.game.ZoneLobby;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.mapper.WarzoneYmlMapper;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
|
||||
public class SaveZoneCommand extends AbstractZoneMakerCommand {
|
||||
|
||||
|
@ -5,9 +5,9 @@ import org.bukkit.entity.Player;
|
||||
|
||||
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Bomb;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.mapper.WarzoneYmlMapper;
|
||||
import com.tommytony.war.structure.Bomb;
|
||||
|
||||
/**
|
||||
* Places a bomb
|
||||
|
@ -5,9 +5,9 @@ import org.bukkit.entity.Player;
|
||||
|
||||
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Cake;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.mapper.WarzoneYmlMapper;
|
||||
import com.tommytony.war.structure.Cake;
|
||||
|
||||
/**
|
||||
* Places a cake
|
||||
|
@ -5,9 +5,9 @@ import org.bukkit.entity.Player;
|
||||
|
||||
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Monument;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.mapper.WarzoneYmlMapper;
|
||||
import com.tommytony.war.structure.Monument;
|
||||
|
||||
/**
|
||||
* Places a monument
|
||||
|
@ -4,11 +4,11 @@ import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.TeamKind;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.config.TeamConfig;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.TeamKind;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.mapper.WarzoneYmlMapper;
|
||||
|
||||
/**
|
||||
|
@ -4,13 +4,13 @@ import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.TeamKind;
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.TeamKind;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.game.ZoneLobby;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.mapper.WarzoneYmlMapper;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
|
||||
public class SetTeamConfigCommand extends AbstractZoneMakerCommand {
|
||||
|
||||
|
@ -5,10 +5,10 @@ import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.TeamKind;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.TeamKind;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.mapper.WarzoneYmlMapper;
|
||||
|
||||
/**
|
||||
|
@ -6,9 +6,9 @@ import org.bukkit.entity.Player;
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.WarHub;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.mapper.WarYmlMapper;
|
||||
import com.tommytony.war.structure.WarHub;
|
||||
|
||||
/**
|
||||
* Places the warhub
|
||||
|
@ -5,7 +5,7 @@ import org.bukkit.entity.Player;
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.ZoneSetter;
|
||||
import com.tommytony.war.ZoneSetter;
|
||||
|
||||
|
||||
public class SetZoneCommand extends AbstractZoneMakerCommand {
|
||||
|
@ -6,9 +6,9 @@ import org.bukkit.entity.Player;
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.game.ZoneLobby;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.mapper.WarzoneYmlMapper;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
|
||||
public class SetZoneConfigCommand extends AbstractZoneMakerCommand {
|
||||
|
||||
|
@ -7,9 +7,9 @@ import org.bukkit.entity.Player;
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.game.ZoneLobby;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.mapper.WarzoneYmlMapper;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
|
||||
/**
|
||||
* Places the zonelobby
|
||||
|
@ -5,8 +5,8 @@ import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Team;
|
||||
|
||||
/**
|
||||
* Sends a message to all team-members
|
||||
|
@ -5,8 +5,8 @@ import org.bukkit.entity.Player;
|
||||
|
||||
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.game.ZoneLobby;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
|
||||
/**
|
||||
* Shows team information
|
||||
|
@ -6,7 +6,7 @@ import org.bukkit.entity.Player;
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Warzone;
|
||||
|
||||
/**
|
||||
* Warps the player to the warhub.
|
||||
|
@ -6,7 +6,7 @@ import org.bukkit.entity.Player;
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Warzone;
|
||||
|
||||
/**
|
||||
* Warps the player to the given warzone.
|
||||
|
@ -4,10 +4,10 @@ import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.WarCommandHandler;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Warzone;
|
||||
|
||||
/**
|
||||
* Lists all warzones
|
||||
|
@ -6,7 +6,7 @@ import org.bukkit.inventory.ItemStack;
|
||||
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Warzone;
|
||||
|
||||
public class InventoryBag {
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
package com.tommytony.war.config;
|
||||
|
||||
import com.tommytony.war.game.FlagReturn;
|
||||
import com.tommytony.war.game.TeamSpawnStyle;
|
||||
import com.tommytony.war.structure.FlagReturn;
|
||||
import com.tommytony.war.structure.TeamSpawnStyle;
|
||||
|
||||
public enum TeamConfig {
|
||||
FLAGMUSTBEHOME (Boolean.class),
|
||||
|
@ -7,9 +7,9 @@ import org.bukkit.configuration.ConfigurationSection;
|
||||
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.game.FlagReturn;
|
||||
import com.tommytony.war.game.TeamSpawnStyle;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.structure.FlagReturn;
|
||||
import com.tommytony.war.structure.TeamSpawnStyle;
|
||||
|
||||
public class TeamConfigBag {
|
||||
|
||||
|
@ -19,16 +19,16 @@ import org.bukkit.inventory.ItemStack;
|
||||
import org.getspout.spoutapi.SpoutManager;
|
||||
import org.getspout.spoutapi.player.SpoutPlayer;
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.config.WarConfig;
|
||||
import com.tommytony.war.config.WarzoneConfig;
|
||||
import com.tommytony.war.game.Bomb;
|
||||
import com.tommytony.war.game.Cake;
|
||||
import com.tommytony.war.game.FlagReturn;
|
||||
import com.tommytony.war.game.Monument;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.spout.SpoutMessenger;
|
||||
import com.tommytony.war.structure.Bomb;
|
||||
import com.tommytony.war.structure.Cake;
|
||||
import com.tommytony.war.structure.FlagReturn;
|
||||
import com.tommytony.war.structure.Monument;
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -35,15 +35,15 @@ import org.bukkit.inventory.ItemStack;
|
||||
import org.getspout.spoutapi.SpoutManager;
|
||||
import org.getspout.spoutapi.player.SpoutPlayer;
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.config.TeamConfig;
|
||||
import com.tommytony.war.config.WarConfig;
|
||||
import com.tommytony.war.config.WarzoneConfig;
|
||||
import com.tommytony.war.game.Bomb;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.job.DeferredBlockResetsJob;
|
||||
import com.tommytony.war.spout.SpoutMessenger;
|
||||
import com.tommytony.war.structure.Bomb;
|
||||
import com.tommytony.war.utility.DeferredBlockReset;
|
||||
|
||||
/**
|
||||
|
@ -29,19 +29,19 @@ import org.bukkit.inventory.PlayerInventory;
|
||||
import org.getspout.spoutapi.SpoutManager;
|
||||
import org.getspout.spoutapi.player.SpoutPlayer;
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.ZoneSetter;
|
||||
import com.tommytony.war.config.TeamConfig;
|
||||
import com.tommytony.war.config.WarzoneConfig;
|
||||
import com.tommytony.war.game.Bomb;
|
||||
import com.tommytony.war.game.Cake;
|
||||
import com.tommytony.war.game.FlagReturn;
|
||||
import com.tommytony.war.game.LoadoutSelection;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.WarHub;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.game.ZoneLobby;
|
||||
import com.tommytony.war.game.ZoneSetter;
|
||||
import com.tommytony.war.spout.SpoutMessenger;
|
||||
import com.tommytony.war.structure.Bomb;
|
||||
import com.tommytony.war.structure.Cake;
|
||||
import com.tommytony.war.structure.FlagReturn;
|
||||
import com.tommytony.war.structure.WarHub;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
import com.tommytony.war.utility.LoadoutSelection;
|
||||
|
||||
/**
|
||||
* @author tommytony, Tim Düsterhus
|
||||
|
@ -6,11 +6,11 @@ import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.inventory.PlayerInventory;
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.TeamKind;
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.config.WarzoneConfig;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.TeamKind;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
|
||||
|
||||
/**
|
||||
|
@ -2,7 +2,7 @@ package com.tommytony.war.job;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Warzone;
|
||||
|
||||
public class InitZoneJob implements Runnable {
|
||||
|
||||
|
@ -2,8 +2,8 @@ package com.tommytony.war.job;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.Warzone;
|
||||
|
||||
public class LoadoutResetJob implements Runnable {
|
||||
|
||||
|
@ -2,8 +2,8 @@ package com.tommytony.war.job;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.Warzone;
|
||||
|
||||
public class RespawnPlayerJob implements Runnable {
|
||||
|
||||
|
@ -2,7 +2,7 @@ package com.tommytony.war.job;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Warzone;
|
||||
|
||||
public class RestoreDeadmanInventoryJob implements Runnable {
|
||||
|
||||
|
@ -7,9 +7,9 @@ import org.bukkit.World;
|
||||
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.game.WarHub;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.mapper.VolumeMapper;
|
||||
import com.tommytony.war.structure.WarHub;
|
||||
import com.tommytony.war.volume.Volume;
|
||||
|
||||
public class RestoreWarhubJob implements Runnable {
|
||||
|
@ -4,8 +4,8 @@ import java.util.logging.Level;
|
||||
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.config.WarzoneConfig;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.mapper.WarYmlMapper;
|
||||
import com.tommytony.war.mapper.WarzoneTxtMapper;
|
||||
import com.tommytony.war.mapper.WarzoneYmlMapper;
|
||||
|
@ -8,9 +8,9 @@ import org.bukkit.configuration.ConfigurationSection;
|
||||
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.game.WarHub;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.mapper.VolumeMapper;
|
||||
import com.tommytony.war.structure.WarHub;
|
||||
import com.tommytony.war.volume.Volume;
|
||||
|
||||
public class RestoreYmlWarhubJob implements Runnable {
|
||||
|
@ -5,8 +5,8 @@ import java.util.logging.Level;
|
||||
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.config.WarzoneConfig;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.mapper.WarzoneYmlMapper;
|
||||
|
||||
public class RestoreYmlWarzonesJob implements Runnable {
|
||||
|
@ -8,9 +8,9 @@ import org.getspout.spoutapi.SpoutManager;
|
||||
import org.getspout.spoutapi.player.SpoutPlayer;
|
||||
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.spout.SpoutMessenger;
|
||||
|
||||
public class ScoreCapReachedJob implements Runnable {
|
||||
|
@ -12,10 +12,10 @@ import com.tommytony.war.War;
|
||||
import com.tommytony.war.config.TeamConfig;
|
||||
import com.tommytony.war.config.WarConfig;
|
||||
import com.tommytony.war.config.WarzoneConfig;
|
||||
import com.tommytony.war.game.FlagReturn;
|
||||
import com.tommytony.war.game.TeamSpawnStyle;
|
||||
import com.tommytony.war.job.RestoreWarhubJob;
|
||||
import com.tommytony.war.job.RestoreWarzonesJob;
|
||||
import com.tommytony.war.structure.FlagReturn;
|
||||
import com.tommytony.war.structure.TeamSpawnStyle;
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -13,10 +13,10 @@ import org.bukkit.inventory.ItemStack;
|
||||
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.game.WarHub;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.job.RestoreYmlWarhubJob;
|
||||
import com.tommytony.war.job.RestoreYmlWarzonesJob;
|
||||
import com.tommytony.war.structure.WarHub;
|
||||
|
||||
public class WarYmlMapper {
|
||||
|
||||
|
@ -11,16 +11,16 @@ import org.bukkit.block.BlockFace;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.TeamKind;
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.config.TeamConfig;
|
||||
import com.tommytony.war.config.WarzoneConfig;
|
||||
import com.tommytony.war.game.FlagReturn;
|
||||
import com.tommytony.war.game.Monument;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.TeamKind;
|
||||
import com.tommytony.war.game.TeamSpawnStyle;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.game.ZoneLobby;
|
||||
import com.tommytony.war.structure.FlagReturn;
|
||||
import com.tommytony.war.structure.Monument;
|
||||
import com.tommytony.war.structure.TeamSpawnStyle;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
import com.tommytony.war.volume.Volume;
|
||||
import com.tommytony.war.volume.ZoneVolume;
|
||||
|
||||
|
@ -15,15 +15,15 @@ import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.TeamKind;
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.config.TeamConfig;
|
||||
import com.tommytony.war.game.Bomb;
|
||||
import com.tommytony.war.game.Cake;
|
||||
import com.tommytony.war.game.Monument;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.TeamKind;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.game.ZoneLobby;
|
||||
import com.tommytony.war.structure.Bomb;
|
||||
import com.tommytony.war.structure.Cake;
|
||||
import com.tommytony.war.structure.Monument;
|
||||
import com.tommytony.war.structure.ZoneLobby;
|
||||
import com.tommytony.war.volume.Volume;
|
||||
import com.tommytony.war.volume.ZoneVolume;
|
||||
|
||||
|
@ -15,11 +15,11 @@ import org.getspout.spoutapi.gui.WidgetAnchor;
|
||||
import org.getspout.spoutapi.player.SpoutPlayer;
|
||||
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.TeamKind;
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.config.TeamConfig;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.TeamKind;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
|
||||
public class SpoutMessenger {
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.tommytony.war.game;
|
||||
package com.tommytony.war.structure;
|
||||
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
@ -6,6 +6,7 @@ import org.bukkit.block.Block;
|
||||
import org.bukkit.block.BlockFace;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.volume.Volume;
|
||||
|
||||
/**
|
@ -1,4 +1,4 @@
|
||||
package com.tommytony.war.game;
|
||||
package com.tommytony.war.structure;
|
||||
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
@ -6,6 +6,7 @@ import org.bukkit.block.Block;
|
||||
import org.bukkit.block.BlockFace;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.volume.Volume;
|
||||
|
||||
/**
|
@ -1,4 +1,4 @@
|
||||
package com.tommytony.war.game;
|
||||
package com.tommytony.war.structure;
|
||||
|
||||
public enum FlagReturn {
|
||||
BOTH,
|
@ -1,10 +1,12 @@
|
||||
package com.tommytony.war.game;
|
||||
package com.tommytony.war.structure;
|
||||
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.block.BlockFace;
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.volume.Volume;
|
||||
|
||||
/**
|
@ -1,4 +1,4 @@
|
||||
package com.tommytony.war.game;
|
||||
package com.tommytony.war.structure;
|
||||
|
||||
/**
|
||||
*
|
@ -1,4 +1,4 @@
|
||||
package com.tommytony.war.game;
|
||||
package com.tommytony.war.structure;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
@ -10,7 +10,9 @@ import org.bukkit.block.Block;
|
||||
import org.bukkit.block.BlockFace;
|
||||
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.config.TeamConfig;
|
||||
import com.tommytony.war.config.WarzoneConfig;
|
||||
import com.tommytony.war.utility.SignHelper;
|
@ -1,4 +1,4 @@
|
||||
package com.tommytony.war.game;
|
||||
package com.tommytony.war.structure;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
@ -12,7 +12,10 @@ import org.bukkit.block.BlockFace;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.TeamKind;
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.config.TeamConfig;
|
||||
import com.tommytony.war.config.WarzoneConfig;
|
||||
import com.tommytony.war.utility.SignHelper;
|
@ -1,4 +1,4 @@
|
||||
package com.tommytony.war.game;
|
||||
package com.tommytony.war.structure;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -10,6 +10,7 @@ import org.bukkit.block.BlockFace;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.volume.BlockInfo;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.tommytony.war.game;
|
||||
package com.tommytony.war.utility;
|
||||
|
||||
public class LoadoutSelection {
|
||||
|
@ -5,7 +5,6 @@ import java.util.List;
|
||||
import org.bukkit.GameMode;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import com.tommytony.war.game.PotionEffect;
|
||||
|
||||
public class PlayerState {
|
||||
private ItemStack[] contents;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package com.tommytony.war.game;
|
||||
package com.tommytony.war.utility;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
@ -4,11 +4,11 @@ import org.bukkit.World;
|
||||
import org.bukkit.block.Block;
|
||||
|
||||
|
||||
import com.tommytony.war.Team;
|
||||
import com.tommytony.war.War;
|
||||
import com.tommytony.war.game.Monument;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.Warzone;
|
||||
import com.tommytony.war.mapper.ZoneVolumeMapper;
|
||||
import com.tommytony.war.structure.Monument;
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -10,9 +10,7 @@ import static org.junit.Assert.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
import com.tommytony.war.*;
|
||||
import com.tommytony.war.game.Monument;
|
||||
import com.tommytony.war.game.Team;
|
||||
import com.tommytony.war.game.Warzone;
|
||||
import com.tommytony.war.structure.Monument;
|
||||
import com.tommytony.war.volume.*;
|
||||
|
||||
public class ZoneVolumeSpecTest {
|
||||
|
Loading…
Reference in New Issue
Block a user