diff --git a/Server/build.gradle b/Server/build.gradle index e41dee3f0..97d88ed02 100644 --- a/Server/build.gradle +++ b/Server/build.gradle @@ -25,7 +25,7 @@ dependencies { implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2' implementation files( "libs/PrimitiveExtensions-1.0.jar", - "libs/ConstLib-1.2.jar", + "libs/ConstLib-1.3.jar", "libs/json-simple-1.1.1.jar", "libs/markdown-jvm-0.2.4.jar", "libs/classgraph-4.8.98.jar", diff --git a/Server/libs/ConstLib-1.2.jar b/Server/libs/ConstLib-1.3.jar similarity index 55% rename from Server/libs/ConstLib-1.2.jar rename to Server/libs/ConstLib-1.3.jar index e8679d136..c46ffc6e9 100644 Binary files a/Server/libs/ConstLib-1.2.jar and b/Server/libs/ConstLib-1.3.jar differ diff --git a/Server/src/main/java/core/cache/def/impl/SceneryDefinition.java b/Server/src/main/java/core/cache/def/impl/SceneryDefinition.java index d2342d415..155a22803 100644 --- a/Server/src/main/java/core/cache/def/impl/SceneryDefinition.java +++ b/Server/src/main/java/core/cache/def/impl/SceneryDefinition.java @@ -5,7 +5,7 @@ import core.cache.def.Definition; import core.cache.misc.buffer.ByteBufferUtils; import core.game.interaction.OptionHandler; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import rs09.game.system.SystemLogger; import rs09.game.world.GameWorld; diff --git a/Server/src/main/java/core/game/content/activity/barrows/BarrowsActivityPlugin.java b/Server/src/main/java/core/game/content/activity/barrows/BarrowsActivityPlugin.java index 336b6aee7..be2820b4d 100644 --- a/Server/src/main/java/core/game/content/activity/barrows/BarrowsActivityPlugin.java +++ b/Server/src/main/java/core/game/content/activity/barrows/BarrowsActivityPlugin.java @@ -16,7 +16,7 @@ import core.game.node.entity.npc.agg.AggressiveHandler; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.ActivityData; import core.game.node.entity.skill.summoning.familiar.Familiar; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import core.game.world.map.Location; import core.game.world.map.RegionManager; diff --git a/Server/src/main/java/core/game/content/activity/barrows/BarrowsCrypt.java b/Server/src/main/java/core/game/content/activity/barrows/BarrowsCrypt.java index 7d30190fb..ce8c6da14 100644 --- a/Server/src/main/java/core/game/content/activity/barrows/BarrowsCrypt.java +++ b/Server/src/main/java/core/game/content/activity/barrows/BarrowsCrypt.java @@ -4,7 +4,7 @@ import core.game.content.global.action.DigAction; import core.game.content.global.action.DigSpadeHandler; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.RegionManager; diff --git a/Server/src/main/java/core/game/content/activity/bountyhunter/BHOptionHandler.java b/Server/src/main/java/core/game/content/activity/bountyhunter/BHOptionHandler.java index a0b20ec96..a87e47002 100644 --- a/Server/src/main/java/core/game/content/activity/bountyhunter/BHOptionHandler.java +++ b/Server/src/main/java/core/game/content/activity/bountyhunter/BHOptionHandler.java @@ -5,7 +5,7 @@ import core.game.content.activity.ActivityManager; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/content/activity/clanwars/ClanWarsActivityPlugin.java b/Server/src/main/java/core/game/content/activity/clanwars/ClanWarsActivityPlugin.java index fa07958d6..d154f5a48 100644 --- a/Server/src/main/java/core/game/content/activity/clanwars/ClanWarsActivityPlugin.java +++ b/Server/src/main/java/core/game/content/activity/clanwars/ClanWarsActivityPlugin.java @@ -16,8 +16,8 @@ import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.impl.PulseManager; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.ConfigurationManager.Configuration; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.communication.ClanEntry; import core.game.system.communication.ClanRepository; import core.game.system.task.Pulse; diff --git a/Server/src/main/java/core/game/content/activity/clanwars/ClanWarsChallengeRoom.java b/Server/src/main/java/core/game/content/activity/clanwars/ClanWarsChallengeRoom.java index bb55cf13c..46a609aa5 100644 --- a/Server/src/main/java/core/game/content/activity/clanwars/ClanWarsChallengeRoom.java +++ b/Server/src/main/java/core/game/content/activity/clanwars/ClanWarsChallengeRoom.java @@ -4,7 +4,7 @@ import core.game.interaction.Option; import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneBuilder; diff --git a/Server/src/main/java/core/game/content/activity/gnomecopter/GnomeCopterActivity.java b/Server/src/main/java/core/game/content/activity/gnomecopter/GnomeCopterActivity.java index 00b3acea5..f942472d5 100644 --- a/Server/src/main/java/core/game/content/activity/gnomecopter/GnomeCopterActivity.java +++ b/Server/src/main/java/core/game/content/activity/gnomecopter/GnomeCopterActivity.java @@ -9,8 +9,8 @@ import core.game.node.entity.Entity; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/content/activity/guild/CraftingGuildPlugin.java b/Server/src/main/java/core/game/content/activity/guild/CraftingGuildPlugin.java index 2a42fb592..dd3aedb80 100644 --- a/Server/src/main/java/core/game/content/activity/guild/CraftingGuildPlugin.java +++ b/Server/src/main/java/core/game/content/activity/guild/CraftingGuildPlugin.java @@ -12,7 +12,7 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/content/activity/guild/FishingGuild.java b/Server/src/main/java/core/game/content/activity/guild/FishingGuild.java index 04e422031..bff6904d3 100644 --- a/Server/src/main/java/core/game/content/activity/guild/FishingGuild.java +++ b/Server/src/main/java/core/game/content/activity/guild/FishingGuild.java @@ -9,7 +9,7 @@ import core.game.node.entity.skill.Skills; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/content/activity/guild/HeroGuildPlugin.java b/Server/src/main/java/core/game/content/activity/guild/HeroGuildPlugin.java index 3a2b34b41..fa46612bd 100644 --- a/Server/src/main/java/core/game/content/activity/guild/HeroGuildPlugin.java +++ b/Server/src/main/java/core/game/content/activity/guild/HeroGuildPlugin.java @@ -11,7 +11,7 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/content/activity/guild/MiningGuildPlugin.java b/Server/src/main/java/core/game/content/activity/guild/MiningGuildPlugin.java index e8a1c6944..d77056288 100644 --- a/Server/src/main/java/core/game/content/activity/guild/MiningGuildPlugin.java +++ b/Server/src/main/java/core/game/content/activity/guild/MiningGuildPlugin.java @@ -8,7 +8,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/content/activity/guild/RangingGuildPlugin.java b/Server/src/main/java/core/game/content/activity/guild/RangingGuildPlugin.java index e3c156830..8e445cd0b 100644 --- a/Server/src/main/java/core/game/content/activity/guild/RangingGuildPlugin.java +++ b/Server/src/main/java/core/game/content/activity/guild/RangingGuildPlugin.java @@ -28,7 +28,7 @@ import core.game.node.entity.impl.Projectile; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import core.game.world.map.Location; import core.game.world.map.RegionManager; diff --git a/Server/src/main/java/core/game/content/activity/guild/WizardGuildPlugin.java b/Server/src/main/java/core/game/content/activity/guild/WizardGuildPlugin.java index 3dfd6ad90..132a399c3 100644 --- a/Server/src/main/java/core/game/content/activity/guild/WizardGuildPlugin.java +++ b/Server/src/main/java/core/game/content/activity/guild/WizardGuildPlugin.java @@ -12,7 +12,7 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.skill.Skills; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/content/activity/gwd/GodwarsEntranceHandler.java b/Server/src/main/java/core/game/content/activity/gwd/GodwarsEntranceHandler.java index adaea18f0..41534ca4d 100644 --- a/Server/src/main/java/core/game/content/activity/gwd/GodwarsEntranceHandler.java +++ b/Server/src/main/java/core/game/content/activity/gwd/GodwarsEntranceHandler.java @@ -9,7 +9,7 @@ import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/activity/gwd/GodwarsMapzone.java b/Server/src/main/java/core/game/content/activity/gwd/GodwarsMapzone.java index 0b27e6034..4ab906656 100644 --- a/Server/src/main/java/core/game/content/activity/gwd/GodwarsMapzone.java +++ b/Server/src/main/java/core/game/content/activity/gwd/GodwarsMapzone.java @@ -14,7 +14,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.info.Rights; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/content/activity/magearena/MageArenaPlugin.java b/Server/src/main/java/core/game/content/activity/magearena/MageArenaPlugin.java index 4141ea044..7000ff01f 100644 --- a/Server/src/main/java/core/game/content/activity/magearena/MageArenaPlugin.java +++ b/Server/src/main/java/core/game/content/activity/magearena/MageArenaPlugin.java @@ -11,7 +11,7 @@ import core.game.node.entity.skill.agility.AgilityHandler; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import core.game.world.map.Direction; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/activity/mta/impl/AlchemistZone.java b/Server/src/main/java/core/game/content/activity/mta/impl/AlchemistZone.java index cdb4c2021..1282754b9 100644 --- a/Server/src/main/java/core/game/content/activity/mta/impl/AlchemistZone.java +++ b/Server/src/main/java/core/game/content/activity/mta/impl/AlchemistZone.java @@ -12,8 +12,8 @@ import core.game.node.entity.Entity; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/activity/mta/impl/EnchantingZone.java b/Server/src/main/java/core/game/content/activity/mta/impl/EnchantingZone.java index d1080b04c..a298f0f06 100644 --- a/Server/src/main/java/core/game/content/activity/mta/impl/EnchantingZone.java +++ b/Server/src/main/java/core/game/content/activity/mta/impl/EnchantingZone.java @@ -13,7 +13,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/activity/mta/impl/GraveyardZone.java b/Server/src/main/java/core/game/content/activity/mta/impl/GraveyardZone.java index c9c053c83..0e7e20ecb 100644 --- a/Server/src/main/java/core/game/content/activity/mta/impl/GraveyardZone.java +++ b/Server/src/main/java/core/game/content/activity/mta/impl/GraveyardZone.java @@ -10,8 +10,8 @@ import core.game.node.entity.Entity; import core.game.node.entity.combat.ImpactHandler.HitsplatType; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/activity/partyroom/BalloonManager.java b/Server/src/main/java/core/game/content/activity/partyroom/BalloonManager.java index a6f8a4092..8bbd52077 100644 --- a/Server/src/main/java/core/game/content/activity/partyroom/BalloonManager.java +++ b/Server/src/main/java/core/game/content/activity/partyroom/BalloonManager.java @@ -12,8 +12,8 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/activity/partyroom/PartyRoomPlugin.java b/Server/src/main/java/core/game/content/activity/partyroom/PartyRoomPlugin.java index ac0724d82..a6ae4b2ee 100644 --- a/Server/src/main/java/core/game/content/activity/partyroom/PartyRoomPlugin.java +++ b/Server/src/main/java/core/game/content/activity/partyroom/PartyRoomPlugin.java @@ -18,8 +18,8 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import kotlin.Unit; import rs09.game.world.GameWorld; diff --git a/Server/src/main/java/core/game/content/activity/pestcontrol/PCLanderZone.java b/Server/src/main/java/core/game/content/activity/pestcontrol/PCLanderZone.java index 0d4e3060e..d6205ae28 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/PCLanderZone.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/PCLanderZone.java @@ -4,7 +4,7 @@ import core.game.interaction.Option; import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneRestriction; diff --git a/Server/src/main/java/core/game/content/activity/pestcontrol/PCObjectHandler.java b/Server/src/main/java/core/game/content/activity/pestcontrol/PCObjectHandler.java index e79fefa3f..c7ae1396e 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/PCObjectHandler.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/PCObjectHandler.java @@ -9,8 +9,8 @@ import core.game.node.entity.player.Player; import rs09.game.ai.pvmbots.PvMBotsBuilder; import core.game.node.entity.player.info.Rights; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.RegionManager; diff --git a/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlSession.java b/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlSession.java index e5a8cd8b7..45ef3be6e 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlSession.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlSession.java @@ -11,7 +11,7 @@ import core.game.content.dialogue.FacialExpression; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.ConfigurationManager.Configuration; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.game.world.map.Point; import core.game.world.map.RegionPlane; diff --git a/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCRavagerNPC.java b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCRavagerNPC.java index e68e9d789..a7dd30cf3 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCRavagerNPC.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCRavagerNPC.java @@ -6,8 +6,8 @@ import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCSplatterNPC.java b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCSplatterNPC.java index 92ed3881d..3df492dce 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCSplatterNPC.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCSplatterNPC.java @@ -8,8 +8,8 @@ import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/activity/puropuro/PuroPuroPlugin.java b/Server/src/main/java/core/game/content/activity/puropuro/PuroPuroPlugin.java index 2e351fc2c..fede65a3f 100644 --- a/Server/src/main/java/core/game/content/activity/puropuro/PuroPuroPlugin.java +++ b/Server/src/main/java/core/game/content/activity/puropuro/PuroPuroPlugin.java @@ -17,8 +17,8 @@ import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.TeleportManager.TeleportType; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderObject.java b/Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderObject.java index 25166b95d..49c882bc9 100644 --- a/Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderObject.java +++ b/Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderObject.java @@ -1,7 +1,7 @@ package core.game.content.activity.pyramidplunder; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; /** * Object wrapper for pyramid plunder nodes diff --git a/Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderZones.java b/Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderZones.java index 55eebc501..6a2e2de5b 100644 --- a/Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderZones.java +++ b/Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderZones.java @@ -9,7 +9,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.skill.Skills; import core.game.node.item.Item; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidOptionHandler.java b/Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidOptionHandler.java index ed646888d..28788cf5b 100644 --- a/Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidOptionHandler.java +++ b/Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidOptionHandler.java @@ -8,10 +8,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; -import kotlin.Unit; -import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/content/activity/stronghold/StrongHoldSecurityPlugin.java b/Server/src/main/java/core/game/content/activity/stronghold/StrongHoldSecurityPlugin.java index a07972b2f..50227a414 100644 --- a/Server/src/main/java/core/game/content/activity/stronghold/StrongHoldSecurityPlugin.java +++ b/Server/src/main/java/core/game/content/activity/stronghold/StrongHoldSecurityPlugin.java @@ -15,7 +15,7 @@ import core.game.node.entity.Entity; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/activity/stronghold/playersafety/PSOptionHandler.java b/Server/src/main/java/core/game/content/activity/stronghold/playersafety/PSOptionHandler.java index 4fdf20945..9d2bc2c15 100644 --- a/Server/src/main/java/core/game/content/activity/stronghold/playersafety/PSOptionHandler.java +++ b/Server/src/main/java/core/game/content/activity/stronghold/playersafety/PSOptionHandler.java @@ -20,8 +20,8 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.emote.Emotes; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/content/activity/stronghold/playersafety/StrongHoldOfPlayerSafetyPlugin.java b/Server/src/main/java/core/game/content/activity/stronghold/playersafety/StrongHoldOfPlayerSafetyPlugin.java index 651ce6a9c..9501564fb 100644 --- a/Server/src/main/java/core/game/content/activity/stronghold/playersafety/StrongHoldOfPlayerSafetyPlugin.java +++ b/Server/src/main/java/core/game/content/activity/stronghold/playersafety/StrongHoldOfPlayerSafetyPlugin.java @@ -4,7 +4,7 @@ import core.game.component.CloseEvent; import core.game.component.Component; import core.game.component.ComponentPlugin; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.net.packet.PacketRepository; import core.net.packet.context.CameraContext; diff --git a/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightCavesPlugin.java b/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightCavesPlugin.java index f0fba5361..55d058535 100644 --- a/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightCavesPlugin.java +++ b/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightCavesPlugin.java @@ -12,7 +12,7 @@ import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.slayer.Tasks; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import core.game.world.map.Location; import core.game.world.map.build.DynamicRegion; diff --git a/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightPitsPlugin.java b/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightPitsPlugin.java index 79482f29d..06f651c79 100644 --- a/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightPitsPlugin.java +++ b/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightPitsPlugin.java @@ -22,7 +22,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/activity/wguild/WarriorsGuild.java b/Server/src/main/java/core/game/content/activity/wguild/WarriorsGuild.java index 3d3390a2f..9fd0abc29 100644 --- a/Server/src/main/java/core/game/content/activity/wguild/WarriorsGuild.java +++ b/Server/src/main/java/core/game/content/activity/wguild/WarriorsGuild.java @@ -10,7 +10,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Plugin; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/content/activity/wguild/animator/AnimationRoom.java b/Server/src/main/java/core/game/content/activity/wguild/animator/AnimationRoom.java index f091efbd4..67fbb13fe 100644 --- a/Server/src/main/java/core/game/content/activity/wguild/animator/AnimationRoom.java +++ b/Server/src/main/java/core/game/content/activity/wguild/animator/AnimationRoom.java @@ -7,7 +7,7 @@ import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.ItemLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; diff --git a/Server/src/main/java/core/game/content/activity/wguild/barrel/BarrelRoom.java b/Server/src/main/java/core/game/content/activity/wguild/barrel/BarrelRoom.java index 73a48d4fe..50b3eaa64 100644 --- a/Server/src/main/java/core/game/content/activity/wguild/barrel/BarrelRoom.java +++ b/Server/src/main/java/core/game/content/activity/wguild/barrel/BarrelRoom.java @@ -13,7 +13,7 @@ import core.game.node.entity.combat.ImpactHandler.HitsplatType; import core.game.node.entity.lock.Lock; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.zone.MapZone; diff --git a/Server/src/main/java/core/game/content/activity/wguild/catapult/CatapultRoom.java b/Server/src/main/java/core/game/content/activity/wguild/catapult/CatapultRoom.java index 47b4ae155..c19811a5b 100644 --- a/Server/src/main/java/core/game/content/activity/wguild/catapult/CatapultRoom.java +++ b/Server/src/main/java/core/game/content/activity/wguild/catapult/CatapultRoom.java @@ -19,8 +19,8 @@ import core.game.node.entity.impl.Projectile; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/activity/wguild/cyclopes/CyclopesRoom.java b/Server/src/main/java/core/game/content/activity/wguild/cyclopes/CyclopesRoom.java index 650069a1d..4ef808d96 100644 --- a/Server/src/main/java/core/game/content/activity/wguild/cyclopes/CyclopesRoom.java +++ b/Server/src/main/java/core/game/content/activity/wguild/cyclopes/CyclopesRoom.java @@ -17,7 +17,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/activity/wguild/dummy/DummyRoom.java b/Server/src/main/java/core/game/content/activity/wguild/dummy/DummyRoom.java index ea11ce859..060e58927 100644 --- a/Server/src/main/java/core/game/content/activity/wguild/dummy/DummyRoom.java +++ b/Server/src/main/java/core/game/content/activity/wguild/dummy/DummyRoom.java @@ -8,8 +8,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.combat.equipment.WeaponInterface; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/activity/wguild/shot/ShotPutRoom.java b/Server/src/main/java/core/game/content/activity/wguild/shot/ShotPutRoom.java index 205bd63d2..8504dc572 100644 --- a/Server/src/main/java/core/game/content/activity/wguild/shot/ShotPutRoom.java +++ b/Server/src/main/java/core/game/content/activity/wguild/shot/ShotPutRoom.java @@ -16,7 +16,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/cutscene/DBRCutscenePlugin.java b/Server/src/main/java/core/game/content/cutscene/DBRCutscenePlugin.java index ebc79438b..df29bf950 100644 --- a/Server/src/main/java/core/game/content/cutscene/DBRCutscenePlugin.java +++ b/Server/src/main/java/core/game/content/cutscene/DBRCutscenePlugin.java @@ -19,8 +19,8 @@ import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.node.item.ItemPlugin; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/content/cutscene/JulietCutscenePlugin.java b/Server/src/main/java/core/game/content/cutscene/JulietCutscenePlugin.java index b1d6d9968..b1adc0f89 100644 --- a/Server/src/main/java/core/game/content/cutscene/JulietCutscenePlugin.java +++ b/Server/src/main/java/core/game/content/cutscene/JulietCutscenePlugin.java @@ -4,8 +4,8 @@ import core.game.content.activity.ActivityPlugin; import core.game.content.activity.CutscenePlugin; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.build.DynamicRegion; diff --git a/Server/src/main/java/core/game/content/cutscene/OrganCutScene.java b/Server/src/main/java/core/game/content/cutscene/OrganCutScene.java index dff8c44ab..61427a5c5 100644 --- a/Server/src/main/java/core/game/content/cutscene/OrganCutScene.java +++ b/Server/src/main/java/core/game/content/cutscene/OrganCutScene.java @@ -4,8 +4,8 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.content.activity.ActivityPlugin; import core.game.content.activity.CutscenePlugin; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/dialogue/BorderGuardDialogue.java b/Server/src/main/java/core/game/content/dialogue/BorderGuardDialogue.java index 3445632b1..3a15338f1 100644 --- a/Server/src/main/java/core/game/content/dialogue/BorderGuardDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/BorderGuardDialogue.java @@ -4,7 +4,7 @@ import core.game.content.global.action.DoorActionHandler; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.game.world.map.RegionManager; diff --git a/Server/src/main/java/core/game/content/dialogue/DoorPerilDialogue.java b/Server/src/main/java/core/game/content/dialogue/DoorPerilDialogue.java index 9c5d84581..bb18fd294 100644 --- a/Server/src/main/java/core/game/content/dialogue/DoorPerilDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/DoorPerilDialogue.java @@ -4,7 +4,7 @@ import core.game.content.global.action.DoorActionHandler; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.plugin.Initializable; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; /** * Represents the door peril dialogue. diff --git a/Server/src/main/java/core/game/content/dialogue/EnchantTiaraDialogue.java b/Server/src/main/java/core/game/content/dialogue/EnchantTiaraDialogue.java index 8dc1e06f1..5c47866f5 100644 --- a/Server/src/main/java/core/game/content/dialogue/EnchantTiaraDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/EnchantTiaraDialogue.java @@ -7,8 +7,7 @@ import core.game.node.entity.skill.runecrafting.EnchantTiaraPulse; import core.game.node.entity.skill.runecrafting.Talisman; import core.game.interaction.NodeUsageEvent; import core.game.node.entity.player.Player; -import core.game.node.entity.player.link.RunScript; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import kotlin.Unit; /** diff --git a/Server/src/main/java/core/game/content/dialogue/IgnatiusVulcanDialogue.java b/Server/src/main/java/core/game/content/dialogue/IgnatiusVulcanDialogue.java index 2d56d3da3..aec85e33c 100644 --- a/Server/src/main/java/core/game/content/dialogue/IgnatiusVulcanDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/IgnatiusVulcanDialogue.java @@ -6,8 +6,8 @@ import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; diff --git a/Server/src/main/java/core/game/content/dialogue/MithrilSeedsDialogue.java b/Server/src/main/java/core/game/content/dialogue/MithrilSeedsDialogue.java index 313253240..5e5a95020 100644 --- a/Server/src/main/java/core/game/content/dialogue/MithrilSeedsDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/MithrilSeedsDialogue.java @@ -2,8 +2,8 @@ package core.game.content.dialogue; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/content/dialogue/MithrilSeedsPlugin.java b/Server/src/main/java/core/game/content/dialogue/MithrilSeedsPlugin.java index 53040f544..a9a300f21 100644 --- a/Server/src/main/java/core/game/content/dialogue/MithrilSeedsPlugin.java +++ b/Server/src/main/java/core/game/content/dialogue/MithrilSeedsPlugin.java @@ -5,8 +5,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.RegionManager; diff --git a/Server/src/main/java/core/game/content/dialogue/TraibornDialogue.java b/Server/src/main/java/core/game/content/dialogue/TraibornDialogue.java index 4a0f7d4dc..d4c89c195 100644 --- a/Server/src/main/java/core/game/content/dialogue/TraibornDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/TraibornDialogue.java @@ -4,8 +4,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/global/GodType.java b/Server/src/main/java/core/game/content/global/GodType.java index 3221bbaee..e202c34e4 100644 --- a/Server/src/main/java/core/game/content/global/GodType.java +++ b/Server/src/main/java/core/game/content/global/GodType.java @@ -5,7 +5,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/global/action/ClimbActionHandler.java b/Server/src/main/java/core/game/content/global/action/ClimbActionHandler.java index 3f716136b..8e2d403fa 100644 --- a/Server/src/main/java/core/game/content/global/action/ClimbActionHandler.java +++ b/Server/src/main/java/core/game/content/global/action/ClimbActionHandler.java @@ -5,7 +5,7 @@ import org.rs09.consts.Items; import core.game.node.entity.player.link.diary.DiaryType; import core.game.content.dialogue.DialoguePlugin; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/content/global/action/DoorActionHandler.java b/Server/src/main/java/core/game/content/global/action/DoorActionHandler.java index d175a1b62..47202eb02 100644 --- a/Server/src/main/java/core/game/content/global/action/DoorActionHandler.java +++ b/Server/src/main/java/core/game/content/global/action/DoorActionHandler.java @@ -1,13 +1,12 @@ package core.game.content.global.action; -import core.game.interaction.DestinationFlag; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; import core.game.node.entity.player.link.diary.DiaryType; -import core.game.node.object.Constructed; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Constructed; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; diff --git a/Server/src/main/java/core/game/content/holiday/christmas/ChristmasEvent.java b/Server/src/main/java/core/game/content/holiday/christmas/ChristmasEvent.java index f71db693f..8415797b4 100644 --- a/Server/src/main/java/core/game/content/holiday/christmas/ChristmasEvent.java +++ b/Server/src/main/java/core/game/content/holiday/christmas/ChristmasEvent.java @@ -30,8 +30,8 @@ import core.game.node.entity.player.link.TeleportManager.TeleportType; import core.game.node.entity.player.link.emote.Emotes; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/holiday/halloween/DeathMansionEvent.java b/Server/src/main/java/core/game/content/holiday/halloween/DeathMansionEvent.java index e97188198..ad87fe745 100644 --- a/Server/src/main/java/core/game/content/holiday/halloween/DeathMansionEvent.java +++ b/Server/src/main/java/core/game/content/holiday/halloween/DeathMansionEvent.java @@ -33,7 +33,7 @@ import core.game.node.entity.player.link.emote.Emotes; import core.game.node.entity.player.link.request.RequestType; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; diff --git a/Server/src/main/java/core/game/content/quest/PluginInteractionManager.java b/Server/src/main/java/core/game/content/quest/PluginInteractionManager.java index 92c23ab8c..727363b11 100644 --- a/Server/src/main/java/core/game/content/quest/PluginInteractionManager.java +++ b/Server/src/main/java/core/game/content/quest/PluginInteractionManager.java @@ -5,7 +5,7 @@ import core.game.interaction.Option; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import java.util.HashMap; diff --git a/Server/src/main/java/core/game/content/quest/free/ImpCatcher.java b/Server/src/main/java/core/game/content/quest/free/ImpCatcher.java index f84846c1f..8bc3e9b55 100644 --- a/Server/src/main/java/core/game/content/quest/free/ImpCatcher.java +++ b/Server/src/main/java/core/game/content/quest/free/ImpCatcher.java @@ -5,8 +5,8 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.plugin.Initializable; import core.game.world.map.RegionManager; diff --git a/Server/src/main/java/core/game/content/quest/free/blackknightsfortress/BKFortressPlugin.java b/Server/src/main/java/core/game/content/quest/free/blackknightsfortress/BKFortressPlugin.java index 708aaaeb0..3311d3adb 100644 --- a/Server/src/main/java/core/game/content/quest/free/blackknightsfortress/BKFortressPlugin.java +++ b/Server/src/main/java/core/game/content/quest/free/blackknightsfortress/BKFortressPlugin.java @@ -8,7 +8,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayerCutscene.java b/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayerCutscene.java index d088f8640..6de56ef71 100644 --- a/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayerCutscene.java +++ b/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayerCutscene.java @@ -13,8 +13,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.SpellBookManager.SpellBook; import core.game.node.entity.player.link.quest.Quest; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayerPlugin.java b/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayerPlugin.java index 315252acd..8405a488a 100644 --- a/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayerPlugin.java +++ b/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayerPlugin.java @@ -9,8 +9,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/content/quest/free/demonslayer/TraibornDialogue.java b/Server/src/main/java/core/game/content/quest/free/demonslayer/TraibornDialogue.java index f742ca12e..db54f8923 100644 --- a/Server/src/main/java/core/game/content/quest/free/demonslayer/TraibornDialogue.java +++ b/Server/src/main/java/core/game/content/quest/free/demonslayer/TraibornDialogue.java @@ -6,8 +6,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayer.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayer.java index 2ca3f80cb..439f10329 100644 --- a/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayer.java +++ b/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayer.java @@ -6,7 +6,7 @@ import core.game.node.entity.player.link.quest.Quest; import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.agility.AgilityHandler; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import core.game.world.map.Location; import core.game.world.map.RegionManager; diff --git a/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayerPlugin.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayerPlugin.java index cc8d30721..415cbfb56 100644 --- a/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayerPlugin.java +++ b/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayerPlugin.java @@ -15,13 +15,12 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; -import rs09.game.interaction.InteractionListeners; import java.util.List; diff --git a/Server/src/main/java/core/game/content/quest/free/dragonslayer/ElvargNPC.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/ElvargNPC.java index 8a8376c1c..c8f108ff2 100644 --- a/Server/src/main/java/core/game/content/quest/free/dragonslayer/ElvargNPC.java +++ b/Server/src/main/java/core/game/content/quest/free/dragonslayer/ElvargNPC.java @@ -12,8 +12,8 @@ import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GoblinDiplomacyPlugin.java b/Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GoblinDiplomacyPlugin.java index 7b9e93bb6..807c401af 100644 --- a/Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GoblinDiplomacyPlugin.java +++ b/Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GoblinDiplomacyPlugin.java @@ -9,7 +9,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import rs09.game.world.GameWorld; import core.plugin.Plugin; import rs09.plugin.PluginManager; diff --git a/Server/src/main/java/core/game/content/quest/free/piratestreasure/PiratesTreasurePlugin.java b/Server/src/main/java/core/game/content/quest/free/piratestreasure/PiratesTreasurePlugin.java index 10e7e3638..c609db1e3 100644 --- a/Server/src/main/java/core/game/content/quest/free/piratestreasure/PiratesTreasurePlugin.java +++ b/Server/src/main/java/core/game/content/quest/free/piratestreasure/PiratesTreasurePlugin.java @@ -12,7 +12,7 @@ import core.game.node.entity.player.link.HintIconManager; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/content/quest/free/princealirescue/PrinceAliRescuePlugin.java b/Server/src/main/java/core/game/content/quest/free/princealirescue/PrinceAliRescuePlugin.java index 5691ae5d4..146b02a1a 100644 --- a/Server/src/main/java/core/game/content/quest/free/princealirescue/PrinceAliRescuePlugin.java +++ b/Server/src/main/java/core/game/content/quest/free/princealirescue/PrinceAliRescuePlugin.java @@ -8,7 +8,7 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/content/quest/free/shieldofarrav/ShieldArravPlugin.java b/Server/src/main/java/core/game/content/quest/free/shieldofarrav/ShieldArravPlugin.java index 501cac1b1..388ebc9cb 100644 --- a/Server/src/main/java/core/game/content/quest/free/shieldofarrav/ShieldArravPlugin.java +++ b/Server/src/main/java/core/game/content/quest/free/shieldofarrav/ShieldArravPlugin.java @@ -13,8 +13,8 @@ import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostPlugin.java b/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostPlugin.java index 508bc9222..61f9b54de 100644 --- a/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostPlugin.java +++ b/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostPlugin.java @@ -10,8 +10,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostSkull.java b/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostSkull.java index e5174002e..325e30e97 100644 --- a/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostSkull.java +++ b/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostSkull.java @@ -3,7 +3,7 @@ package core.game.content.quest.free.therestlessghost; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/content/quest/members/fishingcontest/GarlicPipeInteraction.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/GarlicPipeInteraction.java index 645bd4467..164c0a7bd 100644 --- a/Server/src/main/java/core/game/content/quest/members/fishingcontest/GarlicPipeInteraction.java +++ b/Server/src/main/java/core/game/content/quest/members/fishingcontest/GarlicPipeInteraction.java @@ -5,7 +5,7 @@ import core.game.interaction.NodeUsageEvent; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/content/quest/members/fishingcontest/StairInteraction.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/StairInteraction.java index 4926b1fec..360238047 100644 --- a/Server/src/main/java/core/game/content/quest/members/fishingcontest/StairInteraction.java +++ b/Server/src/main/java/core/game/content/quest/members/fishingcontest/StairInteraction.java @@ -4,7 +4,7 @@ import core.game.interaction.MovementPulse; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; import core.game.content.quest.PluginInteraction; diff --git a/Server/src/main/java/core/game/content/quest/members/fishingcontest/VineInteraction.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/VineInteraction.java index 000061652..f64cddca9 100644 --- a/Server/src/main/java/core/game/content/quest/members/fishingcontest/VineInteraction.java +++ b/Server/src/main/java/core/game/content/quest/members/fishingcontest/VineInteraction.java @@ -3,7 +3,7 @@ package core.game.content.quest.members.fishingcontest; import core.game.interaction.MovementPulse; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/content/quest/members/junglepotion/JunglePotion.java b/Server/src/main/java/core/game/content/quest/members/junglepotion/JunglePotion.java index c0793b74e..92a012675 100644 --- a/Server/src/main/java/core/game/content/quest/members/junglepotion/JunglePotion.java +++ b/Server/src/main/java/core/game/content/quest/members/junglepotion/JunglePotion.java @@ -5,8 +5,8 @@ import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.herblore.Herbs; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import core.game.world.update.flag.context.Animation; import rs09.plugin.PluginManager; diff --git a/Server/src/main/java/core/game/content/quest/members/junglepotion/JunglePotionPlugin.java b/Server/src/main/java/core/game/content/quest/members/junglepotion/JunglePotionPlugin.java index 2b54ff4c5..d8d4bf7a5 100644 --- a/Server/src/main/java/core/game/content/quest/members/junglepotion/JunglePotionPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/junglepotion/JunglePotionPlugin.java @@ -7,8 +7,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/content/quest/members/lostcity/LostCityPlugin.java b/Server/src/main/java/core/game/content/quest/members/lostcity/LostCityPlugin.java index 543372b47..d26823730 100644 --- a/Server/src/main/java/core/game/content/quest/members/lostcity/LostCityPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/lostcity/LostCityPlugin.java @@ -13,7 +13,7 @@ import core.game.node.entity.player.link.quest.Quest; import core.game.node.entity.skill.gather.GatheringSkillPulse; import core.game.node.entity.skill.gather.SkillingTool; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import core.game.world.map.Location; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/CrateCutscenePlugin.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/CrateCutscenePlugin.java index b44270cce..b026b7195 100644 --- a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/CrateCutscenePlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/CrateCutscenePlugin.java @@ -5,8 +5,8 @@ import core.game.content.activity.CutscenePlugin; import core.game.content.dialogue.DialoguePlugin; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.build.DynamicRegion; diff --git a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystalOptionPlugin.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystalOptionPlugin.java index ae19b6753..431d99244 100644 --- a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystalOptionPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystalOptionPlugin.java @@ -6,7 +6,7 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Plugin; /** diff --git a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystalPlugin.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystalPlugin.java index b5a5ca2fc..af194ccbc 100644 --- a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystalPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystalPlugin.java @@ -20,8 +20,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/content/quest/members/sheepherder/IncineratorHandler.java b/Server/src/main/java/core/game/content/quest/members/sheepherder/IncineratorHandler.java index 04b139cd9..acca54416 100644 --- a/Server/src/main/java/core/game/content/quest/members/sheepherder/IncineratorHandler.java +++ b/Server/src/main/java/core/game/content/quest/members/sheepherder/IncineratorHandler.java @@ -5,7 +5,7 @@ import core.game.interaction.MovementPulse; import core.game.interaction.NodeUsageEvent; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/content/quest/members/thetouristrap/BedabinNomadDialogue.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/BedabinNomadDialogue.java index 486496a83..20ea36f0d 100644 --- a/Server/src/main/java/core/game/content/quest/members/thetouristrap/BedabinNomadDialogue.java +++ b/Server/src/main/java/core/game/content/quest/members/thetouristrap/BedabinNomadDialogue.java @@ -4,8 +4,8 @@ import core.game.content.dialogue.DialoguePlugin; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; diff --git a/Server/src/main/java/core/game/content/quest/members/thetouristrap/TouristTrapPlugin.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/TouristTrapPlugin.java index 7e25f0095..a87caed01 100644 --- a/Server/src/main/java/core/game/content/quest/members/thetouristrap/TouristTrapPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/thetouristrap/TouristTrapPlugin.java @@ -23,8 +23,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterfallPlugin.java b/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterfallPlugin.java index 6706df812..3af50ab50 100644 --- a/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterfallPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterfallPlugin.java @@ -19,8 +19,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; diff --git a/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowCutscene.java b/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowCutscene.java index 96108526a..e26b29980 100644 --- a/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowCutscene.java +++ b/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowCutscene.java @@ -9,8 +9,8 @@ import core.game.node.entity.Entity; import core.game.node.entity.impl.Projectile; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/quest/members/witchshouse/WitchsHousePlugin.java b/Server/src/main/java/core/game/content/quest/members/witchshouse/WitchsHousePlugin.java index 823d634ad..e781d6403 100644 --- a/Server/src/main/java/core/game/content/quest/members/witchshouse/WitchsHousePlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/witchshouse/WitchsHousePlugin.java @@ -11,10 +11,8 @@ import core.game.node.entity.combat.ImpactHandler; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; -import core.game.node.item.GroundItem; -import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/content/quest/miniquest/barcrawl/BarcrawlDialogue.java b/Server/src/main/java/core/game/content/quest/miniquest/barcrawl/BarcrawlDialogue.java index feaa63313..891d7e2e8 100644 --- a/Server/src/main/java/core/game/content/quest/miniquest/barcrawl/BarcrawlDialogue.java +++ b/Server/src/main/java/core/game/content/quest/miniquest/barcrawl/BarcrawlDialogue.java @@ -2,6 +2,7 @@ package core.game.content.quest.miniquest.barcrawl; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; +import core.plugin.Initializable; import rs09.game.world.GameWorld; import core.game.content.dialogue.DialogueInterpreter; import core.game.content.dialogue.DialoguePlugin; @@ -11,12 +12,13 @@ import core.game.content.dialogue.DialoguePlugin; * @author 'Vexia * @version 1.0 */ +@Initializable public final class BarcrawlDialogue extends DialoguePlugin { /** * The npc id being used. */ - private BarcrawlPlugin.BarcrawlType type; + private BarcrawlType type; /** * The npc id. @@ -48,7 +50,7 @@ public final class BarcrawlDialogue extends DialoguePlugin { @Override public boolean open(Object... args) { npcId = (Integer) args[0]; - type = (BarcrawlPlugin.BarcrawlType) args[1]; + type = (BarcrawlType) args[1]; player("I'm doing Alfred Grimhand's Barcrawl."); return true; } diff --git a/Server/src/main/java/core/game/content/quest/miniquest/barcrawl/BarcrawlPlugin.java b/Server/src/main/java/core/game/content/quest/miniquest/barcrawl/BarcrawlPlugin.java deleted file mode 100644 index 28799c909..000000000 --- a/Server/src/main/java/core/game/content/quest/miniquest/barcrawl/BarcrawlPlugin.java +++ /dev/null @@ -1,382 +0,0 @@ -package core.game.content.quest.miniquest.barcrawl; - -import core.cache.def.impl.NPCDefinition; -import core.game.node.entity.skill.Skills; -import core.game.interaction.OptionHandler; -import core.game.node.Node; -import core.game.node.entity.combat.ImpactHandler.HitsplatType; -import core.game.node.entity.player.Player; -import core.game.node.item.Item; -import core.game.system.task.Pulse; -import rs09.game.world.GameWorld; -import core.net.packet.PacketRepository; -import core.net.packet.context.CameraContext; -import core.net.packet.context.CameraContext.CameraType; -import core.net.packet.out.CameraViewPacket; -import core.plugin.Plugin; -import rs09.plugin.PluginManager; -import core.plugin.Initializable; -import core.tools.StringUtils; - -/** - * Handles the barcrawl npc interactions. - * @author 'Vexia - * @version 1.0 - */ -@Initializable -public final class BarcrawlPlugin extends OptionHandler { - - @Override - public Plugin newInstance(Object arg) throws Throwable { - for (BarcrawlType type : BarcrawlType.values()) { - for (int npc : type.getNpc()) { - NPCDefinition.forId(npc).getHandlers().put("option:talk-to", this); - } - } - PluginManager.definePlugin(new BarcrawlDialogue()); - return this; - } - - @Override - public boolean handle(Player player, Node node, String option) { - final BarcrawlType type = BarcrawlType.forId(node.getId()); - if (player.getBarcrawlManager().isFinished() || !player.getBarcrawlManager().isStarted() || player.getBarcrawlManager().isCompleted(type.ordinal())) { - player.getDialogueInterpreter().open(node.getId(), node); - } else { - player.getDialogueInterpreter().open("barcrawl dialogue", node.getId(), type); - } - return true; - } - - /** - * A barcrawl type npc. - * @author 'Vexia - * @version 1.0 - */ - public enum BarcrawlType { - BLUE_MOON(733, 50, "Uncle Humphrey's Gutrot", new String[] { "Oh no not another of you guys. These barbarian", "barcrawls cause too much damage to my bar." }, new String[] { "You're going to have to pay me 50 gold for the Uncle", "Humphrey's Gutrot." }) { - @Override - public void effect(final Player player) { - player.sendChat("Blearrgh!"); - player.getImpactHandler().manualHit(player, 1, HitsplatType.NORMAL); - addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE, Skills.STRENGTH, Skills.SMITHING); - } - - @Override - public void message(final Player player, boolean start) { - if (!start) { - player.getPacketDispatch().sendMessages("Your insides feel terrible.", "The bartender signs your card."); - } else { - player.getPacketDispatch().sendMessages("You buy some " + getName() + ".", "You drink the " + getName() + "."); - } - } - }, - BLUEBERRY_BAR(848, 10, "Fire Toad Blast", new String[] { "Ah, you've come to the best stop on your list! I'll give", "you my famous Fire Toad last! It'll cost you 10", "coins." }) { - @Override - public void effect(final Player player) { - player.getImpactHandler().manualHit(player, 1, HitsplatType.NORMAL); - } - - @Override - public void message(final Player player, boolean start) { - if (!start) { - player.getPacketDispatch().sendMessage("Blueberry signs your card."); - } else { - super.message(player, start); - player.getPacketDispatch().sendMessage("Your mouth and throat burns as you gulp it down."); - } - } - - }, - DEADMAN_CHEST(735, 15, "Supergrog", new String[] { "Haha time to be breaking out the old Supergrog. That'll", "be 15 coins please." }) { - @Override - public void effect(final Player player) { - addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE, Skills.HERBLORE, Skills.CONSTRUCTION, Skills.PRAYER); - } - - @Override - public void message(final Player player, boolean start) { - if (!start) { - player.getPacketDispatch().sendMessages("You stagger backwards.", "You think you see 2 bartenders signing 2 barcrawl cards."); - } else { - player.getPacketDispatch().sendMessages("The bartender serves you a glass of strange thick dark liquid.", "You wince and drink it."); - } - } - - }, - DRAGON_INN(739, 12, "Fire Brandy", new String[] { "I suppose you'll be wanting some Fire Brandy. That'll", "cost you 12 coins." }) { - @Override - public void effect(final Player player) { - addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE); - } - - @Override - public void message(final Player player, boolean start) { - if (!start) { - player.getPacketDispatch().sendMessages("Your vision blurs and you stagger slightly.", "You can just about make out the bartender signing your barcrawl card."); - } else { - player.getPacketDispatch().sendMessages("The bartender hands you a small glass and sets light to the contents.", "You blow out the flame and drink it."); - } - } - - }, - FLYING_HORSE_INN(737, 8, "Heart Stopper", new String[] { "Fancy a bit of Heart Stopper then do you? It'll only be", "8 coins." }) { - @Override - public void effect(final Player player) { - player.getImpactHandler().manualHit(player, (int) (player.getSkills().getLevel(Skills.HITPOINTS) * 0.15), HitsplatType.NORMAL); - } - - @Override - public void message(final Player player, boolean start) { - if (!start) { - player.getPacketDispatch().sendMessages("You clutch your chest.", "Through your tears you see the bartender...", "signing your barcrawl card."); - } else { - player.getPacketDispatch().sendMessages("The bartender hands you a shot of Heart Stopper.", "You grimace and drink it."); - } - } - }, - FORESTERS_ARMS(738, 18, "Liverbane Ale", new String[] { "Oh you're a barbarian then. Now which of these barrels", "contained the Liverbane Ale? That'll be 18 coins please." }) { - @Override - public void effect(final Player player) { - addBonus(player, Skills.ATTACK, Skills.DEFENCE, Skills.FLETCHING, Skills.FIREMAKING, Skills.WOODCUTTING); - } - - @Override - public void message(final Player player, boolean start) { - if (!start) { - player.getPacketDispatch().sendMessages("The room seems to be swaying.", "The bartender scrawls his signature on your card."); - } else { - player.getPacketDispatch().sendMessages("The bartender gives you a glass of Liverbane Ale.", "You gulp it down."); - } - } - - }, - JOLLY_BOAR(731, 10, "Olde Suspiciouse", new String[] { "Ah, there seems to be a fair few doing that one these", "days. My supply of Olde suspiciouse is starting to run", "low, it'll cost you 10 coins." }) { - @Override - public void effect(final Player player) { - addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE, Skills.STRENGTH, Skills.MINING, Skills.CRAFTING, Skills.MAGIC); - player.getImpactHandler().manualHit(player, 1, HitsplatType.NORMAL); - player.getDialogueInterpreter().sendDialogues(player, null, "Thanksh very mush..."); - } - - @Override - public void message(final Player player, boolean start) { - if (!start) { - player.getPacketDispatch().sendMessages("Your head is spinning.", "The bartender signs your card."); - } else { - player.getPacketDispatch().sendMessages("You buy a pint of Olde Suspiciouse.", "You gulp it down."); - } - } - }, - KARAMJA_SPIRITS(568, 7, "Ape Bite Liqueur", new String[] { "Ah, you'll be wanting some Ape Bite Liqueur then. It's", "got a lovely bannana taste, and it'll only cost you 7", "coins." }) { - @Override - public void effect(final Player player) { - addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE); - } - - @Override - public void message(final Player player, boolean start) { - if (!start) { - player.getPacketDispatch().sendMessages("Zamo signs your card."); - player.getDialogueInterpreter().sendDialogues(player, null, "Mmmmm, dat was luverly..."); - } else { - player.getPacketDispatch().sendMessages("You buy some Ape Bite liqueur.", "You swirl it around and swallow it."); - } - } - - }, - RISING_SUNN_INN(new int[] { 3217, 736 }, 70, "Hand of Death Cocktail", new String[] { "Heehee, this'll be fun!" }, new String[] { "You'll be after our Hand of Death cocktail, then. Lots", "of expensive parts to the cocktail, though, so it will cost", "you 70 coins." }) { - @Override - public void effect(final Player player) { - addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE, Skills.RANGE, Skills.FIREMAKING); - player.getImpactHandler().manualHit(player, 1, HitsplatType.NORMAL); - } - - @Override - public void message(final Player player, boolean start) { - if (!start) { - player.getPacketDispatch().sendMessages("The barmaid giggles.", "The barmaid signs your card."); - } else { - PacketRepository.send(CameraViewPacket.class, new CameraContext(player, CameraType.SHAKE, 4, 4, 1, 4, 4)); - GameWorld.getPulser().submit(new Pulse(3, player) { - @Override - public boolean pulse() { - PacketRepository.send(CameraViewPacket.class, new CameraContext(player, CameraType.RESET, 4, 4, 1, 4, 4)); - return true; - } - }); - player.getPacketDispatch().sendMessages("You buy a Hand of Death cocktail.", "You drink the cocktail.", "You stumble around the room."); - } - } - }, - RUSTY_ANCHOR_INN(734, 8, "Black Skull Ale", new String[] { "Okay, one Black Skull Ale coming up. Eight coins, please." }) { - @Override - public void effect(final Player player) { - player.sendChat("Hiccup!"); - } - - @Override - public void message(final Player player, boolean start) { - if (!start) { - super.message(player, start); - } else { - player.getPacketDispatch().sendMessages("You buy a Black Skull Ale...", "You drink your Black Skull Ale...", "Your vision blurs."); - } - } - }; - - /** - * The npc id. - */ - private final int[] npc; - - /** - * The name. - */ - private final String name; - - /** - * The coin required. - */ - private final Item coins; - - /** - * The dialogue to use. - */ - private final String[][] dialogue; - - /** - * Constructs a new {@code BarcrawlType} {@code Object}. - * @param npc the npc. - * @param name the name. - * @param coins the coins. - * @param dialogue the dialogue. - */ - private BarcrawlType(int npc, Item coins, String name, String[][] dialogue) { - this.npc = new int[] { npc }; - this.name = name; - this.coins = coins; - this.dialogue = dialogue; - } - - /** - * Constructs a new {@code BarcrawlType} {@code Object}. - * @param npc the npc. - * @param coins the coins. - */ - private BarcrawlType(int npc, int coins, final String name, String[] first, String[] second) { - this.npc = new int[] { npc }; - this.name = name; - this.coins = new Item(995, coins); - this.dialogue = new String[][] { first, second }; - } - - /** - * Constructs a new {@code BarcrawlType} {@code Object}. - * @param npc the npc. - * @param coins the coins. - * @param first the first dial. - * @param second the second dial. - */ - private BarcrawlType(int[] npc, int coins, String name, String[] first, String[] second) { - this.npc = npc; - this.name = name; - this.coins = new Item(995, coins); - this.dialogue = new String[][] { first, second }; - } - - /** - * Constructs a new {@code BarcrawlType} {@code Object}. - * @param npc the npc. - * @param coins the coins. - */ - private BarcrawlType(int npc, int coins, String name, String[] first) { - this.npc = new int[] { npc }; - this.name = name; - this.coins = new Item(995, coins); - this.dialogue = new String[][] { first }; - } - - /** - * Method used to effect the player. - * @param player the player. - */ - public void effect(final Player player) { - - } - - /** - * Method used to message the player. - * @param player the player. - * @param start or finish. - */ - public void message(final Player player, boolean start) { - if (!start) { - player.getPacketDispatch().sendMessage("The bartender signs your card."); - } else { - player.getPacketDispatch().sendMessage("You buy a " + (StringUtils.isPlusN(getName()) ? "an" : "a") + " " + getName() + "."); - } - } - - /** - * Method used to a skill bonus. - * @param player the player. - * @param amount the amount. - * @param skills the skills. - */ - public void addBonus(final Player player, int amount, final int... skills) { - for (int i : skills) { - player.getSkills().updateLevel(i, -amount, 0); - } - } - - /** - * Gets the bar crawl type. - * @param id the id. - * @return the type. - */ - public static BarcrawlType forId(int id) { - for (BarcrawlType type : values()) { - for (int npc : type.getNpc()) { - if (npc == id) { - return type; - } - } - } - return null; - } - - /** - * Gets the npc. - * @return The npc. - */ - public int[] getNpc() { - return npc; - } - - /** - * Gets the coins. - * @return The coins. - */ - public Item getCoins() { - return coins; - } - - /** - * Gets the dialogue. - * @return The dialogue. - */ - public String[][] getDialogue() { - return dialogue; - } - - /** - * Gets the name. - * @return The name. - */ - public String getName() { - return name; - } - - } -} diff --git a/Server/src/main/java/core/game/content/quest/miniquest/barcrawl/BarcrawlType.java b/Server/src/main/java/core/game/content/quest/miniquest/barcrawl/BarcrawlType.java new file mode 100644 index 000000000..8573d9b54 --- /dev/null +++ b/Server/src/main/java/core/game/content/quest/miniquest/barcrawl/BarcrawlType.java @@ -0,0 +1,357 @@ +package core.game.content.quest.miniquest.barcrawl; + +import core.game.node.entity.combat.ImpactHandler; +import core.game.node.entity.player.Player; +import core.game.node.entity.skill.Skills; +import core.game.node.item.Item; +import core.game.system.task.Pulse; +import core.net.packet.PacketRepository; +import core.net.packet.context.CameraContext; +import core.net.packet.out.CameraViewPacket; +import core.tools.StringUtils; +import rs09.game.world.GameWorld; + +/** + * A barcrawl type npc. + * + * @author 'Vexia + * @version 1.0 + */ +public enum BarcrawlType { + BLUE_MOON(733, 50, "Uncle Humphrey's Gutrot", new String[]{"Oh no not another of you guys. These barbarian", "barcrawls cause too much damage to my bar."}, new String[]{"You're going to have to pay me 50 gold for the Uncle", "Humphrey's Gutrot."}) { + @Override + public void effect(final Player player) { + player.sendChat("Blearrgh!"); + player.getImpactHandler().manualHit(player, 1, ImpactHandler.HitsplatType.NORMAL); + addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE, Skills.STRENGTH, Skills.SMITHING); + } + + @Override + public void message(final Player player, boolean start) { + if (!start) { + player.getPacketDispatch().sendMessages("Your insides feel terrible.", "The bartender signs your card."); + } else { + player.getPacketDispatch().sendMessages("You buy some " + getName() + ".", "You drink the " + getName() + "."); + } + } + }, + BLUEBERRY_BAR(848, 10, "Fire Toad Blast", new String[]{"Ah, you've come to the best stop on your list! I'll give", "you my famous Fire Toad last! It'll cost you 10", "coins."}) { + @Override + public void effect(final Player player) { + player.getImpactHandler().manualHit(player, 1, ImpactHandler.HitsplatType.NORMAL); + } + + @Override + public void message(final Player player, boolean start) { + if (!start) { + player.getPacketDispatch().sendMessage("Blueberry signs your card."); + } else { + super.message(player, start); + player.getPacketDispatch().sendMessage("Your mouth and throat burns as you gulp it down."); + } + } + + }, + DEADMAN_CHEST(735, 15, "Supergrog", new String[]{"Haha time to be breaking out the old Supergrog. That'll", "be 15 coins please."}) { + @Override + public void effect(final Player player) { + addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE, Skills.HERBLORE, Skills.CONSTRUCTION, Skills.PRAYER); + } + + @Override + public void message(final Player player, boolean start) { + if (!start) { + player.getPacketDispatch().sendMessages("You stagger backwards.", "You think you see 2 bartenders signing 2 barcrawl cards."); + } else { + player.getPacketDispatch().sendMessages("The bartender serves you a glass of strange thick dark liquid.", "You wince and drink it."); + } + } + + }, + DRAGON_INN(739, 12, "Fire Brandy", new String[]{"I suppose you'll be wanting some Fire Brandy. That'll", "cost you 12 coins."}) { + @Override + public void effect(final Player player) { + addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE); + } + + @Override + public void message(final Player player, boolean start) { + if (!start) { + player.getPacketDispatch().sendMessages("Your vision blurs and you stagger slightly.", "You can just about make out the bartender signing your barcrawl card."); + } else { + player.getPacketDispatch().sendMessages("The bartender hands you a small glass and sets light to the contents.", "You blow out the flame and drink it."); + } + } + + }, + FLYING_HORSE_INN(737, 8, "Heart Stopper", new String[]{"Fancy a bit of Heart Stopper then do you? It'll only be", "8 coins."}) { + @Override + public void effect(final Player player) { + player.getImpactHandler().manualHit(player, (int) (player.getSkills().getLevel(Skills.HITPOINTS) * 0.15), ImpactHandler.HitsplatType.NORMAL); + } + + @Override + public void message(final Player player, boolean start) { + if (!start) { + player.getPacketDispatch().sendMessages("You clutch your chest.", "Through your tears you see the bartender...", "signing your barcrawl card."); + } else { + player.getPacketDispatch().sendMessages("The bartender hands you a shot of Heart Stopper.", "You grimace and drink it."); + } + } + }, + FORESTERS_ARMS(738, 18, "Liverbane Ale", new String[]{"Oh you're a barbarian then. Now which of these barrels", "contained the Liverbane Ale? That'll be 18 coins please."}) { + @Override + public void effect(final Player player) { + addBonus(player, Skills.ATTACK, Skills.DEFENCE, Skills.FLETCHING, Skills.FIREMAKING, Skills.WOODCUTTING); + } + + @Override + public void message(final Player player, boolean start) { + if (!start) { + player.getPacketDispatch().sendMessages("The room seems to be swaying.", "The bartender scrawls his signature on your card."); + } else { + player.getPacketDispatch().sendMessages("The bartender gives you a glass of Liverbane Ale.", "You gulp it down."); + } + } + + }, + JOLLY_BOAR(731, 10, "Olde Suspiciouse", new String[]{"Ah, there seems to be a fair few doing that one these", "days. My supply of Olde suspiciouse is starting to run", "low, it'll cost you 10 coins."}) { + @Override + public void effect(final Player player) { + addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE, Skills.STRENGTH, Skills.MINING, Skills.CRAFTING, Skills.MAGIC); + player.getImpactHandler().manualHit(player, 1, ImpactHandler.HitsplatType.NORMAL); + player.getDialogueInterpreter().sendDialogues(player, null, "Thanksh very mush..."); + } + + @Override + public void message(final Player player, boolean start) { + if (!start) { + player.getPacketDispatch().sendMessages("Your head is spinning.", "The bartender signs your card."); + } else { + player.getPacketDispatch().sendMessages("You buy a pint of Olde Suspiciouse.", "You gulp it down."); + } + } + }, + KARAMJA_SPIRITS(568, 7, "Ape Bite Liqueur", new String[]{"Ah, you'll be wanting some Ape Bite Liqueur then. It's", "got a lovely bannana taste, and it'll only cost you 7", "coins."}) { + @Override + public void effect(final Player player) { + addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE); + } + + @Override + public void message(final Player player, boolean start) { + if (!start) { + player.getPacketDispatch().sendMessages("Zamo signs your card."); + player.getDialogueInterpreter().sendDialogues(player, null, "Mmmmm, dat was luverly..."); + } else { + player.getPacketDispatch().sendMessages("You buy some Ape Bite liqueur.", "You swirl it around and swallow it."); + } + } + + }, + RISING_SUNN_INN(new int[]{3217, 736}, 70, "Hand of Death Cocktail", new String[]{"Heehee, this'll be fun!"}, new String[]{"You'll be after our Hand of Death cocktail, then. Lots", "of expensive parts to the cocktail, though, so it will cost", "you 70 coins."}) { + @Override + public void effect(final Player player) { + addBonus(player, 1, Skills.ATTACK, Skills.DEFENCE, Skills.RANGE, Skills.FIREMAKING); + player.getImpactHandler().manualHit(player, 1, ImpactHandler.HitsplatType.NORMAL); + } + + @Override + public void message(final Player player, boolean start) { + if (!start) { + player.getPacketDispatch().sendMessages("The barmaid giggles.", "The barmaid signs your card."); + } else { + PacketRepository.send(CameraViewPacket.class, new CameraContext(player, CameraContext.CameraType.SHAKE, 4, 4, 1, 4, 4)); + GameWorld.getPulser().submit(new Pulse(3, player) { + @Override + public boolean pulse() { + PacketRepository.send(CameraViewPacket.class, new CameraContext(player, CameraContext.CameraType.RESET, 4, 4, 1, 4, 4)); + return true; + } + }); + player.getPacketDispatch().sendMessages("You buy a Hand of Death cocktail.", "You drink the cocktail.", "You stumble around the room."); + } + } + }, + RUSTY_ANCHOR_INN(734, 8, "Black Skull Ale", new String[]{"Okay, one Black Skull Ale coming up. Eight coins, please."}) { + @Override + public void effect(final Player player) { + player.sendChat("Hiccup!"); + } + + @Override + public void message(final Player player, boolean start) { + if (!start) { + super.message(player, start); + } else { + player.getPacketDispatch().sendMessages("You buy a Black Skull Ale...", "You drink your Black Skull Ale...", "Your vision blurs."); + } + } + }; + + /** + * The npc id. + */ + private final int[] npc; + + /** + * The name. + */ + private final String name; + + /** + * The coin required. + */ + private final Item coins; + + /** + * The dialogue to use. + */ + private final String[][] dialogue; + + /** + * Constructs a new {@code BarcrawlType} {@code Object}. + * + * @param npc the npc. + * @param name the name. + * @param coins the coins. + * @param dialogue the dialogue. + */ + private BarcrawlType(int npc, Item coins, String name, String[][] dialogue) { + this.npc = new int[]{npc}; + this.name = name; + this.coins = coins; + this.dialogue = dialogue; + } + + /** + * Constructs a new {@code BarcrawlType} {@code Object}. + * + * @param npc the npc. + * @param coins the coins. + */ + private BarcrawlType(int npc, int coins, final String name, String[] first, String[] second) { + this.npc = new int[]{npc}; + this.name = name; + this.coins = new Item(995, coins); + this.dialogue = new String[][]{first, second}; + } + + /** + * Constructs a new {@code BarcrawlType} {@code Object}. + * + * @param npc the npc. + * @param coins the coins. + * @param first the first dial. + * @param second the second dial. + */ + private BarcrawlType(int[] npc, int coins, String name, String[] first, String[] second) { + this.npc = npc; + this.name = name; + this.coins = new Item(995, coins); + this.dialogue = new String[][]{first, second}; + } + + /** + * Constructs a new {@code BarcrawlType} {@code Object}. + * + * @param npc the npc. + * @param coins the coins. + */ + private BarcrawlType(int npc, int coins, String name, String[] first) { + this.npc = new int[]{npc}; + this.name = name; + this.coins = new Item(995, coins); + this.dialogue = new String[][]{first}; + } + + /** + * Method used to effect the player. + * + * @param player the player. + */ + public void effect(final Player player) { + + } + + /** + * Method used to message the player. + * + * @param player the player. + * @param start or finish. + */ + public void message(final Player player, boolean start) { + if (!start) { + player.getPacketDispatch().sendMessage("The bartender signs your card."); + } else { + player.getPacketDispatch().sendMessage("You buy a " + (StringUtils.isPlusN(getName()) ? "an" : "a") + " " + getName() + "."); + } + } + + /** + * Method used to a skill bonus. + * + * @param player the player. + * @param amount the amount. + * @param skills the skills. + */ + public void addBonus(final Player player, int amount, final int... skills) { + for (int i : skills) { + player.getSkills().updateLevel(i, -amount, 0); + } + } + + /** + * Gets the bar crawl type. + * + * @param id the id. + * @return the type. + */ + public static BarcrawlType forId(int id) { + for (BarcrawlType type : values()) { + for (int npc : type.getNpc()) { + if (npc == id) { + return type; + } + } + } + return null; + } + + /** + * Gets the npc. + * + * @return The npc. + */ + public int[] getNpc() { + return npc; + } + + /** + * Gets the coins. + * + * @return The coins. + */ + public Item getCoins() { + return coins; + } + + /** + * Gets the dialogue. + * + * @return The dialogue. + */ + public String[][] getDialogue() { + return dialogue; + } + + /** + * Gets the name. + * + * @return The name. + */ + public String getName() { + return name; + } + +} diff --git a/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialIslandPlugin.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialIslandPlugin.java index ca052868f..cb9b52f6a 100644 --- a/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialIslandPlugin.java +++ b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialIslandPlugin.java @@ -9,7 +9,7 @@ import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialStage.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialStage.java index 382954f98..3fdf4f662 100644 --- a/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialStage.java +++ b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialStage.java @@ -4,7 +4,7 @@ import core.game.component.Component; import core.game.node.entity.combat.equipment.WeaponInterface; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.HintIconManager; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import rs09.game.system.SystemLogger; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; diff --git a/Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java b/Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java index 409ced2bb..db69d4241 100644 --- a/Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java +++ b/Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java @@ -12,7 +12,7 @@ import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import org.json.simple.JSONObject; import rs09.ServerStore; import rs09.game.world.GameWorld; diff --git a/Server/src/main/java/core/game/content/zone/YanilleAgilityDungeon.java b/Server/src/main/java/core/game/content/zone/YanilleAgilityDungeon.java index 22b603758..68efb361a 100644 --- a/Server/src/main/java/core/game/content/zone/YanilleAgilityDungeon.java +++ b/Server/src/main/java/core/game/content/zone/YanilleAgilityDungeon.java @@ -13,8 +13,8 @@ import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.node.entity.state.EntityState; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/content/zone/phasmatys/PhasmatysZone.java b/Server/src/main/java/core/game/content/zone/phasmatys/PhasmatysZone.java index 95f8d1141..a8d6ed7d4 100644 --- a/Server/src/main/java/core/game/content/zone/phasmatys/PhasmatysZone.java +++ b/Server/src/main/java/core/game/content/zone/phasmatys/PhasmatysZone.java @@ -10,8 +10,8 @@ import core.game.node.entity.player.Player; import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.agility.AgilityHandler; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import core.game.world.map.Direction; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/zone/rellekka/RellekkaZone.java b/Server/src/main/java/core/game/content/zone/rellekka/RellekkaZone.java index 1f55183c6..e6837adfb 100644 --- a/Server/src/main/java/core/game/content/zone/rellekka/RellekkaZone.java +++ b/Server/src/main/java/core/game/content/zone/rellekka/RellekkaZone.java @@ -1,8 +1,6 @@ package core.game.content.zone.rellekka; -import core.cache.def.impl.NPCDefinition; import core.cache.def.impl.SceneryDefinition; -import core.game.component.Component; import core.plugin.Initializable; import core.game.node.entity.skill.agility.AgilityHandler; import core.game.interaction.Option; @@ -12,11 +10,7 @@ import core.game.node.entity.Entity; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.system.task.LocationLogoutTask; -import core.game.system.task.LogoutTask; -import core.game.system.task.Pulse; -import rs09.game.world.GameWorld; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBorders; diff --git a/Server/src/main/java/core/game/content/zone/wbisland/WaterBirthDungeonZone.java b/Server/src/main/java/core/game/content/zone/wbisland/WaterBirthDungeonZone.java index 6a3bbf6f0..02a44add7 100644 --- a/Server/src/main/java/core/game/content/zone/wbisland/WaterBirthDungeonZone.java +++ b/Server/src/main/java/core/game/content/zone/wbisland/WaterBirthDungeonZone.java @@ -17,7 +17,7 @@ import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/interaction/DestinationFlag.java b/Server/src/main/java/core/game/interaction/DestinationFlag.java index 9be1bacbc..cbd44f039 100644 --- a/Server/src/main/java/core/game/interaction/DestinationFlag.java +++ b/Server/src/main/java/core/game/interaction/DestinationFlag.java @@ -3,7 +3,7 @@ package core.game.interaction; import core.game.content.global.action.DoorActionHandler; import core.game.node.Node; import core.game.node.entity.Entity; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.RegionManager; diff --git a/Server/src/main/java/core/game/interaction/Interaction.java b/Server/src/main/java/core/game/interaction/Interaction.java index 7fa46b7ff..a43caa0d8 100644 --- a/Server/src/main/java/core/game/interaction/Interaction.java +++ b/Server/src/main/java/core/game/interaction/Interaction.java @@ -5,7 +5,7 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import core.game.world.update.flag.player.FaceLocationFlag; import core.net.packet.PacketRepository; diff --git a/Server/src/main/java/core/game/interaction/Option.java b/Server/src/main/java/core/game/interaction/Option.java index d3b42ed79..37b85c9ba 100644 --- a/Server/src/main/java/core/game/interaction/Option.java +++ b/Server/src/main/java/core/game/interaction/Option.java @@ -6,7 +6,7 @@ import core.cache.def.impl.SceneryDefinition; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; /** * Represents an Interaction option. diff --git a/Server/src/main/java/core/game/interaction/UseWithHandler.java b/Server/src/main/java/core/game/interaction/UseWithHandler.java index 43c1d4220..0af44418f 100644 --- a/Server/src/main/java/core/game/interaction/UseWithHandler.java +++ b/Server/src/main/java/core/game/interaction/UseWithHandler.java @@ -5,7 +5,7 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import rs09.game.system.SystemLogger; import core.game.system.task.Pulse; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/interaction/city/BedabinPlugin.java b/Server/src/main/java/core/game/interaction/city/BedabinPlugin.java index 720d45702..22b9eb696 100644 --- a/Server/src/main/java/core/game/interaction/city/BedabinPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/BedabinPlugin.java @@ -6,8 +6,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/interaction/city/BurthorpePlugin.java b/Server/src/main/java/core/game/interaction/city/BurthorpePlugin.java index 65de24ea1..7c61fb7e3 100644 --- a/Server/src/main/java/core/game/interaction/city/BurthorpePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/BurthorpePlugin.java @@ -5,7 +5,7 @@ import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/city/CamelotNodePlugin.java b/Server/src/main/java/core/game/interaction/city/CamelotNodePlugin.java index 03c6a26d1..8503dc735 100644 --- a/Server/src/main/java/core/game/interaction/city/CamelotNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/CamelotNodePlugin.java @@ -4,7 +4,7 @@ import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/city/DraynorManorPlugin.java b/Server/src/main/java/core/game/interaction/city/DraynorManorPlugin.java index ab34f6a9f..5ce18a965 100644 --- a/Server/src/main/java/core/game/interaction/city/DraynorManorPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/DraynorManorPlugin.java @@ -10,8 +10,8 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/interaction/city/DraynorNodePlugin.java b/Server/src/main/java/core/game/interaction/city/DraynorNodePlugin.java index e1fb8e301..5408317e9 100644 --- a/Server/src/main/java/core/game/interaction/city/DraynorNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/DraynorNodePlugin.java @@ -4,7 +4,7 @@ import core.cache.def.impl.NPCDefinition; import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.node.entity.player.link.diary.DiaryType; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.SceneryBuilder; import core.game.content.activity.ActivityManager; import core.game.content.activity.ActivityPlugin; import core.game.content.activity.CutscenePlugin; @@ -14,7 +14,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/interaction/city/EdgevilleNodePlugin.java b/Server/src/main/java/core/game/interaction/city/EdgevilleNodePlugin.java index 382540d62..3fcc2aef5 100644 --- a/Server/src/main/java/core/game/interaction/city/EdgevilleNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/EdgevilleNodePlugin.java @@ -5,8 +5,8 @@ import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/city/FaladorNodePlugin.java b/Server/src/main/java/core/game/interaction/city/FaladorNodePlugin.java index 7a07be6b0..9e2bd9c48 100644 --- a/Server/src/main/java/core/game/interaction/city/FaladorNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/FaladorNodePlugin.java @@ -13,8 +13,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/interaction/city/GnomeStrongholdPlugin.java b/Server/src/main/java/core/game/interaction/city/GnomeStrongholdPlugin.java index 6e5d79974..88116c5b6 100644 --- a/Server/src/main/java/core/game/interaction/city/GnomeStrongholdPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/GnomeStrongholdPlugin.java @@ -7,9 +7,10 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; +import core.game.world.map.path.Pathfinder; import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; @@ -90,10 +91,10 @@ public final class GnomeStrongholdPlugin extends OptionHandler { * @param object The door. */ private void openGates(Player player, final Scenery object) { - if (object.getCharge() == 88) { + if (object.getCharge() == 0) { return; } - object.setCharge(88); + object.setCharge(0); SceneryBuilder.replace(object, object.transform(191), 4); SceneryBuilder.add(new Scenery(192, Location.create(2462, 3383, 0)), 4); Location start = Location.create(2461, 3382, 0); @@ -103,7 +104,7 @@ public final class GnomeStrongholdPlugin extends OptionHandler { start = end; end = s; } - AgilityHandler.walk(player, -1, start, end, new Animation(1426), 0, null); + Pathfinder.find(player, end).walk(player); GameWorld.getPulser().submit(new Pulse(4) { @Override public boolean pulse() { diff --git a/Server/src/main/java/core/game/interaction/city/HamHideoutPlugin.java b/Server/src/main/java/core/game/interaction/city/HamHideoutPlugin.java index a5960cfa7..8c095a871 100644 --- a/Server/src/main/java/core/game/interaction/city/HamHideoutPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/HamHideoutPlugin.java @@ -5,7 +5,7 @@ import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/interaction/city/KaramajaOptionPlugin.java b/Server/src/main/java/core/game/interaction/city/KaramajaOptionPlugin.java index 5893c1868..b8abc70c5 100644 --- a/Server/src/main/java/core/game/interaction/city/KaramajaOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/KaramajaOptionPlugin.java @@ -16,8 +16,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import rs09.game.world.repository.Repository; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/city/LumbridgeNodePlugin.java b/Server/src/main/java/core/game/interaction/city/LumbridgeNodePlugin.java index bc4247ea7..c705175af 100644 --- a/Server/src/main/java/core/game/interaction/city/LumbridgeNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/LumbridgeNodePlugin.java @@ -14,7 +14,7 @@ import core.game.node.entity.combat.equipment.WeaponInterface; import core.game.node.entity.impl.Projectile; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/interaction/city/MonasteryPlugin.java b/Server/src/main/java/core/game/interaction/city/MonasteryPlugin.java index a9b728140..299dcb2a7 100644 --- a/Server/src/main/java/core/game/interaction/city/MonasteryPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/MonasteryPlugin.java @@ -5,7 +5,7 @@ import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/city/PortSarimPlugin.java b/Server/src/main/java/core/game/interaction/city/PortSarimPlugin.java index ee072e70f..4bf051ea8 100644 --- a/Server/src/main/java/core/game/interaction/city/PortSarimPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/PortSarimPlugin.java @@ -7,7 +7,7 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/interaction/city/SophanemPlugin.java b/Server/src/main/java/core/game/interaction/city/SophanemPlugin.java index d35c8a363..4328b221c 100644 --- a/Server/src/main/java/core/game/interaction/city/SophanemPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/SophanemPlugin.java @@ -6,7 +6,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/interaction/city/TaverlyDungeonPlugin.java b/Server/src/main/java/core/game/interaction/city/TaverlyDungeonPlugin.java index 2bed35a9c..68dafd82e 100644 --- a/Server/src/main/java/core/game/interaction/city/TaverlyDungeonPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/TaverlyDungeonPlugin.java @@ -6,8 +6,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/interaction/city/TrollheimPlugin.java b/Server/src/main/java/core/game/interaction/city/TrollheimPlugin.java index 302858f2c..a91c057f4 100644 --- a/Server/src/main/java/core/game/interaction/city/TrollheimPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/TrollheimPlugin.java @@ -13,12 +13,11 @@ import core.game.node.entity.skill.Skills; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.Entity; -import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/interaction/city/TzhaarCityPlugin.java b/Server/src/main/java/core/game/interaction/city/TzhaarCityPlugin.java index aa0f284e2..ba088c5fd 100644 --- a/Server/src/main/java/core/game/interaction/city/TzhaarCityPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/TzhaarCityPlugin.java @@ -7,7 +7,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/city/VarrockNodePlugin.java b/Server/src/main/java/core/game/interaction/city/VarrockNodePlugin.java index 571075c02..57d9bad57 100644 --- a/Server/src/main/java/core/game/interaction/city/VarrockNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/VarrockNodePlugin.java @@ -9,8 +9,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/interaction/city/WildernessPlugin.java b/Server/src/main/java/core/game/interaction/city/WildernessPlugin.java index 687212634..fe057d388 100644 --- a/Server/src/main/java/core/game/interaction/city/WildernessPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/WildernessPlugin.java @@ -7,7 +7,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.TeleportManager.TeleportType; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/interaction/city/WizardTowerPlugin.java b/Server/src/main/java/core/game/interaction/city/WizardTowerPlugin.java index b45862c80..c4093c1a5 100644 --- a/Server/src/main/java/core/game/interaction/city/WizardTowerPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/WizardTowerPlugin.java @@ -23,7 +23,7 @@ import core.game.node.entity.skill.Skills; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/interaction/city/ZanarisPlugin.java b/Server/src/main/java/core/game/interaction/city/ZanarisPlugin.java index 531836bbc..c9c40f062 100644 --- a/Server/src/main/java/core/game/interaction/city/ZanarisPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/ZanarisPlugin.java @@ -10,7 +10,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.TeleportManager.TeleportType; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Plugin; import rs09.plugin.PluginManager; diff --git a/Server/src/main/java/core/game/interaction/city/lumbridge/FredChest.java b/Server/src/main/java/core/game/interaction/city/lumbridge/FredChest.java index 85810a801..d89ec93d2 100644 --- a/Server/src/main/java/core/game/interaction/city/lumbridge/FredChest.java +++ b/Server/src/main/java/core/game/interaction/city/lumbridge/FredChest.java @@ -4,8 +4,8 @@ import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/item/GodBookPlugin.java b/Server/src/main/java/core/game/interaction/item/GodBookPlugin.java index 899e22188..8f383e3e8 100644 --- a/Server/src/main/java/core/game/interaction/item/GodBookPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/GodBookPlugin.java @@ -31,9 +31,8 @@ public class GodBookPlugin extends OptionHandler { public Plugin newInstance(Object arg) throws Throwable { for (GodBook book : GodBook.values()) { book.getDamagedBook().getDefinition().getHandlers().put("option:check", this); - book.getBook().getDefinition().getHandlers().put("option:preach", this); } - PluginManager.definePlugins(new PageHandler(), new GodBookDialogue(), new GodBookItem(), new SymbolBlessHandler()); + PluginManager.definePlugins(new PageHandler(), new GodBookItem(), new SymbolBlessHandler()); return this; } @@ -153,133 +152,6 @@ public class GodBookPlugin extends OptionHandler { } - /** - * Handles the god book dialogue. - * @author Vexia - */ - public static class GodBookDialogue extends DialoguePlugin { - - /** - * The partnership messages. - */ - private static final String[][] PARTNERSHIPS = new String[][] { { "In the name of Saradomin,", "protector of us all,", " I now join you in the eyes of Saradomin." }, { "Light and dark,", "day and night,", "Balance arises from contrast.", "I unify thee in the name of Guthix." }, { "May your union not be harmonious,", "but may your conflicts make you stronger,", "in Zamorak's name,", "now two are one." } }; - - /** - * The last rite messages. - */ - private static final String[][] LAST_RITES = new String[][] { { "Thy cause was false,", "thy skills did lack;", "See you in Lumbridge when you get back." }, { "Thy death was not in vain,", "For it brought some balance to the world.", "May Guthix bring thee rest." }, { "The weak deserve to die,", "so the strong may flourish.", "This is the creed of Zamorak." } }; - - /** - * The blessing messages. - */ - private static final String[][] BLESSINGS = new String[][] { { "Go in peace in the name of Saradomin;", "may his glory shine upon you like the sun." }, { "Mayest thou walk the path,", "and never fall,", "For Guthix walks beside thee on thy journey.", "May Guthix bring thee peace." }, { "May you reject all safe paths,", "and embrace all challenges.", "Zamorak bring you strength." } }; - - /** - * The preaching messages. - */ - private static final String[][] PREACH = new String[][] { { "Protect yourself,", "protect your friends.", "Mine is the glory that never ends.", "This is Saradomin's wisdom." }, { "Thee trees,", "the earth,", "the sky,", "the waters:", "All play their part upon this land.", "May Guthix bring thee balance." }, { "Battles are not lost and won;", "They simply remove the weak from the equation.", "Zamorak give me strength!" } }; - - private static final Animation[] ANIMATIONS = new Animation[] { new Animation(1335), new Animation(1337), new Animation(1336) }; - - /** - * The god book. - */ - private GodBook book; - - /** - * Constructs a new {@code GodBookDialogue} {@code Object} - */ - public GodBookDialogue() { - /** - * empty. - */ - } - - /** - * Constructs a new {@code GodBookDialogue} {@code Object} - * @param player the player. - */ - public GodBookDialogue(Player player) { - super(player); - } - - @Override - public DialoguePlugin newInstance(Player player) { - return new GodBookDialogue(player); - } - - @Override - public boolean open(Object... args) { - book = (GodBook) args[0]; - options("Wedding Ceremony", "Last Rites", "Blessings", "Preach"); - return true; - } - - @Override - public boolean handle(int interfaceId, int buttonId) { - switch (stage) { - case 0: - String[][] data = null; - switch (buttonId) { - case 1: - data = PARTNERSHIPS; - break; - case 2: - data = LAST_RITES; - break; - case 3: - data = BLESSINGS; - break; - case 4: - data = PREACH; - break; - } - say(data); - end(); - break; - } - return true; - } - - /** - * Says the messages for the type. - * @param data the data. - */ - private void say(String[][] data) { - if (player.inCombat()) { - player.sendMessage("You can't do that while in combat."); - return; - } - final String[] messages = data[book.ordinal()]; - final Animation animation = ANIMATIONS[book.ordinal()]; - player.animate(animation); - player.lock(); - GameWorld.getPulser().submit(new Pulse(2, player) { - int index = 0; - - @Override - public boolean pulse() { - player.animate(animation); - player.sendChat(messages[index]); - return index++ >= messages.length - 1; - } - - @Override - public void stop() { - super.stop(); - player.unlock(); - } - - }); - } - - @Override - public int[] getIds() { - return new int[] { DialogueInterpreter.getDialogueKey("god-book") }; - } - - } - /** * The page handler. * @author Vexia diff --git a/Server/src/main/java/core/game/interaction/item/SilverSicklePlugin.java b/Server/src/main/java/core/game/interaction/item/SilverSicklePlugin.java index 26629dd58..632db87a3 100644 --- a/Server/src/main/java/core/game/interaction/item/SilverSicklePlugin.java +++ b/Server/src/main/java/core/game/interaction/item/SilverSicklePlugin.java @@ -5,14 +5,8 @@ import core.cache.def.impl.ItemDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; -import core.game.world.map.Location; -import core.game.world.map.Region; -import core.game.world.map.RegionManager; import core.plugin.Initializable; import core.plugin.Plugin; -import core.tools.RandomFunction; import rs09.game.content.quest.members.naturespirit.NSUtils; /** diff --git a/Server/src/main/java/core/game/interaction/item/withitem/ChestKeyPlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/ChestKeyPlugin.java index 1f83be6c2..c3bb454f3 100644 --- a/Server/src/main/java/core/game/interaction/item/withitem/ChestKeyPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withitem/ChestKeyPlugin.java @@ -4,8 +4,8 @@ import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/item/withitem/ImpJarCreatePlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/ImpJarCreatePlugin.java index 9d2829285..30b90a001 100644 --- a/Server/src/main/java/core/game/interaction/item/withitem/ImpJarCreatePlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withitem/ImpJarCreatePlugin.java @@ -4,7 +4,7 @@ import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/item/withobject/GWDEntranceRopeUsage.java b/Server/src/main/java/core/game/interaction/item/withobject/GWDEntranceRopeUsage.java index 620f456c0..2a5a99e46 100644 --- a/Server/src/main/java/core/game/interaction/item/withobject/GWDEntranceRopeUsage.java +++ b/Server/src/main/java/core/game/interaction/item/withobject/GWDEntranceRopeUsage.java @@ -2,7 +2,7 @@ package core.game.interaction.item.withobject; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/item/withobject/PriestInPerilUsePlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/PriestInPerilUsePlugin.java index 5b7cde83e..0e712f0f0 100644 --- a/Server/src/main/java/core/game/interaction/item/withobject/PriestInPerilUsePlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withobject/PriestInPerilUsePlugin.java @@ -7,7 +7,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/item/withobject/SmithingPlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/SmithingPlugin.java index e62516b42..8502523b5 100644 --- a/Server/src/main/java/core/game/interaction/item/withobject/SmithingPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withobject/SmithingPlugin.java @@ -10,7 +10,7 @@ import core.game.interaction.UseWithHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Plugin; import core.plugin.Initializable; import rs09.game.node.entity.skill.skillcapeperks.SkillcapePerks; diff --git a/Server/src/main/java/core/game/interaction/item/withobject/WaterSourcePlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/WaterSourcePlugin.java index 9d9a44dad..546b1afea 100644 --- a/Server/src/main/java/core/game/interaction/item/withobject/WaterSourcePlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withobject/WaterSourcePlugin.java @@ -8,11 +8,10 @@ import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; -import rs09.game.system.SystemLogger; /** * Represents the plugin used to fill a bucket. diff --git a/Server/src/main/java/core/game/interaction/npc/BurthorpeOptionPlugin.java b/Server/src/main/java/core/game/interaction/npc/BurthorpeOptionPlugin.java index 021840af1..3b2c0fd76 100644 --- a/Server/src/main/java/core/game/interaction/npc/BurthorpeOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/npc/BurthorpeOptionPlugin.java @@ -7,7 +7,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/interaction/npc/SpiritKyattOptionPlugin.java b/Server/src/main/java/core/game/interaction/npc/SpiritKyattOptionPlugin.java index ea914a132..0700cbd80 100644 --- a/Server/src/main/java/core/game/interaction/npc/SpiritKyattOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/npc/SpiritKyattOptionPlugin.java @@ -6,8 +6,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/interaction/npc/ZaffPlugin.kt b/Server/src/main/java/core/game/interaction/npc/ZaffPlugin.kt index cf459799a..01693be2f 100644 --- a/Server/src/main/java/core/game/interaction/npc/ZaffPlugin.kt +++ b/Server/src/main/java/core/game/interaction/npc/ZaffPlugin.kt @@ -114,9 +114,10 @@ class ZaffPlugin : OptionHandler() { "Can I have another ring?" ) stage = 1 + } else { + interpreter.sendOptions("Select an Option", "Yes, please.", "No, thank you.") + stage = 1 } - interpreter.sendOptions("Select an Option", "Yes, please.", "No, thank you.") - stage = 1 } 1 -> when (buttonId) { 1 -> { @@ -134,9 +135,10 @@ class ZaffPlugin : OptionHandler() { } else if (quest!!.getStage(player) == 80) { player("We did it! We beat Surok!") stage = 200 + } else { + interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Can I have another ring?") + stage = 50 } - interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Can I have another ring?") - stage = 50 } } 10 -> { @@ -453,4 +455,4 @@ class ZaffPlugin : OptionHandler() { return ServerStore.getArchive("daily-zaff") } } -} \ No newline at end of file +} diff --git a/Server/src/main/java/core/game/interaction/npc/sorceress_app/SorceressApprenticePlugin.java b/Server/src/main/java/core/game/interaction/npc/sorceress_app/SorceressApprenticePlugin.java index 69d92e357..d4e3ee2a0 100644 --- a/Server/src/main/java/core/game/interaction/npc/sorceress_app/SorceressApprenticePlugin.java +++ b/Server/src/main/java/core/game/interaction/npc/sorceress_app/SorceressApprenticePlugin.java @@ -7,7 +7,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/interaction/object/BankingPlugin.java b/Server/src/main/java/core/game/interaction/object/BankingPlugin.java index 71e3914b5..d72498471 100644 --- a/Server/src/main/java/core/game/interaction/object/BankingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/BankingPlugin.java @@ -19,10 +19,9 @@ import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.IronmanMode; -import core.game.node.entity.player.link.RunScript; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import core.game.world.map.Direction; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/interaction/object/BarrowsTunnelShortcut.java b/Server/src/main/java/core/game/interaction/object/BarrowsTunnelShortcut.java index 66a0c1a89..210bc20ab 100644 --- a/Server/src/main/java/core/game/interaction/object/BarrowsTunnelShortcut.java +++ b/Server/src/main/java/core/game/interaction/object/BarrowsTunnelShortcut.java @@ -6,7 +6,7 @@ import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/object/BrassKeyDoorPlugin.java b/Server/src/main/java/core/game/interaction/object/BrassKeyDoorPlugin.java index a5c2f5580..b9336f110 100644 --- a/Server/src/main/java/core/game/interaction/object/BrassKeyDoorPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/BrassKeyDoorPlugin.java @@ -5,7 +5,7 @@ import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/object/ChampionsArenaPlugin.java b/Server/src/main/java/core/game/interaction/object/ChampionsArenaPlugin.java index 6ff0dacb7..cf7df65f9 100644 --- a/Server/src/main/java/core/game/interaction/object/ChampionsArenaPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ChampionsArenaPlugin.java @@ -5,7 +5,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/object/ChampionsGuildDoor.java b/Server/src/main/java/core/game/interaction/object/ChampionsGuildDoor.java index be987496e..46df975ee 100644 --- a/Server/src/main/java/core/game/interaction/object/ChampionsGuildDoor.java +++ b/Server/src/main/java/core/game/interaction/object/ChampionsGuildDoor.java @@ -6,7 +6,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/object/ChefGuildDoorPlugin.java b/Server/src/main/java/core/game/interaction/object/ChefGuildDoorPlugin.java index bdeedbc84..d3793bd6b 100644 --- a/Server/src/main/java/core/game/interaction/object/ChefGuildDoorPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ChefGuildDoorPlugin.java @@ -8,7 +8,7 @@ import core.game.node.entity.skill.Skills; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/object/CowMilkingPlugin.java b/Server/src/main/java/core/game/interaction/object/CowMilkingPlugin.java index 578bcb362..efb6160e6 100644 --- a/Server/src/main/java/core/game/interaction/object/CowMilkingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/CowMilkingPlugin.java @@ -7,7 +7,7 @@ import core.game.interaction.UseWithHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/object/CulinomancerChestPliugin.java b/Server/src/main/java/core/game/interaction/object/CulinomancerChestPliugin.java index 32314daa3..fa25b5715 100644 --- a/Server/src/main/java/core/game/interaction/object/CulinomancerChestPliugin.java +++ b/Server/src/main/java/core/game/interaction/object/CulinomancerChestPliugin.java @@ -4,8 +4,8 @@ import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/interaction/object/DoorManagingPlugin.java b/Server/src/main/java/core/game/interaction/object/DoorManagingPlugin.java index ced526848..d57aa9ece 100644 --- a/Server/src/main/java/core/game/interaction/object/DoorManagingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/DoorManagingPlugin.java @@ -5,8 +5,8 @@ import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/interaction/object/DropPartyLeverOptionPlugin.java b/Server/src/main/java/core/game/interaction/object/DropPartyLeverOptionPlugin.java index eedc6f991..f8431a5e5 100644 --- a/Server/src/main/java/core/game/interaction/object/DropPartyLeverOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/DropPartyLeverOptionPlugin.java @@ -4,7 +4,7 @@ import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/interaction/object/ErnestTheChickenPlugin.java b/Server/src/main/java/core/game/interaction/object/ErnestTheChickenPlugin.java index b7692f3d0..63d6eb349 100644 --- a/Server/src/main/java/core/game/interaction/object/ErnestTheChickenPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ErnestTheChickenPlugin.java @@ -10,8 +10,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/interaction/object/FieldPickingPlugin.java b/Server/src/main/java/core/game/interaction/object/FieldPickingPlugin.java index df18bdf0c..551f64776 100644 --- a/Server/src/main/java/core/game/interaction/object/FieldPickingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/FieldPickingPlugin.java @@ -8,8 +8,8 @@ import core.game.node.entity.combat.ImpactHandler.HitsplatType; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/interaction/object/GrandExchangeShortcut.java b/Server/src/main/java/core/game/interaction/object/GrandExchangeShortcut.java index 189b4bef8..6caff3adc 100644 --- a/Server/src/main/java/core/game/interaction/object/GrandExchangeShortcut.java +++ b/Server/src/main/java/core/game/interaction/object/GrandExchangeShortcut.java @@ -8,7 +8,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/interaction/object/HaystackPlugin.java b/Server/src/main/java/core/game/interaction/object/HaystackPlugin.java index d5c7871fc..830fa5053 100644 --- a/Server/src/main/java/core/game/interaction/object/HaystackPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/HaystackPlugin.java @@ -7,7 +7,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/interaction/object/JangerBerryPlugin.java b/Server/src/main/java/core/game/interaction/object/JangerBerryPlugin.java index 1f65fe92c..0e19af875 100644 --- a/Server/src/main/java/core/game/interaction/object/JangerBerryPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/JangerBerryPlugin.java @@ -8,8 +8,8 @@ import core.game.interaction.OptionHandler; import core.game.interaction.UseWithHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/object/KalphiteEntranceHandler.java b/Server/src/main/java/core/game/interaction/object/KalphiteEntranceHandler.java index c2b90bbc9..15b7c22cd 100644 --- a/Server/src/main/java/core/game/interaction/object/KalphiteEntranceHandler.java +++ b/Server/src/main/java/core/game/interaction/object/KalphiteEntranceHandler.java @@ -6,8 +6,8 @@ import core.game.interaction.OptionHandler; import core.game.interaction.UseWithHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/interaction/object/KhardianInteractionPlugin.java b/Server/src/main/java/core/game/interaction/object/KhardianInteractionPlugin.java index 23dd000f6..86562b787 100644 --- a/Server/src/main/java/core/game/interaction/object/KhardianInteractionPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/KhardianInteractionPlugin.java @@ -7,8 +7,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/object/LadderManagingPlugin.java b/Server/src/main/java/core/game/interaction/object/LadderManagingPlugin.java index 0eaee88fc..256330a7f 100644 --- a/Server/src/main/java/core/game/interaction/object/LadderManagingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/LadderManagingPlugin.java @@ -5,7 +5,7 @@ import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/object/LavaMazePlugin.java b/Server/src/main/java/core/game/interaction/object/LavaMazePlugin.java index a361da272..0282bca1d 100644 --- a/Server/src/main/java/core/game/interaction/object/LavaMazePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/LavaMazePlugin.java @@ -5,7 +5,7 @@ import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/object/LumbridgeBasementPlugin.java b/Server/src/main/java/core/game/interaction/object/LumbridgeBasementPlugin.java index 42956e250..b568be5c8 100644 --- a/Server/src/main/java/core/game/interaction/object/LumbridgeBasementPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/LumbridgeBasementPlugin.java @@ -10,8 +10,8 @@ import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/interaction/object/LumbridgeSwampHolePlugin.java b/Server/src/main/java/core/game/interaction/object/LumbridgeSwampHolePlugin.java index c0aaeb545..08f4e568e 100644 --- a/Server/src/main/java/core/game/interaction/object/LumbridgeSwampHolePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/LumbridgeSwampHolePlugin.java @@ -7,8 +7,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/interaction/object/MuseumGatePlugin.java b/Server/src/main/java/core/game/interaction/object/MuseumGatePlugin.java index 47f237a90..722bcd31f 100644 --- a/Server/src/main/java/core/game/interaction/object/MuseumGatePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/MuseumGatePlugin.java @@ -5,7 +5,7 @@ import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/object/PortsObjectPlugin.java b/Server/src/main/java/core/game/interaction/object/PortsObjectPlugin.java index 20416bd8c..54530ad20 100644 --- a/Server/src/main/java/core/game/interaction/object/PortsObjectPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/PortsObjectPlugin.java @@ -5,7 +5,7 @@ import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import rs09.game.world.repository.Repository; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/interaction/object/PriestInPerilOptionPlugin.java b/Server/src/main/java/core/game/interaction/object/PriestInPerilOptionPlugin.java index ba1b8d79f..03e4f027d 100644 --- a/Server/src/main/java/core/game/interaction/object/PriestInPerilOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/PriestInPerilOptionPlugin.java @@ -10,7 +10,7 @@ import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/object/ProspectOrePlugin.java b/Server/src/main/java/core/game/interaction/object/ProspectOrePlugin.java index 80704ee7d..d2fc96923 100644 --- a/Server/src/main/java/core/game/interaction/object/ProspectOrePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ProspectOrePlugin.java @@ -9,7 +9,7 @@ import core.game.node.entity.skill.gather.SkillingResource; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/object/PyreSitePlugin.java b/Server/src/main/java/core/game/interaction/object/PyreSitePlugin.java index 758b342e1..d00c330dc 100644 --- a/Server/src/main/java/core/game/interaction/object/PyreSitePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/PyreSitePlugin.java @@ -14,8 +14,8 @@ import core.game.node.entity.skill.firemaking.Log; import core.game.node.entity.skill.gather.SkillingTool; import core.game.node.item.ChanceItem; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/interaction/object/ReadSignPostPlugin.java b/Server/src/main/java/core/game/interaction/object/ReadSignPostPlugin.java index 0248ef077..71e2e61af 100644 --- a/Server/src/main/java/core/game/interaction/object/ReadSignPostPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ReadSignPostPlugin.java @@ -6,7 +6,7 @@ import core.game.component.Component; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.net.packet.PacketRepository; import core.net.packet.context.MinimapStateContext; import core.net.packet.out.MinimapState; diff --git a/Server/src/main/java/core/game/interaction/object/RedberryBushPlugin.java b/Server/src/main/java/core/game/interaction/object/RedberryBushPlugin.java index 31a7ff280..ce7b031da 100644 --- a/Server/src/main/java/core/game/interaction/object/RedberryBushPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/RedberryBushPlugin.java @@ -5,8 +5,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/object/RomeoQuestPlugin.java b/Server/src/main/java/core/game/interaction/object/RomeoQuestPlugin.java index 05acef473..8740ef9a3 100644 --- a/Server/src/main/java/core/game/interaction/object/RomeoQuestPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/RomeoQuestPlugin.java @@ -5,8 +5,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/object/RuneCraftingGuildObjects.java b/Server/src/main/java/core/game/interaction/object/RuneCraftingGuildObjects.java index f99988861..68511467e 100644 --- a/Server/src/main/java/core/game/interaction/object/RuneCraftingGuildObjects.java +++ b/Server/src/main/java/core/game/interaction/object/RuneCraftingGuildObjects.java @@ -4,7 +4,7 @@ import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/object/ShantayPassPlugin.java b/Server/src/main/java/core/game/interaction/object/ShantayPassPlugin.java index 61dd5a65a..e308a0fd2 100644 --- a/Server/src/main/java/core/game/interaction/object/ShantayPassPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ShantayPassPlugin.java @@ -12,7 +12,7 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/object/SinclairFlourBarrelPlugin.java b/Server/src/main/java/core/game/interaction/object/SinclairFlourBarrelPlugin.java index 252afe650..d272cb9c0 100644 --- a/Server/src/main/java/core/game/interaction/object/SinclairFlourBarrelPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/SinclairFlourBarrelPlugin.java @@ -9,7 +9,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; import rs09.plugin.PluginManager; diff --git a/Server/src/main/java/core/game/interaction/object/SlashWebPlugin.java b/Server/src/main/java/core/game/interaction/object/SlashWebPlugin.java index 5b037a3fd..6824d7f93 100644 --- a/Server/src/main/java/core/game/interaction/object/SlashWebPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/SlashWebPlugin.java @@ -13,8 +13,8 @@ import core.game.node.entity.combat.equipment.WeaponInterface.WeaponInterfaces; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/interaction/object/ThievingGuidePlugin.java b/Server/src/main/java/core/game/interaction/object/ThievingGuidePlugin.java index 6ca480bad..7323331f6 100644 --- a/Server/src/main/java/core/game/interaction/object/ThievingGuidePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ThievingGuidePlugin.java @@ -9,8 +9,8 @@ import core.game.node.entity.player.Player; import core.game.node.entity.skill.Skills; import core.game.node.item.ChanceItem; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/interaction/object/TollGateOptionPlugin.java b/Server/src/main/java/core/game/interaction/object/TollGateOptionPlugin.java index 6381cf9e0..a3fd99706 100644 --- a/Server/src/main/java/core/game/interaction/object/TollGateOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/TollGateOptionPlugin.java @@ -6,7 +6,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import rs09.game.world.repository.Repository; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/object/VampireSlayerPlugin.java b/Server/src/main/java/core/game/interaction/object/VampireSlayerPlugin.java index aa18e2eec..e9fe41fb3 100644 --- a/Server/src/main/java/core/game/interaction/object/VampireSlayerPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/VampireSlayerPlugin.java @@ -7,7 +7,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/object/WildernessLeverPlugin.java b/Server/src/main/java/core/game/interaction/object/WildernessLeverPlugin.java index d300809dc..bb7330025 100644 --- a/Server/src/main/java/core/game/interaction/object/WildernessLeverPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/WildernessLeverPlugin.java @@ -9,8 +9,8 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.TeleportManager; import core.game.node.entity.player.link.audio.Audio; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/interaction/object/WildernessObeliskPlugin.java b/Server/src/main/java/core/game/interaction/object/WildernessObeliskPlugin.java index 82a481ea0..75ea82f6e 100644 --- a/Server/src/main/java/core/game/interaction/object/WildernessObeliskPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/WildernessObeliskPlugin.java @@ -5,8 +5,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.TeleportManager.TeleportType; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/interaction/object/WydinDoorPlugin.java b/Server/src/main/java/core/game/interaction/object/WydinDoorPlugin.java index 4ea80da36..00939ab60 100644 --- a/Server/src/main/java/core/game/interaction/object/WydinDoorPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/WydinDoorPlugin.java @@ -6,7 +6,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/object/dmc/DMCHandler.java b/Server/src/main/java/core/game/interaction/object/dmc/DMCHandler.java index 1c39b27f1..519b7c981 100644 --- a/Server/src/main/java/core/game/interaction/object/dmc/DMCHandler.java +++ b/Server/src/main/java/core/game/interaction/object/dmc/DMCHandler.java @@ -8,8 +8,8 @@ import core.game.node.entity.impl.Projectile; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; diff --git a/Server/src/main/java/core/game/interaction/object/sorceress/GardenObjectsPlugin.kt b/Server/src/main/java/core/game/interaction/object/sorceress/GardenObjectsPlugin.kt index b76395aed..b79512f50 100644 --- a/Server/src/main/java/core/game/interaction/object/sorceress/GardenObjectsPlugin.kt +++ b/Server/src/main/java/core/game/interaction/object/sorceress/GardenObjectsPlugin.kt @@ -12,7 +12,7 @@ import core.game.content.dialogue.FacialExpression import core.game.interaction.NodeUsageEvent import core.game.interaction.UseWithHandler import core.game.node.Node -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.entity.player.link.quest.Quest diff --git a/Server/src/main/java/core/game/interaction/object/sorceress/SorceressGardenObject.java b/Server/src/main/java/core/game/interaction/object/sorceress/SorceressGardenObject.java index 95c0281d9..d897c0ec0 100644 --- a/Server/src/main/java/core/game/interaction/object/sorceress/SorceressGardenObject.java +++ b/Server/src/main/java/core/game/interaction/object/sorceress/SorceressGardenObject.java @@ -6,7 +6,7 @@ import core.game.node.entity.skill.Skills; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Plugin; /** diff --git a/Server/src/main/java/core/game/interaction/object/wildyditch/WildernessDitchPlugin.java b/Server/src/main/java/core/game/interaction/object/wildyditch/WildernessDitchPlugin.java index 0a755ea24..e31f7604f 100644 --- a/Server/src/main/java/core/game/interaction/object/wildyditch/WildernessDitchPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/wildyditch/WildernessDitchPlugin.java @@ -6,7 +6,7 @@ import core.game.interaction.MovementPulse; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; import rs09.plugin.PluginManager; diff --git a/Server/src/main/java/core/game/interaction/object/wildyditch/WildernessInterfacePlugin.java b/Server/src/main/java/core/game/interaction/object/wildyditch/WildernessInterfacePlugin.java index 3202dfd7d..9e52435a4 100644 --- a/Server/src/main/java/core/game/interaction/object/wildyditch/WildernessInterfacePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/wildyditch/WildernessInterfacePlugin.java @@ -6,7 +6,7 @@ import core.game.component.ComponentPlugin; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/node/Node.java b/Server/src/main/java/core/game/node/Node.java index 33b4aabd0..493ec9239 100644 --- a/Server/src/main/java/core/game/node/Node.java +++ b/Server/src/main/java/core/game/node/Node.java @@ -5,7 +5,7 @@ import core.game.interaction.Interaction; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Direction; import core.game.world.map.Location; import core.tools.StringUtils; diff --git a/Server/src/main/java/core/game/node/entity/npc/city/sophanem/WallShortcut.java b/Server/src/main/java/core/game/node/entity/npc/city/sophanem/WallShortcut.java index 7d1df6b77..3a394d3ea 100644 --- a/Server/src/main/java/core/game/node/entity/npc/city/sophanem/WallShortcut.java +++ b/Server/src/main/java/core/game/node/entity/npc/city/sophanem/WallShortcut.java @@ -7,7 +7,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/BeaverNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/BeaverNPC.java index ace957e93..aadf2cdbc 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/BeaverNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/BeaverNPC.java @@ -7,7 +7,7 @@ import core.game.node.entity.skill.summoning.familiar.FamiliarSpecial; import core.game.node.entity.skill.summoning.familiar.Forager; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/CompostMoundNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/CompostMoundNPC.java index ef5696ca6..4de682105 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/CompostMoundNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/CompostMoundNPC.java @@ -12,7 +12,7 @@ import core.game.node.entity.skill.summoning.familiar.Familiar; import core.game.node.entity.skill.summoning.familiar.FamiliarSpecial; import core.game.node.entity.skill.summoning.familiar.Forager; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/DesertWyrmNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/DesertWyrmNPC.java index 315b0366c..84dd26460 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/DesertWyrmNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/DesertWyrmNPC.java @@ -20,7 +20,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/ForgeRegentNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/ForgeRegentNPC.java index 835c9f4ab..7b64dc9d4 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/ForgeRegentNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/ForgeRegentNPC.java @@ -6,8 +6,8 @@ import core.game.interaction.UseWithHandler; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.RegionManager; diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/PyreLordNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/PyreLordNPC.java index 9f41ae7f8..da1335864 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/PyreLordNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/PyreLordNPC.java @@ -15,8 +15,8 @@ import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.RegionManager; diff --git a/Server/src/main/java/core/game/node/entity/npc/other/ArmourSuitNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/ArmourSuitNPC.java index 3fe12fc2f..013071479 100644 --- a/Server/src/main/java/core/game/node/entity/npc/other/ArmourSuitNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/other/ArmourSuitNPC.java @@ -1,8 +1,8 @@ package core.game.node.entity.npc.other; import core.game.node.entity.npc.AbstractNPC; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/node/entity/player/link/PacketDispatch.java b/Server/src/main/java/core/game/node/entity/player/link/PacketDispatch.java index 3b9076515..ec8e26a23 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/PacketDispatch.java +++ b/Server/src/main/java/core/game/node/entity/player/link/PacketDispatch.java @@ -3,7 +3,7 @@ package core.game.node.entity.player.link; import rs09.game.Varp; import core.game.content.quest.tutorials.tutorialisland.TutorialSession; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import rs09.game.system.SystemLogger; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/AgilityShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/AgilityShortcut.java index acd426b38..3adb63a89 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/AgilityShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/AgilityShortcut.java @@ -4,7 +4,7 @@ import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Direction; import core.game.world.map.Location; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BrimhavenArena.java b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BrimhavenArena.java index be5b658c6..e11430740 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BrimhavenArena.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BrimhavenArena.java @@ -11,8 +11,8 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.MovementHook; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BrimhavenCourse.java b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BrimhavenCourse.java index 71aa75198..138941e50 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BrimhavenCourse.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BrimhavenCourse.java @@ -8,7 +8,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/AgilityPyramidCourse.java b/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/AgilityPyramidCourse.java index 81d56efef..9dbf026c7 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/AgilityPyramidCourse.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/AgilityPyramidCourse.java @@ -11,7 +11,7 @@ import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/RollingBlock.java b/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/RollingBlock.java index 15f6f0990..82960b3da 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/RollingBlock.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/RollingBlock.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.agility.pyramid; import core.game.node.entity.skill.agility.AgilityHandler; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.MovementHook; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/AlKharidPitShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/AlKharidPitShortcut.java index e6d5bbb82..866a50f37 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/AlKharidPitShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/AlKharidPitShortcut.java @@ -5,7 +5,7 @@ import core.game.node.entity.skill.agility.AgilityShortcut; import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/BarSqueezeShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/BarSqueezeShortcut.java index f6f811718..adf8651ec 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/BarSqueezeShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/BarSqueezeShortcut.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.agility.shortcuts; import core.game.node.entity.skill.agility.AgilityHandler; import core.game.node.entity.skill.agility.AgilityShortcut; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/CrumblingWallShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/CrumblingWallShortcut.java index 716ace6e2..c43893d5c 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/CrumblingWallShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/CrumblingWallShortcut.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.agility.shortcuts; import core.game.node.entity.skill.agility.AgilityShortcut; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/FenceJumpShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/FenceJumpShortcut.java index 79a104842..072d3f0e6 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/FenceJumpShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/FenceJumpShortcut.java @@ -5,7 +5,7 @@ import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/KaramjaGrapple.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/KaramjaGrapple.java index 515912757..b5658cc8a 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/KaramjaGrapple.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/KaramjaGrapple.java @@ -8,7 +8,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/LogBalanceShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/LogBalanceShortcut.java index 348ccd944..2fbd925ad 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/LogBalanceShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/LogBalanceShortcut.java @@ -6,7 +6,7 @@ import core.game.node.entity.skill.agility.AgilityHandler; import core.game.node.entity.skill.agility.AgilityShortcut; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/MonkeyBarShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/MonkeyBarShortcut.java index 5ab3fcd23..b1a1014db 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/MonkeyBarShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/MonkeyBarShortcut.java @@ -6,7 +6,7 @@ import core.game.node.entity.skill.agility.AgilityShortcut; import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/RopeSwing.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/RopeSwing.java index 0906bcdbc..d57f8116d 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/RopeSwing.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/RopeSwing.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.agility.shortcuts; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/StileShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/StileShortcut.java index 05fd4e659..2efb7745d 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/StileShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/StileShortcut.java @@ -6,7 +6,7 @@ import core.game.node.entity.skill.agility.AgilityShortcut; import core.game.interaction.MovementPulse; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/StrangeFloorShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/StrangeFloorShortcut.java index 4fad95805..9a21ec827 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/StrangeFloorShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/StrangeFloorShortcut.java @@ -7,7 +7,7 @@ import core.game.node.entity.skill.agility.AgilityShortcut; import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/TunnelShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/TunnelShortcut.java index 00a079cd2..445854d4e 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/TunnelShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/TunnelShortcut.java @@ -5,7 +5,7 @@ import core.game.node.entity.skill.agility.AgilityShortcut; import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/WaterOrbGrapple.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/WaterOrbGrapple.java index 70749edc6..5128206b3 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/WaterOrbGrapple.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/WaterOrbGrapple.java @@ -8,8 +8,8 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/ZanarisSqueezeShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/ZanarisSqueezeShortcut.java index b9a16714d..1d057e5b8 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/ZanarisSqueezeShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/ZanarisSqueezeShortcut.java @@ -5,7 +5,7 @@ import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.agility.AgilityShortcut; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/BuildOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/BuildOptionPlugin.java index d9b648347..63cf6aed3 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/BuildOptionPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/BuildOptionPlugin.java @@ -8,7 +8,7 @@ import core.game.content.dialogue.DialoguePlugin; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; import rs09.game.node.entity.skill.construction.Hotspot; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/BuildRoomDialogue.java b/Server/src/main/java/core/game/node/entity/skill/construction/BuildRoomDialogue.java index ef029de68..2b34c49eb 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/BuildRoomDialogue.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/BuildRoomDialogue.java @@ -3,8 +3,8 @@ package core.game.node.entity.skill.construction; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.RegionChunk; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/BuildingUtils.java b/Server/src/main/java/core/game/node/entity/skill/construction/BuildingUtils.java index 0a1efea84..5399e0bbf 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/BuildingUtils.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/BuildingUtils.java @@ -5,8 +5,8 @@ import core.game.component.Component; import core.game.node.entity.player.Player; import core.game.node.entity.skill.Skills; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import core.game.world.map.BuildRegionChunk; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/ConstructionInterface.java b/Server/src/main/java/core/game/node/entity/skill/construction/ConstructionInterface.java index 425d51927..33ee06a11 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/ConstructionInterface.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/ConstructionInterface.java @@ -7,7 +7,7 @@ import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; import core.game.node.entity.player.Player; import core.game.node.entity.skill.Skills; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; import rs09.game.node.entity.skill.construction.Hotspot; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/Decoration.java b/Server/src/main/java/core/game/node/entity/skill/construction/Decoration.java index 34502c90d..792e10bd0 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/Decoration.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/Decoration.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.construction; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import rs09.game.node.entity.skill.construction.Hotspot; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/HouseManager.java b/Server/src/main/java/core/game/node/entity/skill/construction/HouseManager.java index 5629301fa..017e43efb 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/HouseManager.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/HouseManager.java @@ -8,7 +8,7 @@ import core.game.content.dialogue.FacialExpression; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; import core.game.node.entity.skill.Skills; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import core.game.world.map.*; import core.game.world.map.build.DynamicRegion; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/PortalOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/PortalOptionPlugin.java index 433236eb2..7dd543a29 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/PortalOptionPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/PortalOptionPlugin.java @@ -8,7 +8,7 @@ import core.game.content.dialogue.DialoguePlugin; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; import core.plugin.PluginManifest; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/Room.java b/Server/src/main/java/core/game/node/entity/skill/construction/Room.java index ac800fda8..df8782295 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/Room.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/Room.java @@ -2,11 +2,10 @@ package core.game.node.entity.skill.construction; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.*; import rs09.game.node.entity.skill.construction.Hotspot; -import rs09.game.system.SystemLogger; /** * Represents a room. diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/RoomBuilder.java b/Server/src/main/java/core/game/node/entity/skill/construction/RoomBuilder.java index e3b07327d..3bb0e5bc4 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/RoomBuilder.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/RoomBuilder.java @@ -4,8 +4,8 @@ import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.BuildRegionChunk; import core.game.world.map.Direction; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/RoomProperties.java b/Server/src/main/java/core/game/node/entity/skill/construction/RoomProperties.java index 85e529edd..66dfb6880 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/RoomProperties.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/RoomProperties.java @@ -1,7 +1,7 @@ package core.game.node.entity.skill.construction; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Region; import core.game.world.map.RegionChunk; import core.game.world.map.RegionManager; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/BeerBarrelPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/BeerBarrelPlugin.java index e28be9da2..5ea2e14fd 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/BeerBarrelPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/BeerBarrelPlugin.java @@ -4,7 +4,7 @@ import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/ChairBenchPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/ChairBenchPlugin.java index 3b4978d88..d38840226 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/ChairBenchPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/ChairBenchPlugin.java @@ -6,7 +6,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/FireplacePlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/FireplacePlugin.java index 83487d3cb..4cbc250d2 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/FireplacePlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/FireplacePlugin.java @@ -8,8 +8,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/StaircasePlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/StaircasePlugin.java index be7f2c6ad..d204bdcbc 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/StaircasePlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/StaircasePlugin.java @@ -10,8 +10,8 @@ import core.game.node.entity.skill.construction.BuildingUtils; import core.game.node.entity.skill.construction.HouseManager; import core.game.node.entity.skill.construction.Room; import core.game.node.entity.skill.construction.RoomProperties; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import core.game.world.map.Direction; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/bedroom/ClockPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/bedroom/ClockPlugin.java index 9fbb07004..abc594914 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/bedroom/ClockPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/bedroom/ClockPlugin.java @@ -5,7 +5,7 @@ import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/chapel/BoneOfferPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/chapel/BoneOfferPlugin.java index 28139bea9..3a8ee87aa 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/chapel/BoneOfferPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/chapel/BoneOfferPlugin.java @@ -10,9 +10,8 @@ import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; -import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/BeerBarrelPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/BeerBarrelPlugin.java index 2f994df57..efe2e9f8e 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/BeerBarrelPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/BeerBarrelPlugin.java @@ -5,7 +5,7 @@ import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberPlugin.java index ad079ebf1..ddc1d3f2d 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberPlugin.java @@ -10,7 +10,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.skill.construction.Decoration; import core.game.node.entity.skill.runecrafting.Rune; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/workshop/ClockmakersBenchPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/workshop/ClockmakersBenchPlugin.java index c4a76b3e5..c75439dcf 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/workshop/ClockmakersBenchPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/workshop/ClockmakersBenchPlugin.java @@ -12,7 +12,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; import rs09.plugin.PluginManager; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/workshop/ToolsPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/workshop/ToolsPlugin.java index adf36c31e..e12b7f104 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/workshop/ToolsPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/workshop/ToolsPlugin.java @@ -10,7 +10,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Plugin; import rs09.plugin.PluginManager; diff --git a/Server/src/main/java/core/game/node/entity/skill/cooking/CookingRewrite.kt b/Server/src/main/java/core/game/node/entity/skill/cooking/CookingRewrite.kt index f3537f36b..4acf52ded 100644 --- a/Server/src/main/java/core/game/node/entity/skill/cooking/CookingRewrite.kt +++ b/Server/src/main/java/core/game/node/entity/skill/cooking/CookingRewrite.kt @@ -1,6 +1,6 @@ package core.game.node.entity.skill.cooking -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.player.Player import core.game.node.item.Item import org.rs09.consts.Items diff --git a/Server/src/main/java/core/game/node/entity/skill/cooking/IntentionalBurnPulse.java b/Server/src/main/java/core/game/node/entity/skill/cooking/IntentionalBurnPulse.java index 323ef620c..632ee7f62 100644 --- a/Server/src/main/java/core/game/node/entity/skill/cooking/IntentionalBurnPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/cooking/IntentionalBurnPulse.java @@ -2,7 +2,7 @@ package core.game.node.entity.skill.cooking; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; public class IntentionalBurnPulse extends StandardCookingPulse { int initial,product,amount; diff --git a/Server/src/main/java/core/game/node/entity/skill/cooking/PieCookingPulse.java b/Server/src/main/java/core/game/node/entity/skill/cooking/PieCookingPulse.java index 9de2dcf92..f19b45265 100644 --- a/Server/src/main/java/core/game/node/entity/skill/cooking/PieCookingPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/cooking/PieCookingPulse.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.cooking; import core.cache.def.impl.ItemDefinition; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; public class PieCookingPulse extends StandardCookingPulse { private Scenery object; diff --git a/Server/src/main/java/core/game/node/entity/skill/cooking/PizzaCookingPulse.java b/Server/src/main/java/core/game/node/entity/skill/cooking/PizzaCookingPulse.java index 0f3926457..4d0bdd19c 100644 --- a/Server/src/main/java/core/game/node/entity/skill/cooking/PizzaCookingPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/cooking/PizzaCookingPulse.java @@ -2,7 +2,7 @@ package core.game.node.entity.skill.cooking; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; public class PizzaCookingPulse extends StandardCookingPulse { Scenery object; diff --git a/Server/src/main/java/core/game/node/entity/skill/cooking/StandardCookingPulse.java b/Server/src/main/java/core/game/node/entity/skill/cooking/StandardCookingPulse.java index d07497a1e..976be2063 100644 --- a/Server/src/main/java/core/game/node/entity/skill/cooking/StandardCookingPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/cooking/StandardCookingPulse.java @@ -10,7 +10,7 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.entity.skill.Skills; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/skill/crafting/WeaveOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/WeaveOptionPlugin.java index b25fee8e2..40594940b 100644 --- a/Server/src/main/java/core/game/node/entity/skill/crafting/WeaveOptionPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/crafting/WeaveOptionPlugin.java @@ -12,7 +12,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; import core.tools.StringUtils; diff --git a/Server/src/main/java/core/game/node/entity/skill/firemaking/FireMakingPulse.java b/Server/src/main/java/core/game/node/entity/skill/firemaking/FireMakingPulse.java index d078eb17d..e8dda160d 100644 --- a/Server/src/main/java/core/game/node/entity/skill/firemaking/FireMakingPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/firemaking/FireMakingPulse.java @@ -10,8 +10,8 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import rs09.game.world.GameWorld; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/skill/gather/GatheringSkillPulse.java b/Server/src/main/java/core/game/node/entity/skill/gather/GatheringSkillPulse.java index 9d95c2135..2d6d03b06 100644 --- a/Server/src/main/java/core/game/node/entity/skill/gather/GatheringSkillPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/gather/GatheringSkillPulse.java @@ -12,8 +12,8 @@ import core.game.node.entity.player.Player; import core.game.node.entity.skill.SkillPulse; import core.game.node.entity.skill.Skills; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.tools.RandomFunction; import core.tools.StringUtils; diff --git a/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingNode.java b/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingNode.java index beda21d8c..566d63ba8 100644 --- a/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingNode.java +++ b/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingNode.java @@ -273,6 +273,8 @@ public enum WoodcuttingNode { experience = 175.0; level = 60; rewardAmount = 40; + baseLow = 4; + baseHigh = 12.5; tierModLow = 2; tierModHigh = 6.25; break; diff --git a/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java b/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java index 7d1319102..5fb6a2cf0 100644 --- a/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java @@ -14,8 +14,8 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.gather.SkillingTool; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/DeadfallSetting.java b/Server/src/main/java/core/game/node/entity/skill/hunter/DeadfallSetting.java index b1daa96ff..97867a60a 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/DeadfallSetting.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/DeadfallSetting.java @@ -5,8 +5,8 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/HunterManager.java b/Server/src/main/java/core/game/node/entity/skill/hunter/HunterManager.java index d55652b23..9b343f988 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/HunterManager.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/HunterManager.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.hunter; import core.game.node.entity.skill.Skills; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import java.util.ArrayList; import java.util.Iterator; diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/HunterPlugin.java b/Server/src/main/java/core/game/node/entity/skill/hunter/HunterPlugin.java index b6137bad5..1bcc4e555 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/HunterPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/HunterPlugin.java @@ -17,7 +17,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/NetTrapSetting.java b/Server/src/main/java/core/game/node/entity/skill/hunter/NetTrapSetting.java index c19dc2788..157fe9e24 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/NetTrapSetting.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/NetTrapSetting.java @@ -4,8 +4,8 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/TrapCreatePulse.java b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapCreatePulse.java index d528d6df2..6d308f379 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/TrapCreatePulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapCreatePulse.java @@ -6,8 +6,8 @@ import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/TrapDismantlePulse.java b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapDismantlePulse.java index e7b0fb288..1773e3e0b 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/TrapDismantlePulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapDismantlePulse.java @@ -4,7 +4,7 @@ import core.game.content.global.SkillingPets; import core.game.node.entity.skill.SkillPulse; import core.game.node.entity.skill.Skills; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; /** * Handles the dismantling of a trap. diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/TrapSetting.java b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapSetting.java index 48181f4cc..c21cf0fda 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/TrapSetting.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapSetting.java @@ -8,8 +8,8 @@ import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/TrapWrapper.java b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapWrapper.java index 626b94165..ccc0a930f 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/TrapWrapper.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapWrapper.java @@ -3,8 +3,8 @@ package core.game.node.entity.skill.hunter; import core.game.node.entity.skill.hunter.NetTrapSetting.NetTrap; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/Traps.java b/Server/src/main/java/core/game/node/entity/skill/hunter/Traps.java index 259367a0a..daf56d261 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/Traps.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/Traps.java @@ -4,7 +4,7 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import rs09.game.system.SystemLogger; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/skill/magic/ChargeOrbSpells.java b/Server/src/main/java/core/game/node/entity/skill/magic/ChargeOrbSpells.java index c954889d3..7c1a514c2 100644 --- a/Server/src/main/java/core/game/node/entity/skill/magic/ChargeOrbSpells.java +++ b/Server/src/main/java/core/game/node/entity/skill/magic/ChargeOrbSpells.java @@ -8,7 +8,7 @@ import core.game.node.entity.combat.equipment.SpellType; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.SpellBookManager.SpellBook; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Initializable; @@ -78,7 +78,7 @@ public final class ChargeOrbSpells extends MagicSpell { public Plugin newInstance(SpellType arg) throws Throwable { SpellBook.MODERN.register(35, new ChargeOrbSpells(56, 2151, 571, 35, new Graphics(149, 96), Runes.WATER_RUNE.getItem(30), Runes.COSMIC_RUNE.getItem(3), UNPOWERED_ORB)); SpellBook.MODERN.register(39, new ChargeOrbSpells(60, 29415, 575, 39, new Graphics(151, 96), Runes.EARTH_RUNE.getItem(30), Runes.COSMIC_RUNE.getItem(3), UNPOWERED_ORB)); - SpellBook.MODERN.register(46, new ChargeOrbSpells(63, 42322, 569, 46, new Graphics(152, 96), Runes.FIRE_RUNE.getItem(30), Runes.COSMIC_RUNE.getItem(3), UNPOWERED_ORB)); + SpellBook.MODERN.register(46, new ChargeOrbSpells(63, 2153, 569, 46, new Graphics(152, 96), Runes.FIRE_RUNE.getItem(30), Runes.COSMIC_RUNE.getItem(3), UNPOWERED_ORB)); SpellBook.MODERN.register(49, new ChargeOrbSpells(66, 2152, 573, 49, new Graphics(150, 96), Runes.AIR_RUNE.getItem(30), Runes.COSMIC_RUNE.getItem(3), UNPOWERED_ORB)); return this; } diff --git a/Server/src/main/java/core/game/node/entity/skill/magic/lunar/FertileSoilSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/FertileSoilSpell.java index 33dc7c1d6..cf578cd9f 100644 --- a/Server/src/main/java/core/game/node/entity/skill/magic/lunar/FertileSoilSpell.java +++ b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/FertileSoilSpell.java @@ -8,7 +8,7 @@ import core.game.node.entity.player.link.SpellBookManager.SpellBook; import core.game.node.entity.skill.magic.MagicSpell; import core.game.node.entity.skill.magic.Runes; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/node/entity/skill/runecrafting/Altar.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/Altar.java index 41fb75ded..af7463cb5 100644 --- a/Server/src/main/java/core/game/node/entity/skill/runecrafting/Altar.java +++ b/Server/src/main/java/core/game/node/entity/skill/runecrafting/Altar.java @@ -2,7 +2,7 @@ package core.game.node.entity.skill.runecrafting; import core.cache.def.impl.ItemDefinition; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; /** * Represents an altar an it's relative information(corresponding ruin, etc) diff --git a/Server/src/main/java/core/game/node/entity/skill/runecrafting/CombinationRunePlugin.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/CombinationRunePlugin.java index a1c83515c..2b9c17a85 100644 --- a/Server/src/main/java/core/game/node/entity/skill/runecrafting/CombinationRunePlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/runecrafting/CombinationRunePlugin.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.runecrafting; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Plugin; /** diff --git a/Server/src/main/java/core/game/node/entity/skill/runecrafting/EnchantTiaraPlugin.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/EnchantTiaraPlugin.java index 78a1c0b21..9e5b07a87 100644 --- a/Server/src/main/java/core/game/node/entity/skill/runecrafting/EnchantTiaraPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/runecrafting/EnchantTiaraPlugin.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.runecrafting; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Plugin; /** diff --git a/Server/src/main/java/core/game/node/entity/skill/runecrafting/MysteriousRuin.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/MysteriousRuin.java index 3e9e94f2e..e92a01adf 100644 --- a/Server/src/main/java/core/game/node/entity/skill/runecrafting/MysteriousRuin.java +++ b/Server/src/main/java/core/game/node/entity/skill/runecrafting/MysteriousRuin.java @@ -2,7 +2,7 @@ package core.game.node.entity.skill.runecrafting; import core.game.container.impl.EquipmentContainer; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; /** diff --git a/Server/src/main/java/core/game/node/entity/skill/runecrafting/MysteriousRuinPlugin.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/MysteriousRuinPlugin.java index 096284106..1a7795051 100644 --- a/Server/src/main/java/core/game/node/entity/skill/runecrafting/MysteriousRuinPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/runecrafting/MysteriousRuinPlugin.java @@ -5,7 +5,7 @@ import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; import core.game.node.entity.player.info.Rights; import core.game.node.entity.player.link.diary.DiaryType; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/skill/runecrafting/RunecraftingPlugin.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/RunecraftingPlugin.java index 051d032fb..72e1a4d43 100644 --- a/Server/src/main/java/core/game/node/entity/skill/runecrafting/RunecraftingPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/runecrafting/RunecraftingPlugin.java @@ -11,7 +11,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.info.Rights; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import core.game.world.map.Location; import core.net.packet.PacketRepository; diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/FishingExplosivePlugin.java b/Server/src/main/java/core/game/node/entity/skill/slayer/FishingExplosivePlugin.java index f1f060336..7f577e01d 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/FishingExplosivePlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/FishingExplosivePlugin.java @@ -15,7 +15,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.HintIconManager; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerTowerPlugin.java b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerTowerPlugin.java index a49c9d9d0..ffe1ac96c 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerTowerPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerTowerPlugin.java @@ -5,8 +5,8 @@ import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerTowerZone.java b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerTowerZone.java index 646ad36e1..292306344 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerTowerZone.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerTowerZone.java @@ -6,7 +6,7 @@ import core.game.interaction.Option; import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneBuilder; diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/AncientCavern.java b/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/AncientCavern.java index fb0e87776..2e12a707a 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/AncientCavern.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/AncientCavern.java @@ -14,8 +14,8 @@ import core.game.node.entity.combat.ImpactHandler.HitsplatType; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/FremennikDungeon.java b/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/FremennikDungeon.java index d9eeb3a88..d896511f3 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/FremennikDungeon.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/FremennikDungeon.java @@ -8,7 +8,7 @@ import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.combat.ImpactHandler.HitsplatType; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/node/entity/skill/smithing/FurnaceOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/smithing/FurnaceOptionPlugin.java index dab204861..9a8433b6a 100644 --- a/Server/src/main/java/core/game/node/entity/skill/smithing/FurnaceOptionPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/smithing/FurnaceOptionPlugin.java @@ -12,7 +12,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningCreator.java b/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningCreator.java index 94ec26e1f..34ae72382 100644 --- a/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningCreator.java +++ b/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningCreator.java @@ -6,7 +6,7 @@ import core.game.node.entity.skill.SkillPulse; import core.game.node.entity.skill.Skills; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningTrainingRoom.java b/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningTrainingRoom.java index 81a30ac11..ec155c05c 100644 --- a/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningTrainingRoom.java +++ b/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningTrainingRoom.java @@ -16,7 +16,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/node/entity/skill/thieving/PickableDoorHandler.java b/Server/src/main/java/core/game/node/entity/skill/thieving/PickableDoorHandler.java index a6e826b84..408944d2e 100644 --- a/Server/src/main/java/core/game/node/entity/skill/thieving/PickableDoorHandler.java +++ b/Server/src/main/java/core/game/node/entity/skill/thieving/PickableDoorHandler.java @@ -10,7 +10,7 @@ import core.game.node.entity.Entity; import core.game.node.entity.combat.ImpactHandler; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Direction; import core.game.world.map.Location; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/node/entity/skill/thieving/Stall.java b/Server/src/main/java/core/game/node/entity/skill/thieving/Stall.java index 4679a531b..9e5ddcf8c 100644 --- a/Server/src/main/java/core/game/node/entity/skill/thieving/Stall.java +++ b/Server/src/main/java/core/game/node/entity/skill/thieving/Stall.java @@ -1,7 +1,7 @@ package core.game.node.entity.skill.thieving; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.tools.RandomFunction; import java.util.*; diff --git a/Server/src/main/java/core/game/node/entity/skill/thieving/StallThiefPulse.java b/Server/src/main/java/core/game/node/entity/skill/thieving/StallThiefPulse.java index 02f150cd7..65a180905 100644 --- a/Server/src/main/java/core/game/node/entity/skill/thieving/StallThiefPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/thieving/StallThiefPulse.java @@ -6,8 +6,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; diff --git a/Server/src/main/java/core/game/node/entity/skill/thieving/ThievableChestPlugin.java b/Server/src/main/java/core/game/node/entity/skill/thieving/ThievableChestPlugin.java index 7c5d2db15..8f99f1235 100644 --- a/Server/src/main/java/core/game/node/entity/skill/thieving/ThievableChestPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/thieving/ThievableChestPlugin.java @@ -7,8 +7,8 @@ import core.game.node.Node; import core.game.node.entity.combat.ImpactHandler.HitsplatType; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; -import core.game.node.object.SceneryBuilder; +import core.game.node.scenery.Scenery; +import core.game.node.scenery.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/skill/thieving/ThievingOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/thieving/ThievingOptionPlugin.java index aa385e2af..46eab307f 100644 --- a/Server/src/main/java/core/game/node/entity/skill/thieving/ThievingOptionPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/thieving/ThievingOptionPlugin.java @@ -4,7 +4,7 @@ import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/node/object/Constructed.java b/Server/src/main/java/core/game/node/scenery/Constructed.java similarity index 98% rename from Server/src/main/java/core/game/node/object/Constructed.java rename to Server/src/main/java/core/game/node/scenery/Constructed.java index e17e79dcd..d0af7b26d 100644 --- a/Server/src/main/java/core/game/node/object/Constructed.java +++ b/Server/src/main/java/core/game/node/scenery/Constructed.java @@ -1,4 +1,4 @@ -package core.game.node.object; +package core.game.node.scenery; import core.game.node.item.Item; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/node/object/Scenery.java b/Server/src/main/java/core/game/node/scenery/Scenery.java similarity index 99% rename from Server/src/main/java/core/game/node/object/Scenery.java rename to Server/src/main/java/core/game/node/scenery/Scenery.java index d85b51415..4493620ff 100644 --- a/Server/src/main/java/core/game/node/object/Scenery.java +++ b/Server/src/main/java/core/game/node/scenery/Scenery.java @@ -1,4 +1,4 @@ -package core.game.node.object; +package core.game.node.scenery; import core.cache.def.impl.VarbitDefinition; import core.cache.def.impl.SceneryDefinition; diff --git a/Server/src/main/java/core/game/node/object/SceneryBuilder.java b/Server/src/main/java/core/game/node/scenery/SceneryBuilder.java similarity index 99% rename from Server/src/main/java/core/game/node/object/SceneryBuilder.java rename to Server/src/main/java/core/game/node/scenery/SceneryBuilder.java index 02daf3dd5..4db5c619a 100644 --- a/Server/src/main/java/core/game/node/object/SceneryBuilder.java +++ b/Server/src/main/java/core/game/node/scenery/SceneryBuilder.java @@ -1,4 +1,4 @@ -package core.game.node.object; +package core.game.node.scenery; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; diff --git a/Server/src/main/java/core/game/world/map/BuildRegionChunk.java b/Server/src/main/java/core/game/world/map/BuildRegionChunk.java index 8a9eac3ef..197011b42 100644 --- a/Server/src/main/java/core/game/world/map/BuildRegionChunk.java +++ b/Server/src/main/java/core/game/world/map/BuildRegionChunk.java @@ -4,8 +4,8 @@ package core.game.world.map; import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.Item; -import core.game.node.object.Constructed; -import core.game.node.object.Scenery; +import core.game.node.scenery.Constructed; +import core.game.node.scenery.Scenery; import rs09.game.system.SystemLogger; import core.game.world.map.build.LandscapeParser; import core.net.packet.IoBuffer; diff --git a/Server/src/main/java/core/game/world/map/RegionChunk.java b/Server/src/main/java/core/game/world/map/RegionChunk.java index f528f2527..4deaabbab 100644 --- a/Server/src/main/java/core/game/world/map/RegionChunk.java +++ b/Server/src/main/java/core/game/world/map/RegionChunk.java @@ -3,7 +3,7 @@ package core.game.world.map; import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import rs09.game.system.SystemLogger; import core.game.world.map.build.DynamicRegion; import core.game.world.map.build.LandscapeParser; diff --git a/Server/src/main/java/core/game/world/map/RegionManager.kt b/Server/src/main/java/core/game/world/map/RegionManager.kt index eaf6e062d..1b3a9b0ba 100644 --- a/Server/src/main/java/core/game/world/map/RegionManager.kt +++ b/Server/src/main/java/core/game/world/map/RegionManager.kt @@ -2,7 +2,7 @@ package core.game.world.map import core.game.world.map.RegionManager import core.game.world.map.RegionPlane -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.Node import core.game.node.entity.Entity import core.game.node.entity.npc.NPC diff --git a/Server/src/main/java/core/game/world/map/RegionPlane.java b/Server/src/main/java/core/game/world/map/RegionPlane.java index ba4a56cbf..15b68bc03 100644 --- a/Server/src/main/java/core/game/world/map/RegionPlane.java +++ b/Server/src/main/java/core/game/world/map/RegionPlane.java @@ -5,7 +5,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.build.DynamicRegion; import core.game.world.map.build.RegionFlags; import core.game.world.update.flag.chunk.ItemUpdateFlag; diff --git a/Server/src/main/java/core/game/world/map/build/DynamicRegion.java b/Server/src/main/java/core/game/world/map/build/DynamicRegion.java index 48ae4f9c6..bbfef5458 100644 --- a/Server/src/main/java/core/game/world/map/build/DynamicRegion.java +++ b/Server/src/main/java/core/game/world/map/build/DynamicRegion.java @@ -5,7 +5,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.music.MusicZone; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.*; import core.game.world.map.zone.RegionZone; import core.game.world.map.zone.ZoneBorders; diff --git a/Server/src/main/java/core/game/world/map/build/LandscapeParser.java b/Server/src/main/java/core/game/world/map/build/LandscapeParser.java index 95734f9cf..703e3907b 100644 --- a/Server/src/main/java/core/game/world/map/build/LandscapeParser.java +++ b/Server/src/main/java/core/game/world/map/build/LandscapeParser.java @@ -2,7 +2,7 @@ package core.game.world.map.build; import core.cache.def.impl.SceneryDefinition; import core.cache.misc.buffer.ByteBufferUtils; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.game.world.map.Region; import core.game.world.map.RegionManager; diff --git a/Server/src/main/java/core/game/world/map/path/Pathfinder.java b/Server/src/main/java/core/game/world/map/path/Pathfinder.java index 28fe256ae..7d0a81d23 100644 --- a/Server/src/main/java/core/game/world/map/path/Pathfinder.java +++ b/Server/src/main/java/core/game/world/map/path/Pathfinder.java @@ -3,7 +3,7 @@ package core.game.world.map.path; import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.item.GroundItem; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.game.world.map.RegionManager; import rs09.game.world.map.path.SmartPathfinder; diff --git a/Server/src/main/java/core/game/world/objectparser/ObjectParser.java b/Server/src/main/java/core/game/world/objectparser/ObjectParser.java index ca6e0dc3a..bc143b336 100644 --- a/Server/src/main/java/core/game/world/objectparser/ObjectParser.java +++ b/Server/src/main/java/core/game/world/objectparser/ObjectParser.java @@ -1,7 +1,7 @@ package core.game.world.objectparser; import rs09.ServerConstants; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import rs09.game.world.GameWorld; import core.game.world.map.build.LandscapeParser; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/world/update/flag/chunk/ObjectUpdateFlag.java b/Server/src/main/java/core/game/world/update/flag/chunk/ObjectUpdateFlag.java index 2b06271d7..5b1d4ee18 100644 --- a/Server/src/main/java/core/game/world/update/flag/chunk/ObjectUpdateFlag.java +++ b/Server/src/main/java/core/game/world/update/flag/chunk/ObjectUpdateFlag.java @@ -1,6 +1,6 @@ package core.game.world.update.flag.chunk; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.update.flag.UpdateFlag; import core.net.packet.IoBuffer; import core.net.packet.out.ClearScenery; diff --git a/Server/src/main/java/core/game/world/update/flag/context/Animation.java b/Server/src/main/java/core/game/world/update/flag/context/Animation.java index 712a76282..9c2c6e36b 100644 --- a/Server/src/main/java/core/game/world/update/flag/context/Animation.java +++ b/Server/src/main/java/core/game/world/update/flag/context/Animation.java @@ -2,7 +2,7 @@ package core.game.world.update.flag.context; import core.cache.def.impl.AnimationDefinition; import core.game.node.entity.impl.Animator.Priority; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; /** * Represents an animation. diff --git a/Server/src/main/java/core/game/world/update/flag/player/FaceLocationFlag.java b/Server/src/main/java/core/game/world/update/flag/player/FaceLocationFlag.java index 458ab7f5c..022d33a71 100644 --- a/Server/src/main/java/core/game/world/update/flag/player/FaceLocationFlag.java +++ b/Server/src/main/java/core/game/world/update/flag/player/FaceLocationFlag.java @@ -1,7 +1,7 @@ package core.game.world.update.flag.player; import core.game.node.Node; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.UpdateFlag; import core.net.packet.IoBuffer; diff --git a/Server/src/main/java/core/net/packet/context/BuildSceneryContext.java b/Server/src/main/java/core/net/packet/context/BuildSceneryContext.java index df37baa03..3fa8ff0e0 100644 --- a/Server/src/main/java/core/net/packet/context/BuildSceneryContext.java +++ b/Server/src/main/java/core/net/packet/context/BuildSceneryContext.java @@ -1,7 +1,7 @@ package core.net.packet.context; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.net.packet.Context; /** diff --git a/Server/src/main/java/core/net/packet/in/InteractionPacket.java b/Server/src/main/java/core/net/packet/in/InteractionPacket.java index 8973c4049..0b581e843 100644 --- a/Server/src/main/java/core/net/packet/in/InteractionPacket.java +++ b/Server/src/main/java/core/net/packet/in/InteractionPacket.java @@ -12,7 +12,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.net.packet.IncomingPacket; diff --git a/Server/src/main/java/core/net/packet/in/InterfaceUseOnPacket.java b/Server/src/main/java/core/net/packet/in/InterfaceUseOnPacket.java index 7e082c1a6..15197610f 100644 --- a/Server/src/main/java/core/net/packet/in/InterfaceUseOnPacket.java +++ b/Server/src/main/java/core/net/packet/in/InterfaceUseOnPacket.java @@ -10,7 +10,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.SpellBookManager; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import rs09.game.node.entity.skill.magic.SpellListener; import rs09.game.node.entity.skill.magic.SpellListeners; import rs09.game.node.entity.skill.magic.SpellUtils; diff --git a/Server/src/main/java/core/net/packet/in/ItemActionPacket.java b/Server/src/main/java/core/net/packet/in/ItemActionPacket.java index 7d1b09f09..930309318 100644 --- a/Server/src/main/java/core/net/packet/in/ItemActionPacket.java +++ b/Server/src/main/java/core/net/packet/in/ItemActionPacket.java @@ -8,7 +8,7 @@ import core.game.interaction.UseWithHandler; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.RegionManager; import core.net.packet.IncomingPacket; import core.net.packet.IoBuffer; diff --git a/Server/src/main/java/core/net/packet/out/AnimateObjectPacket.java b/Server/src/main/java/core/net/packet/out/AnimateObjectPacket.java index db24d5dcf..27a891b7a 100644 --- a/Server/src/main/java/core/net/packet/out/AnimateObjectPacket.java +++ b/Server/src/main/java/core/net/packet/out/AnimateObjectPacket.java @@ -1,7 +1,7 @@ package core.net.packet.out; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.net.packet.IoBuffer; diff --git a/Server/src/main/java/core/net/packet/out/ClearScenery.java b/Server/src/main/java/core/net/packet/out/ClearScenery.java index a2767a070..3191df18e 100644 --- a/Server/src/main/java/core/net/packet/out/ClearScenery.java +++ b/Server/src/main/java/core/net/packet/out/ClearScenery.java @@ -1,7 +1,7 @@ package core.net.packet.out; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.net.packet.IoBuffer; import core.net.packet.OutgoingPacket; diff --git a/Server/src/main/java/core/net/packet/out/ConstructScenery.java b/Server/src/main/java/core/net/packet/out/ConstructScenery.java index 6f36f5010..654ce071c 100644 --- a/Server/src/main/java/core/net/packet/out/ConstructScenery.java +++ b/Server/src/main/java/core/net/packet/out/ConstructScenery.java @@ -1,7 +1,7 @@ package core.net.packet.out; import core.game.node.entity.player.Player; -import core.game.node.object.Scenery; +import core.game.node.scenery.Scenery; import core.game.world.map.Location; import core.net.packet.IoBuffer; import core.net.packet.OutgoingPacket; diff --git a/Server/src/main/kotlin/api/ContentAPI.kt b/Server/src/main/kotlin/api/ContentAPI.kt index dff42dfcd..61937a20e 100644 --- a/Server/src/main/kotlin/api/ContentAPI.kt +++ b/Server/src/main/kotlin/api/ContentAPI.kt @@ -6,8 +6,8 @@ import core.game.component.Component import core.game.content.dialogue.FacialExpression import core.game.content.global.action.SpecialLadders import core.game.node.Node -import core.game.node.`object`.Scenery -import core.game.node.`object`.SceneryBuilder +import core.game.node.scenery.Scenery +import core.game.node.scenery.SceneryBuilder import core.game.node.entity.Entity import core.game.node.entity.combat.ImpactHandler import core.game.node.entity.impl.Animator diff --git a/Server/src/main/kotlin/rs09/game/ai/general/ScriptAPI.kt b/Server/src/main/kotlin/rs09/game/ai/general/ScriptAPI.kt index 83672a5e2..34cd637ff 100644 --- a/Server/src/main/kotlin/rs09/game/ai/general/ScriptAPI.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/ScriptAPI.kt @@ -11,7 +11,7 @@ import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse import core.game.interaction.Option import core.game.node.Node -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.Entity import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player @@ -41,7 +41,6 @@ import rs09.game.world.repository.Repository import rs09.tools.stringtools.colorize import java.util.* import java.util.concurrent.CountDownLatch -import java.util.concurrent.Executors import kotlin.math.pow import kotlin.math.sqrt diff --git a/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/Adventurer.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/Adventurer.kt index 004aaad65..241394670 100644 --- a/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/Adventurer.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/Adventurer.kt @@ -2,7 +2,7 @@ package rs09.game.ai.general.scriptrepository import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.combat.CombatStyle import rs09.game.node.entity.combat.CombatSwingHandler import core.game.node.entity.skill.Skills diff --git a/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerSession.kt b/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerSession.kt index 58c80d4f3..f0fb716dd 100644 --- a/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerSession.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerSession.kt @@ -1,8 +1,8 @@ package rs09.game.content.activity.fishingtrawler import core.game.component.Component -import core.game.node.`object`.Scenery -import core.game.node.`object`.SceneryBuilder +import core.game.node.scenery.Scenery +import core.game.node.scenery.SceneryBuilder import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.entity.state.EntityState diff --git a/Server/src/main/kotlin/rs09/game/content/activity/fog/FogInteractionHandler.kt b/Server/src/main/kotlin/rs09/game/content/activity/fog/FogInteractionHandler.kt index 8d12de0c6..9c3dbc357 100644 --- a/Server/src/main/kotlin/rs09/game/content/activity/fog/FogInteractionHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/fog/FogInteractionHandler.kt @@ -4,7 +4,7 @@ import core.game.content.global.action.ClimbActionHandler import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse import core.game.node.Node -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.player.Player import core.plugin.Initializable import core.plugin.Plugin diff --git a/Server/src/main/kotlin/rs09/game/content/dialogue/region/dungeon/taverley/VelrakDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/region/dungeon/taverley/VelrakDialogue.kt new file mode 100644 index 000000000..319cd2089 --- /dev/null +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/region/dungeon/taverley/VelrakDialogue.kt @@ -0,0 +1,63 @@ +package rs09.game.content.dialogue.region.dungeon.taverley + +import api.Container +import api.ContentAPI +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression +import core.game.node.entity.player.Player +import core.plugin.Initializable +import org.rs09.consts.Items +import org.rs09.consts.NPCs +import rs09.tools.END_DIALOGUE + +@Initializable +class VelrakDialogue(player: Player? = null) : DialoguePlugin(player) { + override fun newInstance(player: Player?): DialoguePlugin { + return VelrakDialogue(player) + } + + override fun open(vararg args: Any?): Boolean { + if(ContentAPI.inInventory(player, Items.DUSTY_KEY_1590)){ + playerl(FacialExpression.HALF_THINKING, "Are you still here?").also { stage = 100 } + } else { + npcl(FacialExpression.FRIENDLY, "Thank you for rescuing me! It isn't very comfy in this cell.") + ContentAPI.removeItem(player, Items.JAIL_KEY_1591, Container.INVENTORY) + } + return true + } + + override fun handle(interfaceId: Int, buttonId: Int): Boolean { + when(stage){ + 0 -> options("So... do you know anywhere good to explore?","Do I get a reward for freeing you?").also { stage++ } + 1 -> when(buttonId){ + 1 -> playerl(FacialExpression.HALF_THINKING, "So... do you know anywhere good to explore?").also { stage = 10 } + 2 -> playerl(FacialExpression.FRIENDLY, "Do I get a reward for freeing you?").also { stage = 20 } + } + + 10 -> npcl(FacialExpression.HALF_THINKING, "Well, this dungeon was quite good to explore...until I got captured, anyway. I was given a key to an inner part of this dungeon by a mysterious stranger!").also { stage++ } + 11 -> npcl(FacialExpression.NEUTRAL, "It's rather tough for me to get that far into the dungeon however. I just keep getting captured! Would you like to give it a go?").also { stage++ } + 12 -> options("Yes, please!", "No, it's too dangerous for me too.").also { stage++ } + 13 -> when(buttonId){ + 1 -> playerl(FacialExpression.FRIENDLY, "Yes, please!").also { stage++ } + 2 -> playerl(FacialExpression.NEUTRAL, "No, it's too dangerous for me too.").also { stage = 15 } + } + + 14 -> ContentAPI.sendItemDialogue(player, Items.DUSTY_KEY_1590, "Velrak reaches somewhere mysterious and passes you a key.").also { ContentAPI.addItem(player, Items.DUSTY_KEY_1590, 1); stage = END_DIALOGUE } + + 15 -> npcl(FacialExpression.FRIENDLY, "I don't blame you!").also { stage = END_DIALOGUE } + + 20 -> npcl(FacialExpression.HALF_GUILTY, "Well, not really. The Black Knights took all of my stuff before throwing me in here to rot!").also { stage = 0 } + + 100 -> npcl(FacialExpression.HALF_THINKING, "Yes... I'm still plucking up the courage to run out past those Black Knights.").also { stage++ } + 101 -> playerl(FacialExpression.FRIENDLY, "Oh, go on. You can do it!").also { stage = END_DIALOGUE } + } + + return true + } + + override fun getIds(): IntArray { + return intArrayOf(NPCs.VELRAK_THE_EXPLORER_798) + } + + +} \ No newline at end of file diff --git a/Server/src/main/kotlin/rs09/game/content/global/NPCDropTable.kt b/Server/src/main/kotlin/rs09/game/content/global/NPCDropTable.kt index 9a71eb5f8..65b29d673 100644 --- a/Server/src/main/kotlin/rs09/game/content/global/NPCDropTable.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/NPCDropTable.kt @@ -8,13 +8,11 @@ import core.game.node.item.Item import core.tools.RandomFunction import org.rs09.consts.Items -private val CHARMS = intArrayOf(Items.CRIMSON_CHARM_12160,Items.BLUE_CHARM_12163,Items.GREEN_CHARM_12159,Items.GOLD_CHARM_12158) class NPCDropTable : WeightBasedTable() { val charmDrops = WeightBasedTable() - override fun add(element: WeightedItem): Boolean { - return if(CHARMS.contains(element.id)) charmDrops.add(element) - else super.add(element) + fun addToCharms(element: WeightedItem): Boolean { + return charmDrops.add(element) } override fun roll(player: Player?): ArrayList { diff --git a/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStar.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStar.kt index f250d441a..0d5a35009 100644 --- a/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStar.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStar.kt @@ -1,14 +1,13 @@ package rs09.game.content.global.worldevents.shootingstar -import core.game.node.`object`.Scenery -import core.game.node.`object`.SceneryBuilder +import core.game.node.scenery.Scenery +import core.game.node.scenery.SceneryBuilder import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.world.map.Location import rs09.ServerStore.getBoolean import rs09.ServerStore.getInt import rs09.ServerStore.getString -import rs09.game.system.SystemLogger import rs09.game.world.repository.Repository /** diff --git a/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt index b51717e83..88d630eac 100644 --- a/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt @@ -2,7 +2,7 @@ package rs09.game.content.global.worldevents.shootingstar import api.ContentAPI import core.game.content.global.worldevents.shootingstar.ScoreboardManager -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.player.Player import core.game.node.entity.skill.SkillPulse import core.game.node.entity.skill.Skills diff --git a/Server/src/main/kotlin/rs09/game/content/quest/members/naturespirit/NSUtils.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/naturespirit/NSUtils.kt index 0f07c86e2..c301909bd 100644 --- a/Server/src/main/kotlin/rs09/game/content/quest/members/naturespirit/NSUtils.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/naturespirit/NSUtils.kt @@ -3,8 +3,8 @@ package rs09.game.content.quest.members.naturespirit import api.Container import api.ContentAPI import core.game.node.Node -import core.game.node.`object`.Scenery -import core.game.node.`object`.SceneryBuilder +import core.game.node.scenery.Scenery +import core.game.node.scenery.SceneryBuilder import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.system.task.Pulse diff --git a/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TFTInteractionListeners.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TFTInteractionListeners.kt index 8b27b9a74..d2c781728 100644 --- a/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TFTInteractionListeners.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TFTInteractionListeners.kt @@ -1,7 +1,7 @@ package rs09.game.content.quest.members.thefremenniktrials import core.game.content.dialogue.FacialExpression -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.impl.Animator import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player diff --git a/Server/src/main/kotlin/rs09/game/content/quest/members/thelostcity/DramenTreeListener.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thelostcity/DramenTreeListener.kt index c8d4fa6ac..5b920e067 100644 --- a/Server/src/main/kotlin/rs09/game/content/quest/members/thelostcity/DramenTreeListener.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thelostcity/DramenTreeListener.kt @@ -1,7 +1,7 @@ package rs09.game.content.quest.members.thelostcity import core.game.content.quest.members.lostcity.TreeSpiritNPC -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.skill.gather.GatheringSkillPulse import core.game.node.entity.skill.gather.SkillingTool import core.game.world.map.Location diff --git a/Server/src/main/kotlin/rs09/game/interaction/item/GodBookListeners.kt b/Server/src/main/kotlin/rs09/game/interaction/item/GodBookListeners.kt new file mode 100644 index 000000000..7e2b75ae0 --- /dev/null +++ b/Server/src/main/kotlin/rs09/game/interaction/item/GodBookListeners.kt @@ -0,0 +1,134 @@ +package rs09.game.interaction.item + +import api.ContentAPI +import core.game.node.entity.player.Player +import core.game.system.task.Pulse +import core.game.world.update.flag.context.Animation +import org.rs09.consts.Items +import rs09.game.content.dialogue.DialogueFile +import rs09.game.interaction.InteractionListener +import rs09.tools.END_DIALOGUE + +class GodBookListeners : InteractionListener() { + + val GB_SARADOMIN = Items.HOLY_BOOK_3840 + val GB_ZAMORAK = Items.UNHOLY_BOOK_3842 + val GB_GUTHIX = Items.BOOK_OF_BALANCE_3844 + + override fun defineListeners() { + on(GB_SARADOMIN, ITEM, "preach"){player, _ -> + ContentAPI.openDialogue(player, HOLY_DIALOGUE(BOOK.SARA)) + return@on true + } + + on(GB_ZAMORAK, ITEM, "preach"){ player, _ -> + ContentAPI.openDialogue(player, HOLY_DIALOGUE(BOOK.ZAM)) + return@on true + } + + on(GB_GUTHIX, ITEM, "preach"){ player, _ -> + ContentAPI.openDialogue(player, HOLY_DIALOGUE(BOOK.GUTHIX)) + return@on true + } + } + + internal enum class BOOK { + SARA, + GUTHIX, + ZAM + } + + internal class HOLY_DIALOGUE(val book: BOOK) : DialogueFile(){ + + val WEDDINGS = arrayOf( + "In the name of Saradomin, protector of us all, I now join you in the eyes of Saradomin.", + "Light and dark, day and night, balance arises from contrast. I unify thee in the name of Guthix.", + "Two great warriors, joined by hand, to spread destruction across the land. In Zamorak's name, now two are one." + ) + + val LAST_RITES = arrayOf( + "Thy cause was false, thy skills did lack; See you in Lumbridge when you get back.", + "Thy death was not in vain, for it brought some balance to the world. May Guthix bring you rest.", + "The weak deserve to die, so the strong may flourish. This is the creed of Zamorak." + ) + + val BLESSINGS = arrayOf( + "Go in peace in the name of Saradomin; may his glory shine upon you like the sun.", + "May you walk the path, and never fall, for Guthix walks beside thee on thy journey. May Guthix bring you peace.", + "May your bloodthirst never be sated, and may all your battles be glorious. Zamorak bring you strength." + ) + + val PREACHINGS = arrayOf( + arrayOf( + "Protect your self, protect your friends. Mine is the glory that never ends.", + "The darkness in life may be avoided, by the light of wisdom shining.", + "Show love to your friends, and mercy to your enemies, and know that the wisdom of Saradomin will follow. ", + "A fight begun, when the cause is just, will prevail over all others.", + "The currency of goodness is honour; It retains its value through scarcity." + ), + arrayOf( + "All things must end, as all begin; Only Guthix knows the role thou must play.", + "In life, in death, in joy, in sorrow: May thine experience show thee balance.", + "Thou must do as thou must, no matter what. Thine actions bring balance to this world.", + "he river flows, the sun ignites, May you stand with Guthix in thy fights.", + "A journey of a single step, May take thee over a thousand miles." + ), + arrayOf( + "There is no opinion that cannot be proven true...by crushing those who choose to disagree with it.", + "Battles are not lost and won; They simply remove the weak from the equation.", + "Those who fight, then run away, shame Zamorak with their cowardice.", + "Battle is by those who choose to disagree with it.", + "Strike fast, strike hard, strike true: The strength of Zamorak will be with you." + ) + ) + + val PREACH_SARA_AMEN = "This is Saradomin's Wisdom." + val PREACH_ZAM_AMEN = "Zamorak give me strength!" + val PREACH_GUTH_AMEN = "May Guthix bring you balance." + + override fun handle(componentID: Int, buttonID: Int) { + when(stage){ + 0 -> options("Weddings","Last Rites","Blessings","Preaching").also { stage++ } + 1 -> when(buttonID){ + 1 -> say(player!!, WEDDINGS[book.ordinal], book, false) + 2 -> say(player!!, LAST_RITES[book.ordinal], book, false) + 3 -> say(player!!, BLESSINGS[book.ordinal], book, false) + 4 -> say(player!!, PREACHINGS[book.ordinal].random(), book, true) + else -> {} + }.also { end() } + } + } + + private fun say(player: Player, message: String, book: BOOK, preach: Boolean){ + val animation = when(book){ + BOOK.SARA -> Animation(1335) + BOOK.ZAM -> Animation(1336) + BOOK.GUTHIX -> Animation(1337) + } + + val preachText = when(book){ + BOOK.SARA -> PREACH_SARA_AMEN + BOOK.ZAM -> PREACH_ZAM_AMEN + BOOK.GUTHIX -> PREACH_GUTH_AMEN + } + + val lastTick = ContentAPI.animationDuration(animation) + + ContentAPI.lock(player, 100) + ContentAPI.animate(player, animation) + + ContentAPI.submitIndividualPulse(player, object : Pulse() { + var counter = 0 + override fun pulse(): Boolean { + when(counter++){ + 0 -> ContentAPI.sendChat(player, message) + lastTick - 1 -> if(preach) ContentAPI.sendChat(player, preachText) + lastTick -> ContentAPI.unlock(player).also { return true } + } + return false + } + }) + } + + } +} \ No newline at end of file diff --git a/Server/src/main/kotlin/rs09/game/interaction/npc/NPCTalkListener.kt b/Server/src/main/kotlin/rs09/game/interaction/npc/NPCTalkListener.kt index 8bea79755..0537b31b7 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/npc/NPCTalkListener.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/npc/NPCTalkListener.kt @@ -1,9 +1,11 @@ package rs09.game.interaction.npc +import core.game.content.quest.miniquest.barcrawl.BarcrawlType import core.game.node.entity.npc.NPC import rs09.game.content.activity.gnomecooking.* import rs09.game.content.ame.RandomEvents import rs09.game.interaction.InteractionListener +import rs09.game.system.SystemLogger /** * Handles the NPC talk-to option. @@ -11,8 +13,21 @@ import rs09.game.interaction.InteractionListener */ class NPCTalkListener : InteractionListener() { + val barCrawlNPCs = intArrayOf(733,848,735,739,737,738,731,568,3217,736,734) + override fun defineListeners() { + on(barCrawlNPCs, NPC, "talk-to", "talk"){player, node -> + val type = BarcrawlType.forId(node.id) + + if (player.barcrawlManager.isFinished || !player.barcrawlManager.isStarted || player.barcrawlManager.isCompleted(type!!.ordinal)) { + player.dialogueInterpreter.open(node.id, node) + } else { + player.dialogueInterpreter.open("barcrawl dialogue", node.id, type) + } + return@on true + } + on(NPC,"talk-to","talk"){player,node -> val npc = node.asNpc() if(RandomEvents.randomIDs.contains(node.id)){ diff --git a/Server/src/main/kotlin/rs09/game/interaction/object/GutanothChestPlugin.kt b/Server/src/main/kotlin/rs09/game/interaction/object/GutanothChestPlugin.kt index f13affedd..e26c41232 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/object/GutanothChestPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/GutanothChestPlugin.kt @@ -1,7 +1,7 @@ package rs09.game.interaction.`object` -import core.game.node.`object`.Scenery -import core.game.node.`object`.SceneryBuilder +import core.game.node.scenery.Scenery +import core.game.node.scenery.SceneryBuilder import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.item.GroundItemManager diff --git a/Server/src/main/kotlin/rs09/game/interaction/object/JungleBushHandler.kt b/Server/src/main/kotlin/rs09/game/interaction/object/JungleBushHandler.kt index 17fafe76c..d78b5dd97 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/object/JungleBushHandler.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/JungleBushHandler.kt @@ -1,7 +1,7 @@ package rs09.game.interaction.`object` -import core.game.node.`object`.Scenery -import core.game.node.`object`.SceneryBuilder +import core.game.node.scenery.Scenery +import core.game.node.scenery.SceneryBuilder import core.game.node.entity.player.Player import core.game.node.item.Item import core.game.system.task.Pulse diff --git a/Server/src/main/kotlin/rs09/game/interaction/object/MuddyChestHandler.kt b/Server/src/main/kotlin/rs09/game/interaction/object/MuddyChestHandler.kt index 6eb5476bd..28f3e7f09 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/object/MuddyChestHandler.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/MuddyChestHandler.kt @@ -1,7 +1,7 @@ package rs09.game.interaction.`object` -import core.game.node.`object`.Scenery -import core.game.node.`object`.SceneryBuilder +import core.game.node.scenery.Scenery +import core.game.node.scenery.SceneryBuilder import core.game.node.item.GroundItemManager import core.game.node.item.Item import core.game.world.update.flag.context.Animation diff --git a/Server/src/main/kotlin/rs09/game/interaction/object/TarBarrelListener.kt b/Server/src/main/kotlin/rs09/game/interaction/object/TarBarrelListener.kt index dd7e9b0f9..27f95711b 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/object/TarBarrelListener.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/TarBarrelListener.kt @@ -1,6 +1,6 @@ package rs09.game.interaction.`object` -import core.game.node.`object`.SceneryBuilder +import core.game.node.scenery.SceneryBuilder import core.game.node.item.Item import core.tools.RandomFunction import org.rs09.consts.Items diff --git a/Server/src/main/kotlin/rs09/game/interaction/region/MorytaniaListeners.kt b/Server/src/main/kotlin/rs09/game/interaction/region/MorytaniaListeners.kt index ca4edd9cb..b5f8dd5a6 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/region/MorytaniaListeners.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/region/MorytaniaListeners.kt @@ -1,11 +1,16 @@ package rs09.game.interaction.region import api.ContentAPI +import core.game.content.global.action.DoorActionHandler import core.game.node.entity.skill.agility.AgilityHandler import core.game.system.task.Pulse import core.game.world.map.Location import core.game.world.update.flag.context.Animation import core.game.world.update.flag.context.Graphics +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.launch +import org.rs09.consts.NPCs +import org.rs09.consts.Scenery import rs09.game.interaction.InteractionListener import kotlin.random.Random @@ -17,7 +22,7 @@ import kotlin.random.Random class MorytaniaListeners : InteractionListener() { - val GROTTO_ENTRANCE = 3516 + val SWAMP_GATES = intArrayOf(Scenery.GATE_3506, Scenery.GATE_3507) val GROTTO_EXIT = intArrayOf(3525, 3526) val GROTTO_BRIDGE = 3522 val outside = Location.create(3439, 3337, 0) @@ -30,10 +35,26 @@ class MorytaniaListeners : InteractionListener() { private val splashGFX = Graphics(68) override fun defineListeners() { -/* on(GROTTO_ENTRANCE,SCENERY,"enter"){ player, node -> - player.teleport(inside) + + on(SWAMP_GATES, SCENERY, "open"){player, node -> + if(player.location.y == 3457){ + DoorActionHandler.handleAutowalkDoor(player, node.asScenery()) + GlobalScope.launch { + ContentAPI.findLocalNPC(player, NPCs.ULIZIUS_1054)?.sendChat("Oh my! You're still alive!", 2) + } + } else { + if (player.questRepository.hasStarted("Nature Spirit")) { + DoorActionHandler.handleAutowalkDoor(player, node.asScenery()) + } else { + ContentAPI.sendNPCDialogue( + player, + NPCs.ULIZIUS_1054, + "I'm sorry, but I'm afraid it's too dangerous to let you through this gate right now." + ) + } + } return@on true - }*/ + } on(GROTTO_EXIT,SCENERY,"exit"){ player, node -> player.teleport(outside) diff --git a/Server/src/main/kotlin/rs09/game/interaction/region/dungeons/brimhaven/BrimhavenUtils.kt b/Server/src/main/kotlin/rs09/game/interaction/region/dungeons/brimhaven/BrimhavenUtils.kt index 97390d807..3131a58a0 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/region/dungeons/brimhaven/BrimhavenUtils.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/region/dungeons/brimhaven/BrimhavenUtils.kt @@ -2,8 +2,8 @@ package rs09.game.interaction.region.dungeons.brimhaven import api.ContentAPI import core.game.content.global.action.ClimbActionHandler -import core.game.node.`object`.Scenery -import core.game.node.`object`.SceneryBuilder +import core.game.node.scenery.Scenery +import core.game.node.scenery.SceneryBuilder import core.game.node.entity.player.Player import core.game.node.entity.player.link.diary.DiaryType import core.game.node.entity.skill.Skills diff --git a/Server/src/main/kotlin/rs09/game/interaction/region/dungeons/taverley/TaverleyDungeonListeners.kt b/Server/src/main/kotlin/rs09/game/interaction/region/dungeons/taverley/TaverleyDungeonListeners.kt new file mode 100644 index 000000000..a1653061c --- /dev/null +++ b/Server/src/main/kotlin/rs09/game/interaction/region/dungeons/taverley/TaverleyDungeonListeners.kt @@ -0,0 +1,42 @@ +package rs09.game.interaction.region.dungeons.taverley + +import api.ContentAPI +import core.game.content.global.action.DoorActionHandler +import org.rs09.consts.Items +import org.rs09.consts.Scenery +import rs09.game.interaction.InteractionListener + +class TaverleyDungeonListeners : InteractionListener() { + + val BD_GATE = Scenery.GATE_2623 + val JAIL_DOOR = Scenery.DOOR_31838 + + override fun defineListeners() { + + on(BD_GATE, SCENERY, "open"){player, node -> + if(!ContentAPI.inInventory(player, Items.DUSTY_KEY_1590)){ + ContentAPI.sendMessage(player, "This gate seems to be locked.") + } else { + DoorActionHandler.handleAutowalkDoor(player, node.asScenery()) + } + return@on true + } + + + on(JAIL_DOOR, SCENERY, "open"){player, node -> + when(player.location.y){ + 9689 -> DoorActionHandler.handleAutowalkDoor(player, node.asScenery()) //inside the cell going out + 9690 -> { //outside the cell going in + if(!ContentAPI.inInventory(player, Items.JAIL_KEY_1591)){ + ContentAPI.sendMessage(player, "This door is locked.") + } else { + DoorActionHandler.handleAutowalkDoor(player, node.asScenery()) + } + } + } + + return@on true + } + + } +} \ No newline at end of file diff --git a/Server/src/main/kotlin/rs09/game/interaction/region/wilderness/RoguesCastleListeners.kt b/Server/src/main/kotlin/rs09/game/interaction/region/wilderness/RoguesCastleListeners.kt index b26fc91a0..53af624dd 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/region/wilderness/RoguesCastleListeners.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/region/wilderness/RoguesCastleListeners.kt @@ -1,7 +1,7 @@ package rs09.game.interaction.region.wilderness import api.ContentAPI -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.combat.ImpactHandler import core.game.node.entity.player.Player import core.game.node.entity.skill.Skills diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/BarbarianOutpostCourse.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/BarbarianOutpostCourse.kt index 64711c12f..f21cb9d9d 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/BarbarianOutpostCourse.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/BarbarianOutpostCourse.kt @@ -8,7 +8,7 @@ import core.game.content.global.action.ClimbActionHandler import core.game.content.global.action.DoorActionHandler import core.game.content.quest.miniquest.barcrawl.BarcrawlManager import core.game.node.Node -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.combat.ImpactHandler.HitsplatType import core.game.node.entity.player.Player import core.game.node.entity.skill.agility.AgilityCourse diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/GnomeStrongholdCourse.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/GnomeStrongholdCourse.kt index dfe185d3b..b4bd88d2b 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/GnomeStrongholdCourse.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/GnomeStrongholdCourse.kt @@ -2,7 +2,7 @@ package rs09.game.node.entity.skill.agility import core.cache.def.impl.SceneryDefinition import core.game.node.Node -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.entity.skill.agility.AgilityCourse diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/WildernessCourse.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/WildernessCourse.kt index 7c88eb8c9..c43c1cca1 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/WildernessCourse.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/WildernessCourse.kt @@ -4,7 +4,7 @@ import api.ContentAPI import core.cache.def.impl.SceneryDefinition import core.game.content.global.action.DoorActionHandler import core.game.node.Node -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.player.Player import core.game.node.entity.player.link.TeleportManager import core.game.node.entity.skill.Skills diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/BasaltRockShortcut.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/BasaltRockShortcut.kt index d4783da04..61f29e60a 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/BasaltRockShortcut.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/BasaltRockShortcut.kt @@ -1,7 +1,7 @@ package rs09.game.node.entity.skill.agility.shortcuts import core.game.node.Node -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.player.Player import core.game.node.entity.skill.agility.AgilityHandler import core.game.node.entity.skill.agility.AgilityShortcut diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/PipeShortcut.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/PipeShortcut.kt index 3dabe17d3..8ed3d0bbc 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/PipeShortcut.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/PipeShortcut.kt @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.agility.shortcuts -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.player.Player import core.game.node.entity.player.link.diary.DiaryType import core.game.node.entity.skill.agility.AgilityHandler diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/RockClimbShortcut.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/RockClimbShortcut.kt index 82c204a42..eaad2f461 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/RockClimbShortcut.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/RockClimbShortcut.kt @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.agility.shortcuts -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.impl.ForceMovement import core.game.node.entity.player.Player import core.game.node.entity.skill.Skills diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/ConstructionDoorPlugin.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/ConstructionDoorPlugin.kt index f4e426b42..43a09b716 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/ConstructionDoorPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/ConstructionDoorPlugin.kt @@ -4,7 +4,7 @@ import core.cache.def.impl.SceneryDefinition import core.game.content.global.action.DoorActionHandler import core.game.interaction.OptionHandler import core.game.node.Node -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.player.Player import core.game.node.entity.skill.construction.BuildHotspot import core.game.node.entity.skill.construction.HousingStyle diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/chapel/BurnerListener.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/chapel/BurnerListener.kt index 9c4230aa1..1f4c227a0 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/chapel/BurnerListener.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/chapel/BurnerListener.kt @@ -1,7 +1,7 @@ package rs09.game.node.entity.skill.construction.decoration.chapel -import core.game.node.`object`.Scenery -import core.game.node.`object`.SceneryBuilder +import core.game.node.scenery.Scenery +import core.game.node.scenery.SceneryBuilder import core.game.node.item.Item import core.game.world.update.flag.context.Animation import core.tools.RandomFunction diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/study/TelescopePlugin.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/study/TelescopePlugin.kt index 8ceeec5bc..fee31ef24 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/study/TelescopePlugin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/study/TelescopePlugin.kt @@ -4,7 +4,7 @@ import core.cache.def.impl.SceneryDefinition import core.game.component.Component import core.game.interaction.OptionHandler import core.game.node.Node -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.player.Player import core.game.system.task.Pulse import core.game.world.update.flag.context.Animation diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/cooking/CookingDialogue.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/cooking/CookingDialogue.kt index bab5ab170..284cbee7d 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/cooking/CookingDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/cooking/CookingDialogue.kt @@ -2,7 +2,7 @@ package rs09.game.node.entity.skill.cooking import api.ContentAPI import core.cache.def.impl.ItemDefinition -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.player.link.RunScript import core.game.node.entity.skill.cooking.CookableItems import core.game.node.entity.skill.cooking.CookingRewrite.Companion.cook diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBins.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBins.kt index ed995f9f6..e6d0f6a48 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBins.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBins.kt @@ -2,7 +2,7 @@ package rs09.game.node.entity.skill.farming import core.cache.def.impl.SceneryDefinition import core.cache.def.impl.VarbitDefinition -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.player.Player import rs09.game.node.entity.state.newsys.states.FarmingState diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FarmingPatch.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FarmingPatch.kt index 26087b8cc..74bcb6c47 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FarmingPatch.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FarmingPatch.kt @@ -2,7 +2,7 @@ package rs09.game.node.entity.skill.farming import core.cache.def.impl.SceneryDefinition import core.cache.def.impl.VarbitDefinition -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.player.Player import rs09.game.node.entity.state.newsys.states.FarmingState diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/mining/MiningSkillPulse.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/mining/MiningSkillPulse.kt index 9e401b01c..d1b75145d 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/mining/MiningSkillPulse.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/mining/MiningSkillPulse.kt @@ -8,8 +8,8 @@ import core.game.content.global.SkillingPets import core.game.content.quest.tutorials.tutorialisland.TutorialSession import core.game.content.quest.tutorials.tutorialisland.TutorialStage import core.game.node.Node -import core.game.node.`object`.Scenery -import core.game.node.`object`.SceneryBuilder +import core.game.node.scenery.Scenery +import core.game.node.scenery.SceneryBuilder import core.game.node.entity.impl.Animator import core.game.node.entity.npc.drop.DropFrequency import core.game.node.entity.player.Player diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/HunterTracking.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/HunterTracking.kt index b2f134e92..d888c6315 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/HunterTracking.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/HunterTracking.kt @@ -2,7 +2,7 @@ package rs09.game.node.entity.skill.hunter.tracking import core.game.interaction.OptionHandler import core.game.node.Node -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.player.Player import core.game.node.entity.skill.Skills import core.game.node.item.GroundItemManager diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/magic/LunarListeners.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/magic/LunarListeners.kt index 1a4a95b63..5c42bb50d 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/magic/LunarListeners.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/magic/LunarListeners.kt @@ -1,7 +1,7 @@ package rs09.game.node.entity.skill.magic import core.game.component.Component -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.entity.player.link.TeleportManager diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/runecrafting/abyss/AbyssPlugin.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/runecrafting/abyss/AbyssPlugin.kt index df625a63a..72c50b41d 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/runecrafting/abyss/AbyssPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/runecrafting/abyss/AbyssPlugin.kt @@ -4,7 +4,7 @@ import api.ContentAPI import rs09.plugin.PluginManager.definePlugin import rs09.tools.stringtools.colorize import rs09.game.system.SystemLogger.logInfo -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.impl.Animator import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player diff --git a/Server/src/main/kotlin/rs09/game/system/command/oldsys/VisualCommand.kt b/Server/src/main/kotlin/rs09/game/system/command/oldsys/VisualCommand.kt index 325521fcf..ec0814583 100644 --- a/Server/src/main/kotlin/rs09/game/system/command/oldsys/VisualCommand.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/oldsys/VisualCommand.kt @@ -4,8 +4,8 @@ import api.ContentAPI import core.cache.Cache import core.game.container.access.InterfaceContainer import core.game.content.quest.tutorials.tutorialisland.CharacterDesign -import core.game.node.`object`.Scenery -import core.game.node.`object`.SceneryBuilder +import core.game.node.scenery.Scenery +import core.game.node.scenery.SceneryBuilder import core.game.node.entity.combat.ImpactHandler.HitsplatType import core.game.node.entity.impl.Projectile import core.game.node.entity.npc.NPC diff --git a/Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RottenPotatoUseWithHandler.kt b/Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RottenPotatoUseWithHandler.kt index 6b52cafb8..53a42225e 100644 --- a/Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RottenPotatoUseWithHandler.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RottenPotatoUseWithHandler.kt @@ -1,7 +1,7 @@ package rs09.game.system.command.rottenpotato import core.game.node.Node -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.item.Item diff --git a/Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt index 719af0571..244ad3bd9 100644 --- a/Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt @@ -8,7 +8,7 @@ import core.cache.def.impl.SceneryDefinition import core.cache.def.impl.VarbitDefinition import core.game.component.Component import core.game.ge.OfferState -import core.game.node.`object`.Scenery +import core.game.node.scenery.Scenery import core.game.node.entity.player.Player import core.game.node.entity.player.info.Rights import core.game.node.entity.skill.Skills @@ -25,7 +25,6 @@ import rs09.ServerConstants import rs09.game.content.activity.fishingtrawler.TrawlerLoot import rs09.game.content.ame.RandomEvents import rs09.game.ge.OfferManager -import rs09.game.interaction.SpadeDigListener import rs09.game.node.entity.state.newsys.states.FarmingState import rs09.game.system.SystemLogger import rs09.game.system.command.Command @@ -34,9 +33,7 @@ import rs09.game.world.repository.Repository import rs09.tools.stringtools.colorize import java.awt.Toolkit import java.awt.datatransfer.StringSelection -import java.lang.Integer.max import java.util.* -import java.util.concurrent.TimeUnit import kotlin.collections.ArrayList @Initializable diff --git a/Server/src/main/kotlin/rs09/game/system/command/sets/SpawnCommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/SpawnCommandSet.kt index 5ce550da6..9f26c7e78 100644 --- a/Server/src/main/kotlin/rs09/game/system/command/sets/SpawnCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/SpawnCommandSet.kt @@ -1,8 +1,8 @@ package rs09.game.system.command.sets import core.cache.Cache -import core.game.node.`object`.Scenery -import core.game.node.`object`.SceneryBuilder +import core.game.node.scenery.Scenery +import core.game.node.scenery.SceneryBuilder import core.game.node.entity.npc.NPC import core.game.node.item.Item import rs09.game.system.SystemLogger diff --git a/Server/src/main/kotlin/rs09/game/system/config/DropTableParser.kt b/Server/src/main/kotlin/rs09/game/system/config/DropTableParser.kt index a40820697..78a715a65 100644 --- a/Server/src/main/kotlin/rs09/game/system/config/DropTableParser.kt +++ b/Server/src/main/kotlin/rs09/game/system/config/DropTableParser.kt @@ -5,6 +5,7 @@ import org.json.simple.JSONArray import org.json.simple.JSONObject import org.json.simple.parser.JSONParser import rs09.ServerConstants +import rs09.game.content.global.NPCDropTable import rs09.game.content.global.WeightBasedTable import rs09.game.content.global.WeightedItem import rs09.game.system.SystemLogger @@ -24,7 +25,7 @@ class DropTableParser { val def = NPCDefinition.forId(n.toInt()).dropTables def ?: continue parseTable(tab["main"] as JSONArray, def.table, false) - parseTable(tab["charm"] as JSONArray, def.table, false) + parseTable(tab["charm"] as JSONArray, def.table, false, true) parseTable(tab["default"] as JSONArray,def.table,true) count++ } @@ -32,7 +33,7 @@ class DropTableParser { SystemLogger.logInfo("Parsed $count drop tables.") } - private fun parseTable(data: JSONArray, destTable: WeightBasedTable, isAlways: Boolean) { + private fun parseTable(data: JSONArray, destTable: NPCDropTable, isAlways: Boolean, isCharms: Boolean = false) { for(it in data){ val item = it as JSONObject val id = item["id"].toString().toInt() @@ -40,7 +41,8 @@ class DropTableParser { val maxAmount = item["maxAmount"].toString().toInt() val weight = item["weight"].toString().toDouble() val newItem = WeightedItem(id,minAmount,maxAmount,weight.toDouble(),isAlways) - destTable.add(newItem) + if(isCharms) destTable.addToCharms(newItem) + else destTable.add(newItem) } } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..e0fa37628 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +org.gradle.jvmargs=-Xmx2g -Dkotlin.daemon.jvm.options=-Xmx2g \ No newline at end of file