From c46a55028237ddf33eff36fd87e42f8d46d0ce54 Mon Sep 17 00:00:00 2001 From: Chiss Date: Tue, 10 Sep 2013 07:56:55 +1000 Subject: [PATCH] restructured games in arcade --- .../src/nautilus/game/arcade/GameFactory.java | 28 +++++++++---------- .../{standalone => games}/bridge/Bridge.java | 4 +-- .../bridge/BridgePart.java | 2 +- .../bridge/kits/KitApple.java | 2 +- .../bridge/kits/KitArcher.java | 2 +- .../bridge/kits/KitBeserker.java | 2 +- .../bridge/kits/KitBomber.java | 2 +- .../bridge/kits/KitMammoth.java | 2 +- .../bridge/kits/KitMiner.java | 2 +- .../castlesiege/CastleSiege.java | 4 +-- .../kits/KitHumanElementalist.java | 2 +- .../castlesiege/kits/KitHumanKnight.java | 2 +- .../castlesiege/kits/KitHumanMarksman.java | 2 +- .../castlesiege/kits/KitHumanPeasant.java | 2 +- .../castlesiege/kits/KitUndeadArcher.java | 2 +- .../castlesiege/kits/KitUndeadGhoul.java | 2 +- .../castlesiege/kits/KitUndeadZombie.java | 2 +- .../deathtag/DeathTag.java | 4 +-- .../deathtag/kits/KitArcher.java | 2 +- .../dragons/DragonData.java | 2 +- .../{minigames => games}/dragons/Dragons.java | 6 ++-- .../dragons/kits/KitCoward.java | 2 +- .../dragons/kits/KitMarksman.java | 2 +- .../dragons/kits/KitPyrotechnic.java | 2 +- .../escape/DragonEscape.java | 7 ++--- .../escape/DragonEscapeData.java | 2 +- .../escape/DragonScore.java | 2 +- .../escape/kits/KitLeaper.java | 2 +- .../evolution/EvoScore.java | 2 +- .../evolution/Evolution.java | 6 ++-- .../evolution/kits/KitAgility.java | 2 +- .../evolution/kits/KitHealth.java | 2 +- .../evolution/kits/KitRecharge.java | 2 +- .../evolution/mobs/KitBlaze.java | 2 +- .../evolution/mobs/KitChicken.java | 2 +- .../evolution/mobs/KitCreeper.java | 2 +- .../evolution/mobs/KitEnderman.java | 2 +- .../evolution/mobs/KitGolem.java | 2 +- .../evolution/mobs/KitSkeleton.java | 2 +- .../evolution/mobs/KitSlime.java | 2 +- .../evolution/mobs/KitSnowman.java | 2 +- .../evolution/mobs/KitSpider.java | 2 +- .../evolution/mobs/KitWolf.java | 2 +- .../horsecharge/Horse.java | 4 +-- .../horsecharge/kits/KitDefenceArcher.java | 2 +- .../horsecharge/kits/KitHorseKnight.java | 2 +- .../mineware/MineWare.java | 8 +++--- .../mineware/order/Order.java | 4 +-- .../mineware/order/OrderCraft.java | 4 +-- .../mineware/order/OrderGather.java | 4 +-- .../mineware/order/OrderPlace.java | 4 +-- .../mineware/random/ActionMilkCow.java | 6 ++-- .../mineware/random/ActionShearSheep.java | 6 ++-- .../mineware/random/CraftLadder.java | 6 ++-- .../mineware/random/CraftStoneShovel.java | 6 ++-- .../mineware/random/DamageChicken.java | 6 ++-- .../mineware/random/DamageFall.java | 6 ++-- .../mineware/random/DamageGhast.java | 6 ++-- .../mineware/random/GatherCobble.java | 6 ++-- .../mineware/random/GatherRedFlower.java | 6 ++-- .../mineware/random/GatherSand.java | 6 ++-- .../mineware/random/GatherYellowFlower.java | 6 ++-- .../mineware/random/PlaceDoor.java | 6 ++-- .../mineware/random/RideBoat.java | 6 ++-- .../mineware/random/RidePig.java | 6 ++-- .../mineware/random/StandAlone.java | 6 ++-- .../mineware/random/StandShelter.java | 6 ++-- .../mineware/random/StandStone.java | 6 ++-- .../mineware/random/StandWater.java | 6 ++-- .../{minigames => games}/quiver/Quiver.java | 4 +-- .../quiver/QuiverScore.java | 2 +- .../quiver/kits/KitBrawler.java | 2 +- .../quiver/kits/KitElementalist.java | 2 +- .../quiver/kits/KitLeaper.java | 2 +- .../{minigames => games}/runner/Runner.java | 4 +-- .../runner/kits/KitArcher.java | 2 +- .../runner/kits/KitFrosty.java | 2 +- .../runner/kits/KitLeaper.java | 2 +- .../smash/SuperSmash.java | 4 +-- .../game/games/smash/items/SmashItem.java | 5 ++++ .../smash/kits/KitBlaze.java | 2 +- .../smash/kits/KitChicken.java | 2 +- .../smash/kits/KitCreeper.java | 2 +- .../smash/kits/KitEnderman.java | 2 +- .../smash/kits/KitGolem.java | 2 +- .../smash/kits/KitKnight.java | 2 +- .../smash/kits/KitSkeleton.java | 2 +- .../smash/kits/KitSkySquid.java | 2 +- .../smash/kits/KitSlime.java | 2 +- .../smash/kits/KitSnowman.java | 2 +- .../smash/kits/KitSpider.java | 2 +- .../smash/kits/KitWitherSkeleton.java | 2 +- .../snowfight/SnowFight.java | 2 +- .../{minigames => games}/spleef/Spleef.java | 4 +-- .../spleef/kits/KitArcher.java | 2 +- .../spleef/kits/KitBrawler.java | 2 +- .../spleef/kits/KitLeaper.java | 2 +- .../turfforts/TurfForts.java | 4 +-- .../turfforts/kits/KitInfiltrator.java | 2 +- .../turfforts/kits/KitMarksman.java | 2 +- .../turfforts/kits/KitShredder.java | 2 +- .../{standalone => games}/uhc/KitUHC.java | 2 +- .../game/{standalone => games}/uhc/UHC.java | 2 +- .../zombiesurvival/ZombieData.java | 2 +- .../zombiesurvival/ZombieSurvival.java | 4 +-- .../kits/KitSurvivorArcher.java | 2 +- .../kits/KitSurvivorKnight.java | 2 +- .../zombiesurvival/kits/KitSurvivorRogue.java | 2 +- .../zombiesurvival/kits/KitUndeadAlpha.java | 2 +- .../zombiesurvival/kits/KitUndeadZombie.java | 2 +- 110 files changed, 186 insertions(+), 182 deletions(-) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/bridge/Bridge.java (99%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/bridge/BridgePart.java (97%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/bridge/kits/KitApple.java (93%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/bridge/kits/KitArcher.java (94%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/bridge/kits/KitBeserker.java (94%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/bridge/kits/KitBomber.java (92%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/bridge/kits/KitMammoth.java (94%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/bridge/kits/KitMiner.java (94%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/castlesiege/CastleSiege.java (99%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/castlesiege/kits/KitHumanElementalist.java (97%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/castlesiege/kits/KitHumanKnight.java (97%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/castlesiege/kits/KitHumanMarksman.java (97%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/castlesiege/kits/KitHumanPeasant.java (95%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/castlesiege/kits/KitUndeadArcher.java (95%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/castlesiege/kits/KitUndeadGhoul.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/castlesiege/kits/KitUndeadZombie.java (95%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/deathtag/DeathTag.java (81%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/deathtag/kits/KitArcher.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/dragons/DragonData.java (98%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/dragons/Dragons.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/dragons/kits/KitCoward.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/dragons/kits/KitMarksman.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/dragons/kits/KitPyrotechnic.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/escape/DragonEscape.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/escape/DragonEscapeData.java (97%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/escape/DragonScore.java (80%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/escape/kits/KitLeaper.java (94%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/evolution/EvoScore.java (78%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/evolution/Evolution.java (97%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/evolution/kits/KitAgility.java (92%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/evolution/kits/KitHealth.java (92%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/evolution/kits/KitRecharge.java (92%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/evolution/mobs/KitBlaze.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/evolution/mobs/KitChicken.java (97%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/evolution/mobs/KitCreeper.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/evolution/mobs/KitEnderman.java (95%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/evolution/mobs/KitGolem.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/evolution/mobs/KitSkeleton.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/evolution/mobs/KitSlime.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/evolution/mobs/KitSnowman.java (97%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/evolution/mobs/KitSpider.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/evolution/mobs/KitWolf.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/horsecharge/Horse.java (91%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/horsecharge/kits/KitDefenceArcher.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/horsecharge/kits/KitHorseKnight.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/MineWare.java (97%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/order/Order.java (94%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/order/OrderCraft.java (94%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/order/OrderGather.java (93%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/order/OrderPlace.java (92%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/random/ActionMilkCow.java (84%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/random/ActionShearSheep.java (80%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/random/CraftLadder.java (55%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/random/CraftStoneShovel.java (56%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/random/DamageChicken.java (82%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/random/DamageFall.java (78%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/random/DamageGhast.java (88%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/random/GatherCobble.java (55%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/random/GatherRedFlower.java (55%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/random/GatherSand.java (54%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/random/GatherYellowFlower.java (56%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/random/PlaceDoor.java (54%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/random/RideBoat.java (79%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/random/RidePig.java (83%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/random/StandAlone.java (83%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/random/StandShelter.java (84%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/random/StandStone.java (80%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/mineware/random/StandWater.java (78%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/quiver/Quiver.java (98%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/quiver/QuiverScore.java (80%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/quiver/kits/KitBrawler.java (95%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/quiver/kits/KitElementalist.java (95%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/quiver/kits/KitLeaper.java (95%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/runner/Runner.java (98%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/runner/kits/KitArcher.java (94%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/runner/kits/KitFrosty.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/runner/kits/KitLeaper.java (94%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/smash/SuperSmash.java (98%) create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/items/SmashItem.java rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/smash/kits/KitBlaze.java (98%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/smash/kits/KitChicken.java (98%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/smash/kits/KitCreeper.java (98%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/smash/kits/KitEnderman.java (98%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/smash/kits/KitGolem.java (97%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/smash/kits/KitKnight.java (99%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/smash/kits/KitSkeleton.java (98%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/smash/kits/KitSkySquid.java (97%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/smash/kits/KitSlime.java (98%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/smash/kits/KitSnowman.java (98%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/smash/kits/KitSpider.java (98%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/smash/kits/KitWitherSkeleton.java (98%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/snowfight/SnowFight.java (98%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/spleef/Spleef.java (97%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/spleef/kits/KitArcher.java (94%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/spleef/kits/KitBrawler.java (94%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/spleef/kits/KitLeaper.java (94%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/turfforts/TurfForts.java (99%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/turfforts/kits/KitInfiltrator.java (95%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/turfforts/kits/KitMarksman.java (95%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{minigames => games}/turfforts/kits/KitShredder.java (95%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/uhc/KitUHC.java (93%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/uhc/UHC.java (99%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/zombiesurvival/ZombieData.java (81%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/zombiesurvival/ZombieSurvival.java (98%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/zombiesurvival/kits/KitSurvivorArcher.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/zombiesurvival/kits/KitSurvivorKnight.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/zombiesurvival/kits/KitSurvivorRogue.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/zombiesurvival/kits/KitUndeadAlpha.java (96%) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/{standalone => games}/zombiesurvival/kits/KitUndeadZombie.java (95%) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameFactory.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameFactory.java index 3defa5ac2..e31c893f6 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameFactory.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameFactory.java @@ -5,20 +5,20 @@ import java.util.HashMap; import org.bukkit.ChatColor; import nautilus.game.arcade.game.Game; -import nautilus.game.arcade.game.minigames.dragons.Dragons; -import nautilus.game.arcade.game.minigames.escape.DragonEscape; -import nautilus.game.arcade.game.minigames.evolution.Evolution; -import nautilus.game.arcade.game.minigames.mineware.MineWare; -import nautilus.game.arcade.game.minigames.quiver.Quiver; -import nautilus.game.arcade.game.minigames.snowfight.SnowFight; -import nautilus.game.arcade.game.minigames.runner.Runner; -import nautilus.game.arcade.game.minigames.spleef.Spleef; -import nautilus.game.arcade.game.minigames.turfforts.TurfForts; -import nautilus.game.arcade.game.standalone.bridge.Bridge; -import nautilus.game.arcade.game.standalone.castlesiege.CastleSiege; -import nautilus.game.arcade.game.standalone.smash.SuperSmash; -import nautilus.game.arcade.game.standalone.uhc.UHC; -import nautilus.game.arcade.game.standalone.zombiesurvival.ZombieSurvival; +import nautilus.game.arcade.game.games.bridge.Bridge; +import nautilus.game.arcade.game.games.castlesiege.CastleSiege; +import nautilus.game.arcade.game.games.dragons.Dragons; +import nautilus.game.arcade.game.games.escape.DragonEscape; +import nautilus.game.arcade.game.games.evolution.Evolution; +import nautilus.game.arcade.game.games.mineware.MineWare; +import nautilus.game.arcade.game.games.quiver.Quiver; +import nautilus.game.arcade.game.games.runner.Runner; +import nautilus.game.arcade.game.games.smash.SuperSmash; +import nautilus.game.arcade.game.games.snowfight.SnowFight; +import nautilus.game.arcade.game.games.spleef.Spleef; +import nautilus.game.arcade.game.games.turfforts.TurfForts; +import nautilus.game.arcade.game.games.uhc.UHC; +import nautilus.game.arcade.game.games.zombiesurvival.ZombieSurvival; public class GameFactory { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/Bridge.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java similarity index 99% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/Bridge.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java index a334b990e..1dbb2f2c5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/Bridge.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.bridge; +package nautilus.game.arcade.game.games.bridge; import java.util.ArrayList; import java.util.HashMap; @@ -50,7 +50,7 @@ import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.events.PlayerDeathOutEvent; import nautilus.game.arcade.game.GameTeam; import nautilus.game.arcade.game.TeamGame; -import nautilus.game.arcade.game.standalone.bridge.kits.*; +import nautilus.game.arcade.game.games.bridge.kits.*; import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.ore.OreHider; import nautilus.game.arcade.ore.OreObsfucation; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/BridgePart.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/BridgePart.java similarity index 97% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/BridgePart.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/BridgePart.java index a519e4857..86765e9a1 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/BridgePart.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/BridgePart.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.bridge; +package nautilus.game.arcade.game.games.bridge; import mineplex.core.common.util.MapUtil; import mineplex.core.common.util.UtilAlg; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/kits/KitApple.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitApple.java similarity index 93% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/kits/KitApple.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitApple.java index a5a78550b..a8270754a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/kits/KitApple.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitApple.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.bridge.kits; +package nautilus.game.arcade.game.games.bridge.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/kits/KitArcher.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitArcher.java similarity index 94% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/kits/KitArcher.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitArcher.java index ffd9e6bae..25fbc3bcd 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/kits/KitArcher.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitArcher.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.bridge.kits; +package nautilus.game.arcade.game.games.bridge.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/kits/KitBeserker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBeserker.java similarity index 94% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/kits/KitBeserker.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBeserker.java index e3820533b..133f27aaf 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/kits/KitBeserker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBeserker.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.bridge.kits; +package nautilus.game.arcade.game.games.bridge.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/kits/KitBomber.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBomber.java similarity index 92% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/kits/KitBomber.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBomber.java index c3bd8464d..a021971dd 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/kits/KitBomber.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBomber.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.bridge.kits; +package nautilus.game.arcade.game.games.bridge.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/kits/KitMammoth.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitMammoth.java similarity index 94% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/kits/KitMammoth.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitMammoth.java index b8cb4a97f..789335e2d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/kits/KitMammoth.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitMammoth.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.bridge.kits; +package nautilus.game.arcade.game.games.bridge.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/kits/KitMiner.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitMiner.java similarity index 94% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/kits/KitMiner.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitMiner.java index 695eba7cd..225e97443 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/bridge/kits/KitMiner.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitMiner.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.bridge.kits; +package nautilus.game.arcade.game.games.bridge.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/CastleSiege.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/CastleSiege.java similarity index 99% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/CastleSiege.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/CastleSiege.java index 4b0ac2f09..b5a3c363f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/CastleSiege.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/CastleSiege.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.castlesiege; +package nautilus.game.arcade.game.games.castlesiege; import java.util.ArrayList; import java.util.HashMap; @@ -45,7 +45,7 @@ import nautilus.game.arcade.GameType; import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.game.AsymTeamGame; import nautilus.game.arcade.game.GameTeam; -import nautilus.game.arcade.game.standalone.castlesiege.kits.*; +import nautilus.game.arcade.game.games.castlesiege.kits.*; import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.NullKit; import net.minecraft.server.v1_6_R2.EntityCreature; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanElementalist.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanElementalist.java similarity index 97% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanElementalist.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanElementalist.java index e3922dad1..ac2b48425 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanElementalist.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanElementalist.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.castlesiege.kits; +package nautilus.game.arcade.game.games.castlesiege.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanKnight.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanKnight.java similarity index 97% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanKnight.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanKnight.java index ae692eeee..ef89dad9a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanKnight.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanKnight.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.castlesiege.kits; +package nautilus.game.arcade.game.games.castlesiege.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanMarksman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanMarksman.java similarity index 97% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanMarksman.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanMarksman.java index f56dbdbf0..5e6c8749a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanMarksman.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanMarksman.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.castlesiege.kits; +package nautilus.game.arcade.game.games.castlesiege.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanPeasant.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanPeasant.java similarity index 95% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanPeasant.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanPeasant.java index 97b94511b..876e3d5c1 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanPeasant.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanPeasant.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.castlesiege.kits; +package nautilus.game.arcade.game.games.castlesiege.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitUndeadArcher.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitUndeadArcher.java similarity index 95% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitUndeadArcher.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitUndeadArcher.java index 8565a9cbe..c01011094 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitUndeadArcher.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitUndeadArcher.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.castlesiege.kits; +package nautilus.game.arcade.game.games.castlesiege.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitUndeadGhoul.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitUndeadGhoul.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitUndeadGhoul.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitUndeadGhoul.java index ba70ab086..4210c4dad 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitUndeadGhoul.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitUndeadGhoul.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.castlesiege.kits; +package nautilus.game.arcade.game.games.castlesiege.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitUndeadZombie.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitUndeadZombie.java similarity index 95% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitUndeadZombie.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitUndeadZombie.java index 70bcc66e4..2cd675439 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitUndeadZombie.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitUndeadZombie.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.castlesiege.kits; +package nautilus.game.arcade.game.games.castlesiege.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/deathtag/DeathTag.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/deathtag/DeathTag.java similarity index 81% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/deathtag/DeathTag.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/deathtag/DeathTag.java index 682b21fd0..1f66d4285 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/deathtag/DeathTag.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/deathtag/DeathTag.java @@ -1,9 +1,9 @@ -package nautilus.game.arcade.game.minigames.deathtag; +package nautilus.game.arcade.game.games.deathtag; import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.GameType; import nautilus.game.arcade.game.TeamGame; -import nautilus.game.arcade.game.minigames.deathtag.kits.*; +import nautilus.game.arcade.game.games.deathtag.kits.*; import nautilus.game.arcade.kit.Kit; public class DeathTag extends TeamGame diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/deathtag/kits/KitArcher.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/deathtag/kits/KitArcher.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/deathtag/kits/KitArcher.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/deathtag/kits/KitArcher.java index 96d6f66ce..34614a007 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/deathtag/kits/KitArcher.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/deathtag/kits/KitArcher.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.deathtag.kits; +package nautilus.game.arcade.game.games.deathtag.kits; import org.bukkit.Material; import org.bukkit.entity.LivingEntity; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/DragonData.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/DragonData.java similarity index 98% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/DragonData.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/DragonData.java index f87935e3d..6f32e9ccd 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/DragonData.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/DragonData.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.dragons; +package nautilus.game.arcade.game.games.dragons; import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilMath; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/Dragons.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/Dragons.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/Dragons.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/Dragons.java index 80af24e80..1b4648021 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/Dragons.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/Dragons.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.dragons; +package nautilus.game.arcade.game.games.dragons; import java.util.ArrayList; import java.util.HashMap; @@ -28,8 +28,8 @@ import nautilus.game.arcade.GameType; import nautilus.game.arcade.events.PlayerStateChangeEvent; import nautilus.game.arcade.game.SoloGame; import nautilus.game.arcade.game.GameTeam.PlayerState; -import nautilus.game.arcade.game.minigames.dragons.kits.*; -import nautilus.game.arcade.game.minigames.dragons.DragonData; +import nautilus.game.arcade.game.games.dragons.DragonData; +import nautilus.game.arcade.game.games.dragons.kits.*; import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.Perk; import nautilus.game.arcade.kit.perks.PerkSparkler; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitCoward.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/kits/KitCoward.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitCoward.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/kits/KitCoward.java index 74c8b7a27..d7d6a3207 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitCoward.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/kits/KitCoward.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.dragons.kits; +package nautilus.game.arcade.game.games.dragons.kits; import org.bukkit.Material; import org.bukkit.entity.LivingEntity; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitMarksman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/kits/KitMarksman.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitMarksman.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/kits/KitMarksman.java index 6633530f5..49962dcc9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitMarksman.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/kits/KitMarksman.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.dragons.kits; +package nautilus.game.arcade.game.games.dragons.kits; import org.bukkit.Material; import org.bukkit.entity.LivingEntity; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitPyrotechnic.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/kits/KitPyrotechnic.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitPyrotechnic.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/kits/KitPyrotechnic.java index c6d943738..be4cc0489 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitPyrotechnic.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/kits/KitPyrotechnic.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.dragons.kits; +package nautilus.game.arcade.game.games.dragons.kits; import org.bukkit.Material; import org.bukkit.entity.LivingEntity; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/escape/DragonEscape.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/escape/DragonEscape.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/escape/DragonEscape.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/escape/DragonEscape.java index 9eb54d6a3..097f3dc6b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/escape/DragonEscape.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/escape/DragonEscape.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.escape; +package nautilus.game.arcade.game.games.escape; import java.util.ArrayList; @@ -20,8 +20,7 @@ import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.GameType; import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.game.SoloGame; -import nautilus.game.arcade.game.minigames.escape.DragonEscapeData; -import nautilus.game.arcade.game.minigames.quiver.kits.KitBrawler; +import nautilus.game.arcade.game.games.escape.kits.*; import nautilus.game.arcade.kit.Kit; public class DragonEscape extends SoloGame @@ -40,7 +39,7 @@ public class DragonEscape extends SoloGame new Kit[] { - new KitBrawler(manager) + new KitLeaper(manager) }, new String[] diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/escape/DragonEscapeData.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/escape/DragonEscapeData.java similarity index 97% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/escape/DragonEscapeData.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/escape/DragonEscapeData.java index 65299177d..df3392e42 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/escape/DragonEscapeData.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/escape/DragonEscapeData.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.escape; +package nautilus.game.arcade.game.games.escape; import mineplex.core.common.util.UtilAlg; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/escape/DragonScore.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/escape/DragonScore.java similarity index 80% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/escape/DragonScore.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/escape/DragonScore.java index 1a2dfbdd7..524c533e8 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/escape/DragonScore.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/escape/DragonScore.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.escape; +package nautilus.game.arcade.game.games.escape; import org.bukkit.entity.Player; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/escape/kits/KitLeaper.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/escape/kits/KitLeaper.java similarity index 94% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/escape/kits/KitLeaper.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/escape/kits/KitLeaper.java index 11a8df1dc..ef1cb3e30 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/escape/kits/KitLeaper.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/escape/kits/KitLeaper.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.escape.kits; +package nautilus.game.arcade.game.games.escape.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/EvoScore.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/EvoScore.java similarity index 78% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/EvoScore.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/EvoScore.java index 3a3d95c20..dd4fb9d0e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/EvoScore.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/EvoScore.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.evolution; +package nautilus.game.arcade.game.games.evolution; import org.bukkit.entity.Player; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/Evolution.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java similarity index 97% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/Evolution.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java index 1e60b8b9f..ab103184e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/Evolution.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.evolution; +package nautilus.game.arcade.game.games.evolution; import java.util.ArrayList; import java.util.HashMap; @@ -24,8 +24,8 @@ import nautilus.game.arcade.GameType; import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.game.Game; import nautilus.game.arcade.game.SoloGame; -import nautilus.game.arcade.game.minigames.evolution.kits.*; -import nautilus.game.arcade.game.minigames.evolution.mobs.*; +import nautilus.game.arcade.game.games.evolution.kits.*; +import nautilus.game.arcade.game.games.evolution.mobs.*; import nautilus.game.arcade.kit.Kit; public class Evolution extends SoloGame diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/kits/KitAgility.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/kits/KitAgility.java similarity index 92% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/kits/KitAgility.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/kits/KitAgility.java index 4ea1cc9e3..38e4573bf 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/kits/KitAgility.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/kits/KitAgility.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.evolution.kits; +package nautilus.game.arcade.game.games.evolution.kits; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/kits/KitHealth.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/kits/KitHealth.java similarity index 92% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/kits/KitHealth.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/kits/KitHealth.java index 7059ce2cf..39e751c8c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/kits/KitHealth.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/kits/KitHealth.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.evolution.kits; +package nautilus.game.arcade.game.games.evolution.kits; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/kits/KitRecharge.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/kits/KitRecharge.java similarity index 92% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/kits/KitRecharge.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/kits/KitRecharge.java index 263c45c5c..cb45410fa 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/kits/KitRecharge.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/kits/KitRecharge.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.evolution.kits; +package nautilus.game.arcade.game.games.evolution.kits; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitBlaze.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitBlaze.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitBlaze.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitBlaze.java index d64ea9bc8..fd3c424f2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitBlaze.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitBlaze.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.evolution.mobs; +package nautilus.game.arcade.game.games.evolution.mobs; import org.bukkit.Material; import org.bukkit.Sound; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitChicken.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitChicken.java similarity index 97% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitChicken.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitChicken.java index 1d7986eee..92b53faa7 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitChicken.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitChicken.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.evolution.mobs; +package nautilus.game.arcade.game.games.evolution.mobs; import org.bukkit.Material; import org.bukkit.Sound; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitCreeper.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitCreeper.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitCreeper.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitCreeper.java index 19efbebf7..2765601fb 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitCreeper.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitCreeper.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.evolution.mobs; +package nautilus.game.arcade.game.games.evolution.mobs; import org.bukkit.Material; import org.bukkit.Sound; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitEnderman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitEnderman.java similarity index 95% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitEnderman.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitEnderman.java index 8ea57fca7..2faeb7011 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitEnderman.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitEnderman.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.evolution.mobs; +package nautilus.game.arcade.game.games.evolution.mobs; import org.bukkit.Material; import org.bukkit.Sound; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitGolem.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitGolem.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitGolem.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitGolem.java index ddf9cc9e7..657696679 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitGolem.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitGolem.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.evolution.mobs; +package nautilus.game.arcade.game.games.evolution.mobs; import org.bukkit.Material; import org.bukkit.Sound; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitSkeleton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSkeleton.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitSkeleton.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSkeleton.java index 76dd227db..55a9f24fa 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitSkeleton.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSkeleton.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.evolution.mobs; +package nautilus.game.arcade.game.games.evolution.mobs; import org.bukkit.Material; import org.bukkit.Sound; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitSlime.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSlime.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitSlime.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSlime.java index 91cd62c5a..3b033876b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitSlime.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSlime.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.evolution.mobs; +package nautilus.game.arcade.game.games.evolution.mobs; import org.bukkit.Material; import org.bukkit.Sound; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitSnowman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSnowman.java similarity index 97% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitSnowman.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSnowman.java index 32a676c20..c6ed833a5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitSnowman.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSnowman.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.evolution.mobs; +package nautilus.game.arcade.game.games.evolution.mobs; import org.bukkit.Material; import org.bukkit.Sound; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitSpider.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSpider.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitSpider.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSpider.java index 6f64278c9..9376c7429 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitSpider.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSpider.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.evolution.mobs; +package nautilus.game.arcade.game.games.evolution.mobs; import org.bukkit.Material; import org.bukkit.Sound; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitWolf.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitWolf.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitWolf.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitWolf.java index 0cf1627b4..2e16e06b7 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/evolution/mobs/KitWolf.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitWolf.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.evolution.mobs; +package nautilus.game.arcade.game.games.evolution.mobs; import org.bukkit.Material; import org.bukkit.Sound; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/Horse.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/horsecharge/Horse.java similarity index 91% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/Horse.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/horsecharge/Horse.java index d7f9e1e17..fbfc53576 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/Horse.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/horsecharge/Horse.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.horsecharge; +package nautilus.game.arcade.game.games.horsecharge; import java.util.HashMap; @@ -8,7 +8,7 @@ import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.GameType; import nautilus.game.arcade.game.AsymTeamGame; import nautilus.game.arcade.game.GameTeam; -import nautilus.game.arcade.game.minigames.horsecharge.kits.*; +import nautilus.game.arcade.game.games.horsecharge.kits.*; import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.NullKit; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitDefenceArcher.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/horsecharge/kits/KitDefenceArcher.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitDefenceArcher.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/horsecharge/kits/KitDefenceArcher.java index f6dd6ce80..5ae80bea9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitDefenceArcher.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/horsecharge/kits/KitDefenceArcher.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.horsecharge.kits; +package nautilus.game.arcade.game.games.horsecharge.kits; import org.bukkit.Material; import org.bukkit.entity.LivingEntity; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitHorseKnight.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/horsecharge/kits/KitHorseKnight.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitHorseKnight.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/horsecharge/kits/KitHorseKnight.java index bb3f0211e..3d636bf89 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/horsecharge/kits/KitHorseKnight.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/horsecharge/kits/KitHorseKnight.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.horsecharge.kits; +package nautilus.game.arcade.game.games.horsecharge.kits; import org.bukkit.Material; import org.bukkit.entity.LivingEntity; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/MineWare.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java similarity index 97% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/MineWare.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java index 59234b425..1fde7f097 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/MineWare.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.mineware; +package nautilus.game.arcade.game.games.mineware; import java.util.ArrayList; import java.util.HashMap; @@ -35,9 +35,9 @@ import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.GameType; import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.game.SoloGame; -import nautilus.game.arcade.game.minigames.mineware.order.Order; -import nautilus.game.arcade.game.minigames.mineware.random.*; -import nautilus.game.arcade.game.minigames.spleef.kits.KitLeaper; +import nautilus.game.arcade.game.games.mineware.order.Order; +import nautilus.game.arcade.game.games.mineware.random.*; +import nautilus.game.arcade.game.games.spleef.kits.KitLeaper; import nautilus.game.arcade.kit.Kit; public class MineWare extends SoloGame diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/order/Order.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/order/Order.java similarity index 94% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/order/Order.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/order/Order.java index a65aba829..d1802065c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/order/Order.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/order/Order.java @@ -1,11 +1,11 @@ -package nautilus.game.arcade.game.minigames.mineware.order; +package nautilus.game.arcade.game.games.mineware.order; import java.util.HashSet; import mineplex.core.common.util.C; import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilTime; -import nautilus.game.arcade.game.minigames.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.MineWare; import org.bukkit.Sound; import org.bukkit.entity.Player; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/order/OrderCraft.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/order/OrderCraft.java similarity index 94% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/order/OrderCraft.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/order/OrderCraft.java index 160097ba7..62905185d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/order/OrderCraft.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/order/OrderCraft.java @@ -1,10 +1,10 @@ -package nautilus.game.arcade.game.minigames.mineware.order; +package nautilus.game.arcade.game.games.mineware.order; import java.util.HashMap; import mineplex.core.common.util.UtilInv; import mineplex.core.itemstack.ItemStackFactory; -import nautilus.game.arcade.game.minigames.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.MineWare; import org.bukkit.Material; import org.bukkit.Sound; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/order/OrderGather.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/order/OrderGather.java similarity index 93% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/order/OrderGather.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/order/OrderGather.java index 77cd9e50f..bc8dd249a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/order/OrderGather.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/order/OrderGather.java @@ -1,10 +1,10 @@ -package nautilus.game.arcade.game.minigames.mineware.order; +package nautilus.game.arcade.game.games.mineware.order; import java.util.HashMap; import mineplex.core.common.util.UtilInv; import mineplex.core.itemstack.ItemStackFactory; -import nautilus.game.arcade.game.minigames.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.MineWare; import org.bukkit.Sound; import org.bukkit.entity.Player; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/order/OrderPlace.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/order/OrderPlace.java similarity index 92% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/order/OrderPlace.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/order/OrderPlace.java index f5d8cdf42..db0991c84 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/order/OrderPlace.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/order/OrderPlace.java @@ -1,8 +1,8 @@ -package nautilus.game.arcade.game.minigames.mineware.order; +package nautilus.game.arcade.game.games.mineware.order; import java.util.HashMap; -import nautilus.game.arcade.game.minigames.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.MineWare; import org.bukkit.Sound; import org.bukkit.entity.Player; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/ActionMilkCow.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/ActionMilkCow.java similarity index 84% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/ActionMilkCow.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/ActionMilkCow.java index 97afdef61..8c3f99904 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/ActionMilkCow.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/ActionMilkCow.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.mineware.random; +package nautilus.game.arcade.game.games.mineware.random; import org.bukkit.Material; import org.bukkit.entity.Cow; @@ -8,8 +8,8 @@ import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.inventory.ItemStack; import mineplex.core.common.util.UtilGear; -import nautilus.game.arcade.game.minigames.mineware.MineWare; -import nautilus.game.arcade.game.minigames.mineware.order.Order; +import nautilus.game.arcade.game.games.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.order.Order; public class ActionMilkCow extends Order { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/ActionShearSheep.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/ActionShearSheep.java similarity index 80% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/ActionShearSheep.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/ActionShearSheep.java index e21030c38..0dcd3e13f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/ActionShearSheep.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/ActionShearSheep.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.mineware.random; +package nautilus.game.arcade.game.games.mineware.random; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -6,8 +6,8 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerShearEntityEvent; import org.bukkit.inventory.ItemStack; -import nautilus.game.arcade.game.minigames.mineware.MineWare; -import nautilus.game.arcade.game.minigames.mineware.order.Order; +import nautilus.game.arcade.game.games.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.order.Order; public class ActionShearSheep extends Order { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/CraftLadder.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/CraftLadder.java similarity index 55% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/CraftLadder.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/CraftLadder.java index 58dcef43b..2cb7ae54c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/CraftLadder.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/CraftLadder.java @@ -1,7 +1,7 @@ -package nautilus.game.arcade.game.minigames.mineware.random; +package nautilus.game.arcade.game.games.mineware.random; -import nautilus.game.arcade.game.minigames.mineware.MineWare; -import nautilus.game.arcade.game.minigames.mineware.order.OrderCraft; +import nautilus.game.arcade.game.games.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.order.OrderCraft; public class CraftLadder extends OrderCraft { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/CraftStoneShovel.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/CraftStoneShovel.java similarity index 56% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/CraftStoneShovel.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/CraftStoneShovel.java index 5bad3ea5d..7c587446d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/CraftStoneShovel.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/CraftStoneShovel.java @@ -1,7 +1,7 @@ -package nautilus.game.arcade.game.minigames.mineware.random; +package nautilus.game.arcade.game.games.mineware.random; -import nautilus.game.arcade.game.minigames.mineware.MineWare; -import nautilus.game.arcade.game.minigames.mineware.order.OrderCraft; +import nautilus.game.arcade.game.games.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.order.OrderCraft; public class CraftStoneShovel extends OrderCraft { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/DamageChicken.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/DamageChicken.java similarity index 82% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/DamageChicken.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/DamageChicken.java index dde295ab8..26182e868 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/DamageChicken.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/DamageChicken.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.mineware.random; +package nautilus.game.arcade.game.games.mineware.random; import org.bukkit.entity.Chicken; import org.bukkit.entity.LivingEntity; @@ -7,8 +7,8 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import mineplex.minecraft.game.core.damage.CustomDamageEvent; -import nautilus.game.arcade.game.minigames.mineware.MineWare; -import nautilus.game.arcade.game.minigames.mineware.order.Order; +import nautilus.game.arcade.game.games.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.order.Order; public class DamageChicken extends Order { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/DamageFall.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/DamageFall.java similarity index 78% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/DamageFall.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/DamageFall.java index 99f407217..6a700de8b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/DamageFall.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/DamageFall.java @@ -1,12 +1,12 @@ -package nautilus.game.arcade.game.minigames.mineware.random; +package nautilus.game.arcade.game.games.mineware.random; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import mineplex.minecraft.game.core.damage.CustomDamageEvent; -import nautilus.game.arcade.game.minigames.mineware.MineWare; -import nautilus.game.arcade.game.minigames.mineware.order.Order; +import nautilus.game.arcade.game.games.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.order.Order; public class DamageFall extends Order { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/DamageGhast.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/DamageGhast.java similarity index 88% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/DamageGhast.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/DamageGhast.java index 41e8232d3..1ec28a023 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/DamageGhast.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/DamageGhast.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.mineware.random; +package nautilus.game.arcade.game.games.mineware.random; import org.bukkit.Material; import org.bukkit.entity.Ghast; @@ -11,8 +11,8 @@ import org.bukkit.inventory.ItemStack; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; import mineplex.minecraft.game.core.damage.CustomDamageEvent; -import nautilus.game.arcade.game.minigames.mineware.MineWare; -import nautilus.game.arcade.game.minigames.mineware.order.Order; +import nautilus.game.arcade.game.games.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.order.Order; public class DamageGhast extends Order { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/GatherCobble.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/GatherCobble.java similarity index 55% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/GatherCobble.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/GatherCobble.java index 88b88feed..06d8ad584 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/GatherCobble.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/GatherCobble.java @@ -1,7 +1,7 @@ -package nautilus.game.arcade.game.minigames.mineware.random; +package nautilus.game.arcade.game.games.mineware.random; -import nautilus.game.arcade.game.minigames.mineware.MineWare; -import nautilus.game.arcade.game.minigames.mineware.order.OrderGather; +import nautilus.game.arcade.game.games.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.order.OrderGather; public class GatherCobble extends OrderGather { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/GatherRedFlower.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/GatherRedFlower.java similarity index 55% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/GatherRedFlower.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/GatherRedFlower.java index 34052dff9..9a54ffd62 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/GatherRedFlower.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/GatherRedFlower.java @@ -1,7 +1,7 @@ -package nautilus.game.arcade.game.minigames.mineware.random; +package nautilus.game.arcade.game.games.mineware.random; -import nautilus.game.arcade.game.minigames.mineware.MineWare; -import nautilus.game.arcade.game.minigames.mineware.order.OrderGather; +import nautilus.game.arcade.game.games.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.order.OrderGather; public class GatherRedFlower extends OrderGather { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/GatherSand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/GatherSand.java similarity index 54% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/GatherSand.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/GatherSand.java index 99d76396c..64f0fb9b3 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/GatherSand.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/GatherSand.java @@ -1,7 +1,7 @@ -package nautilus.game.arcade.game.minigames.mineware.random; +package nautilus.game.arcade.game.games.mineware.random; -import nautilus.game.arcade.game.minigames.mineware.MineWare; -import nautilus.game.arcade.game.minigames.mineware.order.OrderGather; +import nautilus.game.arcade.game.games.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.order.OrderGather; public class GatherSand extends OrderGather { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/GatherYellowFlower.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/GatherYellowFlower.java similarity index 56% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/GatherYellowFlower.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/GatherYellowFlower.java index a112e3d4b..66b3dc2f9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/GatherYellowFlower.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/GatherYellowFlower.java @@ -1,7 +1,7 @@ -package nautilus.game.arcade.game.minigames.mineware.random; +package nautilus.game.arcade.game.games.mineware.random; -import nautilus.game.arcade.game.minigames.mineware.MineWare; -import nautilus.game.arcade.game.minigames.mineware.order.OrderGather; +import nautilus.game.arcade.game.games.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.order.OrderGather; public class GatherYellowFlower extends OrderGather { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/PlaceDoor.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/PlaceDoor.java similarity index 54% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/PlaceDoor.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/PlaceDoor.java index fe16504e3..9f768220e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/PlaceDoor.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/PlaceDoor.java @@ -1,7 +1,7 @@ -package nautilus.game.arcade.game.minigames.mineware.random; +package nautilus.game.arcade.game.games.mineware.random; -import nautilus.game.arcade.game.minigames.mineware.MineWare; -import nautilus.game.arcade.game.minigames.mineware.order.OrderPlace; +import nautilus.game.arcade.game.games.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.order.OrderPlace; public class PlaceDoor extends OrderPlace { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/RideBoat.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/RideBoat.java similarity index 79% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/RideBoat.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/RideBoat.java index d1c36217d..42bb40d82 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/RideBoat.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/RideBoat.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.mineware.random; +package nautilus.game.arcade.game.games.mineware.random; import org.bukkit.entity.Boat; import org.bukkit.entity.Player; @@ -6,8 +6,8 @@ import org.bukkit.event.EventHandler; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; -import nautilus.game.arcade.game.minigames.mineware.MineWare; -import nautilus.game.arcade.game.minigames.mineware.order.Order; +import nautilus.game.arcade.game.games.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.order.Order; public class RideBoat extends Order { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/RidePig.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/RidePig.java similarity index 83% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/RidePig.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/RidePig.java index 2a394929f..8b737287a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/RidePig.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/RidePig.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.mineware.random; +package nautilus.game.arcade.game.games.mineware.random; import org.bukkit.Material; import org.bukkit.entity.Pig; @@ -8,8 +8,8 @@ import org.bukkit.inventory.ItemStack; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; -import nautilus.game.arcade.game.minigames.mineware.MineWare; -import nautilus.game.arcade.game.minigames.mineware.order.Order; +import nautilus.game.arcade.game.games.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.order.Order; public class RidePig extends Order { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/StandAlone.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/StandAlone.java similarity index 83% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/StandAlone.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/StandAlone.java index de105899e..b568c9e24 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/StandAlone.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/StandAlone.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.mineware.random; +package nautilus.game.arcade.game.games.mineware.random; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -6,8 +6,8 @@ import org.bukkit.event.EventHandler; import mineplex.core.common.util.UtilMath; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; -import nautilus.game.arcade.game.minigames.mineware.MineWare; -import nautilus.game.arcade.game.minigames.mineware.order.Order; +import nautilus.game.arcade.game.games.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.order.Order; public class StandAlone extends Order { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/StandShelter.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/StandShelter.java similarity index 84% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/StandShelter.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/StandShelter.java index 96c21911c..ce0c3cdca 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/StandShelter.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/StandShelter.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.mineware.random; +package nautilus.game.arcade.game.games.mineware.random; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -7,8 +7,8 @@ import org.bukkit.event.EventHandler; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; -import nautilus.game.arcade.game.minigames.mineware.MineWare; -import nautilus.game.arcade.game.minigames.mineware.order.Order; +import nautilus.game.arcade.game.games.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.order.Order; public class StandShelter extends Order { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/StandStone.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/StandStone.java similarity index 80% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/StandStone.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/StandStone.java index 2229eadee..e88e9df61 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/StandStone.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/StandStone.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.mineware.random; +package nautilus.game.arcade.game.games.mineware.random; import org.bukkit.Material; import org.bukkit.block.BlockFace; @@ -7,8 +7,8 @@ import org.bukkit.event.EventHandler; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; -import nautilus.game.arcade.game.minigames.mineware.MineWare; -import nautilus.game.arcade.game.minigames.mineware.order.Order; +import nautilus.game.arcade.game.games.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.order.Order; public class StandStone extends Order { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/StandWater.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/StandWater.java similarity index 78% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/StandWater.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/StandWater.java index d809a78ad..69d7e2706 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/mineware/random/StandWater.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/random/StandWater.java @@ -1,12 +1,12 @@ -package nautilus.game.arcade.game.minigames.mineware.random; +package nautilus.game.arcade.game.games.mineware.random; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; -import nautilus.game.arcade.game.minigames.mineware.MineWare; -import nautilus.game.arcade.game.minigames.mineware.order.Order; +import nautilus.game.arcade.game.games.mineware.MineWare; +import nautilus.game.arcade.game.games.mineware.order.Order; public class StandWater extends Order { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/Quiver.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java similarity index 98% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/Quiver.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java index 458d194a4..63feec746 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/Quiver.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.quiver; +package nautilus.game.arcade.game.games.quiver; import java.util.ArrayList; import java.util.HashMap; @@ -30,7 +30,7 @@ import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.GameType; import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.game.SoloGame; -import nautilus.game.arcade.game.minigames.quiver.kits.*; +import nautilus.game.arcade.game.games.quiver.kits.*; import nautilus.game.arcade.kit.Kit; public class Quiver extends SoloGame diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/QuiverScore.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/QuiverScore.java similarity index 80% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/QuiverScore.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/QuiverScore.java index c1ff54ffd..eb2246082 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/QuiverScore.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/QuiverScore.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.quiver; +package nautilus.game.arcade.game.games.quiver; import org.bukkit.entity.Player; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitBrawler.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitBrawler.java similarity index 95% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitBrawler.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitBrawler.java index 859b133b1..cb915c59d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitBrawler.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitBrawler.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.quiver.kits; +package nautilus.game.arcade.game.games.quiver.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitElementalist.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitElementalist.java similarity index 95% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitElementalist.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitElementalist.java index 83f8d1716..33076b16e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitElementalist.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitElementalist.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.quiver.kits; +package nautilus.game.arcade.game.games.quiver.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitLeaper.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitLeaper.java similarity index 95% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitLeaper.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitLeaper.java index 2507f96c6..9f13552b9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitLeaper.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitLeaper.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.quiver.kits; +package nautilus.game.arcade.game.games.quiver.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/runner/Runner.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/Runner.java similarity index 98% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/runner/Runner.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/Runner.java index be966ea2b..944d9d53d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/runner/Runner.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/Runner.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.runner; +package nautilus.game.arcade.game.games.runner; import java.lang.reflect.Field; import java.util.HashMap; @@ -30,7 +30,7 @@ import mineplex.core.updater.event.UpdateEvent; import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.GameType; import nautilus.game.arcade.game.SoloGame; -import nautilus.game.arcade.game.minigames.runner.kits.*; +import nautilus.game.arcade.game.games.runner.kits.*; import nautilus.game.arcade.kit.Kit; import net.minecraft.server.v1_6_R2.EntityArrow; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/runner/kits/KitArcher.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/kits/KitArcher.java similarity index 94% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/runner/kits/KitArcher.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/kits/KitArcher.java index 3f9f0b5f3..cd1760581 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/runner/kits/KitArcher.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/kits/KitArcher.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.runner.kits; +package nautilus.game.arcade.game.games.runner.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/runner/kits/KitFrosty.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/kits/KitFrosty.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/runner/kits/KitFrosty.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/kits/KitFrosty.java index 8814f82d7..aa6c65056 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/runner/kits/KitFrosty.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/kits/KitFrosty.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.runner.kits; +package nautilus.game.arcade.game.games.runner.kits; import org.bukkit.EntityEffect; import org.bukkit.Material; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/runner/kits/KitLeaper.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/kits/KitLeaper.java similarity index 94% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/runner/kits/KitLeaper.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/kits/KitLeaper.java index 697c86e18..5a078383f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/runner/kits/KitLeaper.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/kits/KitLeaper.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.runner.kits; +package nautilus.game.arcade.game.games.runner.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/SuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java similarity index 98% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/SuperSmash.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java index f60b15f60..454277b30 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/SuperSmash.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.smash; +package nautilus.game.arcade.game.games.smash; import java.util.ArrayList; import java.util.HashMap; @@ -30,7 +30,7 @@ import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.game.GameTeam; import nautilus.game.arcade.game.SoloGame; import nautilus.game.arcade.game.GameTeam.PlayerState; -import nautilus.game.arcade.game.standalone.smash.kits.*; +import nautilus.game.arcade.game.games.smash.kits.*; import nautilus.game.arcade.kit.Kit; public class SuperSmash extends SoloGame diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/items/SmashItem.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/items/SmashItem.java new file mode 100644 index 000000000..954c2e571 --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/items/SmashItem.java @@ -0,0 +1,5 @@ +package nautilus.game.arcade.game.games.smash.items; + +public class SmashItem { + +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitBlaze.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitBlaze.java similarity index 98% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitBlaze.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitBlaze.java index f89e7d77b..f291a1a5a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitBlaze.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitBlaze.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.smash.kits; +package nautilus.game.arcade.game.games.smash.kits; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitChicken.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitChicken.java similarity index 98% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitChicken.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitChicken.java index 21d398b33..2899206bd 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitChicken.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitChicken.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.smash.kits; +package nautilus.game.arcade.game.games.smash.kits; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitCreeper.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitCreeper.java similarity index 98% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitCreeper.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitCreeper.java index 4319b8a2a..117d53528 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitCreeper.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitCreeper.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.smash.kits; +package nautilus.game.arcade.game.games.smash.kits; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitEnderman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitEnderman.java similarity index 98% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitEnderman.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitEnderman.java index cd57a25cc..9d48672d2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitEnderman.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitEnderman.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.smash.kits; +package nautilus.game.arcade.game.games.smash.kits; import java.util.HashMap; import java.util.Iterator; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitGolem.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitGolem.java similarity index 97% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitGolem.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitGolem.java index 53a7b84e4..7391c4938 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitGolem.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitGolem.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.smash.kits; +package nautilus.game.arcade.game.games.smash.kits; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitKnight.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java similarity index 99% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitKnight.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java index 18f607265..d2c665dae 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitKnight.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.smash.kits; +package nautilus.game.arcade.game.games.smash.kits; import java.util.HashMap; import java.util.HashSet; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkeleton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSkeleton.java similarity index 98% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkeleton.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSkeleton.java index 8e585ea23..9906c0572 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkeleton.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSkeleton.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.smash.kits; +package nautilus.game.arcade.game.games.smash.kits; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkySquid.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSkySquid.java similarity index 97% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkySquid.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSkySquid.java index 93500bd89..27cf7b5e9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkySquid.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSkySquid.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.smash.kits; +package nautilus.game.arcade.game.games.smash.kits; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSlime.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSlime.java similarity index 98% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSlime.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSlime.java index 31dda4a54..b54bd189e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSlime.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSlime.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.smash.kits; +package nautilus.game.arcade.game.games.smash.kits; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSnowman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSnowman.java similarity index 98% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSnowman.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSnowman.java index e39b8adb9..d77c88574 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSnowman.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSnowman.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.smash.kits; +package nautilus.game.arcade.game.games.smash.kits; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSpider.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSpider.java similarity index 98% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSpider.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSpider.java index 78dfbd5f2..7bf9f81ef 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSpider.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSpider.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.smash.kits; +package nautilus.game.arcade.game.games.smash.kits; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitWitherSkeleton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitWitherSkeleton.java similarity index 98% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitWitherSkeleton.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitWitherSkeleton.java index bef9a2970..2b7089de1 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitWitherSkeleton.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitWitherSkeleton.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.smash.kits; +package nautilus.game.arcade.game.games.smash.kits; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/snowfight/SnowFight.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java similarity index 98% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/snowfight/SnowFight.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java index 3fd50d338..488896052 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/snowfight/SnowFight.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.snowfight; +package nautilus.game.arcade.game.games.snowfight; import org.bukkit.Effect; import org.bukkit.Material; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/spleef/Spleef.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/Spleef.java similarity index 97% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/spleef/Spleef.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/Spleef.java index 80d79a04d..2d09d63e1 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/spleef/Spleef.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/Spleef.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.spleef; +package nautilus.game.arcade.game.games.spleef; import java.lang.reflect.Field; @@ -17,7 +17,7 @@ import mineplex.core.common.util.UtilEnt; import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.GameType; import nautilus.game.arcade.game.SoloGame; -import nautilus.game.arcade.game.minigames.spleef.kits.*; +import nautilus.game.arcade.game.games.spleef.kits.*; import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.perks.event.PerkLeapEvent; import net.minecraft.server.v1_6_R2.EntityArrow; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/spleef/kits/KitArcher.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/kits/KitArcher.java similarity index 94% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/spleef/kits/KitArcher.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/kits/KitArcher.java index 3ee34f4ed..1093e839f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/spleef/kits/KitArcher.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/kits/KitArcher.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.spleef.kits; +package nautilus.game.arcade.game.games.spleef.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/spleef/kits/KitBrawler.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/kits/KitBrawler.java similarity index 94% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/spleef/kits/KitBrawler.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/kits/KitBrawler.java index c37297497..463520c67 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/spleef/kits/KitBrawler.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/kits/KitBrawler.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.spleef.kits; +package nautilus.game.arcade.game.games.spleef.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/spleef/kits/KitLeaper.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/kits/KitLeaper.java similarity index 94% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/spleef/kits/KitLeaper.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/kits/KitLeaper.java index 0a2d4650e..62f637fe9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/spleef/kits/KitLeaper.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/kits/KitLeaper.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.spleef.kits; +package nautilus.game.arcade.game.games.spleef.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/TurfForts.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java similarity index 99% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/TurfForts.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java index 89a00a784..6d9ccc21e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/TurfForts.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.turfforts; +package nautilus.game.arcade.game.games.turfforts; import java.lang.reflect.Field; import java.util.ArrayList; @@ -42,7 +42,7 @@ import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.GameType; import nautilus.game.arcade.game.GameTeam; import nautilus.game.arcade.game.TeamGame; -import nautilus.game.arcade.game.minigames.turfforts.kits.*; +import nautilus.game.arcade.game.games.turfforts.kits.*; import nautilus.game.arcade.kit.Kit; import net.minecraft.server.v1_6_R2.EntityArrow; import net.minecraft.server.v1_6_R2.Item; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitInfiltrator.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/kits/KitInfiltrator.java similarity index 95% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitInfiltrator.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/kits/KitInfiltrator.java index c6e42e49e..deec1b998 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitInfiltrator.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/kits/KitInfiltrator.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.turfforts.kits; +package nautilus.game.arcade.game.games.turfforts.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitMarksman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/kits/KitMarksman.java similarity index 95% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitMarksman.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/kits/KitMarksman.java index 2cceaeb34..1abe72fae 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitMarksman.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/kits/KitMarksman.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.turfforts.kits; +package nautilus.game.arcade.game.games.turfforts.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitShredder.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/kits/KitShredder.java similarity index 95% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitShredder.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/kits/KitShredder.java index 8c7711fd9..bb18b66cf 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitShredder.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/kits/KitShredder.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.minigames.turfforts.kits; +package nautilus.game.arcade.game.games.turfforts.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/uhc/KitUHC.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/KitUHC.java similarity index 93% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/uhc/KitUHC.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/KitUHC.java index 8b282d54c..3bbf9130a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/uhc/KitUHC.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/KitUHC.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.uhc; +package nautilus.game.arcade.game.games.uhc; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/uhc/UHC.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java similarity index 99% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/uhc/UHC.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java index 520f7a278..4e402d01e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/uhc/UHC.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.uhc; +package nautilus.game.arcade.game.games.uhc; import java.util.ArrayList; import java.util.Iterator; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/ZombieData.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/ZombieData.java similarity index 81% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/ZombieData.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/ZombieData.java index 692254020..9d904cb0c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/ZombieData.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/ZombieData.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.zombiesurvival; +package nautilus.game.arcade.game.games.zombiesurvival; import org.bukkit.Location; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/ZombieSurvival.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/ZombieSurvival.java similarity index 98% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/ZombieSurvival.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/ZombieSurvival.java index ca2c8268c..c8e11e66f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/ZombieSurvival.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/ZombieSurvival.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.zombiesurvival; +package nautilus.game.arcade.game.games.zombiesurvival; import java.util.HashMap; import java.util.Iterator; @@ -29,7 +29,7 @@ import nautilus.game.arcade.GameType; import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.game.GameTeam; import nautilus.game.arcade.game.SoloGame; -import nautilus.game.arcade.game.standalone.zombiesurvival.kits.*; +import nautilus.game.arcade.game.games.zombiesurvival.kits.*; import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.NullKit; import net.minecraft.server.v1_6_R2.EntityCreature; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorArcher.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/kits/KitSurvivorArcher.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorArcher.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/kits/KitSurvivorArcher.java index 7e92807a1..26026824a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorArcher.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/kits/KitSurvivorArcher.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.zombiesurvival.kits; +package nautilus.game.arcade.game.games.zombiesurvival.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorKnight.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/kits/KitSurvivorKnight.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorKnight.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/kits/KitSurvivorKnight.java index e64ec87bf..8ba4ce416 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorKnight.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/kits/KitSurvivorKnight.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.zombiesurvival.kits; +package nautilus.game.arcade.game.games.zombiesurvival.kits; import org.bukkit.Material; import org.bukkit.entity.LivingEntity; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorRogue.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/kits/KitSurvivorRogue.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorRogue.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/kits/KitSurvivorRogue.java index b237f888b..ce8839d61 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorRogue.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/kits/KitSurvivorRogue.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.zombiesurvival.kits; +package nautilus.game.arcade.game.games.zombiesurvival.kits; import org.bukkit.Material; import org.bukkit.entity.LivingEntity; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitUndeadAlpha.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/kits/KitUndeadAlpha.java similarity index 96% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitUndeadAlpha.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/kits/KitUndeadAlpha.java index 91340cd06..ff6bb6b06 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitUndeadAlpha.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/kits/KitUndeadAlpha.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.zombiesurvival.kits; +package nautilus.game.arcade.game.games.zombiesurvival.kits; import org.bukkit.Material; import org.bukkit.entity.LivingEntity; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitUndeadZombie.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/kits/KitUndeadZombie.java similarity index 95% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitUndeadZombie.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/kits/KitUndeadZombie.java index 1813f7c36..921fec6b5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitUndeadZombie.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/kits/KitUndeadZombie.java @@ -1,4 +1,4 @@ -package nautilus.game.arcade.game.standalone.zombiesurvival.kits; +package nautilus.game.arcade.game.games.zombiesurvival.kits; import org.bukkit.Material; import org.bukkit.entity.EntityType;