From 5097ff46fb425e32eb2072d13d0e3eb3cadb4d58 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Fri, 20 Mar 2020 09:36:05 -0500 Subject: [PATCH] Refactored a lot of things Signed-off-by: Ceikry --- .../crandor/game/node/entity/player/link/PacketDispatch.java | 3 +++ Server/src/plugin/activity/wguild/cyclopes/CyclopesRoom.java | 2 +- .../src/plugin/interaction/item/withobject/BurnMeatPlugin.java | 2 +- Server/src/plugin/npc/{ => bosses}/GiantMoleNPC.java | 2 +- Server/src/plugin/npc/{ => bosses}/KalphiteQueenNPC.java | 2 +- Server/src/plugin/npc/{ => bosses}/TormentedDemonNPC.java | 2 +- Server/src/plugin/npc/{ => bosses}/TzRekJadNPC.java | 2 +- Server/src/plugin/npc/{ => bosses}/corp/CorporealBeastNPC.java | 2 +- Server/src/plugin/npc/{ => bosses}/corp/DarkEnergyCoreNPC.java | 2 +- Server/src/plugin/npc/{ => bosses}/kraken/CaveKrakenNPC.java | 2 +- .../plugin/npc/{ => bosses}/kraken/EnormousTentacleNPC.java | 2 +- Server/src/plugin/npc/{ => bosses}/kraken/KrakenNPC.java | 2 +- .../plugin/npc/{ => bosses/wilderness}/ChaosElementalNPC.java | 2 +- .../npc/{ => bosses/wilderness}/CrazyArchaeologistNPC.java | 2 +- .../plugin/npc/{ => bosses/wilderness}/KingBlackDragonNPC.java | 2 +- .../npc/{ => bosses/wilderness}/callisto/CallistoNPC.java | 2 +- .../npc/{ => bosses/wilderness}/venenatis/VenenatisNPC.java | 2 +- .../plugin/npc/{ => bosses}/zulrah/ZulrahCombatHandler.java | 2 +- Server/src/plugin/npc/{ => bosses}/zulrah/ZulrahCutscene.java | 2 +- Server/src/plugin/npc/{ => bosses}/zulrah/ZulrahNPC.java | 2 +- Server/src/plugin/npc/{ => bosses}/zulrah/ZulrahPattern.java | 2 +- Server/src/plugin/npc/{ => bosses}/zulrah/ZulrahPlugin.java | 2 +- Server/src/plugin/npc/{ => bosses}/zulrah/ZulrahSpot.java | 2 +- Server/src/plugin/npc/{ => bosses}/zulrah/ZulrahType.java | 2 +- .../plugin/{interaction => npc}/city/nardah/AliTheCarter.java | 2 +- .../{interaction => npc}/city/nardah/ArtimeusDialogue.java | 2 +- Server/src/plugin/{interaction => npc}/city/nardah/Awusah.java | 2 +- .../src/plugin/{interaction => npc}/city/nardah/Ghaslor.java | 2 +- .../src/plugin/{interaction => npc}/city/nardah/Kazemde.java | 2 +- Server/src/plugin/{interaction => npc}/city/nardah/Rokuh.java | 2 +- Server/src/plugin/{interaction => npc}/city/nardah/Seddu.java | 2 +- .../{interaction => npc}/city/pollnivneach/AliCamelMan.java | 2 +- .../city/pollnivneach/AliTheCamelHandler.java | 2 +- .../city/pollnivneach/AliTheKebabSeller.java | 2 +- .../city/pollnivneach/BlackJackSeller.java | 2 +- .../{interaction => npc}/city/pollnivneach/DesertBandit.java | 2 +- .../city/pollnivneach/SnakeCharmerBasket.java | 2 +- .../city/pollnivneach/StreetUrchinDialogue.java | 2 +- .../plugin/{interaction => npc}/city/sophanem/KlenterNPC.java | 3 +-- .../{interaction => npc}/city/sophanem/SphinxDialogue.java | 3 +-- .../{interaction => npc}/city/sophanem/TarikDialogue.java | 2 +- .../{interaction => npc}/city/sophanem/WallShortcut.java | 2 +- Server/src/plugin/npc/{ => other}/AlKharidWarriorPlugin.java | 2 +- Server/src/plugin/npc/{ => other}/AntonNPC.java | 2 +- Server/src/plugin/npc/{ => other}/ArmourSuitNPC.java | 2 +- Server/src/plugin/npc/{ => other}/BarbarianNPC.java | 2 +- Server/src/plugin/npc/{ => other}/BennyNPC.java | 2 +- Server/src/plugin/npc/{ => other}/BorkNPC.java | 2 +- Server/src/plugin/npc/{ => other}/CatableponNPC.java | 2 +- Server/src/plugin/npc/{ => other}/ChromaticDragonNPC.java | 2 +- Server/src/plugin/npc/{ => other}/CitizenNPC.java | 2 +- Server/src/plugin/npc/{ => other}/CowNPC.java | 2 +- Server/src/plugin/npc/{ => other}/DarkWizardNPC.java | 2 +- Server/src/plugin/npc/{ => other}/DraynorTreeNPC.java | 2 +- Server/src/plugin/npc/{ => other}/DuckNPC.java | 2 +- Server/src/plugin/npc/{ => other}/ElementalNPC.java | 2 +- Server/src/plugin/npc/{ => other}/ElementalWizardNPC.java | 2 +- Server/src/plugin/npc/{ => other}/FishingNPC.java | 2 +- Server/src/plugin/npc/{ => other}/GoblinVillageNPC.java | 2 +- Server/src/plugin/npc/{ => other}/GraveStoneNPC.java | 2 +- Server/src/plugin/npc/{ => other}/GuardNPC.java | 2 +- Server/src/plugin/npc/{ => other}/HansNPC.java | 3 +-- Server/src/plugin/npc/{ => other}/HighwayManNPC.java | 2 +- Server/src/plugin/npc/{ => other}/JogreNPC.java | 2 +- Server/src/plugin/npc/{ => other}/KamfreenaNPC.java | 2 +- Server/src/plugin/npc/{ => other}/LumberKittenNPC.java | 2 +- Server/src/plugin/npc/{ => other}/LumbridgeInstructorNPC.java | 2 +- Server/src/plugin/npc/{ => other}/MetalDragonNPC.java | 2 +- Server/src/plugin/npc/{ => other}/MonkNPC.java | 2 +- Server/src/plugin/npc/{ => other}/RatNPC.java | 2 +- Server/src/plugin/npc/{ => other}/RatTutorialNPC.java | 2 +- Server/src/plugin/npc/{ => other}/RockCrabNPC.java | 2 +- Server/src/plugin/npc/{ => other}/SandwichLadyNPC.java | 2 +- Server/src/plugin/npc/{ => other}/ShanomiNPC.java | 2 +- Server/src/plugin/npc/{ => other}/SheepNPC.java | 2 +- Server/src/plugin/npc/{ => other}/ShopNPC.java | 2 +- Server/src/plugin/npc/{ => other}/SkippyNPC.java | 2 +- Server/src/plugin/npc/{ => other}/StrayDogNPC.java | 2 +- Server/src/plugin/npc/{ => other}/Student.java | 2 +- Server/src/plugin/npc/{ => other}/ThrowerTrollNPC.java | 2 +- Server/src/plugin/npc/{ => other}/TribesmanNPC.java | 2 +- Server/src/plugin/npc/{ => other}/TutorialChickenNPC.java | 2 +- Server/src/plugin/npc/{ => other}/VampireSlayerNPC.java | 2 +- Server/src/plugin/npc/{ => other}/WerewolfNPC.java | 2 +- Server/src/plugin/npc/{ => other}/ZombieNPC.java | 2 +- Server/src/plugin/skill/cooking/CookingPlugin.java | 2 +- 86 files changed, 88 insertions(+), 88 deletions(-) rename Server/src/plugin/npc/{ => bosses}/GiantMoleNPC.java (99%) rename Server/src/plugin/npc/{ => bosses}/KalphiteQueenNPC.java (99%) rename Server/src/plugin/npc/{ => bosses}/TormentedDemonNPC.java (99%) rename Server/src/plugin/npc/{ => bosses}/TzRekJadNPC.java (99%) rename Server/src/plugin/npc/{ => bosses}/corp/CorporealBeastNPC.java (99%) rename Server/src/plugin/npc/{ => bosses}/corp/DarkEnergyCoreNPC.java (98%) rename Server/src/plugin/npc/{ => bosses}/kraken/CaveKrakenNPC.java (98%) rename Server/src/plugin/npc/{ => bosses}/kraken/EnormousTentacleNPC.java (98%) rename Server/src/plugin/npc/{ => bosses}/kraken/KrakenNPC.java (99%) rename Server/src/plugin/npc/{ => bosses/wilderness}/ChaosElementalNPC.java (99%) rename Server/src/plugin/npc/{ => bosses/wilderness}/CrazyArchaeologistNPC.java (99%) rename Server/src/plugin/npc/{ => bosses/wilderness}/KingBlackDragonNPC.java (99%) rename Server/src/plugin/npc/{ => bosses/wilderness}/callisto/CallistoNPC.java (99%) rename Server/src/plugin/npc/{ => bosses/wilderness}/venenatis/VenenatisNPC.java (99%) rename Server/src/plugin/npc/{ => bosses}/zulrah/ZulrahCombatHandler.java (96%) rename Server/src/plugin/npc/{ => bosses}/zulrah/ZulrahCutscene.java (98%) rename Server/src/plugin/npc/{ => bosses}/zulrah/ZulrahNPC.java (99%) rename Server/src/plugin/npc/{ => bosses}/zulrah/ZulrahPattern.java (99%) rename Server/src/plugin/npc/{ => bosses}/zulrah/ZulrahPlugin.java (97%) rename Server/src/plugin/npc/{ => bosses}/zulrah/ZulrahSpot.java (99%) rename Server/src/plugin/npc/{ => bosses}/zulrah/ZulrahType.java (92%) rename Server/src/plugin/{interaction => npc}/city/nardah/AliTheCarter.java (98%) rename Server/src/plugin/{interaction => npc}/city/nardah/ArtimeusDialogue.java (98%) rename Server/src/plugin/{interaction => npc}/city/nardah/Awusah.java (96%) rename Server/src/plugin/{interaction => npc}/city/nardah/Ghaslor.java (96%) rename Server/src/plugin/{interaction => npc}/city/nardah/Kazemde.java (98%) rename Server/src/plugin/{interaction => npc}/city/nardah/Rokuh.java (98%) rename Server/src/plugin/{interaction => npc}/city/nardah/Seddu.java (97%) rename Server/src/plugin/{interaction => npc}/city/pollnivneach/AliCamelMan.java (99%) rename Server/src/plugin/{interaction => npc}/city/pollnivneach/AliTheCamelHandler.java (98%) rename Server/src/plugin/{interaction => npc}/city/pollnivneach/AliTheKebabSeller.java (99%) rename Server/src/plugin/{interaction => npc}/city/pollnivneach/BlackJackSeller.java (95%) rename Server/src/plugin/{interaction => npc}/city/pollnivneach/DesertBandit.java (97%) rename Server/src/plugin/{interaction => npc}/city/pollnivneach/SnakeCharmerBasket.java (98%) rename Server/src/plugin/{interaction => npc}/city/pollnivneach/StreetUrchinDialogue.java (95%) rename Server/src/plugin/{interaction => npc}/city/sophanem/KlenterNPC.java (91%) rename Server/src/plugin/{interaction => npc}/city/sophanem/SphinxDialogue.java (97%) rename Server/src/plugin/{interaction => npc}/city/sophanem/TarikDialogue.java (96%) rename Server/src/plugin/{interaction => npc}/city/sophanem/WallShortcut.java (98%) rename Server/src/plugin/npc/{ => other}/AlKharidWarriorPlugin.java (99%) rename Server/src/plugin/npc/{ => other}/AntonNPC.java (97%) rename Server/src/plugin/npc/{ => other}/ArmourSuitNPC.java (98%) rename Server/src/plugin/npc/{ => other}/BarbarianNPC.java (98%) rename Server/src/plugin/npc/{ => other}/BennyNPC.java (98%) rename Server/src/plugin/npc/{ => other}/BorkNPC.java (99%) rename Server/src/plugin/npc/{ => other}/CatableponNPC.java (98%) rename Server/src/plugin/npc/{ => other}/ChromaticDragonNPC.java (98%) rename Server/src/plugin/npc/{ => other}/CitizenNPC.java (98%) rename Server/src/plugin/npc/{ => other}/CowNPC.java (97%) rename Server/src/plugin/npc/{ => other}/DarkWizardNPC.java (98%) rename Server/src/plugin/npc/{ => other}/DraynorTreeNPC.java (98%) rename Server/src/plugin/npc/{ => other}/DuckNPC.java (97%) rename Server/src/plugin/npc/{ => other}/ElementalNPC.java (99%) rename Server/src/plugin/npc/{ => other}/ElementalWizardNPC.java (99%) rename Server/src/plugin/npc/{ => other}/FishingNPC.java (98%) rename Server/src/plugin/npc/{ => other}/GoblinVillageNPC.java (99%) rename Server/src/plugin/npc/{ => other}/GraveStoneNPC.java (99%) rename Server/src/plugin/npc/{ => other}/GuardNPC.java (98%) rename Server/src/plugin/npc/{ => other}/HansNPC.java (96%) rename Server/src/plugin/npc/{ => other}/HighwayManNPC.java (98%) rename Server/src/plugin/npc/{ => other}/JogreNPC.java (98%) rename Server/src/plugin/npc/{ => other}/KamfreenaNPC.java (98%) rename Server/src/plugin/npc/{ => other}/LumberKittenNPC.java (98%) rename Server/src/plugin/npc/{ => other}/LumbridgeInstructorNPC.java (98%) rename Server/src/plugin/npc/{ => other}/MetalDragonNPC.java (99%) rename Server/src/plugin/npc/{ => other}/MonkNPC.java (98%) rename Server/src/plugin/npc/{ => other}/RatNPC.java (98%) rename Server/src/plugin/npc/{ => other}/RatTutorialNPC.java (98%) rename Server/src/plugin/npc/{ => other}/RockCrabNPC.java (98%) rename Server/src/plugin/npc/{ => other}/SandwichLadyNPC.java (98%) rename Server/src/plugin/npc/{ => other}/ShanomiNPC.java (98%) rename Server/src/plugin/npc/{ => other}/SheepNPC.java (98%) rename Server/src/plugin/npc/{ => other}/ShopNPC.java (98%) rename Server/src/plugin/npc/{ => other}/SkippyNPC.java (97%) rename Server/src/plugin/npc/{ => other}/StrayDogNPC.java (99%) rename Server/src/plugin/npc/{ => other}/Student.java (97%) rename Server/src/plugin/npc/{ => other}/ThrowerTrollNPC.java (98%) rename Server/src/plugin/npc/{ => other}/TribesmanNPC.java (97%) rename Server/src/plugin/npc/{ => other}/TutorialChickenNPC.java (98%) rename Server/src/plugin/npc/{ => other}/VampireSlayerNPC.java (99%) rename Server/src/plugin/npc/{ => other}/WerewolfNPC.java (97%) rename Server/src/plugin/npc/{ => other}/ZombieNPC.java (98%) diff --git a/Server/src/org/crandor/game/node/entity/player/link/PacketDispatch.java b/Server/src/org/crandor/game/node/entity/player/link/PacketDispatch.java index 404ca6f91..6c7c7c3c3 100644 --- a/Server/src/org/crandor/game/node/entity/player/link/PacketDispatch.java +++ b/Server/src/org/crandor/game/node/entity/player/link/PacketDispatch.java @@ -391,4 +391,7 @@ public final class PacketDispatch { return context; } + public void sendScriptConfigs(int id, int value, String type, Object... params) { + PacketRepository.send(CSConfigPacket.class, new CSConfigContext(player, id, value, type, params)); + } } diff --git a/Server/src/plugin/activity/wguild/cyclopes/CyclopesRoom.java b/Server/src/plugin/activity/wguild/cyclopes/CyclopesRoom.java index 5d1edbd39..f315bcec2 100644 --- a/Server/src/plugin/activity/wguild/cyclopes/CyclopesRoom.java +++ b/Server/src/plugin/activity/wguild/cyclopes/CyclopesRoom.java @@ -116,7 +116,7 @@ public final class CyclopesRoom extends MapZone implements Plugin { public boolean death(Entity e, Entity killer) { if (killer instanceof Player && e instanceof NPC && (e.getId() == 4292 || e.getId() == 4291)) { int defenderId = getDefenderIndex((Player) killer); - if (RandomFunction.randomize(32) == 1) { + if (RandomFunction.randomize(32) == 10) { if (++defenderId == DEFENDERS.length) { defenderId--; } diff --git a/Server/src/plugin/interaction/item/withobject/BurnMeatPlugin.java b/Server/src/plugin/interaction/item/withobject/BurnMeatPlugin.java index 966da682e..47f505748 100644 --- a/Server/src/plugin/interaction/item/withobject/BurnMeatPlugin.java +++ b/Server/src/plugin/interaction/item/withobject/BurnMeatPlugin.java @@ -21,7 +21,7 @@ public final class BurnMeatPlugin extends UseWithHandler { /** * Represents the objects allowed to cook {@code Food} on. */ - private static final int[] OBJECTS = new int[] { 2728, 2729, 2730, 2731, 2732, 2859, 3038, 3039, 3769, 3775, 4265, 4266, 5249, 5499, 5631, 5632, 5981, 9682, 10433, 11404, 11405, 11406, 12102, 12796, 13337, 13881, 14169, 14919, 15156, 20000, 20001, 21620, 21792, 22713, 22714, 23046, 24283, 24284, 25155, 25156, 25465, 25730, 27297, 29139, 30017, 32099, 33500, 34495, 34546, 36973, 37597, 37629, 37726, 114, 4172, 5275, 8750, 16893, 22154, 34410, 34565, 114, 9085, 9086, 9087, 12269, 15398, 25440, 25441, 2724, 2725, 2726, 4618, 4650, 5165, 6093, 6094, 6095, 6096, 8712, 9439, 9440, 9441, 10824, 17640, 17641, 17642, 17643, 18039, 21795, 24285, 24329, 27251, 33498, 35449, 36815, 36816, 37426 }; + private static final int[] OBJECTS = new int[] { 21302, 13528, 13529, 13533, 13531, 13536, 13539, 13542, 2728, 2729, 2730, 2731, 2732, 2859, 3038, 3039, 3769, 3775, 4265, 4266, 5249, 5499, 5631, 5632, 5981, 9682, 10433, 11404, 11405, 11406, 12102, 12796, 13337, 13881, 14169, 14919, 15156, 20000, 20001, 21620, 21792, 22713, 22714, 23046, 24283, 24284, 25155, 25156, 25465, 25730, 27297, 29139, 30017, 32099, 33500, 34495, 34546, 36973, 37597, 37629, 37726, 114, 4172, 5275, 8750, 16893, 22154, 34410, 34565, 114, 9085, 9086, 9087, 12269, 15398, 25440, 25441, 2724, 2725, 2726, 4618, 4650, 5165, 6093, 6094, 6095, 6096, 8712, 9439, 9440, 9441, 10824, 17640, 17641, 17642, 17643, 18039, 21795, 24285, 24329, 27251, 33498, 35449, 36815, 36816, 37426, 40110 }; /** * Represents the animation used when cooking over a range. diff --git a/Server/src/plugin/npc/GiantMoleNPC.java b/Server/src/plugin/npc/bosses/GiantMoleNPC.java similarity index 99% rename from Server/src/plugin/npc/GiantMoleNPC.java rename to Server/src/plugin/npc/bosses/GiantMoleNPC.java index 6409c3bc5..10f49c152 100644 --- a/Server/src/plugin/npc/GiantMoleNPC.java +++ b/Server/src/plugin/npc/bosses/GiantMoleNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.bosses; import org.crandor.cache.def.impl.ObjectDefinition; import org.crandor.game.component.Component; diff --git a/Server/src/plugin/npc/KalphiteQueenNPC.java b/Server/src/plugin/npc/bosses/KalphiteQueenNPC.java similarity index 99% rename from Server/src/plugin/npc/KalphiteQueenNPC.java rename to Server/src/plugin/npc/bosses/KalphiteQueenNPC.java index edd579577..9e379afef 100644 --- a/Server/src/plugin/npc/KalphiteQueenNPC.java +++ b/Server/src/plugin/npc/bosses/KalphiteQueenNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.bosses; import java.util.ArrayList; import java.util.List; diff --git a/Server/src/plugin/npc/TormentedDemonNPC.java b/Server/src/plugin/npc/bosses/TormentedDemonNPC.java similarity index 99% rename from Server/src/plugin/npc/TormentedDemonNPC.java rename to Server/src/plugin/npc/bosses/TormentedDemonNPC.java index fe0e9bb9c..7f668fd16 100644 --- a/Server/src/plugin/npc/TormentedDemonNPC.java +++ b/Server/src/plugin/npc/bosses/TormentedDemonNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.bosses; import java.util.concurrent.TimeUnit; diff --git a/Server/src/plugin/npc/TzRekJadNPC.java b/Server/src/plugin/npc/bosses/TzRekJadNPC.java similarity index 99% rename from Server/src/plugin/npc/TzRekJadNPC.java rename to Server/src/plugin/npc/bosses/TzRekJadNPC.java index 7b127dc76..9c3c1897c 100644 --- a/Server/src/plugin/npc/TzRekJadNPC.java +++ b/Server/src/plugin/npc/bosses/TzRekJadNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.bosses; import org.crandor.cache.def.impl.NPCDefinition; import org.crandor.game.content.dialogue.DialogueInterpreter; diff --git a/Server/src/plugin/npc/corp/CorporealBeastNPC.java b/Server/src/plugin/npc/bosses/corp/CorporealBeastNPC.java similarity index 99% rename from Server/src/plugin/npc/corp/CorporealBeastNPC.java rename to Server/src/plugin/npc/bosses/corp/CorporealBeastNPC.java index b8b9979a9..a0b92bf59 100644 --- a/Server/src/plugin/npc/corp/CorporealBeastNPC.java +++ b/Server/src/plugin/npc/bosses/corp/CorporealBeastNPC.java @@ -1,4 +1,4 @@ -package plugin.npc.corp; +package plugin.npc.bosses.corp; import java.util.ArrayList; import java.util.List; diff --git a/Server/src/plugin/npc/corp/DarkEnergyCoreNPC.java b/Server/src/plugin/npc/bosses/corp/DarkEnergyCoreNPC.java similarity index 98% rename from Server/src/plugin/npc/corp/DarkEnergyCoreNPC.java rename to Server/src/plugin/npc/bosses/corp/DarkEnergyCoreNPC.java index f4b59604f..b69cca40f 100644 --- a/Server/src/plugin/npc/corp/DarkEnergyCoreNPC.java +++ b/Server/src/plugin/npc/bosses/corp/DarkEnergyCoreNPC.java @@ -1,4 +1,4 @@ -package plugin.npc.corp; +package plugin.npc.bosses.corp; import org.crandor.game.node.entity.Entity; import org.crandor.game.node.entity.combat.ImpactHandler.HitsplatType; diff --git a/Server/src/plugin/npc/kraken/CaveKrakenNPC.java b/Server/src/plugin/npc/bosses/kraken/CaveKrakenNPC.java similarity index 98% rename from Server/src/plugin/npc/kraken/CaveKrakenNPC.java rename to Server/src/plugin/npc/bosses/kraken/CaveKrakenNPC.java index c3379934b..15073cfdc 100644 --- a/Server/src/plugin/npc/kraken/CaveKrakenNPC.java +++ b/Server/src/plugin/npc/bosses/kraken/CaveKrakenNPC.java @@ -1,4 +1,4 @@ -package plugin.npc.kraken; +package plugin.npc.bosses.kraken; import org.crandor.game.node.entity.Entity; import org.crandor.game.node.entity.combat.BattleState; diff --git a/Server/src/plugin/npc/kraken/EnormousTentacleNPC.java b/Server/src/plugin/npc/bosses/kraken/EnormousTentacleNPC.java similarity index 98% rename from Server/src/plugin/npc/kraken/EnormousTentacleNPC.java rename to Server/src/plugin/npc/bosses/kraken/EnormousTentacleNPC.java index 33fbdcfbb..ec34d8368 100644 --- a/Server/src/plugin/npc/kraken/EnormousTentacleNPC.java +++ b/Server/src/plugin/npc/bosses/kraken/EnormousTentacleNPC.java @@ -1,4 +1,4 @@ -package plugin.npc.kraken; +package plugin.npc.bosses.kraken; import org.crandor.game.node.entity.Entity; import org.crandor.game.node.entity.combat.CombatPulse; diff --git a/Server/src/plugin/npc/kraken/KrakenNPC.java b/Server/src/plugin/npc/bosses/kraken/KrakenNPC.java similarity index 99% rename from Server/src/plugin/npc/kraken/KrakenNPC.java rename to Server/src/plugin/npc/bosses/kraken/KrakenNPC.java index 769a9d662..cadc19c70 100644 --- a/Server/src/plugin/npc/kraken/KrakenNPC.java +++ b/Server/src/plugin/npc/bosses/kraken/KrakenNPC.java @@ -1,4 +1,4 @@ -package plugin.npc.kraken; +package plugin.npc.bosses.kraken; import org.crandor.game.content.global.BossKillCounter; import org.crandor.game.node.entity.Entity; diff --git a/Server/src/plugin/npc/ChaosElementalNPC.java b/Server/src/plugin/npc/bosses/wilderness/ChaosElementalNPC.java similarity index 99% rename from Server/src/plugin/npc/ChaosElementalNPC.java rename to Server/src/plugin/npc/bosses/wilderness/ChaosElementalNPC.java index b087eba73..76ba0494a 100644 --- a/Server/src/plugin/npc/ChaosElementalNPC.java +++ b/Server/src/plugin/npc/bosses/wilderness/ChaosElementalNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.bosses.wilderness; import org.crandor.game.content.global.BossKillCounter; import org.crandor.game.node.entity.Entity; diff --git a/Server/src/plugin/npc/CrazyArchaeologistNPC.java b/Server/src/plugin/npc/bosses/wilderness/CrazyArchaeologistNPC.java similarity index 99% rename from Server/src/plugin/npc/CrazyArchaeologistNPC.java rename to Server/src/plugin/npc/bosses/wilderness/CrazyArchaeologistNPC.java index 5fb9a1484..d43d2a6b1 100644 --- a/Server/src/plugin/npc/CrazyArchaeologistNPC.java +++ b/Server/src/plugin/npc/bosses/wilderness/CrazyArchaeologistNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.bosses.wilderness; import java.util.ArrayList; import java.util.List; diff --git a/Server/src/plugin/npc/KingBlackDragonNPC.java b/Server/src/plugin/npc/bosses/wilderness/KingBlackDragonNPC.java similarity index 99% rename from Server/src/plugin/npc/KingBlackDragonNPC.java rename to Server/src/plugin/npc/bosses/wilderness/KingBlackDragonNPC.java index 18423dc75..66685e8db 100644 --- a/Server/src/plugin/npc/KingBlackDragonNPC.java +++ b/Server/src/plugin/npc/bosses/wilderness/KingBlackDragonNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.bosses.wilderness; import org.crandor.game.content.global.BossKillCounter; import org.crandor.game.node.entity.Entity; diff --git a/Server/src/plugin/npc/callisto/CallistoNPC.java b/Server/src/plugin/npc/bosses/wilderness/callisto/CallistoNPC.java similarity index 99% rename from Server/src/plugin/npc/callisto/CallistoNPC.java rename to Server/src/plugin/npc/bosses/wilderness/callisto/CallistoNPC.java index 45de3e798..80775a417 100644 --- a/Server/src/plugin/npc/callisto/CallistoNPC.java +++ b/Server/src/plugin/npc/bosses/wilderness/callisto/CallistoNPC.java @@ -1,4 +1,4 @@ -package plugin.npc.callisto; +package plugin.npc.bosses.wilderness.callisto; import org.crandor.game.content.global.BossKillCounter; import org.crandor.game.content.skill.Skills; diff --git a/Server/src/plugin/npc/venenatis/VenenatisNPC.java b/Server/src/plugin/npc/bosses/wilderness/venenatis/VenenatisNPC.java similarity index 99% rename from Server/src/plugin/npc/venenatis/VenenatisNPC.java rename to Server/src/plugin/npc/bosses/wilderness/venenatis/VenenatisNPC.java index 5488b735b..713bf7e57 100644 --- a/Server/src/plugin/npc/venenatis/VenenatisNPC.java +++ b/Server/src/plugin/npc/bosses/wilderness/venenatis/VenenatisNPC.java @@ -1,4 +1,4 @@ -package plugin.npc.venenatis; +package plugin.npc.bosses.wilderness.venenatis; import org.crandor.game.content.global.BossKillCounter; import org.crandor.game.node.entity.Entity; diff --git a/Server/src/plugin/npc/zulrah/ZulrahCombatHandler.java b/Server/src/plugin/npc/bosses/zulrah/ZulrahCombatHandler.java similarity index 96% rename from Server/src/plugin/npc/zulrah/ZulrahCombatHandler.java rename to Server/src/plugin/npc/bosses/zulrah/ZulrahCombatHandler.java index 9b7ba48f9..496d0aa05 100644 --- a/Server/src/plugin/npc/zulrah/ZulrahCombatHandler.java +++ b/Server/src/plugin/npc/bosses/zulrah/ZulrahCombatHandler.java @@ -1,4 +1,4 @@ -package plugin.npc.zulrah; +package plugin.npc.bosses.zulrah; import org.crandor.game.node.entity.combat.CombatStyle; import org.crandor.game.node.entity.combat.equipment.SwitchAttack; diff --git a/Server/src/plugin/npc/zulrah/ZulrahCutscene.java b/Server/src/plugin/npc/bosses/zulrah/ZulrahCutscene.java similarity index 98% rename from Server/src/plugin/npc/zulrah/ZulrahCutscene.java rename to Server/src/plugin/npc/bosses/zulrah/ZulrahCutscene.java index 16afe75cf..2776ab6a2 100644 --- a/Server/src/plugin/npc/zulrah/ZulrahCutscene.java +++ b/Server/src/plugin/npc/bosses/zulrah/ZulrahCutscene.java @@ -1,4 +1,4 @@ -package plugin.npc.zulrah; +package plugin.npc.bosses.zulrah; import org.crandor.game.content.activity.ActivityPlugin; import org.crandor.game.content.activity.CutscenePlugin; diff --git a/Server/src/plugin/npc/zulrah/ZulrahNPC.java b/Server/src/plugin/npc/bosses/zulrah/ZulrahNPC.java similarity index 99% rename from Server/src/plugin/npc/zulrah/ZulrahNPC.java rename to Server/src/plugin/npc/bosses/zulrah/ZulrahNPC.java index d23344cd3..d254c52f2 100644 --- a/Server/src/plugin/npc/zulrah/ZulrahNPC.java +++ b/Server/src/plugin/npc/bosses/zulrah/ZulrahNPC.java @@ -1,4 +1,4 @@ -package plugin.npc.zulrah; +package plugin.npc.bosses.zulrah; import org.crandor.game.content.global.BossKillCounter; import org.crandor.game.node.entity.Entity; diff --git a/Server/src/plugin/npc/zulrah/ZulrahPattern.java b/Server/src/plugin/npc/bosses/zulrah/ZulrahPattern.java similarity index 99% rename from Server/src/plugin/npc/zulrah/ZulrahPattern.java rename to Server/src/plugin/npc/bosses/zulrah/ZulrahPattern.java index caf03e4eb..b23542e58 100644 --- a/Server/src/plugin/npc/zulrah/ZulrahPattern.java +++ b/Server/src/plugin/npc/bosses/zulrah/ZulrahPattern.java @@ -1,4 +1,4 @@ -package plugin.npc.zulrah; +package plugin.npc.bosses.zulrah; import java.util.ArrayList; import java.util.List; diff --git a/Server/src/plugin/npc/zulrah/ZulrahPlugin.java b/Server/src/plugin/npc/bosses/zulrah/ZulrahPlugin.java similarity index 97% rename from Server/src/plugin/npc/zulrah/ZulrahPlugin.java rename to Server/src/plugin/npc/bosses/zulrah/ZulrahPlugin.java index 1c16f8c1d..1266f889e 100644 --- a/Server/src/plugin/npc/zulrah/ZulrahPlugin.java +++ b/Server/src/plugin/npc/bosses/zulrah/ZulrahPlugin.java @@ -1,4 +1,4 @@ -package plugin.npc.zulrah; +package plugin.npc.bosses.zulrah; import org.crandor.cache.def.impl.ObjectDefinition; import org.crandor.game.content.activity.ActivityManager; diff --git a/Server/src/plugin/npc/zulrah/ZulrahSpot.java b/Server/src/plugin/npc/bosses/zulrah/ZulrahSpot.java similarity index 99% rename from Server/src/plugin/npc/zulrah/ZulrahSpot.java rename to Server/src/plugin/npc/bosses/zulrah/ZulrahSpot.java index 55d662d65..c54489ad8 100644 --- a/Server/src/plugin/npc/zulrah/ZulrahSpot.java +++ b/Server/src/plugin/npc/bosses/zulrah/ZulrahSpot.java @@ -1,4 +1,4 @@ -package plugin.npc.zulrah; +package plugin.npc.bosses.zulrah; import org.crandor.game.world.map.Direction; import org.crandor.game.world.map.Location; diff --git a/Server/src/plugin/npc/zulrah/ZulrahType.java b/Server/src/plugin/npc/bosses/zulrah/ZulrahType.java similarity index 92% rename from Server/src/plugin/npc/zulrah/ZulrahType.java rename to Server/src/plugin/npc/bosses/zulrah/ZulrahType.java index b46c3795f..c61e3925c 100644 --- a/Server/src/plugin/npc/zulrah/ZulrahType.java +++ b/Server/src/plugin/npc/bosses/zulrah/ZulrahType.java @@ -1,4 +1,4 @@ -package plugin.npc.zulrah; +package plugin.npc.bosses.zulrah; /** * Represents the Zulrah Type. diff --git a/Server/src/plugin/interaction/city/nardah/AliTheCarter.java b/Server/src/plugin/npc/city/nardah/AliTheCarter.java similarity index 98% rename from Server/src/plugin/interaction/city/nardah/AliTheCarter.java rename to Server/src/plugin/npc/city/nardah/AliTheCarter.java index 987bca6d1..f33c59aaf 100644 --- a/Server/src/plugin/interaction/city/nardah/AliTheCarter.java +++ b/Server/src/plugin/npc/city/nardah/AliTheCarter.java @@ -1,4 +1,4 @@ -package plugin.interaction.city.nardah; +package plugin.npc.city.nardah; import org.crandor.game.content.dialogue.DialoguePlugin; import org.crandor.game.node.entity.npc.NPC; diff --git a/Server/src/plugin/interaction/city/nardah/ArtimeusDialogue.java b/Server/src/plugin/npc/city/nardah/ArtimeusDialogue.java similarity index 98% rename from Server/src/plugin/interaction/city/nardah/ArtimeusDialogue.java rename to Server/src/plugin/npc/city/nardah/ArtimeusDialogue.java index d5b7907f7..567936c26 100644 --- a/Server/src/plugin/interaction/city/nardah/ArtimeusDialogue.java +++ b/Server/src/plugin/npc/city/nardah/ArtimeusDialogue.java @@ -1,4 +1,4 @@ -package plugin.interaction.city.nardah; +package plugin.npc.city.nardah; import org.crandor.game.content.dialogue.DialoguePlugin; import org.crandor.game.node.entity.npc.NPC; diff --git a/Server/src/plugin/interaction/city/nardah/Awusah.java b/Server/src/plugin/npc/city/nardah/Awusah.java similarity index 96% rename from Server/src/plugin/interaction/city/nardah/Awusah.java rename to Server/src/plugin/npc/city/nardah/Awusah.java index b474c3f19..3939b2942 100644 --- a/Server/src/plugin/interaction/city/nardah/Awusah.java +++ b/Server/src/plugin/npc/city/nardah/Awusah.java @@ -1,4 +1,4 @@ -package plugin.interaction.city.nardah; +package plugin.npc.city.nardah; import org.crandor.game.content.dialogue.DialoguePlugin; import org.crandor.game.node.entity.player.Player; diff --git a/Server/src/plugin/interaction/city/nardah/Ghaslor.java b/Server/src/plugin/npc/city/nardah/Ghaslor.java similarity index 96% rename from Server/src/plugin/interaction/city/nardah/Ghaslor.java rename to Server/src/plugin/npc/city/nardah/Ghaslor.java index 88c83375b..84674d0aa 100644 --- a/Server/src/plugin/interaction/city/nardah/Ghaslor.java +++ b/Server/src/plugin/npc/city/nardah/Ghaslor.java @@ -1,4 +1,4 @@ -package plugin.interaction.city.nardah; +package plugin.npc.city.nardah; import org.crandor.game.content.dialogue.DialoguePlugin; import org.crandor.game.node.entity.player.Player; diff --git a/Server/src/plugin/interaction/city/nardah/Kazemde.java b/Server/src/plugin/npc/city/nardah/Kazemde.java similarity index 98% rename from Server/src/plugin/interaction/city/nardah/Kazemde.java rename to Server/src/plugin/npc/city/nardah/Kazemde.java index 2bac87ae3..0c4a722c2 100644 --- a/Server/src/plugin/interaction/city/nardah/Kazemde.java +++ b/Server/src/plugin/npc/city/nardah/Kazemde.java @@ -1,4 +1,4 @@ -package plugin.interaction.city.nardah; +package plugin.npc.city.nardah; import org.crandor.cache.def.impl.NPCDefinition; import org.crandor.game.content.dialogue.DialoguePlugin; diff --git a/Server/src/plugin/interaction/city/nardah/Rokuh.java b/Server/src/plugin/npc/city/nardah/Rokuh.java similarity index 98% rename from Server/src/plugin/interaction/city/nardah/Rokuh.java rename to Server/src/plugin/npc/city/nardah/Rokuh.java index 7e2ae1d8c..18b77c487 100644 --- a/Server/src/plugin/interaction/city/nardah/Rokuh.java +++ b/Server/src/plugin/npc/city/nardah/Rokuh.java @@ -1,4 +1,4 @@ -package plugin.interaction.city.nardah; +package plugin.npc.city.nardah; import org.crandor.cache.def.impl.NPCDefinition; import org.crandor.game.content.dialogue.DialoguePlugin; diff --git a/Server/src/plugin/interaction/city/nardah/Seddu.java b/Server/src/plugin/npc/city/nardah/Seddu.java similarity index 97% rename from Server/src/plugin/interaction/city/nardah/Seddu.java rename to Server/src/plugin/npc/city/nardah/Seddu.java index 72108d20e..87128363c 100644 --- a/Server/src/plugin/interaction/city/nardah/Seddu.java +++ b/Server/src/plugin/npc/city/nardah/Seddu.java @@ -1,4 +1,4 @@ -package plugin.interaction.city.nardah; +package plugin.npc.city.nardah; import org.crandor.game.content.dialogue.DialoguePlugin; import org.crandor.game.node.entity.npc.NPC; diff --git a/Server/src/plugin/interaction/city/pollnivneach/AliCamelMan.java b/Server/src/plugin/npc/city/pollnivneach/AliCamelMan.java similarity index 99% rename from Server/src/plugin/interaction/city/pollnivneach/AliCamelMan.java rename to Server/src/plugin/npc/city/pollnivneach/AliCamelMan.java index 5ad89fd7a..84f464952 100644 --- a/Server/src/plugin/interaction/city/pollnivneach/AliCamelMan.java +++ b/Server/src/plugin/npc/city/pollnivneach/AliCamelMan.java @@ -1,4 +1,4 @@ -package plugin.interaction.city.pollnivneach; +package plugin.npc.city.pollnivneach; import org.crandor.game.content.dialogue.DialoguePlugin; import org.crandor.game.content.dialogue.FacialExpression; diff --git a/Server/src/plugin/interaction/city/pollnivneach/AliTheCamelHandler.java b/Server/src/plugin/npc/city/pollnivneach/AliTheCamelHandler.java similarity index 98% rename from Server/src/plugin/interaction/city/pollnivneach/AliTheCamelHandler.java rename to Server/src/plugin/npc/city/pollnivneach/AliTheCamelHandler.java index 5cb74c730..b5f37f834 100644 --- a/Server/src/plugin/interaction/city/pollnivneach/AliTheCamelHandler.java +++ b/Server/src/plugin/npc/city/pollnivneach/AliTheCamelHandler.java @@ -1,4 +1,4 @@ -package plugin.interaction.city.pollnivneach; +package plugin.npc.city.pollnivneach; import org.crandor.cache.def.impl.NPCDefinition; import org.crandor.game.content.dialogue.DialoguePlugin; diff --git a/Server/src/plugin/interaction/city/pollnivneach/AliTheKebabSeller.java b/Server/src/plugin/npc/city/pollnivneach/AliTheKebabSeller.java similarity index 99% rename from Server/src/plugin/interaction/city/pollnivneach/AliTheKebabSeller.java rename to Server/src/plugin/npc/city/pollnivneach/AliTheKebabSeller.java index 18aaaf634..fb168653e 100644 --- a/Server/src/plugin/interaction/city/pollnivneach/AliTheKebabSeller.java +++ b/Server/src/plugin/npc/city/pollnivneach/AliTheKebabSeller.java @@ -1,4 +1,4 @@ -package plugin.interaction.city.pollnivneach; +package plugin.npc.city.pollnivneach; import org.crandor.game.content.dialogue.DialoguePlugin; import org.crandor.game.content.dialogue.FacialExpression; diff --git a/Server/src/plugin/interaction/city/pollnivneach/BlackJackSeller.java b/Server/src/plugin/npc/city/pollnivneach/BlackJackSeller.java similarity index 95% rename from Server/src/plugin/interaction/city/pollnivneach/BlackJackSeller.java rename to Server/src/plugin/npc/city/pollnivneach/BlackJackSeller.java index 28404030f..21c520cdd 100644 --- a/Server/src/plugin/interaction/city/pollnivneach/BlackJackSeller.java +++ b/Server/src/plugin/npc/city/pollnivneach/BlackJackSeller.java @@ -1,4 +1,4 @@ -package plugin.interaction.city.pollnivneach; +package plugin.npc.city.pollnivneach; import org.crandor.game.content.dialogue.DialoguePlugin; import org.crandor.game.node.entity.player.Player; diff --git a/Server/src/plugin/interaction/city/pollnivneach/DesertBandit.java b/Server/src/plugin/npc/city/pollnivneach/DesertBandit.java similarity index 97% rename from Server/src/plugin/interaction/city/pollnivneach/DesertBandit.java rename to Server/src/plugin/npc/city/pollnivneach/DesertBandit.java index 9ade52f8f..29929929a 100644 --- a/Server/src/plugin/interaction/city/pollnivneach/DesertBandit.java +++ b/Server/src/plugin/npc/city/pollnivneach/DesertBandit.java @@ -1,4 +1,4 @@ -package plugin.interaction.city.pollnivneach; +package plugin.npc.city.pollnivneach; import org.crandor.cache.def.impl.NPCDefinition; import org.crandor.game.content.dialogue.DialoguePlugin; diff --git a/Server/src/plugin/interaction/city/pollnivneach/SnakeCharmerBasket.java b/Server/src/plugin/npc/city/pollnivneach/SnakeCharmerBasket.java similarity index 98% rename from Server/src/plugin/interaction/city/pollnivneach/SnakeCharmerBasket.java rename to Server/src/plugin/npc/city/pollnivneach/SnakeCharmerBasket.java index ad4cb35bc..9e3e0f9ca 100644 --- a/Server/src/plugin/interaction/city/pollnivneach/SnakeCharmerBasket.java +++ b/Server/src/plugin/npc/city/pollnivneach/SnakeCharmerBasket.java @@ -1,4 +1,4 @@ -package plugin.interaction.city.pollnivneach; +package plugin.npc.city.pollnivneach; import org.crandor.game.content.dialogue.DialoguePlugin; import org.crandor.game.content.dialogue.FacialExpression; diff --git a/Server/src/plugin/interaction/city/pollnivneach/StreetUrchinDialogue.java b/Server/src/plugin/npc/city/pollnivneach/StreetUrchinDialogue.java similarity index 95% rename from Server/src/plugin/interaction/city/pollnivneach/StreetUrchinDialogue.java rename to Server/src/plugin/npc/city/pollnivneach/StreetUrchinDialogue.java index 518ce110e..4aee48b58 100644 --- a/Server/src/plugin/interaction/city/pollnivneach/StreetUrchinDialogue.java +++ b/Server/src/plugin/npc/city/pollnivneach/StreetUrchinDialogue.java @@ -1,4 +1,4 @@ -package plugin.interaction.city.pollnivneach; +package plugin.npc.city.pollnivneach; import org.crandor.game.content.dialogue.DialoguePlugin; import org.crandor.game.node.entity.player.Player; diff --git a/Server/src/plugin/interaction/city/sophanem/KlenterNPC.java b/Server/src/plugin/npc/city/sophanem/KlenterNPC.java similarity index 91% rename from Server/src/plugin/interaction/city/sophanem/KlenterNPC.java rename to Server/src/plugin/npc/city/sophanem/KlenterNPC.java index 92342ab9e..7ef585673 100644 --- a/Server/src/plugin/interaction/city/sophanem/KlenterNPC.java +++ b/Server/src/plugin/npc/city/sophanem/KlenterNPC.java @@ -1,7 +1,6 @@ -package plugin.interaction.city.sophanem; +package plugin.npc.city.sophanem; import org.crandor.game.content.dialogue.DialoguePlugin; -import org.crandor.game.node.entity.npc.NPC; import org.crandor.game.node.entity.player.Player; import org.crandor.plugin.InitializablePlugin; diff --git a/Server/src/plugin/interaction/city/sophanem/SphinxDialogue.java b/Server/src/plugin/npc/city/sophanem/SphinxDialogue.java similarity index 97% rename from Server/src/plugin/interaction/city/sophanem/SphinxDialogue.java rename to Server/src/plugin/npc/city/sophanem/SphinxDialogue.java index 5a346ebfa..8165e22ee 100644 --- a/Server/src/plugin/interaction/city/sophanem/SphinxDialogue.java +++ b/Server/src/plugin/npc/city/sophanem/SphinxDialogue.java @@ -1,6 +1,5 @@ -package plugin.interaction.city.sophanem; +package plugin.npc.city.sophanem; -import org.crandor.cache.def.impl.NPCDefinition; import org.crandor.game.content.dialogue.DialoguePlugin; import org.crandor.game.content.dialogue.FacialExpression; import org.crandor.game.node.entity.npc.NPC; diff --git a/Server/src/plugin/interaction/city/sophanem/TarikDialogue.java b/Server/src/plugin/npc/city/sophanem/TarikDialogue.java similarity index 96% rename from Server/src/plugin/interaction/city/sophanem/TarikDialogue.java rename to Server/src/plugin/npc/city/sophanem/TarikDialogue.java index 19817f607..8cb04953d 100644 --- a/Server/src/plugin/interaction/city/sophanem/TarikDialogue.java +++ b/Server/src/plugin/npc/city/sophanem/TarikDialogue.java @@ -1,4 +1,4 @@ -package plugin.interaction.city.sophanem; +package plugin.npc.city.sophanem; import org.crandor.game.content.dialogue.DialoguePlugin; import org.crandor.game.node.entity.player.Player; diff --git a/Server/src/plugin/interaction/city/sophanem/WallShortcut.java b/Server/src/plugin/npc/city/sophanem/WallShortcut.java similarity index 98% rename from Server/src/plugin/interaction/city/sophanem/WallShortcut.java rename to Server/src/plugin/npc/city/sophanem/WallShortcut.java index e7dcf7d88..6513807db 100644 --- a/Server/src/plugin/interaction/city/sophanem/WallShortcut.java +++ b/Server/src/plugin/npc/city/sophanem/WallShortcut.java @@ -1,4 +1,4 @@ -package plugin.interaction.city.sophanem; +package plugin.npc.city.sophanem; import org.crandor.cache.def.impl.ObjectDefinition; import org.crandor.game.content.skill.Skills; diff --git a/Server/src/plugin/npc/AlKharidWarriorPlugin.java b/Server/src/plugin/npc/other/AlKharidWarriorPlugin.java similarity index 99% rename from Server/src/plugin/npc/AlKharidWarriorPlugin.java rename to Server/src/plugin/npc/other/AlKharidWarriorPlugin.java index cc3df66d8..a780d4717 100644 --- a/Server/src/plugin/npc/AlKharidWarriorPlugin.java +++ b/Server/src/plugin/npc/other/AlKharidWarriorPlugin.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.cache.def.impl.NPCDefinition; import org.crandor.game.interaction.OptionHandler; diff --git a/Server/src/plugin/npc/AntonNPC.java b/Server/src/plugin/npc/other/AntonNPC.java similarity index 97% rename from Server/src/plugin/npc/AntonNPC.java rename to Server/src/plugin/npc/other/AntonNPC.java index de4379b8d..699256bb7 100644 --- a/Server/src/plugin/npc/AntonNPC.java +++ b/Server/src/plugin/npc/other/AntonNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.npc.AbstractNPC; import org.crandor.game.world.map.Location; diff --git a/Server/src/plugin/npc/ArmourSuitNPC.java b/Server/src/plugin/npc/other/ArmourSuitNPC.java similarity index 98% rename from Server/src/plugin/npc/ArmourSuitNPC.java rename to Server/src/plugin/npc/other/ArmourSuitNPC.java index a9ae1fc44..0d3f3a189 100644 --- a/Server/src/plugin/npc/ArmourSuitNPC.java +++ b/Server/src/plugin/npc/other/ArmourSuitNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.npc.AbstractNPC; import org.crandor.game.node.object.GameObject; diff --git a/Server/src/plugin/npc/BarbarianNPC.java b/Server/src/plugin/npc/other/BarbarianNPC.java similarity index 98% rename from Server/src/plugin/npc/BarbarianNPC.java rename to Server/src/plugin/npc/other/BarbarianNPC.java index 0f1ef44f9..7ac21549e 100644 --- a/Server/src/plugin/npc/BarbarianNPC.java +++ b/Server/src/plugin/npc/other/BarbarianNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.Entity; import org.crandor.game.node.entity.combat.BattleState; diff --git a/Server/src/plugin/npc/BennyNPC.java b/Server/src/plugin/npc/other/BennyNPC.java similarity index 98% rename from Server/src/plugin/npc/BennyNPC.java rename to Server/src/plugin/npc/other/BennyNPC.java index aabc83ee5..c9c8b5763 100644 --- a/Server/src/plugin/npc/BennyNPC.java +++ b/Server/src/plugin/npc/other/BennyNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.npc.AbstractNPC; import org.crandor.game.world.map.Location; diff --git a/Server/src/plugin/npc/BorkNPC.java b/Server/src/plugin/npc/other/BorkNPC.java similarity index 99% rename from Server/src/plugin/npc/BorkNPC.java rename to Server/src/plugin/npc/other/BorkNPC.java index 468872839..c96187053 100644 --- a/Server/src/plugin/npc/BorkNPC.java +++ b/Server/src/plugin/npc/other/BorkNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import java.util.ArrayList; import java.util.List; diff --git a/Server/src/plugin/npc/CatableponNPC.java b/Server/src/plugin/npc/other/CatableponNPC.java similarity index 98% rename from Server/src/plugin/npc/CatableponNPC.java rename to Server/src/plugin/npc/other/CatableponNPC.java index c1a68d9d5..34885c16b 100644 --- a/Server/src/plugin/npc/CatableponNPC.java +++ b/Server/src/plugin/npc/other/CatableponNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.combat.CombatSpell; import org.crandor.game.node.entity.combat.CombatStyle; diff --git a/Server/src/plugin/npc/ChromaticDragonNPC.java b/Server/src/plugin/npc/other/ChromaticDragonNPC.java similarity index 98% rename from Server/src/plugin/npc/ChromaticDragonNPC.java rename to Server/src/plugin/npc/other/ChromaticDragonNPC.java index 7fc4eab41..1276fbecf 100644 --- a/Server/src/plugin/npc/ChromaticDragonNPC.java +++ b/Server/src/plugin/npc/other/ChromaticDragonNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.combat.CombatStyle; import org.crandor.game.node.entity.combat.CombatSwingHandler; diff --git a/Server/src/plugin/npc/CitizenNPC.java b/Server/src/plugin/npc/other/CitizenNPC.java similarity index 98% rename from Server/src/plugin/npc/CitizenNPC.java rename to Server/src/plugin/npc/other/CitizenNPC.java index 08e9301fa..43a059dc6 100644 --- a/Server/src/plugin/npc/CitizenNPC.java +++ b/Server/src/plugin/npc/other/CitizenNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.content.skill.Skills; import org.crandor.game.node.entity.npc.AbstractNPC; diff --git a/Server/src/plugin/npc/CowNPC.java b/Server/src/plugin/npc/other/CowNPC.java similarity index 97% rename from Server/src/plugin/npc/CowNPC.java rename to Server/src/plugin/npc/other/CowNPC.java index 7e5b880b2..0bf0af21d 100644 --- a/Server/src/plugin/npc/CowNPC.java +++ b/Server/src/plugin/npc/other/CowNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.npc.AbstractNPC; import org.crandor.game.world.map.Location; diff --git a/Server/src/plugin/npc/DarkWizardNPC.java b/Server/src/plugin/npc/other/DarkWizardNPC.java similarity index 98% rename from Server/src/plugin/npc/DarkWizardNPC.java rename to Server/src/plugin/npc/other/DarkWizardNPC.java index 67632d296..b6afb654c 100644 --- a/Server/src/plugin/npc/DarkWizardNPC.java +++ b/Server/src/plugin/npc/other/DarkWizardNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.Entity; import org.crandor.game.node.entity.combat.BattleState; diff --git a/Server/src/plugin/npc/DraynorTreeNPC.java b/Server/src/plugin/npc/other/DraynorTreeNPC.java similarity index 98% rename from Server/src/plugin/npc/DraynorTreeNPC.java rename to Server/src/plugin/npc/other/DraynorTreeNPC.java index c5e7dfdb6..02ca84fb4 100644 --- a/Server/src/plugin/npc/DraynorTreeNPC.java +++ b/Server/src/plugin/npc/other/DraynorTreeNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import java.util.List; diff --git a/Server/src/plugin/npc/DuckNPC.java b/Server/src/plugin/npc/other/DuckNPC.java similarity index 97% rename from Server/src/plugin/npc/DuckNPC.java rename to Server/src/plugin/npc/other/DuckNPC.java index edc929505..089e1f585 100644 --- a/Server/src/plugin/npc/DuckNPC.java +++ b/Server/src/plugin/npc/other/DuckNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.npc.AbstractNPC; import org.crandor.game.world.map.Location; diff --git a/Server/src/plugin/npc/ElementalNPC.java b/Server/src/plugin/npc/other/ElementalNPC.java similarity index 99% rename from Server/src/plugin/npc/ElementalNPC.java rename to Server/src/plugin/npc/other/ElementalNPC.java index 9d43e1db6..fa3935d36 100644 --- a/Server/src/plugin/npc/ElementalNPC.java +++ b/Server/src/plugin/npc/other/ElementalNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import java.util.List; diff --git a/Server/src/plugin/npc/ElementalWizardNPC.java b/Server/src/plugin/npc/other/ElementalWizardNPC.java similarity index 99% rename from Server/src/plugin/npc/ElementalWizardNPC.java rename to Server/src/plugin/npc/other/ElementalWizardNPC.java index fc52c15a9..6e8817465 100644 --- a/Server/src/plugin/npc/ElementalWizardNPC.java +++ b/Server/src/plugin/npc/other/ElementalWizardNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.content.dialogue.DialoguePlugin; import org.crandor.game.content.skill.Skills; diff --git a/Server/src/plugin/npc/FishingNPC.java b/Server/src/plugin/npc/other/FishingNPC.java similarity index 98% rename from Server/src/plugin/npc/FishingNPC.java rename to Server/src/plugin/npc/other/FishingNPC.java index d30fbce19..9595786f9 100644 --- a/Server/src/plugin/npc/FishingNPC.java +++ b/Server/src/plugin/npc/other/FishingNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.content.skill.free.fishing.FishSpots; import org.crandor.game.node.entity.npc.AbstractNPC; diff --git a/Server/src/plugin/npc/GoblinVillageNPC.java b/Server/src/plugin/npc/other/GoblinVillageNPC.java similarity index 99% rename from Server/src/plugin/npc/GoblinVillageNPC.java rename to Server/src/plugin/npc/other/GoblinVillageNPC.java index 7bd196890..75d82b40f 100644 --- a/Server/src/plugin/npc/GoblinVillageNPC.java +++ b/Server/src/plugin/npc/other/GoblinVillageNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import java.util.List; diff --git a/Server/src/plugin/npc/GraveStoneNPC.java b/Server/src/plugin/npc/other/GraveStoneNPC.java similarity index 99% rename from Server/src/plugin/npc/GraveStoneNPC.java rename to Server/src/plugin/npc/other/GraveStoneNPC.java index 0dd429001..c53f40b1d 100644 --- a/Server/src/plugin/npc/GraveStoneNPC.java +++ b/Server/src/plugin/npc/other/GraveStoneNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import java.util.List; diff --git a/Server/src/plugin/npc/GuardNPC.java b/Server/src/plugin/npc/other/GuardNPC.java similarity index 98% rename from Server/src/plugin/npc/GuardNPC.java rename to Server/src/plugin/npc/other/GuardNPC.java index d08d0fad5..150d52a2b 100644 --- a/Server/src/plugin/npc/GuardNPC.java +++ b/Server/src/plugin/npc/other/GuardNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.npc.AbstractNPC; import org.crandor.plugin.InitializablePlugin; diff --git a/Server/src/plugin/npc/HansNPC.java b/Server/src/plugin/npc/other/HansNPC.java similarity index 96% rename from Server/src/plugin/npc/HansNPC.java rename to Server/src/plugin/npc/other/HansNPC.java index 5d49281ae..3bc6fc63d 100644 --- a/Server/src/plugin/npc/HansNPC.java +++ b/Server/src/plugin/npc/other/HansNPC.java @@ -1,8 +1,7 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.npc.AbstractNPC; import org.crandor.game.world.map.Location; -import org.crandor.plugin.InitializablePlugin; import org.crandor.plugin.Plugin; /** diff --git a/Server/src/plugin/npc/HighwayManNPC.java b/Server/src/plugin/npc/other/HighwayManNPC.java similarity index 98% rename from Server/src/plugin/npc/HighwayManNPC.java rename to Server/src/plugin/npc/other/HighwayManNPC.java index eada52273..43697ec8e 100644 --- a/Server/src/plugin/npc/HighwayManNPC.java +++ b/Server/src/plugin/npc/other/HighwayManNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.Entity; import org.crandor.game.node.entity.npc.AbstractNPC; diff --git a/Server/src/plugin/npc/JogreNPC.java b/Server/src/plugin/npc/other/JogreNPC.java similarity index 98% rename from Server/src/plugin/npc/JogreNPC.java rename to Server/src/plugin/npc/other/JogreNPC.java index bf59607cb..ebaf774d5 100644 --- a/Server/src/plugin/npc/JogreNPC.java +++ b/Server/src/plugin/npc/other/JogreNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.Entity; import org.crandor.game.node.entity.npc.AbstractNPC; diff --git a/Server/src/plugin/npc/KamfreenaNPC.java b/Server/src/plugin/npc/other/KamfreenaNPC.java similarity index 98% rename from Server/src/plugin/npc/KamfreenaNPC.java rename to Server/src/plugin/npc/other/KamfreenaNPC.java index 4d3d194e3..e3452b2a9 100644 --- a/Server/src/plugin/npc/KamfreenaNPC.java +++ b/Server/src/plugin/npc/other/KamfreenaNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.npc.AbstractNPC; import org.crandor.game.world.map.Location; diff --git a/Server/src/plugin/npc/LumberKittenNPC.java b/Server/src/plugin/npc/other/LumberKittenNPC.java similarity index 98% rename from Server/src/plugin/npc/LumberKittenNPC.java rename to Server/src/plugin/npc/other/LumberKittenNPC.java index 2b63e5888..f752ea573 100644 --- a/Server/src/plugin/npc/LumberKittenNPC.java +++ b/Server/src/plugin/npc/other/LumberKittenNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.npc.AbstractNPC; import org.crandor.game.node.entity.player.Player; diff --git a/Server/src/plugin/npc/LumbridgeInstructorNPC.java b/Server/src/plugin/npc/other/LumbridgeInstructorNPC.java similarity index 98% rename from Server/src/plugin/npc/LumbridgeInstructorNPC.java rename to Server/src/plugin/npc/other/LumbridgeInstructorNPC.java index 465d285ee..840894ad8 100644 --- a/Server/src/plugin/npc/LumbridgeInstructorNPC.java +++ b/Server/src/plugin/npc/other/LumbridgeInstructorNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.npc.AbstractNPC; import org.crandor.game.world.map.Location; diff --git a/Server/src/plugin/npc/MetalDragonNPC.java b/Server/src/plugin/npc/other/MetalDragonNPC.java similarity index 99% rename from Server/src/plugin/npc/MetalDragonNPC.java rename to Server/src/plugin/npc/other/MetalDragonNPC.java index 24e322219..e083c3e07 100644 --- a/Server/src/plugin/npc/MetalDragonNPC.java +++ b/Server/src/plugin/npc/other/MetalDragonNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.Entity; import org.crandor.game.node.entity.combat.CombatStyle; diff --git a/Server/src/plugin/npc/MonkNPC.java b/Server/src/plugin/npc/other/MonkNPC.java similarity index 98% rename from Server/src/plugin/npc/MonkNPC.java rename to Server/src/plugin/npc/other/MonkNPC.java index a5ff83fc3..0cf0cd67f 100644 --- a/Server/src/plugin/npc/MonkNPC.java +++ b/Server/src/plugin/npc/other/MonkNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.Entity; import org.crandor.game.node.entity.combat.BattleState; diff --git a/Server/src/plugin/npc/RatNPC.java b/Server/src/plugin/npc/other/RatNPC.java similarity index 98% rename from Server/src/plugin/npc/RatNPC.java rename to Server/src/plugin/npc/other/RatNPC.java index 6170a9be6..6508171c8 100644 --- a/Server/src/plugin/npc/RatNPC.java +++ b/Server/src/plugin/npc/other/RatNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.Entity; import org.crandor.game.node.entity.npc.AbstractNPC; diff --git a/Server/src/plugin/npc/RatTutorialNPC.java b/Server/src/plugin/npc/other/RatTutorialNPC.java similarity index 98% rename from Server/src/plugin/npc/RatTutorialNPC.java rename to Server/src/plugin/npc/other/RatTutorialNPC.java index 8d3497892..31abe407f 100644 --- a/Server/src/plugin/npc/RatTutorialNPC.java +++ b/Server/src/plugin/npc/other/RatTutorialNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.content.global.tutorial.TutorialSession; import org.crandor.game.content.global.tutorial.TutorialStage; diff --git a/Server/src/plugin/npc/RockCrabNPC.java b/Server/src/plugin/npc/other/RockCrabNPC.java similarity index 98% rename from Server/src/plugin/npc/RockCrabNPC.java rename to Server/src/plugin/npc/other/RockCrabNPC.java index d7764ce44..da05a1698 100644 --- a/Server/src/plugin/npc/RockCrabNPC.java +++ b/Server/src/plugin/npc/other/RockCrabNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.Entity; import org.crandor.game.node.entity.combat.BattleState; diff --git a/Server/src/plugin/npc/SandwichLadyNPC.java b/Server/src/plugin/npc/other/SandwichLadyNPC.java similarity index 98% rename from Server/src/plugin/npc/SandwichLadyNPC.java rename to Server/src/plugin/npc/other/SandwichLadyNPC.java index 6d15868af..8d12a8e42 100644 --- a/Server/src/plugin/npc/SandwichLadyNPC.java +++ b/Server/src/plugin/npc/other/SandwichLadyNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.npc.AbstractNPC; import org.crandor.game.world.map.Location; diff --git a/Server/src/plugin/npc/ShanomiNPC.java b/Server/src/plugin/npc/other/ShanomiNPC.java similarity index 98% rename from Server/src/plugin/npc/ShanomiNPC.java rename to Server/src/plugin/npc/other/ShanomiNPC.java index d6eb5f03e..4ae71dcd3 100644 --- a/Server/src/plugin/npc/ShanomiNPC.java +++ b/Server/src/plugin/npc/other/ShanomiNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.npc.AbstractNPC; import org.crandor.game.world.map.Location; diff --git a/Server/src/plugin/npc/SheepNPC.java b/Server/src/plugin/npc/other/SheepNPC.java similarity index 98% rename from Server/src/plugin/npc/SheepNPC.java rename to Server/src/plugin/npc/other/SheepNPC.java index 99c3f8309..35d52c464 100644 --- a/Server/src/plugin/npc/SheepNPC.java +++ b/Server/src/plugin/npc/other/SheepNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.combat.DeathTask; import org.crandor.game.node.entity.npc.AbstractNPC; diff --git a/Server/src/plugin/npc/ShopNPC.java b/Server/src/plugin/npc/other/ShopNPC.java similarity index 98% rename from Server/src/plugin/npc/ShopNPC.java rename to Server/src/plugin/npc/other/ShopNPC.java index ddea53087..ea33a0d57 100644 --- a/Server/src/plugin/npc/ShopNPC.java +++ b/Server/src/plugin/npc/other/ShopNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.npc.AbstractNPC; import org.crandor.plugin.InitializablePlugin; diff --git a/Server/src/plugin/npc/SkippyNPC.java b/Server/src/plugin/npc/other/SkippyNPC.java similarity index 97% rename from Server/src/plugin/npc/SkippyNPC.java rename to Server/src/plugin/npc/other/SkippyNPC.java index ca96bd293..e755a06a9 100644 --- a/Server/src/plugin/npc/SkippyNPC.java +++ b/Server/src/plugin/npc/other/SkippyNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.npc.AbstractNPC; import org.crandor.game.world.map.Location; diff --git a/Server/src/plugin/npc/StrayDogNPC.java b/Server/src/plugin/npc/other/StrayDogNPC.java similarity index 99% rename from Server/src/plugin/npc/StrayDogNPC.java rename to Server/src/plugin/npc/other/StrayDogNPC.java index 86138e33c..8bc3a2605 100644 --- a/Server/src/plugin/npc/StrayDogNPC.java +++ b/Server/src/plugin/npc/other/StrayDogNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import java.util.ArrayList; import java.util.List; diff --git a/Server/src/plugin/npc/Student.java b/Server/src/plugin/npc/other/Student.java similarity index 97% rename from Server/src/plugin/npc/Student.java rename to Server/src/plugin/npc/other/Student.java index 16f4118c2..4d6e28e91 100644 --- a/Server/src/plugin/npc/Student.java +++ b/Server/src/plugin/npc/other/Student.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.cache.def.impl.NPCDefinition; import org.crandor.game.interaction.OptionHandler; diff --git a/Server/src/plugin/npc/ThrowerTrollNPC.java b/Server/src/plugin/npc/other/ThrowerTrollNPC.java similarity index 98% rename from Server/src/plugin/npc/ThrowerTrollNPC.java rename to Server/src/plugin/npc/other/ThrowerTrollNPC.java index 9a75dfbcc..65a9a30f6 100644 --- a/Server/src/plugin/npc/ThrowerTrollNPC.java +++ b/Server/src/plugin/npc/other/ThrowerTrollNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.Entity; import org.crandor.game.node.entity.combat.CombatStyle; diff --git a/Server/src/plugin/npc/TribesmanNPC.java b/Server/src/plugin/npc/other/TribesmanNPC.java similarity index 97% rename from Server/src/plugin/npc/TribesmanNPC.java rename to Server/src/plugin/npc/other/TribesmanNPC.java index 65a83d7a1..268480597 100644 --- a/Server/src/plugin/npc/TribesmanNPC.java +++ b/Server/src/plugin/npc/other/TribesmanNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.npc.AbstractNPC; import org.crandor.game.system.mysql.impl.NPCConfigSQLHandler; diff --git a/Server/src/plugin/npc/TutorialChickenNPC.java b/Server/src/plugin/npc/other/TutorialChickenNPC.java similarity index 98% rename from Server/src/plugin/npc/TutorialChickenNPC.java rename to Server/src/plugin/npc/other/TutorialChickenNPC.java index edeb02a96..6263cc8b7 100644 --- a/Server/src/plugin/npc/TutorialChickenNPC.java +++ b/Server/src/plugin/npc/other/TutorialChickenNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.content.global.tutorial.TutorialSession; import org.crandor.game.content.global.tutorial.TutorialStage; diff --git a/Server/src/plugin/npc/VampireSlayerNPC.java b/Server/src/plugin/npc/other/VampireSlayerNPC.java similarity index 99% rename from Server/src/plugin/npc/VampireSlayerNPC.java rename to Server/src/plugin/npc/other/VampireSlayerNPC.java index 7478b559b..987a20f50 100644 --- a/Server/src/plugin/npc/VampireSlayerNPC.java +++ b/Server/src/plugin/npc/other/VampireSlayerNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.content.skill.Skills; import org.crandor.game.node.entity.Entity; diff --git a/Server/src/plugin/npc/WerewolfNPC.java b/Server/src/plugin/npc/other/WerewolfNPC.java similarity index 97% rename from Server/src/plugin/npc/WerewolfNPC.java rename to Server/src/plugin/npc/other/WerewolfNPC.java index cf44894d1..19d3398e9 100644 --- a/Server/src/plugin/npc/WerewolfNPC.java +++ b/Server/src/plugin/npc/other/WerewolfNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.Entity; import org.crandor.game.node.entity.npc.AbstractNPC; diff --git a/Server/src/plugin/npc/ZombieNPC.java b/Server/src/plugin/npc/other/ZombieNPC.java similarity index 98% rename from Server/src/plugin/npc/ZombieNPC.java rename to Server/src/plugin/npc/other/ZombieNPC.java index b67f318d1..50e585837 100644 --- a/Server/src/plugin/npc/ZombieNPC.java +++ b/Server/src/plugin/npc/other/ZombieNPC.java @@ -1,4 +1,4 @@ -package plugin.npc; +package plugin.npc.other; import org.crandor.game.node.entity.Entity; import org.crandor.game.node.entity.npc.AbstractNPC; diff --git a/Server/src/plugin/skill/cooking/CookingPlugin.java b/Server/src/plugin/skill/cooking/CookingPlugin.java index 3ce6f8977..4eeea6df2 100644 --- a/Server/src/plugin/skill/cooking/CookingPlugin.java +++ b/Server/src/plugin/skill/cooking/CookingPlugin.java @@ -30,7 +30,7 @@ public final class CookingPlugin extends UseWithHandler { * Constructs a new {@code CookingPlugin} {@code Object}. */ public CookingPlugin() { - super(10816, 2138, 2142, 2134, 3142, 2136, 1859, 3226, 7518, 3150, 327, 321, 345, 353, 335, 341, 349, 331, 3379, 359, 10138, 5001, 377, 363, 371, 2148, 7944, 383, 395, 389, 3363, 3365, 3367, 5986, 401, 1942, 4237, 2001, 7076, 1871, 7080, 2307, 1889, 2132, 2132, 2132, 2132, 2321, 2319, 7168, 2317, 7176, 7186, 7196, 7206, 7216, 2287, 317, 9986, 2876, 7566, 9984, 7224); + super(2142, 4293, 10816, 2138, 2142, 2134, 3142, 2136, 1859, 3226, 7518, 3150, 327, 321, 345, 353, 335, 341, 349, 331, 3379, 359, 10138, 5001, 377, 363, 371, 2148, 7944, 383, 395, 389, 3363, 3365, 3367, 5986, 401, 1942, 4237, 2001, 7076, 1871, 7080, 2307, 1889, 2132, 2132, 2132, 2132, 2321, 2319, 7168, 2317, 7176, 7186, 7196, 7206, 7216, 2287, 317, 9986, 2876, 7566, 9984, 7224); } @Override