From dd73be1b709bc3dd40e6d6453fd89e4789e0992d Mon Sep 17 00:00:00 2001 From: Ceikry Date: Fri, 12 Mar 2021 00:16:27 -0600 Subject: [PATCH] Kotlin/Java split --- Server/build.gradle | 10 +- Server/src/main/java/core/cache/Cache.java | 4 +- .../java/core/cache/def/impl/CS2Mapping.java | 2 +- .../core/cache/def/impl/ClothDefinition.java | 2 +- .../cache/def/impl/GraphicDefinition.java | 2 +- .../core/cache/def/impl/ItemDefinition.java | 43 ++++---- .../core/cache/def/impl/NPCDefinition.java | 4 +- .../core/cache/def/impl/ObjectDefinition.java | 4 +- .../def/impl/RenderAnimationDefinition.java | 4 +- .../core/cache/def/impl/VarbitDefinition.java | 10 +- .../core/game/component/InterfaceType.java | 3 +- .../game/container/impl/BankContainer.java | 6 +- .../container/impl/EquipmentContainer.java | 6 +- .../content/activity/ActivityManager.java | 4 +- .../game/content/activity/ActivityPlugin.java | 2 +- .../game/content/activity/CutscenePlugin.java | 2 +- .../barrows/BarrowsActivityPlugin.java | 11 +- .../bountyhunter/BHOptionHandler.java | 2 +- .../activity/bountyhunter/BountyEntry.java | 2 +- .../bountyhunter/BountyHunterActivity.java | 4 +- .../bountyhunter/BountyLocateSpell.java | 2 +- .../clanwars/ClanWarsActivityPlugin.java | 2 +- .../clanwars/ClanWarsChallengeRoom.java | 2 +- .../game/content/activity/duel/DuelArea.java | 4 +- .../activity/duel/DuelArenaActivity.java | 2 +- .../activity/duel/DuelComponentPlugin.java | 2 +- .../content/activity/duel/DuelSession.java | 8 +- .../activity/fog/FOGActivityPlugin.java | 2 +- .../gnomecopter/GnomeCopterActivity.java | 2 +- .../activity/guild/HeroGuildPlugin.java | 2 +- .../activity/guild/RangingGuildPlugin.java | 4 +- .../activity/guild/WizardGuildPlugin.java | 6 +- .../activity/gwd/GWDGraardorSwingHandler.java | 2 +- .../activity/gwd/GWDKreeArraSwingHandler.java | 2 +- .../gwd/GWDTsutsarothSwingHandler.java | 2 +- .../activity/gwd/GWDZilyanaSwingHandler.java | 2 +- .../activity/gwd/GodWarsMinionNPC.java | 2 +- .../content/activity/gwd/GodwarsBossNPC.java | 6 +- .../activity/gwd/GodwarsEntranceHandler.java | 2 +- .../content/activity/gwd/GodwarsMapzone.java | 2 +- .../activity/magearena/KolodionDialogue.java | 2 +- .../activity/magearena/KolodionNPC.java | 6 +- .../activity/magearena/KolodionSession.java | 2 +- .../activity/magearena/LundailDialogue.java | 2 +- .../activity/magearena/MageArenaPlugin.java | 10 +- .../activity/magearena/MageArenaZone.java | 2 +- .../content/activity/mta/AlchemySpell.java | 2 +- .../mta/EntranceGuardianDialogue.java | 2 +- .../game/content/activity/mta/MTAShop.java | 2 +- .../game/content/activity/mta/MTAZone.java | 2 +- .../activity/mta/MageTrainingArenaPlugin.java | 12 +-- .../activity/mta/TelekineticGrabSpell.java | 13 ++- .../activity/mta/impl/AlchemistZone.java | 2 +- .../activity/mta/impl/EnchantingZone.java | 2 +- .../activity/mta/impl/GraveyardZone.java | 2 +- .../activity/mta/impl/TelekineticZone.java | 2 +- .../activity/partyroom/BalloonManager.java | 2 +- .../activity/partyroom/PartyRoomPlugin.java | 4 +- .../activity/pestcontrol/PCObjectHandler.java | 4 +- .../PestControlActivityPlugin.java | 6 +- .../pestcontrol/monsters/PCDefilerNPC.java | 6 +- .../pestcontrol/monsters/PCRavagerNPC.java | 2 +- .../pestcontrol/monsters/PCShifterNPC.java | 18 ++-- .../pestcontrol/monsters/PCSpinnerNPC.java | 2 +- .../pestcontrol/monsters/PCSplatterNPC.java | 2 +- .../pestcontrol/monsters/PCTorcherNPC.java | 8 +- .../reward/PCIslandOptionPlugin.java | 2 +- .../puropuro/ElnockInquisitorDialogue.java | 2 +- .../activity/puropuro/ImpDefenderNPC.java | 2 +- .../activity/puropuro/PuroPuroPlugin.java | 4 +- .../activity/pyramidplunder/PlunderZones.java | 8 +- .../pyramidplunder/PyramidOptionHandler.java | 2 +- .../PyramidPlunderActivity.java | 3 +- .../pyramidplunder/PyramidPlunderNPC.java | 2 +- .../stronghold/StrongHoldSecurityPlugin.java | 4 +- .../playersafety/GuardDialoguePlugin.java | 4 +- .../StrongHoldOfPlayerSafetyPlugin.java | 2 +- .../activity/tzhaar/TzhaarFightCaveNPC.java | 2 +- .../tzhaar/TzhaarFightCavesPlugin.java | 4 +- .../tzhaar/TzhaarFightPitsPlugin.java | 2 +- .../activity/wguild/WarriorsGuild.java | 2 +- .../wguild/animator/AnimationRoom.java | 2 +- .../activity/wguild/barrel/BarrelRoom.java | 4 +- .../wguild/catapult/CatapultRoom.java | 4 +- .../wguild/cyclopes/CyclopesRoom.java | 4 +- .../activity/wguild/dummy/DummyRoom.java | 2 +- .../activity/wguild/shot/ShotPutRoom.java | 4 +- .../game/content/ame/AntiMacroDialogue.java | 2 +- .../game/content/ame/AntiMacroHandler.java | 4 +- .../core/game/content/ame/AntiMacroNPC.java | 2 +- .../events/drilldemon/DrillDemonEvent.java | 4 +- .../events/drunkdwarf/DrunkDwarfEvent.java | 2 +- .../events/evilchicken/EvilChickenNPC.java | 4 +- .../evilchicken/EvilChickenRandomEvent.java | 2 +- .../events/eviltwin/EvilTwinRandomEvent.java | 6 +- .../ame/events/genie/GenieRandomEvent.java | 2 +- .../lostandfound/LostFoundRandomEvent.java | 6 +- .../ame/events/lostpirate/CapnHandEvent.java | 4 +- .../events/quizmaster/QuizMasterDialogue.java | 2 +- .../events/quizmaster/QuizMasterEvent.java | 4 +- .../ame/events/quizmaster/QuizMasterNPC.java | 2 +- .../rickturpentine/RickTurpentineEvent.java | 4 +- .../rickturpentine/RickTurpentineNPC.java | 2 +- .../game/content/consumable/Consumables.java | 2 +- .../effects/SetAttributeEffect.java | 2 +- .../content/cutscene/DBRCutscenePlugin.java | 4 +- .../content/cutscene/GECutscenePlugin.java | 2 +- .../cutscene/JulietCutscenePlugin.java | 2 +- .../game/content/cutscene/JulietDialogue.java | 4 +- .../game/content/cutscene/OrganCutScene.java | 2 +- .../content/cutscene/RJCutscenePlugin.java | 2 +- .../game/content/dialogue/AablaDialogue.java | 2 +- .../dialogue/BrotherJeredDialogue.java | 2 +- .../dialogue/CaptainBentleyDialogue.java | 2 +- .../dialogue/CaptainShanksDialogue.java | 2 +- .../content/dialogue/DairyChurnDialogue.java | 2 +- .../content/dialogue/DialogueInterpreter.java | 10 +- .../game/content/dialogue/DialoguePlugin.java | 7 +- .../game/content/dialogue/DonieDialogue.java | 2 +- .../game/content/dialogue/DoricDialogue.java | 2 +- .../game/content/dialogue/EblisDialogue.java | 2 +- .../dialogue/EventLocatorDialoguePlugin.java | 2 +- .../dialogue/FaladorSquireDialogue.java | 2 +- .../content/dialogue/GalahadDialogue.java | 2 +- .../dialogue/GertrudesCatDialogue.java | 2 +- .../dialogue/GnomeSpiritTreeDialogue.java | 2 +- .../content/dialogue/GrandExchangeTutor.java | 2 +- .../game/content/dialogue/HarryDialogue.java | 2 +- .../dialogue/IgnatiusVulcanDialogue.java | 2 +- .../InformationclerkMuseumDialogue.java | 4 +- .../content/dialogue/JiminuaDialogue.java | 4 +- .../dialogue/KittenInteractDialogue.java | 2 +- .../dialogue/LeatherCraftDialogue.java | 2 +- .../dialogue/LokarSearunnerDialogue.java | 2 +- .../dialogue/LumbridgeGuideDialogue.java | 2 +- .../content/dialogue/ManDialoguePlugin.java | 2 +- .../dialogue/MartinThwaitDialogue.java | 2 +- .../dialogue/MithrilSeedsDialogue.java | 2 +- .../content/dialogue/MithrilSeedsPlugin.java | 2 +- .../dialogue/PartyPeteDialoguePlugin.java | 2 +- .../content/dialogue/PrinceAliDialogue.java | 2 +- .../dialogue/ProfessorOddensteinPlugin.java | 4 +- .../content/dialogue/ResearcherDialogue.java | 2 +- .../dialogue/RomilyWeaklaxDialogue.java | 4 +- .../content/dialogue/RugMerchantDialogue.java | 9 +- .../game/content/dialogue/SaniDialogue.java | 6 +- .../dialogue/SeamanDialoguePlugin.java | 2 +- .../content/dialogue/SeravelDialogue.java | 2 +- .../content/dialogue/ShantayDialogue.java | 2 +- .../game/content/dialogue/ShantayGuard.java | 4 +- .../content/dialogue/SigmundDialogue.java | 3 +- .../content/dialogue/SilkMerchantPlugin.java | 2 +- .../content/dialogue/SirReniteeDialogue.java | 2 +- .../content/dialogue/SkillDialoguePlugin.java | 3 +- .../content/dialogue/SorcceresDialouge.java | 2 +- .../content/dialogue/StankersDialogue.java | 2 +- .../content/dialogue/TownCrierDialogue.java | 2 +- .../dialogue/TownCrierDialogue.java.orig | 2 +- .../content/dialogue/TraibornDialogue.java | 2 +- .../dialogue/book/SecurityBookPlugin.java | 2 +- .../core/game/content/global/BirdNest.java | 2 +- .../content/global/EnchantedJewellery.java | 2 +- .../core/game/content/global/GodType.java | 2 +- .../core/game/content/global/LightSource.java | 6 +- .../game/content/global/SkillingPets.java | 2 +- .../global/action/ClimbActionHandler.java | 6 +- .../global/action/DigSpadeHandler.java | 4 +- .../global/action/DoorActionHandler.java | 5 +- .../global/action/DropItemHandler.java | 4 +- .../core/game/content/global/shop/Shop.java | 6 +- .../global/travel/canoe/CanoeExtension.java | 2 +- .../global/travel/ship/ShipCharter.java | 4 +- .../shootingstar/ScoreboardHandler.java | 2 +- .../shootingstar/ScoreboardManager.java | 4 +- .../shootingstar/StarChartPlugin.java | 2 +- .../game/content/holiday/HolidayEvent.java | 2 +- .../game/content/holiday/HolidayItem.java | 2 +- .../holiday/christmas/ChristmasEvent.java | 6 +- .../holiday/easter/BasketofEggsEvent.java | 6 +- .../holiday/halloween/DeathMansionEvent.java | 8 +- .../content/quest/free/ErnestTheChicken.java | 2 +- .../BKFortressPlugin.java | 4 +- .../BlackKnightsFortress.java | 2 +- .../quest/free/demonslayer/DemonSlayer.java | 2 +- .../free/demonslayer/DemonSlayerCutscene.java | 2 +- .../free/demonslayer/GypsyArisDialogue.java | 2 +- .../free/demonslayer/SirPyrsinDialogue.java | 2 +- .../free/demonslayer/TraibornDialogue.java | 2 +- .../free/demonslayer/WallyCutscenePlugin.java | 2 +- .../quest/free/dragonslayer/DragonSlayer.java | 13 +-- .../dragonslayer/DragonSlayerCutscene.java | 2 +- .../free/dragonslayer/DragonSlayerPlugin.java | 8 +- .../quest/free/dragonslayer/ElvargNPC.java | 4 +- .../quest/free/dragonslayer/MeldarMadNPC.java | 2 +- .../goblindiplomacy/GDiplomacyCutscene.java | 4 +- .../free/goblindiplomacy/GoblinDiplomacy.java | 2 +- .../GoblinDiplomacyPlugin.java | 4 +- .../free/piratestreasure/PiratesTreasure.java | 2 +- .../princealirescue/LadyKeliDialogue.java | 2 +- .../free/princealirescue/LadyKeliNPC.java | 2 +- .../free/princealirescue/PrinceAliRescue.java | 2 +- .../PrinceAliRescuePlugin.java | 2 +- .../free/shieldofarrav/ReldoDialogue.java | 2 +- .../free/shieldofarrav/ShieldArravPlugin.java | 8 +- .../free/shieldofarrav/ShieldofArrav.java | 4 +- .../free/therestlessghost/RestlessGhost.java | 2 +- .../therestlessghost/RestlessGhostPlugin.java | 2 +- .../animalmagnetism/AliceHusbandDialogue.java | 4 +- .../animalmagnetism/AnimalMagnetism.java | 2 +- .../AnimalMagnetismPlugin.java | 4 +- .../members/animalmagnetism/AvaDialogue.java | 2 +- .../animalmagnetism/AvasDevicePlugin.java | 7 +- .../quest/members/asoulsbane/ASoulsBane.java | 3 +- .../members/asoulsbane/ASoulsBanePlugin.java | 6 +- .../members/dwarfcannon/CannonBallPlugin.java | 6 +- .../members/dwarfcannon/DwarfCannon.java | 2 +- .../dwarfcannon/DwarfCannonPlugin.java | 4 +- .../fishingcontest/FenceInteraction.java | 2 +- .../FishingContestCutscene.java | 2 +- .../fishingcontest/GarlicPipeInteraction.java | 2 +- .../members/junglepotion/JunglePotion.java | 2 +- .../quest/members/lostcity/LostCity.java | 2 +- .../members/lostcity/LostCityPlugin.java | 10 +- .../merlinscrystal/CandleMakerDialogue.java | 4 +- .../merlinscrystal/KingArthurDialogue.java | 2 +- .../members/merlinscrystal/MerlinCrystal.java | 2 +- .../merlinscrystal/MerlinCrystalPlugin.java | 4 +- .../members/merlinscrystal/SirMordredNPC.java | 2 +- .../merlinscrystal/TheLadyOfTheLake.java | 2 +- .../rovingelves/MossGiantGuardianNPC.java | 2 +- .../members/rovingelves/RovingElves.java | 2 +- .../rovingelves/RovingElvesPlugin.java | 2 +- .../sheepherder/GateInteractionHandler.java | 2 +- .../members/sheepherder/HerderSheepNPC.java | 2 +- .../sheepherder/IncineratorHandler.java | 2 +- .../sheepherder/ProdActionHandler.java | 4 +- .../members/sheepherder/SheepHerder.java | 2 +- .../sheepherder/SheepPoisonHandler.java | 2 +- .../members/thetouristrap/AnaDialogue.java | 4 +- .../thetouristrap/DesertGuardDialogue.java | 4 +- .../thetouristrap/MaleSlaveDialogue.java | 2 +- .../MercenaryCaptainDialogue.java | 2 +- .../members/thetouristrap/MineSlaveNPC.java | 2 +- .../members/thetouristrap/MiningCampZone.java | 2 +- .../members/thetouristrap/RowdySlaveNPC.java | 2 +- .../members/thetouristrap/TouristTrap.java | 4 +- .../thetouristrap/TouristTrapPlugin.java | 4 +- .../waterfallquest/HadleyDialogue.java | 2 +- .../members/waterfallquest/WaterFall.java | 2 +- .../waterfallquest/WaterfallPlugin.java | 2 +- .../whatliesbelow/WLBelowCutscene.java | 2 +- .../members/whatliesbelow/WLBelowPlugin.java | 4 +- .../members/whatliesbelow/WhatLiesBelow.java | 4 +- .../witchshouse/ExperimentSession.java | 2 +- .../quest/members/witchshouse/MouseNPC.java | 2 +- .../members/witchshouse/NoraTHaggNPC.java | 4 +- .../witchshouse/WitchsExperimentNPC.java | 2 +- .../witchshouse/WitchsHousePlugin.java | 2 +- .../miniquest/barcrawl/BarcrawlDialogue.java | 2 +- .../miniquest/barcrawl/BarcrawlPlugin.java | 4 +- .../miniquest/surok/HuntForSurokPlugin.java | 2 +- .../LTRDragonFightCutscene.java | 2 +- .../tutorialisland/CharacterDesign.java | 2 +- .../FinancialAdvisorDialogue.java | 2 +- .../tutorialisland/RSGuideDialogue.java | 2 +- .../TutorialCompletionDialogue.java | 2 +- .../tutorialisland/TutorialSession.java | 2 +- .../tutorialisland/TutorialStage.java | 6 +- .../core/game/content/ttrail/ClueLevel.java | 2 +- .../game/content/ttrail/ClueScrollPlugin.java | 2 +- .../game/content/ttrail/EmoteCluePlugin.java | 2 +- .../content/ttrail/SaradominWizardNPC.java | 4 +- .../content/ttrail/TreasureTrailPlugin.java | 8 +- .../java/core/game/content/ttrail/UriNPC.java | 2 +- .../game/content/zone/ChaosTunnelZone.java | 4 +- .../core/game/content/zone/DesertZone.java | 2 +- .../core/game/content/zone/IcePathZone.java | 2 +- .../game/content/zone/WildernessAreaZone.java | 4 +- .../content/zone/YanilleAgilityDungeon.java | 4 +- .../content/zone/neitiznot/NeitiznotZone.java | 2 +- .../zone/neitiznot/YakArmourPlugin.java | 4 +- .../content/zone/phasmatys/GravingasNPC.java | 2 +- .../content/zone/phasmatys/PhasmatysZone.java | 2 +- .../zone/rellekka/JarvaldDialogue.java | 2 +- .../content/zone/rellekka/RellekkaZone.java | 4 +- .../content/zone/wbisland/SpinolypNPC.java | 4 +- .../zone/wbisland/WaterBirthDungeonZone.java | 6 +- .../java/core/game/ge/BuyingLimitation.java | 2 +- .../core/game/ge/GrandExchangeDatabase.java | 4 +- .../core/game/interaction/Interaction.java | 5 +- .../core/game/interaction/OptionHandler.java | 2 +- .../core/game/interaction/UseWithHandler.java | 2 +- .../city/BrimhavenDungeonPlugin.java | 2 +- .../interaction/city/DraynorManorPlugin.java | 2 +- .../interaction/city/DraynorNodePlugin.java | 2 +- .../interaction/city/EntranaObjectPlugin.java | 2 +- .../interaction/city/FaladorNodePlugin.java | 2 +- .../city/GnomeStrongholdPlugin.java | 2 +- .../interaction/city/HamHideoutPlugin.java | 2 +- .../city/KaramajaOptionPlugin.java | 6 +- .../interaction/city/LumbridgeNodePlugin.java | 2 +- .../interaction/city/PortSarimPlugin.java | 2 +- .../interaction/city/ShiloVillagePlugin.java | 2 +- .../interaction/city/TrollheimPlugin.java | 6 +- .../interaction/city/VarrockNodePlugin.java | 2 +- .../interaction/city/WizardTowerPlugin.java | 14 +-- .../game/interaction/city/ZanarisPlugin.java | 2 +- .../interaction/inter/CombatTabInterface.java | 4 +- .../interaction/inter/EquipmentInterface.java | 6 +- .../game/interaction/inter/GameInterface.java | 2 +- .../interaction/inter/GlassInterface.java | 2 +- .../inter/GrandExchangeInterface.java | 11 +- .../interaction/inter/LogoutInterface.java | 2 +- .../interaction/inter/MagicBookInterface.java | 2 +- .../inter/MysticStaffEnchantingPlugin.java | 2 +- .../inter/OrbViewingInterface.java | 4 +- .../interaction/inter/SilverInterface.java | 2 +- .../interaction/inter/SkillTabInterface.java | 2 +- .../item/DragonfireShieldPlugin.java | 10 +- .../interaction/item/FaladorShieldPlugin.java | 2 +- .../game/interaction/item/FishbowlPlugin.java | 4 +- .../game/interaction/item/GodBookPlugin.java | 4 +- .../interaction/item/KeldagrimVotingBond.java | 4 +- .../interaction/item/MorphItemPlugin.java | 4 +- .../game/interaction/item/PharoahSceptre.java | 2 +- .../game/interaction/item/PickupPlugin.java | 2 +- .../interaction/item/QuestCapePlugin.java | 4 +- .../item/toys/SnowGlobePlugin.java | 2 +- .../item/withitem/CapeDyeingPlugin.java | 2 +- .../item/withitem/DarkBowDyePlugin.java | 2 +- .../item/withitem/FishfoodPlugin.java | 2 +- .../item/withitem/FruitCuttingPlugin.java | 2 +- .../item/withitem/GraniteMaulPlugin.java | 2 +- .../item/withitem/LavaScalePlugin.java | 2 +- .../item/withitem/SoftclayPlugin.java | 6 +- .../withnpc/ForestersArmsCiderPlugin.java | 2 +- .../item/withnpc/GertrudeCatUsePlugin.java | 2 +- .../KingArthurPoisonChalicePlugin.java | 2 +- .../item/withnpc/LadyKeliRopePlugin.java | 2 +- .../item/withobject/EctophialFillPlugin.java | 2 +- .../withobject/HairdresserCheesePlugin.java | 4 +- .../item/withobject/IncubatorPlugin.java | 12 +-- .../item/withobject/PoisonFountainPlugin.java | 2 +- .../item/withobject/SmithingPlugin.java | 2 +- .../withobject/SpiritShieldBlessPlugin.java | 4 +- .../item/withobject/TutorialItemHandler.java | 2 +- .../item/withobject/WaterSourcePlugin.java | 2 +- .../game/interaction/npc/BogrogPlugin.java | 2 +- .../interaction/npc/BurthorpeTrainNPC.java | 2 +- .../npc/CanafisWereWolfPlugin.java | 2 +- .../game/interaction/npc/GabootyTrade.java | 3 +- .../game/interaction/npc/NPCTalkPlugin.java | 10 +- .../interaction/npc/SecurityGuardPlugin.java | 4 +- .../interaction/npc/SheepShearPlugin.java | 2 +- .../interaction/npc/ZahurOptionPlugin.java | 2 +- .../interaction/npc/bob/BobRepairItem.java | 2 +- .../SorceressApprenticeDialogue.java | 2 +- .../SorceressApprenticePlugin.java | 2 +- .../interaction/object/BankingPlugin.java | 6 +- .../interaction/object/BarrowsBoatPlugin.java | 2 +- .../interaction/object/BeehivePlugin.java | 4 +- .../interaction/object/BrokenCartBypass.java | 2 +- .../object/BuyCrateOptionPlugin.java | 2 +- .../object/ChefGuildDoorPlugin.java | 2 +- .../interaction/object/CowMilkingPlugin.java | 2 +- .../object/CrystalChestPlugin.java | 2 +- .../object/CulinomancerChestPliugin.java | 2 +- .../object/DropPartyLeverOptionPlugin.java | 2 +- .../object/ErnestTheChickenPlugin.java | 2 +- .../object/FieldPickingPlugin.java | 2 +- .../object/GrandExchangeShortcut.java | 2 +- .../object/KalphiteEntranceHandler.java | 2 +- .../object/LumbridgeBasementPlugin.java | 4 +- .../interaction/object/PortsObjectPlugin.java | 2 +- .../interaction/object/ProspectOrePlugin.java | 2 +- .../interaction/object/PyreSitePlugin.java | 6 +- .../object/SinclairFlourBarrelPlugin.java | 4 +- .../interaction/object/SlashWebPlugin.java | 2 +- .../object/ThievingGuidePlugin.java | 2 +- .../object/TollGateOptionPlugin.java | 6 +- .../object/WildernessLeverPlugin.java | 4 +- .../object/WildernessObeliskPlugin.java | 2 +- .../interaction/object/dmc/DMCHandler.java | 4 +- .../object/dmc/DwarfMultiCannonPlugin.java | 2 +- .../object/sorceress/GardenObjectsPlugin.java | 4 +- .../wildyditch/WildernessDitchPlugin.java | 2 +- .../player/LoginValidationPlugin.java | 2 +- .../java/core/game/node/entity/Entity.java | 12 ++- .../game/node/entity/combat/CombatStyle.java | 7 +- .../game/node/entity/combat/DeathTask.java | 2 +- .../node/entity/combat/ImpactHandler.java | 4 +- .../entity/combat/equipment/BoltEffect.java | 2 +- .../entity/combat/equipment/SwitchAttack.java | 2 +- .../combat/equipment/WeaponInterface.java | 5 +- .../handlers/ChinchompaSwingHandler.java | 3 +- .../handlers/DragonfireSwingHandler.java | 4 +- .../special/AncientMaceSpecialHandler.java | 2 +- .../special/BackstabSpecialHandler.java | 2 +- .../special/ChainhitSpecialHandler.java | 14 +-- .../combat/special/CleaveSpecialHandler.java | 2 +- .../combat/special/ClobberSpecialHandler.java | 2 +- .../DescentOfDarknessSpecialHandler.java | 2 +- .../special/EnergyDrainSpecialHandler.java | 2 +- .../special/ExcaliburSpecialHandler.java | 2 +- .../combat/special/FeintSpecialHandler.java | 2 +- .../special/HealingBladeSpecialHandler.java | 2 +- .../special/IceCleaveSpecialHandler.java | 2 +- .../combat/special/ImpaleSpecialHandler.java | 2 +- .../special/JudgementSpecialHandler.java | 2 +- .../special/PowershotSpecialHandler.java | 2 +- .../special/PowerstabSpecialHandler.java | 2 +- .../special/PunctureSpecialHandler.java | 2 +- .../special/QuickSmashSpecialHandler.java | 4 +- .../combat/special/RampageSpecialHandler.java | 2 +- .../special/SaradominsLightningHandler.java | 2 +- .../combat/special/SeverSpecialHandler.java | 2 +- .../combat/special/ShatterSpecialHandler.java | 2 +- .../combat/special/ShoveSpecialHandler.java | 2 +- .../special/SliceAndDiceSpecialHandler.java | 2 +- .../combat/special/SmashSpecialHandler.java | 2 +- .../special/SnapshotSpecialHandler.java | 8 +- .../combat/special/SnipeSpecialHandler.java | 8 +- .../special/SpearWallSpecialHandler.java | 2 +- .../combat/special/SweepSpecialHandler.java | 2 +- .../special/WarstrikeSpecialHandler.java | 2 +- .../node/entity/combat/spell/BindSpell.java | 2 +- .../node/entity/combat/spell/IceSpells.java | 2 +- .../entity/combat/spell/MiasmicSpells.java | 2 +- .../node/entity/combat/spell/SpellBlocks.java | 2 +- .../core/game/node/entity/impl/Animator.java | 2 +- .../game/node/entity/impl/ForceMovement.java | 2 +- .../game/node/entity/impl/GameAttributes.java | 2 +- .../game/node/entity/impl/Properties.java | 6 +- .../game/node/entity/impl/PulseManager.java | 4 +- .../game/node/entity/impl/WalkingQueue.java | 4 +- .../game/node/entity/lock/ActionLocks.java | 2 +- .../java/core/game/node/entity/lock/Lock.java | 2 +- .../game/node/entity/npc/AbstractNPC.java | 2 +- .../game/node/entity/npc/Metamorphosis.java | 2 +- .../java/core/game/node/entity/npc/NPC.java | 21 ++-- .../entity/npc/agg/AggressiveBehavior.java | 2 +- .../entity/npc/agg/AggressiveHandler.java | 4 +- .../node/entity/npc/bosses/GiantMoleNPC.java | 2 +- .../entity/npc/bosses/KalphiteQueenNPC.java | 4 +- .../entity/npc/bosses/TormentedDemonNPC.java | 2 +- .../node/entity/npc/bosses/TzRekJadNPC.java | 4 +- .../npc/bosses/corp/CorporealBeastNPC.java | 16 +-- .../npc/bosses/corp/DarkEnergyCoreNPC.java | 2 +- .../bosses/wilderness/ChaosElementalNPC.java | 4 +- .../bosses/wilderness/KingBlackDragonNPC.java | 2 +- .../city/pollnivneach/AliTheCamelHandler.java | 2 +- .../npc/city/sophanem/WallShortcut.java | 2 +- .../varrock/VarrockEastBartenderDialogue.java | 2 +- .../node/entity/npc/drop/NPCDropTables.java | 11 +- .../node/entity/npc/drop/RareDropTable.java | 4 +- .../node/entity/npc/drop/SharedTables.java | 2 +- .../node/entity/npc/familiar/BeaverNPC.java | 2 +- .../node/entity/npc/familiar/BunyipNPC.java | 2 +- .../npc/familiar/CockatriceFamiliarNPC.java | 4 +- .../entity/npc/familiar/CompostMoundNPC.java | 2 +- .../entity/npc/familiar/DesertWyrmNPC.java | 4 +- .../entity/npc/familiar/DreadfowlNPC.java | 6 +- .../entity/npc/familiar/ForgeRegentNPC.java | 4 +- .../node/entity/npc/familiar/FruitBatNPC.java | 4 +- .../npc/familiar/GiantChinchompaNPC.java | 2 +- .../node/entity/npc/familiar/IbisNPC.java | 2 +- .../entity/npc/familiar/IronTitanNPC.java | 6 +- .../node/entity/npc/familiar/MacawNPC.java | 4 +- .../npc/familiar/MinotaurFamiliarNPC.java | 4 +- .../node/entity/npc/familiar/PackYakNPC.java | 2 +- .../node/entity/npc/familiar/PyreLordNPC.java | 4 +- .../npc/familiar/SpiritKalphiteNPC.java | 2 +- .../entity/npc/familiar/SpiritSpiderNPC.java | 2 +- .../entity/npc/familiar/SpiritWolfNPC.java | 2 +- .../entity/npc/familiar/SteelTitanNPC.java | 6 +- .../entity/npc/familiar/ThornySnailNPC.java | 2 +- .../npc/familiar/UnicornStallionNPC.java | 2 +- .../entity/npc/familiar/VoidFamiliarNPC.java | 4 +- .../node/entity/npc/other/ArmourSuitNPC.java | 2 +- .../game/node/entity/npc/other/BorkNPC.java | 4 +- .../node/entity/npc/other/CatableponNPC.java | 6 +- .../entity/npc/other/ChromaticDragonNPC.java | 6 +- .../node/entity/npc/other/DraynorTreeNPC.java | 2 +- .../entity/npc/other/ElementalWizardNPC.java | 2 +- .../node/entity/npc/other/FishingNPC.java | 2 +- .../node/entity/npc/other/GraveStoneNPC.java | 6 +- .../entity/npc/other/LumberKittenNPC.java | 2 +- .../node/entity/npc/other/MetalDragonNPC.java | 8 +- .../game/node/entity/npc/other/MonkNPC.java | 4 +- .../npc/other/SorceressElementalNPC.java | 4 +- .../node/entity/npc/other/TribesmanNPC.java | 4 +- .../quest/pirates_treasure/GardenerNPC.java | 2 +- .../entity/npc/revenant/CorruptEquipment.java | 2 +- .../entity/npc/revenant/PVPEquipment.java | 2 +- .../npc/revenant/RevenantCombatHandler.java | 4 +- .../node/entity/npc/revenant/RevenantNPC.java | 10 +- .../entity/npc/revenant/RevenantPlugin.java | 2 +- .../core/game/node/entity/player/Player.java | 86 ++++++--------- .../node/entity/player/info/RenderInfo.java | 2 +- .../game/node/entity/player/info/Rights.java | 2 +- .../player/info/login/LoginConfiguration.java | 8 +- .../player/info/login/PlayerParser.java | 14 +-- .../entity/player/link/BankPinManager.java | 2 +- .../player/link/ConfigurationManager.java | 2 +- .../entity/player/link/InterfaceManager.java | 10 +- .../entity/player/link/PacketDispatch.java | 6 +- .../node/entity/player/link/SavedData.java | 2 +- .../node/entity/player/link/Settings.java | 4 +- .../entity/player/link/TeleportManager.java | 4 +- .../player/link/appearance/Appearance.java | 2 +- .../player/link/diary/AchievementDiary.java | 3 +- .../link/diary/AchievementDiaryManager.java | 10 +- .../entity/player/link/diary/DiaryType.java | 2 +- .../node/entity/player/link/emote/Emotes.java | 4 +- .../player/link/grave/GraveManager.java | 2 +- .../entity/player/link/music/MusicPlayer.java | 2 +- .../entity/player/link/prayer/DrainTask.java | 2 +- .../player/link/quest/QuestRepository.java | 2 +- .../player/link/request/RequestManager.java | 2 +- .../link/request/assist/AssistSession.java | 2 +- .../link/request/trade/TradeContainer.java | 2 +- .../entity/player/link/spawn/PKTitle.java | 2 +- .../entity/player/link/spawn/SpawnData.java | 4 +- .../core/game/node/entity/skill/LevelUp.java | 2 +- .../node/entity/skill/SkillRestoration.java | 4 +- .../core/game/node/entity/skill/Skills.java | 16 +-- .../entity/skill/agility/AgilityHandler.java | 2 +- .../skill/agility/brimhaven/BladeTrap.java | 2 +- .../agility/brimhaven/BrimhavenArena.java | 2 +- .../agility/brimhaven/BrimhavenCourse.java | 2 +- .../skill/agility/brimhaven/DartTrap.java | 2 +- .../skill/agility/brimhaven/FloorSpikes.java | 2 +- .../skill/agility/brimhaven/PressurePad.java | 2 +- .../agility/brimhaven/SpinningBlades.java | 2 +- .../agility/pyramid/AgilityPyramidCourse.java | 4 +- .../skill/agility/pyramid/MovingBlockNPC.java | 2 +- .../skill/agility/pyramid/RollingBlock.java | 2 +- .../shortcuts/FaladorGrapplePlugin.java | 4 +- .../agility/shortcuts/FenceJumpShortcut.java | 2 +- .../agility/shortcuts/KaramjaGrapple.java | 4 +- .../agility/shortcuts/MonkeyBarShortcut.java | 2 +- .../agility/shortcuts/StileShortcut.java | 2 +- .../shortcuts/StrangeFloorShortcut.java | 2 +- .../agility/shortcuts/TunnelShortcut.java | 2 +- .../agility/shortcuts/WaterOrbGrapple.java | 4 +- .../agility/shortcuts/YanilleGrapple.java | 2 +- .../skill/construction/BuildOptionPlugin.java | 5 +- .../skill/construction/BuildingUtils.java | 3 +- .../construction/ConstructionGuideBook.java | 2 +- .../construction/ConstructionInterface.java | 7 +- .../entity/skill/construction/CrestType.java | 2 +- .../entity/skill/construction/Decoration.java | 1 + .../skill/construction/HouseManager.java | 12 +-- .../construction/PortalOptionPlugin.java | 8 +- .../skill/construction/RemovalDialogue.java | 1 + .../node/entity/skill/construction/Room.java | 1 + .../skill/construction/RoomBuilder.java | 3 +- .../skill/construction/RoomProperties.java | 1 + .../decoration/FireplacePlugin.java | 2 +- .../decoration/StaircasePlugin.java | 12 ++- .../decoration/chapel/BoneOfferPlugin.java | 2 +- .../decoration/kitchen/LarderPlugin.java | 2 +- .../decoration/kitchen/ShelfPlugin.java | 2 +- .../portalchamber/PortalChamberPlugin.java | 8 +- .../questhall/MountedGloryPlugin.java | 2 +- .../workshop/ClockmakersBenchPlugin.java | 2 +- .../decoration/workshop/ToolsPlugin.java | 2 +- .../npc/HouseServantDialogue.java | 2 +- .../construction/npc/HouseServantPlugin.java | 2 +- .../entity/skill/cooking/CookableItems.java | 2 +- .../entity/skill/cooking/CookingRewrite.java | 2 +- .../skill/cooking/StandardCookingPulse.java | 2 +- .../skill/cooking/WineFermentPlugin.java | 2 +- .../skill/cooking/recipe/OomlieWrap.java | 2 +- .../entity/skill/crafting/GemCutPlugin.java | 4 +- .../entity/skill/crafting/PotteryPlugin.java | 4 +- .../skill/crafting/SnakeSkinPlugin.java | 4 +- .../skill/crafting/StuddedArmourPlugin.java | 4 +- .../skill/crafting/WeaveOptionPlugin.java | 4 +- .../skill/firemaking/FireMakingPulse.java | 2 +- .../entity/skill/fishing/FishingPulse.java | 16 +-- .../skill/fletching/ArrowCreatePlugin.java | 4 +- .../skill/fletching/BoltCreatePlugin.java | 4 +- .../entity/skill/fletching/BoltGemPlugin.java | 4 +- .../entity/skill/fletching/Fletching.java | 22 ++-- .../skill/fletching/FletchingPlugin.java | 4 +- .../entity/skill/fletching/GemBoltPlugin.java | 12 +-- .../skill/fletching/MakeCrossbowPlugin.java | 2 +- .../skill/fletching/StringbowPlugin.java | 2 +- .../items/arrow/HeadlessArrowPulse.java | 2 +- .../fletching/items/bolts/BoltPulse.java | 2 +- .../gather/GatheringSkillOptionPlugin.java | 4 +- .../skill/gather/GatheringSkillPulse.java | 2 +- .../entity/skill/gather/SkillingResource.java | 6 +- .../skill/gather/mining/MiningNode.java | 6 +- .../gather/woodcutting/WoodcuttingNode.java | 4 +- .../woodcutting/WoodcuttingSkillPulse.java | 18 ++-- .../skill/herblore/FinishedPotionPlugin.java | 4 +- .../entity/skill/herblore/GrindingItem.java | 2 +- .../entity/skill/herblore/HerbTarPlugin.java | 2 +- .../herblore/MakeSuperCombatPotionPlugin.java | 4 +- .../herblore/UnfinishedPotionPlugin.java | 4 +- .../skill/hunter/FalconryActivityPlugin.java | 2 +- .../node/entity/skill/hunter/HunterNPC.java | 2 +- .../entity/skill/hunter/HunterPlugin.java | 2 +- .../entity/skill/hunter/ImpBoxPlugin.java | 2 +- .../skill/hunter/ImpetuousImpulses.java | 2 +- .../node/entity/skill/hunter/ImplingNPC.java | 6 +- .../node/entity/skill/hunter/TrapHook.java | 2 +- .../node/entity/skill/hunter/TrapSetting.java | 2 +- .../node/entity/skill/hunter/TrapWrapper.java | 2 +- .../game/node/entity/skill/hunter/Traps.java | 2 +- .../entity/skill/hunter/bnet/BNetPulse.java | 2 +- .../hunter/falconry/FalconryCatchPulse.java | 4 +- .../skill/magic/HouseTeleportPlugin.java | 2 +- .../node/entity/skill/magic/MagicSpell.java | 4 +- .../skill/magic/ModernTeleportPlugin.java | 4 +- .../game/node/entity/skill/magic/Runes.java | 2 +- .../magic/ancient/AncientTeleportPlugin.java | 2 +- .../skill/magic/lunar/CurePlantSpell.java | 1 - .../entity/skill/magic/lunar/DreamSpell.java | 2 +- .../skill/magic/lunar/FertileSoilSpell.java | 1 - .../skill/magic/lunar/MagicImbueSpell.java | 2 +- .../skill/magic/lunar/PlankMeSpell.java | 2 +- .../skill/magic/lunar/SpellbookSwapSpell.java | 2 +- .../skill/magic/lunar/StatBoostSpell.java | 2 +- .../skill/magic/lunar/StatRestoreSpell.java | 2 +- .../skill/magic/lunar/VengeanceSpell.java | 2 +- .../skill/prayer/BoneBuryingOptionPlugin.java | 2 +- .../runecrafting/MysteriousRuinPlugin.java | 2 +- .../skill/runecrafting/RuneCraftPulse.java | 2 +- .../runecrafting/RunecraftingPlugin.java | 9 +- .../skill/runecrafting/abyss/AbyssPlugin.java | 4 +- .../skill/slayer/AberrantSpectreNPC.java | 6 +- .../entity/skill/slayer/AbyssalDemonNPC.java | 4 +- .../node/entity/skill/slayer/BansheeNPC.java | 6 +- .../node/entity/skill/slayer/BasiliskNPC.java | 2 +- .../entity/skill/slayer/BrutalDragonNPC.java | 4 +- .../entity/skill/slayer/CaveHorrorNPC.java | 4 +- .../entity/skill/slayer/CockatriceNPC.java | 2 +- .../entity/skill/slayer/DustDevilNPC.java | 4 +- .../skill/slayer/FishingExplosivePlugin.java | 2 +- .../node/entity/skill/slayer/GargoyleNPC.java | 2 +- .../skill/slayer/MirrorShieldHandler.java | 2 +- .../entity/skill/slayer/MithrilDragonNPC.java | 4 +- .../entity/skill/slayer/NechryaelNPC.java | 2 +- .../entity/skill/slayer/RockSlugPlugin.java | 2 +- .../skill/slayer/SkeletalWyvernNPC.java | 4 +- .../entity/skill/slayer/SlayerManager.java | 2 +- .../skill/slayer/SlayerMasterDialogue.java | 2 +- .../skill/slayer/SlayerRewardPlugin.java | 2 +- .../entity/skill/slayer/WaterFiendNPC.java | 4 +- .../skill/slayer/dungeon/AncientCavern.java | 4 +- .../slayer/dungeon/FremennikDungeon.java | 2 +- .../slayer/dungeon/LumbridgeDungeon.java | 4 +- .../skill/slayer/dungeon/SmokeDungeon.java | 4 +- .../skill/smithing/FurnaceOptionPlugin.java | 2 +- .../entity/skill/smithing/SmithingPulse.java | 8 +- .../smithing/smelting/SmeltingPulse.java | 2 +- .../summoning/SummoningCreationPlugin.java | 2 +- .../summoning/SummoningTrainingRoom.java | 4 +- .../skill/summoning/familiar/BurdenBeast.java | 2 +- .../skill/summoning/familiar/Familiar.java | 16 +-- .../summoning/familiar/FamiliarManager.java | 2 +- .../skill/summoning/familiar/Forager.java | 2 +- .../summoning/familiar/RemoteViewer.java | 2 +- .../skill/thieving/PickpocketPulse.java | 9 +- .../skill/thieving/StallThiefPulse.java | 2 +- .../skill/thieving/ThievableChestPlugin.java | 2 +- .../skill/thieving/ThievingOptionPlugin.java | 1 + .../game/node/entity/state/StatePulse.java | 2 +- .../entity/state/impl/FireResistantPulse.java | 2 +- .../entity/state/impl/FrozenStatePulse.java | 2 +- .../entity/state/impl/MiasmicStatePulse.java | 2 +- .../java/core/game/node/item/GroundItem.java | 2 +- .../game/node/item/GroundItemManager.java | 4 +- .../core/game/node/object/ObjectBuilder.java | 4 +- .../java/core/game/system/SystemManager.java | 2 +- .../core/game/system/SystemShutdownHook.java | 2 + .../core/game/system/SystemTermination.java | 9 +- .../java/core/game/system/SystemUpdate.java | 6 +- .../core/game/system/command/CommandSet.java | 3 +- .../game/system/communication/ClanEntry.java | 2 +- .../system/communication/ClanRepository.java | 4 +- .../communication/CommunicationInfo.java | 6 +- .../game/system/monitor/DuplicationLog.java | 2 +- .../game/system/mysql/SQLEntryHandler.java | 2 +- .../core/game/system/mysql/SQLManager.java | 4 +- .../mysql/impl/HighscoreSQLHandler.java | 4 +- .../mysql/impl/PlayerLogSQLHandler.java | 2 +- .../system/mysql/impl/PlayerSQLHandler.java | 2 +- .../game/system/script/ScriptCompiler.java | 10 +- .../game/system/script/ScriptManager.java | 6 +- .../script/context/OptionDialInstruction.java | 2 +- .../script/context/PauseInstruction.java | 2 +- .../core/game/system/task/LogoutTask.java | 2 +- .../java/core/game/system/task/NodeTask.java | 2 +- .../core/game/world/map/BuildRegionChunk.java | 2 +- .../main/java/core/game/world/map/Region.java | 8 +- .../java/core/game/world/map/RegionChunk.java | 2 +- .../core/game/world/map/RegionManager.java | 2 +- .../java/core/game/world/map/RegionPlane.java | 2 +- .../core/game/world/map/path/Pathfinder.java | 17 +-- .../game/world/map/zone/impl/DarkZone.java | 4 +- .../world/map/zone/impl/ModeratorZone.java | 2 +- .../world/map/zone/impl/WildernessZone.java | 23 ++-- .../game/world/objectparser/ObjectParser.java | 4 +- .../java/core/gui/component/PlayerViewer.java | 4 +- .../java/core/gui/tab/GrandExchangeTab.java | 4 +- .../src/main/java/core/gui/tab/PlayerTab.java | 2 +- .../main/java/core/gui/tab/StatisticsTab.java | 8 +- Server/src/main/java/core/net/IoSession.java | 2 +- .../java/core/net/amsc/MSEventHandler.java | 2 +- .../core/net/amsc/MSPacketRepository.java | 8 +- .../core/net/amsc/ManagementServerState.java | 2 +- .../java/core/net/amsc/WorldCommunicator.java | 6 +- .../java/core/net/event/GameReadEvent.java | 4 +- .../main/java/core/net/event/MSReadEvent.java | 2 +- .../core/net/event/RegistryReadEvent.java | 4 +- .../core/net/event/RegistryWriteEvent.java | 2 +- .../java/core/net/lobby/WorldDefinition.java | 4 +- .../main/java/core/net/lobby/WorldList.java | 2 +- .../core/net/packet/PacketRepository.java | 6 +- .../net/packet/context/CameraContext.java | 2 +- .../net/packet/in/ActionButtonPacket.java | 2 +- .../java/core/net/packet/in/ChatPacket.java | 2 +- .../core/net/packet/in/ClanPacketHandler.java | 2 +- .../core/net/packet/in/CommandPacket.java | 4 +- .../java/core/net/packet/in/DummyPacket.java | 2 +- .../core/net/packet/in/IdlePacketHandler.java | 2 +- .../core/net/packet/in/InteractionPacket.java | 17 +-- .../net/packet/in/InterfaceUseOnPacket.java | 8 +- .../core/net/packet/in/ItemActionPacket.java | 24 +++-- .../core/net/packet/in/ReportAbusePacket.java | 2 +- .../java/core/net/packet/in/WalkPacket.java | 2 +- .../net/packet/out/BuildDynamicScene.java | 2 +- .../net/packet/out/CommunicationMessage.java | 2 +- .../core/net/packet/out/UpdateSceneGraph.java | 2 +- .../core/net/producer/LoginEventProducer.java | 2 +- .../core/net/registry/AccountRegister.java | 22 ++-- .../core/plugin/CorePluginTypes/Managers.java | 2 +- .../core/tools/mysql/DatabaseManager.java | 4 +- .../java/core/worker/MajorUpdateWorker.java | 4 +- .../plugin/ai/system/android/CombatDroid.java | 4 - .../ai/system/android/GatheringDroid.java | 4 - .../drops/mystery_box/MysteryBoxDropper.java | 2 +- .../drops/mystery_box/MysteryBoxPlugin.java | 2 +- .../{plugin => rs09/game}/ai/AIPBuilder.java | 2 +- .../game}/ai/AIPControlDialogue.java | 2 +- .../{plugin => rs09/game}/ai/AIPlayer.java | 7 +- .../game}/ai/ArtificialSession.java | 2 +- .../ai/general/scriptrepository/Script.java | 4 +- .../game}/ai/lumbridge/DeadIdler.java | 4 +- .../ai/lumbridge/LumbridgeBotHandler.java | 4 +- .../game}/ai/pvmbots/DragonKiller.java | 4 +- .../game}/ai/pvmbots/GiantMoleBot.java | 4 +- .../game}/ai/pvmbots/LowestBot.java | 4 +- .../game}/ai/pvmbots/NoobBot.java | 4 +- .../game}/ai/pvmbots/PvMBots.java | 4 +- .../game}/ai/pvp/PVPAIPActions.java | 6 +- .../game}/ai/pvp/PVPAIPBuilderUtils.java | 4 +- .../game}/ai/resource/ResourceAIPActions.java | 8 +- .../game}/ai/resource/ResourceAIPManager.java | 8 +- .../game}/ai/resource/task/ResourceTask.java | 2 +- .../game}/ai/resource/task/ResourceTasks.java | 2 +- .../game}/ai/skillingbot/SkillingBot.java | 4 +- .../ai/skillingbot/SkillingBotsBuilder.java | 4 +- .../game}/ai/system/GlobalAIManager.java | 4 +- .../game/ai/system/android/CombatDroid.java | 4 + .../ai/system/android/GatheringDroid.java | 4 + .../game}/ai/system/predicate/Predicate.java | 4 +- .../ai/system/predicate/PredicateType.java | 2 +- .../predicate/impl/AppearancePredicate.java | 6 +- .../game}/ai/wilderness/PvPBotsBuilder.java | 10 +- .../game}/ai/wilderness/WildernessBot.java | 4 +- .../core/game/camerautils/CameraUtils.kt | 5 - .../skill/hunter/tracking/CommonKebbitWest.kt | 4 - .../ai/general/scriptrepository/Idler.kt | 17 --- .../scriptrepository/PlayerCompatible.kt | 3 - .../general/scriptrepository/PlayerScripts.kt | 19 ---- .../barbtraining/fishing/BarbFishingPulse.kt | 98 ----------------- .../barbtraining/fishing/FishCuttingPulse.kt | 45 -------- .../barbtraining/fishing/KnifeWithFish.kt | 26 ----- .../barbtraining/fishing/OptionHandlers.kt | 50 --------- .../barbtraining/fishing/SpotManager.kt | 82 -------------- .../kotlin/plugin/creditshop/CreditShop.kt | 102 ------------------ .../main/kotlin/{core => rs09}/JSONUtils.kt | 2 +- .../src/main/kotlin/{core => rs09}/Server.kt | 16 +-- .../kotlin/{core => rs09}/ServerConstants.kt | 31 +++--- .../main/kotlin/{core => rs09}/game/Varbit.kt | 2 +- .../main/kotlin/{core => rs09}/game/Varp.kt | 3 +- .../kotlin/{core => rs09}/game/VarpManager.kt | 2 +- .../{plugin => rs09/game}/ai/AIRepository.kt | 6 +- .../game}/ai/general/GeneralBotCreator.kt | 14 +-- .../game}/ai/general/ScriptAPI.kt | 28 ++--- .../ai/general/scriptrepository/Adventurer.kt | 15 ++- .../general/scriptrepository/ChickenKiller.kt | 7 +- .../ai/general/scriptrepository/CoalMiner.kt | 8 +- .../ai/general/scriptrepository/CowKiller.kt | 7 +- .../general/scriptrepository/DraynorFisher.kt | 6 +- .../scriptrepository/DraynorWillows.kt | 6 +- .../general/scriptrepository/FarmerThiever.kt | 4 +- .../scriptrepository/FletchingBankstander.kt | 6 +- .../scriptrepository/GenericSlayerBot.kt | 11 +- .../GlassBlowingBankstander.kt | 6 +- .../scriptrepository/GreenDragonKiller.kt | 21 ++-- .../game/ai/general/scriptrepository/Idler.kt | 10 ++ .../scriptrepository/LobsterCatcher.kt | 10 +- .../ai/general/scriptrepository/ManThiever.kt | 4 +- .../scriptrepository/NonBankingMiner.kt | 6 +- .../scriptrepository/PlayerCompatible.kt | 3 + .../general/scriptrepository/PlayerScripts.kt | 19 ++++ .../scriptrepository/ScriptDescription.kt | 2 +- .../scriptrepository/ScriptIdentifier.kt | 2 +- .../ai/general/scriptrepository/ScriptName.kt | 2 +- .../ai/general/scriptrepository/SeersFlax.kt | 7 +- .../scriptrepository/SeersMagicTrees.kt | 8 +- .../general/scriptrepository/SharkCatcher.kt | 10 +- .../scriptrepository/VarrockEssenceMiner.kt | 9 +- .../scriptrepository/VarrockSmither.kt | 6 +- .../minigamebots/pestcontrol/CombatState.kt | 8 +- .../pestcontrol/CombatStateIntermediate.kt | 8 +- .../pestcontrol/PestControlIntermediateBot.kt | 13 ++- .../pestcontrol/PestControlNoviceBot.kt | 13 ++- .../game}/ai/pvmbots/CombatBot.kt | 4 +- .../game}/ai/pvmbots/CombatBotAssembler.kt | 6 +- .../game}/ai/pvmbots/PvMBotsBuilder.kt | 10 +- .../ai/skillingbot/SkillingBotAssembler.kt | 4 +- .../rs09/game/camerautils/CameraUtils.kt | 5 + .../game/camerautils/PlayerCamera.kt | 4 +- .../content/activity/allfiredup/AFUBeacon.kt | 4 +- .../activity/allfiredup/AFUBeaconHandler.kt | 6 +- .../allfiredup/AFURepairClimbHandler.kt | 4 +- .../content/activity/allfiredup/AFUSession.kt | 10 +- .../allfiredup/BeaconTenderDialogue.kt | 4 +- .../allfiredup/KingRoaldAFUMiniDialogue.kt | 10 +- .../content/activity/barrows/RewardChest.kt | 6 +- .../fishingtrawler/FishingTrawlerActivity.kt | 8 +- .../FishingTrawlerOptionHandler.kt | 18 ++-- .../fishingtrawler/FishingTrawlerOverlay.kt | 2 +- .../FishingTrawlerRewardInterface.kt | 2 +- .../fishingtrawler/FishingTrawlerSession.kt | 14 ++- .../activity/fishingtrawler/TrawlerLoot.kt | 4 +- .../activity/fog/FogInteractionHandler.kt | 2 +- .../content/activity/fog/ReggieDialogue.kt | 8 +- .../gnomecooking/DeliveryBoxHandler.kt | 2 +- .../gnomecooking/GCRewardTokenHandler.kt | 6 +- .../gnomecooking/GnomeCookingConstants.kt | 2 +- .../activity/gnomecooking/GnomeCookingJob.kt | 2 +- .../activity/gnomecooking/GnomeTipper.kt | 4 +- .../gnomecooking/battas/GnomeBattaCooker.kt | 6 +- .../battas/GnomeBattaDishFiller.kt | 4 +- .../battas/GnomeBattaGarnisher.kt | 4 +- .../battas/GnomeBattaInterface.kt | 4 +- .../battas/GnomeBattaPrepareHandler.kt | 6 +- .../gnomecooking/bowls/GnomeBowlCooker.kt | 6 +- .../gnomecooking/bowls/GnomeBowlGarnisher.kt | 4 +- .../gnomecooking/bowls/GnomeBowlInterface.kt | 4 +- .../bowls/GnomeBowlPrepareHandler.kt | 6 +- .../bowls/GnomebowlMouldFiller.kt | 4 +- .../gnomecooking/cocktails/CocktailCooker.kt | 4 +- .../cocktails/CocktailFinisher.kt | 4 +- .../cocktails/CocktailShakerHandler.kt | 4 +- .../cocktails/GnomeCocktailInterface.kt | 4 +- .../gnomecooking/cocktails/PourMixerPlugin.kt | 4 +- .../crunchies/GnomeCrunchyCooker.kt | 4 +- .../crunchies/GnomeCrunchyGarnisher.kt | 4 +- .../crunchies/GnomeCrunchyInterface.kt | 4 +- .../crunchies/GnomeCrunchyPrepareHandler.kt | 4 +- .../crunchies/GnomeCrunchyTrayFiller.kt | 2 +- .../game/content/activity/mta/EnchantSpell.kt | 13 +-- .../activity/pestcontrol/PestControlHelper.kt | 7 +- .../activity/pyramidplunder/PlunderSession.kt | 6 +- .../content/ame/events/SandwichLadyHandler.kt | 8 +- .../ame/events/SandwichLadyInterface.kt | 4 +- .../content/ame/events/SandwichLadyNPC.kt | 7 +- .../consumable/effects/RestoreSummoning.kt | 2 +- .../game/content/dialogue/AberabDialogue.kt | 4 +- .../content/dialogue/AchiettiesDialogue.kt | 4 +- .../content/dialogue/AfflictedDialogue.kt | 6 +- .../game/content/dialogue/AfrahDialogue.kt | 4 +- .../content/dialogue/AgilityBossDialogue.kt | 4 +- .../game/content/dialogue/AgmundiDialogue.kt | 4 +- .../content/dialogue/AluftGianneJrDialogue.kt | 8 +- .../dialogue/AluftGianneSnrDialogue.kt | 12 ++- .../game/content/dialogue/AsyffDialogue.kt | 6 +- .../content/dialogue/BlurberryDialogue.kt | 11 +- .../dialogue/BrotherBordissDialogue.kt | 6 +- .../game/content/dialogue/DialogueFile.kt | 7 +- .../content/dialogue/DukeHoracioDialogue.kt | 19 ++-- .../game/content/dialogue/ElsieDialogue.kt | 5 +- .../game/content/dialogue/EmptyPlugin.kt | 5 +- .../game/content/dialogue/GabootyDialogue.kt | 12 +-- .../game/content/dialogue/GeoffreyDialogue.kt | 5 +- .../game/content/dialogue/IffieDialogue.kt | 3 +- .../content/dialogue/KingRoaldDialogue.kt | 24 +++-- .../content/dialogue/LegendsGuardDialogue.kt | 4 +- .../game/content/dialogue/LensaDialogue.kt | 4 +- .../game/content/dialogue/MistagDialogue.kt | 12 ++- .../dialogue/OttoGodblessedDialogue.kt | 4 +- .../content/dialogue/SkillDialogueHandler.kt | 4 +- .../game/content/dialogue/ThormacDialogue.kt | 7 +- .../dialogue/WysonTheGardenerDialogue.kt | 7 +- .../global/EnchantedJewelleryDialogueFile.kt | 7 +- .../content/global/action/EquipHandler.kt | 27 ++--- .../content/global/action/PickupHandler.kt | 17 +-- .../content/global/travel/EssenceTeleport.kt | 4 +- .../content/global/worldevents/WorldEvent.kt | 6 +- .../worldevents/WorldEventInitializer.kt | 2 +- .../worldevents/holiday/CandyRewardPlugin.kt | 6 +- .../worldevents/holiday/GrimDialogue.kt | 2 +- .../holiday/SimpleHalloweenEvent.kt | 8 +- .../worldevents/penguinhns/LarryHandler.kt | 6 +- .../worldevents/penguinhns/NotebookHandler.kt | 2 +- .../worldevents/penguinhns/PenguinHNSEvent.kt | 10 +- .../worldevents/penguinhns/PenguinManager.kt | 4 +- .../worldevents/penguinhns/PenguinSpawner.kt | 5 +- .../penguinhns/PenguinSpyingHandler.kt | 4 +- .../worldevents/shootingstar/ShootingStar.kt | 4 +- .../shootingstar/ShootingStarCommands.kt | 6 +- .../shootingstar/ShootingStarEvent.kt | 14 ++- .../shootingstar/ShootingStarLogin.kt | 4 +- .../shootingstar/ShootingStarMiningPulse.kt | 9 +- .../shootingstar/ShootingStarOptionHandler.kt | 6 +- .../shootingstar/StarSpriteDialogue.kt | 4 +- .../content/jobs/CancelJobDialogueFile.kt | 6 +- .../game/content/jobs/JobManager.kt | 4 +- .../content/jobs/WorkForOptionListener.kt | 13 +-- .../game/content/jobs/impl/GatheringJob.kt | 2 +- .../game/content/jobs/impl/SlayingJob.kt | 0 .../free/cooksassistant/CooksAssistant.kt | 4 +- .../cooksassistant/GillieGroatsDialogue.kt | 6 +- .../cooksassistant/LumbridgeCookDialogue.kt | 6 +- .../cooksassistant/MillieMillerDialogue.kt | 8 +- .../dragonslayer/DukeHoracioDSDialogue.kt | 12 ++- .../quest/free/dragonslayer/NedDSDialogue.kt | 9 +- .../quest/free/dragonslayer/NedDialogue.kt | 15 +-- .../free/princealirescue/NedPARDialogue.kt | 8 +- .../runemysteries/DukeHoracioRMDialogue.kt | 8 +- .../shieldofarrav/KingRoaldArravDialogue.kt | 10 +- .../quest/members/allfiredup/AllFiredUp.kt | 8 +- .../allfiredup/BlazeSharpeyeDialogue.kt | 6 +- .../allfiredup/KingRoaldAFUDialogue.kt | 9 +- .../members/allfiredup/SquireFyreDialogue.kt | 9 +- .../asoulsbane/SoulsBaneLaunaDialogue.kt | 7 +- .../priestinperil/KingRoaldPIPDialogue.kt | 9 +- .../thefremenniktrials/AskeladdenDialogue.kt | 2 +- .../thefremenniktrials/BeerOnCouncilWorker.kt | 2 +- .../thefremenniktrials/BranchFletcher.kt | 4 +- .../ChieftanBrundtDialogue.kt | 2 +- .../CouncilWorkerDialogue.kt | 2 +- .../members/thefremenniktrials/Draugen.kt | 2 +- .../members/thefremenniktrials/FishOnAltar.kt | 9 +- .../thefremenniktrials/FremennikTrials.kt | 0 .../thefremenniktrials/KegOnKegAction.kt | 2 +- .../thefremenniktrials/LalliDialogue.kt | 2 +- .../thefremenniktrials/LyreOptionHandler.kt | 2 +- .../thefremenniktrials/ManniDialogue.kt | 4 +- .../members/thefremenniktrials/OlafTheBard.kt | 7 +- .../thefremenniktrials/PipeInserter.kt | 8 +- .../thefremenniktrials/PoisonSalesman.kt | 6 +- .../thefremenniktrials/SigliTheHuntsman.kt | 2 +- .../thefremenniktrials/SwayingTreeHandler.kt | 4 +- .../thefremenniktrials/SwensenLadder.kt | 2 +- .../thefremenniktrials/SwensenPortals.kt | 4 +- .../thefremenniktrials/SwensenTheNavigator.kt | 2 +- .../thefremenniktrials/TalismanHandler.kt | 4 +- .../thefremenniktrials/TinderboxOnBomb.kt | 2 +- .../thelosttribe/CaveGoblinMinerNPC.kt | 2 +- .../members/thelosttribe/CaveRockHandler.kt | 5 +- .../quest/members/thelosttribe/CaveZone.kt | 4 +- .../thelosttribe/DorgCbowEquipPlugin.kt | 4 +- .../thelosttribe/DukeHoracioTLTDialogue.kt | 11 +- .../members/thelosttribe/GoblinFollower.kt | 6 +- .../thelosttribe/HistoryOfTheGoblinRace.kt | 4 +- .../members/thelosttribe/KazgarDialogue.kt | 4 +- .../quest/members/thelosttribe/LostTribe.kt | 6 +- .../members/thelosttribe/LostTribeCutscene.kt | 13 ++- .../thelosttribe/LostTribeOptionHandler.kt | 8 +- .../members/thelosttribe/MistagLTDialogue.kt | 9 +- .../members/thelosttribe/PickaxeOnRubble.kt | 10 +- .../members/thelosttribe/PickpocketSigmund.kt | 8 +- .../thelosttribe/SigmundChestHandler.kt | 4 +- .../zone/keldagrim/CartConductorDialogue.kt | 6 +- .../zone/keldagrim/DwarvenBoatmanDialogue.kt | 14 +-- .../zone/keldagrim/KeldagrimCartMethods.kt | 6 +- .../content/zone/keldagrim/KeldagrimPlugin.kt | 4 +- .../game/content/zone/keldagrim/Reinald.kt | 6 +- .../ReinaldSmithingEmporiumInterface.kt | 2 +- .../bonegrinder/BoneGrinderListener.kt | 8 +- .../{core => rs09}/game/ge/BotPrices.kt | 4 +- .../{core => rs09}/game/ge/GEAutoStock.kt | 4 +- .../game/ge/GrandExchangeOffer.kt | 10 +- .../{core => rs09}/game/ge/OfferManager.kt | 18 ++-- .../game/ge/PlayerGrandExchange.kt | 20 ++-- .../CorporealBeastWarningInterface.kt | 4 +- .../game/interaction/FOGRewardsInterface.kt | 4 +- .../game/interaction/ItemOnBankBooth.kt | 7 +- .../game/interaction/Listeners.kt | 11 +- .../game/interaction/OptionListener.kt | 5 +- .../game/interaction/QCRepository.kt | 8 +- .../game/interaction/city/IsafdarPlugin.kt | 2 +- .../game/interaction/city/MorytaniaPlugin.kt | 2 +- .../city/falador/MakeoverMageInterface.kt | 0 .../inter/ChocatriceIncubationInterface.kt | 2 +- .../interaction/inter/ExperienceInterface.kt | 4 +- .../interaction/inter/FairyRingInterface.kt | 5 +- .../interaction/inter/FurClothingInterface.kt | 4 +- .../interaction/inter/HairDresserInterface.kt | 4 +- .../interaction/inter/MakeOverInterface.kt | 6 +- .../interaction/inter/PuppyInterfacePlugin.kt | 2 +- .../interaction/inter/ThessaliaInterface.kt | 3 +- .../interaction/item/BraceletOfClayPlugin.kt | 2 +- .../item/EnchantJewelleryTabOption.kt | 6 +- .../item/EnchantedJewelleryListener.kt | 8 +- .../interaction/item/GrandSeedPodHandler.kt | 8 +- .../interaction/item/withitem/CapeDyer.kt | 5 +- .../item/withobject/CoalTrucksHandler.kt | 6 +- .../interaction/npc/BogrogPouchSwapper.kt | 7 +- .../interaction/object/DemonTauntHandler.kt | 2 +- .../interaction/object/FairyRingPlugin.kt | 4 +- .../interaction/object/GutanothChestPlugin.kt | 7 +- .../interaction/object/JungleBushHandler.kt | 6 +- .../interaction/object/MuddyChestHandler.kt | 4 +- .../interaction/object/TarBarrelListener.kt | 12 +-- .../interaction/player/PeltOptionPlugin.kt | 8 +- .../game/node/entity/combat/CombatPulse.kt | 10 +- .../node/entity/combat/CombatSwingHandler.kt | 17 +-- .../combat/equipment/EquipmentDegrader.kt | 2 +- .../combat/handlers/MagicSwingHandler.kt | 10 +- .../combat/handlers/MeleeSwingHandler.kt | 12 +-- .../combat/handlers/MultiSwingHandler.kt | 4 +- .../combat/handlers/RangeSwingHandler.kt | 16 +-- .../combat/handlers/SalamanderSwingHandler.kt | 6 +- .../combat/special/LiquefySpecialHandler.kt | 4 +- .../equipment/BarrowsEquipmentRegister.kt | 5 +- .../entity/equipment/PVPEquipmentRegister.kt | 4 +- .../equipment/SnowballEquipmentPlugin.kt | 4 +- .../npc/city/alkharid/AliTheFarmerDialogue.kt | 2 +- .../entity/npc/city/alkharid/AliTheGuard.kt | 2 +- .../npc/city/alkharid/AliTheSmithDialogue.kt | 2 +- .../city/pollnivneach/AliTheHagDialogue.kt | 2 +- .../city/pollnivneach/AliTheMayorDialogue.kt | 2 +- .../npc/city/pollnivneach/AliTheOperator.kt | 2 +- .../entity/npc/other/AlKharidWarriorPlugin.kt | 10 +- .../entity/player/info/login/LoginParser.kt | 15 ++- .../player/info/login/PlayerSaveParser.kt | 17 ++- .../entity/player/info/login/PlayerSaver.kt | 19 ++-- .../player/info/stats/StatAttributeKeys.kt | 2 +- .../player/info/stats/StatsCommandSet.kt | 10 +- .../entity/player/link/diary/DiaryLevel.kt | 2 +- .../skill/agility/BarbarianOutpostCourse.kt | 12 ++- .../skill/agility/GnomeStrongholdCourse.kt | 6 +- .../entity/skill/agility/WildernessCourse.kt | 8 +- .../agility/shortcuts/BasaltRockShortcut.kt | 8 +- .../skill/agility/shortcuts/PipeShortcut.kt | 8 +- .../agility/shortcuts/RockClimbShortcut.kt | 6 +- .../shortcuts/SteppingStoneShortcut.kt | 4 +- .../skill/construction/EstateAgentDialogue.kt | 12 ++- .../node/entity/skill/construction/Hotspot.kt | 6 +- .../decoration/ConstructionDoorPlugin.kt | 6 +- .../decoration/bedroom/ShavingStandHandler.kt | 4 +- .../decoration/bedroom/WardrobeHandler.kt | 4 +- .../decoration/chapel/ShieldBlessingPlugin.kt | 6 +- .../decoration/costume/ToyBoxPlugin.kt | 4 +- .../portalchamber/PortalChamberDialogue.kt | 7 +- .../decoration/study/LecternPlugin.kt | 14 +-- .../decoration/study/TelescopePlugin.kt | 8 +- .../decoration/workshop/ArmourStand.kt | 10 +- .../skill/cooking/ChocolateBarCutter.kt | 4 +- .../crafting/lightsources/LanternCrafting.kt | 4 +- .../lightsources/LightSourceExtinguisher.kt | 4 +- .../lightsources/LightSourceLighter.kt | 4 +- .../crafting/lightsources/LightSources.kt | 2 +- .../entity/skill/farming/BasketsAndSacks.kt | 4 +- .../node/entity/skill/farming/CompostBin.kt | 4 +- .../skill/farming/CompostBinOptionHandler.kt | 2 +- .../node/entity/skill/farming/CompostBins.kt | 4 +- .../node/entity/skill/farming/CompostType.kt | 2 +- .../entity/skill/farming/CropHarvester.kt | 4 +- .../skill/farming/DigUpPatchDialogue.kt | 2 +- .../skill/farming/FarmerPayOptionHandler.kt | 2 +- .../game/node/entity/skill/farming/Farmers.kt | 2 +- .../node/entity/skill/farming/FarmingPatch.kt | 4 +- .../skill/farming/FruitAndBerryPicker.kt | 2 +- .../entity/skill/farming/HealthChecker.kt | 4 +- .../entity/skill/farming/InspectionHandler.kt | 2 +- .../entity/skill/farming/LeprechaunNoter.kt | 4 +- .../game/node/entity/skill/farming/Patch.kt | 4 +- .../node/entity/skill/farming/PatchRaker.kt | 5 +- .../node/entity/skill/farming/PatchType.kt | 2 +- .../node/entity/skill/farming/Plantable.kt | 4 +- .../skill/farming/SackBasketOptionHandler.kt | 4 +- .../entity/skill/farming/SeedOnPlantPot.kt | 4 +- .../node/entity/skill/farming/Seedling.kt | 2 +- .../entity/skill/farming/SeedlingWaterer.kt | 6 +- .../skill/farming/ToolLeprechaunHandler.kt | 6 +- .../skill/farming/ToolLeprechaunInterface.kt | 8 +- .../entity/skill/farming/UseWithBinHandler.kt | 4 +- .../skill/farming/UseWithPatchHandler.kt | 4 +- .../fletching/items/gem/GemBoltCutPulse.kt | 10 +- .../skill/gather/PickaxeRepairPlugin.kt | 2 +- .../skill/gather/mining/MiningSkillPulse.kt | 36 +++---- .../entity/skill/herblore/GrindItemPlugin.kt | 7 +- .../entity/skill/hunter/PolarKebbitHunting.kt | 0 .../skill/hunter/tracking/CommonKebbitEast.kt | 4 +- .../skill/hunter/tracking/CommonKebbitWest.kt | 4 + .../skill/hunter/tracking/HunterTracking.kt | 8 +- .../hunter/tracking/PolarKebbitHunting.kt | 4 +- .../skill/hunter/tracking/TrailDefinition.kt | 2 +- .../entity/skill/runecrafting/PouchManager.kt | 9 +- .../skill/runecrafting/RunePouchPlugin.kt | 6 +- .../entity/skill/skillcapeperks/Skillcape.kt | 2 +- .../SkillcapeEquipmentPlugin.kt | 2 +- .../skillcapeperks/SkillcapeOperatePlugin.kt | 2 +- .../skill/skillcapeperks/SkillcapePerks.kt | 8 +- .../node/entity/skill/thieving/Pickpocket.kt | 6 +- .../node/entity/state/newsys/PlayerState.kt | 2 +- .../game/node/entity/state/newsys/State.kt | 4 +- .../entity/state/newsys/StateRepository.kt | 2 +- .../state/newsys/states/AvaDeviceState.kt | 12 +-- .../state/newsys/states/DiseasedState.kt | 8 +- .../state/newsys/states/FarmingState.kt | 11 +- .../newsys/states/GodspellChargedState.kt | 6 +- .../state/newsys/states/IncubatorState.kt | 6 +- .../state/newsys/states/SeedlingState.kt | 9 +- .../state/newsys/states/ShootingStarState.kt | 8 +- .../state/newsys/states/SkulledState.kt | 4 +- .../game/system/SystemLogger.kt | 11 +- .../game/system/command/Command.kt | 4 +- .../game/system/command/CommandPlugin.kt | 5 +- .../game/system/command/CommandSystem.kt | 3 +- .../game/system/command/MapDumpCommand.kt | 3 +- .../system/command/oldsys/AIPCommandPlugin.kt | 34 +++--- .../command/oldsys/SimpleDumpingCommands.kt | 4 +- .../system/command/oldsys/VisualCommand.kt | 11 +- .../rottenpotato/RPUseWithNPCDialogue.kt | 6 +- .../rottenpotato/RPUseWithPlayerDialogue.kt | 4 +- .../rottenpotato/RottenPotatoExtraDialogue.kt | 8 +- .../rottenpotato/RottenPotatoOptionHandler.kt | 8 +- .../rottenpotato/RottenPotatoRSHDDialogue.kt | 14 +-- .../RottenPotatoUseWithHandler.kt | 2 +- .../command/sets/AnimationCommandSet.kt | 8 +- .../system/command/sets/BottingCommandSet.kt | 16 +-- .../game/system/command/sets/CommandSet.kt | 8 +- .../system/command/sets/ConfigCommandSet.kt | 4 +- .../command/sets/DevelopmentCommandSet.kt | 6 +- .../game/system/command/sets/FunCommandSet.kt | 8 +- .../system/command/sets/MiscCommandSet.kt | 35 +++--- .../command/sets/ModerationCommandSet.kt | 8 +- .../system/command/sets/MusicCommandSet.kt | 4 +- .../system/command/sets/QuestCommandSet.kt | 4 +- .../system/command/sets/SlayerCommandSet.kt | 4 +- .../system/command/sets/SpawnCommandSet.kt | 8 +- .../system/command/sets/SystemCommandSet.kt | 6 +- .../system/command/sets/TeleportCommandSet.kt | 8 +- .../game/system/config/ConfigParser.kt | 3 +- .../game/system/config/DoorConfigLoader.kt | 6 +- .../game/system/config/DropTableParser.kt | 6 +- .../game/system/config/GroundSpawnLoader.kt | 10 +- .../system/config/InterfaceConfigParser.kt | 6 +- .../game/system/config/ItemConfigParser.kt | 6 +- .../game/system/config/MusicConfigLoader.kt | 6 +- .../game/system/config/NPCConfigParser.kt | 8 +- .../game/system/config/NPCSpawner.kt | 6 +- .../game/system/config/ObjectConfigParser.kt | 6 +- .../game/system/config/RangedConfigLoader.kt | 6 +- .../game/system/config/ServerConfigParser.kt | 13 ++- .../game/system/config/ShopParser.kt | 6 +- .../game/system/config/TableDump.kt | 0 .../game/system/config/XteaParser.kt | 6 +- .../game/world/DeadlockDetector.kt | 5 +- .../{core => rs09}/game/world/GameSettings.kt | 4 +- .../{core => rs09}/game/world/GameWorld.kt | 27 +++-- .../{core => rs09}/game/world/ImmerseWorld.kt | 10 +- .../{core => rs09}/game/world/PulseRunner.kt | 6 +- .../game/world/callback/CallbackHub.kt | 13 ++- .../game/world/map/path/SmartPathfinder.kt | 6 +- .../world/repository/DisconnectionQueue.kt | 6 +- .../game/world/repository/Repository.kt | 13 ++- .../game/world/update/MapChunkRenderer.kt | 2 +- .../game/world/update/NPCRenderer.kt | 4 +- .../game/world/update/PlayerRenderer.kt | 2 +- .../game/world/update/UpdateMasks.kt | 2 +- .../game/world/update/UpdateSequence.kt | 4 +- .../net/event/LoginReadEvent.kt | 12 +-- .../net/packet/in/ItemOnGroundItemPacket.kt | 8 +- .../net/packet/in/QuickChatPacketHandler.kt | 8 +- .../plugin/CorePluginTypes/XPGainPlugins.kt | 2 +- .../{core => rs09}/plugin/PluginManager.kt | 22 ++-- .../kotlin/{core => rs09}/tools/Components.kt | 2 +- .../{core => rs09}/tools/DialogueConst.kt | 2 +- .../kotlin/{core => rs09}/tools/Interfaces.kt | 2 +- .../main/kotlin/{core => rs09}/tools/Items.kt | 2 +- .../main/kotlin/{core => rs09}/tools/NPCs.kt | 2 +- .../kotlin/{core => rs09}/tools/TickUtils.kt | 2 +- .../tools/stringtools/StringTools.kt | 2 +- .../worker/MajorUpdateWorker.kt | 12 +-- Server/worldprops/default.json | 1 + build.gradle | 2 +- settings.gradle | 2 +- 1201 files changed, 2817 insertions(+), 3187 deletions(-) delete mode 100644 Server/src/main/java/plugin/ai/system/android/CombatDroid.java delete mode 100644 Server/src/main/java/plugin/ai/system/android/GatheringDroid.java rename Server/src/main/java/{plugin => rs09/game}/ai/AIPBuilder.java (99%) rename Server/src/main/java/{plugin => rs09/game}/ai/AIPControlDialogue.java (99%) rename Server/src/main/java/{plugin => rs09/game}/ai/AIPlayer.java (99%) rename Server/src/main/java/{plugin => rs09/game}/ai/ArtificialSession.java (97%) rename Server/src/main/java/{plugin => rs09/game}/ai/general/scriptrepository/Script.java (93%) rename Server/src/main/java/{plugin => rs09/game}/ai/lumbridge/DeadIdler.java (92%) rename Server/src/main/java/{plugin => rs09/game}/ai/lumbridge/LumbridgeBotHandler.java (93%) rename Server/src/main/java/{plugin => rs09/game}/ai/pvmbots/DragonKiller.java (95%) rename Server/src/main/java/{plugin => rs09/game}/ai/pvmbots/GiantMoleBot.java (95%) rename Server/src/main/java/{plugin => rs09/game}/ai/pvmbots/LowestBot.java (91%) rename Server/src/main/java/{plugin => rs09/game}/ai/pvmbots/NoobBot.java (93%) rename Server/src/main/java/{plugin => rs09/game}/ai/pvmbots/PvMBots.java (98%) rename Server/src/main/java/{plugin => rs09/game}/ai/pvp/PVPAIPActions.java (98%) rename Server/src/main/java/{plugin => rs09/game}/ai/pvp/PVPAIPBuilderUtils.java (99%) rename Server/src/main/java/{plugin => rs09/game}/ai/resource/ResourceAIPActions.java (93%) rename Server/src/main/java/{plugin => rs09/game}/ai/resource/ResourceAIPManager.java (97%) rename Server/src/main/java/{plugin => rs09/game}/ai/resource/task/ResourceTask.java (95%) rename Server/src/main/java/{plugin => rs09/game}/ai/resource/task/ResourceTasks.java (97%) rename Server/src/main/java/{plugin => rs09/game}/ai/skillingbot/SkillingBot.java (97%) rename Server/src/main/java/{plugin => rs09/game}/ai/skillingbot/SkillingBotsBuilder.java (98%) rename Server/src/main/java/{plugin => rs09/game}/ai/system/GlobalAIManager.java (90%) create mode 100644 Server/src/main/java/rs09/game/ai/system/android/CombatDroid.java create mode 100644 Server/src/main/java/rs09/game/ai/system/android/GatheringDroid.java rename Server/src/main/java/{plugin => rs09/game}/ai/system/predicate/Predicate.java (95%) rename Server/src/main/java/{plugin => rs09/game}/ai/system/predicate/PredicateType.java (79%) rename Server/src/main/java/{plugin => rs09/game}/ai/system/predicate/impl/AppearancePredicate.java (90%) rename Server/src/main/java/{plugin => rs09/game}/ai/wilderness/PvPBotsBuilder.java (99%) rename Server/src/main/java/{plugin => rs09/game}/ai/wilderness/WildernessBot.java (99%) delete mode 100644 Server/src/main/kotlin/core/game/camerautils/CameraUtils.kt delete mode 100644 Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/CommonKebbitWest.kt delete mode 100644 Server/src/main/kotlin/plugin/ai/general/scriptrepository/Idler.kt delete mode 100644 Server/src/main/kotlin/plugin/ai/general/scriptrepository/PlayerCompatible.kt delete mode 100644 Server/src/main/kotlin/plugin/ai/general/scriptrepository/PlayerScripts.kt delete mode 100644 Server/src/main/kotlin/plugin/barbtraining/fishing/BarbFishingPulse.kt delete mode 100644 Server/src/main/kotlin/plugin/barbtraining/fishing/FishCuttingPulse.kt delete mode 100644 Server/src/main/kotlin/plugin/barbtraining/fishing/KnifeWithFish.kt delete mode 100644 Server/src/main/kotlin/plugin/barbtraining/fishing/OptionHandlers.kt delete mode 100644 Server/src/main/kotlin/plugin/barbtraining/fishing/SpotManager.kt delete mode 100644 Server/src/main/kotlin/plugin/creditshop/CreditShop.kt rename Server/src/main/kotlin/{core => rs09}/JSONUtils.kt (99%) rename Server/src/main/kotlin/{core => rs09}/Server.kt (93%) rename Server/src/main/kotlin/{core => rs09}/ServerConstants.kt (86%) rename Server/src/main/kotlin/{core => rs09}/game/Varbit.kt (73%) rename Server/src/main/kotlin/{core => rs09}/game/Varp.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/VarpManager.kt (99%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/AIRepository.kt (91%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/GeneralBotCreator.kt (91%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/ScriptAPI.kt (98%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/Adventurer.kt (99%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/ChickenKiller.kt (93%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/CoalMiner.kt (96%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/CowKiller.kt (97%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/DraynorFisher.kt (94%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/DraynorWillows.kt (96%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/FarmerThiever.kt (88%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/FletchingBankstander.kt (90%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/GenericSlayerBot.kt (97%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/GlassBlowingBankstander.kt (90%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/GreenDragonKiller.kt (96%) create mode 100644 Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/Idler.kt rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/LobsterCatcher.kt (97%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/ManThiever.kt (84%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/NonBankingMiner.kt (86%) create mode 100644 Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/PlayerCompatible.kt create mode 100644 Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/PlayerScripts.kt rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/ScriptDescription.kt (57%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/ScriptIdentifier.kt (54%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/ScriptName.kt (51%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/SeersFlax.kt (97%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/SeersMagicTrees.kt (95%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/SharkCatcher.kt (97%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/VarrockEssenceMiner.kt (94%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/general/scriptrepository/VarrockSmither.kt (94%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/minigamebots/pestcontrol/CombatState.kt (94%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/minigamebots/pestcontrol/CombatStateIntermediate.kt (94%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/minigamebots/pestcontrol/PestControlIntermediateBot.kt (95%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/minigamebots/pestcontrol/PestControlNoviceBot.kt (95%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/pvmbots/CombatBot.kt (97%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/pvmbots/CombatBotAssembler.kt (99%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/pvmbots/PvMBotsBuilder.kt (99%) rename Server/src/main/kotlin/{plugin => rs09/game}/ai/skillingbot/SkillingBotAssembler.kt (96%) create mode 100644 Server/src/main/kotlin/rs09/game/camerautils/CameraUtils.kt rename Server/src/main/kotlin/{core => rs09}/game/camerautils/PlayerCamera.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/allfiredup/AFUBeacon.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/allfiredup/AFUBeaconHandler.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/allfiredup/AFURepairClimbHandler.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/allfiredup/AFUSession.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/allfiredup/BeaconTenderDialogue.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/allfiredup/KingRoaldAFUMiniDialogue.kt (90%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/barrows/RewardChest.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/fishingtrawler/FishingTrawlerActivity.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/fishingtrawler/FishingTrawlerOptionHandler.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/fishingtrawler/FishingTrawlerOverlay.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/fishingtrawler/FishingTrawlerRewardInterface.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/fishingtrawler/FishingTrawlerSession.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/fishingtrawler/TrawlerLoot.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/fog/FogInteractionHandler.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/fog/ReggieDialogue.kt (93%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/DeliveryBoxHandler.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/GCRewardTokenHandler.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/GnomeCookingConstants.kt (89%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/GnomeCookingJob.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/GnomeTipper.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/battas/GnomeBattaCooker.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/battas/GnomeBattaDishFiller.kt (92%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/battas/GnomeBattaGarnisher.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/battas/GnomeBattaInterface.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/battas/GnomeBattaPrepareHandler.kt (87%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/bowls/GnomeBowlCooker.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/bowls/GnomeBowlGarnisher.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/bowls/GnomeBowlInterface.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/bowls/GnomeBowlPrepareHandler.kt (86%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/bowls/GnomebowlMouldFiller.kt (91%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/cocktails/CocktailCooker.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/cocktails/CocktailFinisher.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/cocktails/CocktailShakerHandler.kt (90%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/cocktails/GnomeCocktailInterface.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/cocktails/PourMixerPlugin.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/crunchies/GnomeCrunchyCooker.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/crunchies/GnomeCrunchyGarnisher.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/crunchies/GnomeCrunchyInterface.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/crunchies/GnomeCrunchyPrepareHandler.kt (90%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/gnomecooking/crunchies/GnomeCrunchyTrayFiller.kt (93%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/mta/EnchantSpell.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/pestcontrol/PestControlHelper.kt (92%) rename Server/src/main/kotlin/{core => rs09}/game/content/activity/pyramidplunder/PlunderSession.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/ame/events/SandwichLadyHandler.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/content/ame/events/SandwichLadyInterface.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/ame/events/SandwichLadyNPC.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/consumable/effects/RestoreSummoning.kt (93%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/AberabDialogue.kt (85%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/AchiettiesDialogue.kt (85%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/AfflictedDialogue.kt (89%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/AfrahDialogue.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/AgilityBossDialogue.kt (93%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/AgmundiDialogue.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/AluftGianneJrDialogue.kt (84%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/AluftGianneSnrDialogue.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/AsyffDialogue.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/BlurberryDialogue.kt (91%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/BrotherBordissDialogue.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/DialogueFile.kt (93%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/DukeHoracioDialogue.kt (88%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/ElsieDialogue.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/EmptyPlugin.kt (86%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/GabootyDialogue.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/GeoffreyDialogue.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/IffieDialogue.kt (90%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/KingRoaldDialogue.kt (75%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/LegendsGuardDialogue.kt (91%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/LensaDialogue.kt (90%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/MistagDialogue.kt (87%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/OttoGodblessedDialogue.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/SkillDialogueHandler.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/ThormacDialogue.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/dialogue/WysonTheGardenerDialogue.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/EnchantedJewelleryDialogueFile.kt (75%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/action/EquipHandler.kt (90%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/action/PickupHandler.kt (91%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/travel/EssenceTeleport.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/worldevents/WorldEvent.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/worldevents/WorldEventInitializer.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/worldevents/holiday/CandyRewardPlugin.kt (84%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/worldevents/holiday/GrimDialogue.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/worldevents/holiday/SimpleHalloweenEvent.kt (80%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/worldevents/penguinhns/LarryHandler.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/worldevents/penguinhns/NotebookHandler.kt (92%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/worldevents/penguinhns/PenguinHNSEvent.kt (82%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/worldevents/penguinhns/PenguinManager.kt (88%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/worldevents/penguinhns/PenguinSpawner.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/worldevents/penguinhns/PenguinSpyingHandler.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/worldevents/shootingstar/ShootingStar.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/worldevents/shootingstar/ShootingStarCommands.kt (88%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/worldevents/shootingstar/ShootingStarEvent.kt (83%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/worldevents/shootingstar/ShootingStarLogin.kt (88%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/worldevents/shootingstar/ShootingStarOptionHandler.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/content/global/worldevents/shootingstar/StarSpriteDialogue.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/content/jobs/CancelJobDialogueFile.kt (92%) rename Server/src/main/kotlin/{core => rs09}/game/content/jobs/JobManager.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/jobs/WorkForOptionListener.kt (91%) rename Server/src/main/kotlin/{core => rs09}/game/content/jobs/impl/GatheringJob.kt (100%) rename Server/src/main/kotlin/{core => rs09}/game/content/jobs/impl/SlayingJob.kt (100%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/free/cooksassistant/CooksAssistant.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/free/cooksassistant/GillieGroatsDialogue.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/free/cooksassistant/LumbridgeCookDialogue.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/free/cooksassistant/MillieMillerDialogue.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/free/dragonslayer/DukeHoracioDSDialogue.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/free/dragonslayer/NedDSDialogue.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/free/dragonslayer/NedDialogue.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/free/princealirescue/NedPARDialogue.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/free/runemysteries/DukeHoracioRMDialogue.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/free/shieldofarrav/KingRoaldArravDialogue.kt (93%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/allfiredup/AllFiredUp.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/allfiredup/BlazeSharpeyeDialogue.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/allfiredup/KingRoaldAFUDialogue.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/allfiredup/SquireFyreDialogue.kt (91%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/asoulsbane/SoulsBaneLaunaDialogue.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/priestinperil/KingRoaldPIPDialogue.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/AskeladdenDialogue.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/BeerOnCouncilWorker.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/BranchFletcher.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/ChieftanBrundtDialogue.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/CouncilWorkerDialogue.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/Draugen.kt (93%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/FishOnAltar.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/FremennikTrials.kt (100%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/KegOnKegAction.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/LalliDialogue.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/LyreOptionHandler.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/ManniDialogue.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/OlafTheBard.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/PipeInserter.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/PoisonSalesman.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/SigliTheHuntsman.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/SwayingTreeHandler.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/SwensenLadder.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/SwensenPortals.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/SwensenTheNavigator.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/TalismanHandler.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thefremenniktrials/TinderboxOnBomb.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thelosttribe/CaveGoblinMinerNPC.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thelosttribe/CaveRockHandler.kt (93%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thelosttribe/CaveZone.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thelosttribe/DorgCbowEquipPlugin.kt (92%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thelosttribe/DukeHoracioTLTDialogue.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thelosttribe/GoblinFollower.kt (91%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thelosttribe/HistoryOfTheGoblinRace.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thelosttribe/KazgarDialogue.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thelosttribe/LostTribe.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thelosttribe/LostTribeCutscene.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thelosttribe/LostTribeOptionHandler.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thelosttribe/MistagLTDialogue.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thelosttribe/PickaxeOnRubble.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thelosttribe/PickpocketSigmund.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/content/quest/members/thelosttribe/SigmundChestHandler.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/content/zone/keldagrim/CartConductorDialogue.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/zone/keldagrim/DwarvenBoatmanDialogue.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/zone/keldagrim/KeldagrimCartMethods.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/zone/keldagrim/KeldagrimPlugin.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/content/zone/keldagrim/Reinald.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/content/zone/keldagrim/ReinaldSmithingEmporiumInterface.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/content/zone/phasmatys/bonegrinder/BoneGrinderListener.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/ge/BotPrices.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/ge/GEAutoStock.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/ge/GrandExchangeOffer.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/ge/OfferManager.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/ge/PlayerGrandExchange.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/CorporealBeastWarningInterface.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/FOGRewardsInterface.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/ItemOnBankBooth.kt (88%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/Listeners.kt (86%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/OptionListener.kt (79%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/QCRepository.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/city/IsafdarPlugin.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/city/MorytaniaPlugin.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/city/falador/MakeoverMageInterface.kt (100%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/inter/ChocatriceIncubationInterface.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/inter/ExperienceInterface.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/inter/FairyRingInterface.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/inter/FurClothingInterface.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/inter/HairDresserInterface.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/inter/MakeOverInterface.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/inter/PuppyInterfacePlugin.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/inter/ThessaliaInterface.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/item/BraceletOfClayPlugin.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/item/EnchantJewelleryTabOption.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/item/EnchantedJewelleryListener.kt (89%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/item/GrandSeedPodHandler.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/item/withitem/CapeDyer.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/item/withobject/CoalTrucksHandler.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/npc/BogrogPouchSwapper.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/object/DemonTauntHandler.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/object/FairyRingPlugin.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/object/GutanothChestPlugin.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/object/JungleBushHandler.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/object/MuddyChestHandler.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/object/TarBarrelListener.kt (80%) rename Server/src/main/kotlin/{core => rs09}/game/interaction/player/PeltOptionPlugin.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/combat/CombatPulse.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/combat/CombatSwingHandler.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/combat/equipment/EquipmentDegrader.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/combat/handlers/MagicSwingHandler.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/combat/handlers/MeleeSwingHandler.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/combat/handlers/MultiSwingHandler.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/combat/handlers/RangeSwingHandler.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/combat/handlers/SalamanderSwingHandler.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/combat/special/LiquefySpecialHandler.kt (88%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/equipment/BarrowsEquipmentRegister.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/equipment/PVPEquipmentRegister.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/equipment/SnowballEquipmentPlugin.kt (90%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/npc/city/alkharid/AliTheFarmerDialogue.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/npc/city/alkharid/AliTheGuard.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/npc/city/alkharid/AliTheSmithDialogue.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/npc/city/pollnivneach/AliTheHagDialogue.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/npc/city/pollnivneach/AliTheMayorDialogue.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/npc/city/pollnivneach/AliTheOperator.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/npc/other/AlKharidWarriorPlugin.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/player/info/login/LoginParser.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/player/info/login/PlayerSaveParser.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/player/info/login/PlayerSaver.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/player/info/stats/StatAttributeKeys.kt (90%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/player/info/stats/StatsCommandSet.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/player/link/diary/DiaryLevel.kt (59%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/agility/BarbarianOutpostCourse.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/agility/GnomeStrongholdCourse.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/agility/WildernessCourse.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/agility/shortcuts/BasaltRockShortcut.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/agility/shortcuts/PipeShortcut.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/agility/shortcuts/RockClimbShortcut.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/agility/shortcuts/SteppingStoneShortcut.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/construction/EstateAgentDialogue.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/construction/Hotspot.kt (83%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/construction/decoration/ConstructionDoorPlugin.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/construction/decoration/bedroom/ShavingStandHandler.kt (91%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/construction/decoration/bedroom/WardrobeHandler.kt (91%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/construction/decoration/chapel/ShieldBlessingPlugin.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/construction/decoration/costume/ToyBoxPlugin.kt (92%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberDialogue.kt (90%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/construction/decoration/study/LecternPlugin.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/construction/decoration/study/TelescopePlugin.kt (89%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/construction/decoration/workshop/ArmourStand.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/cooking/ChocolateBarCutter.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/crafting/lightsources/LanternCrafting.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/crafting/lightsources/LightSourceExtinguisher.kt (91%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/crafting/lightsources/LightSourceLighter.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/crafting/lightsources/LightSources.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/BasketsAndSacks.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/CompostBin.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/CompostBinOptionHandler.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/CompostBins.kt (91%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/CompostType.kt (57%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/CropHarvester.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/DigUpPatchDialogue.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/FarmerPayOptionHandler.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/Farmers.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/FarmingPatch.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/FruitAndBerryPicker.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/HealthChecker.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/InspectionHandler.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/LeprechaunNoter.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/Patch.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/PatchRaker.kt (91%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/PatchType.kt (80%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/Plantable.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/SackBasketOptionHandler.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/SeedOnPlantPot.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/Seedling.kt (60%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/SeedlingWaterer.kt (93%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/ToolLeprechaunHandler.kt (92%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/ToolLeprechaunInterface.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/UseWithBinHandler.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/farming/UseWithPatchHandler.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/fletching/items/gem/GemBoltCutPulse.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/gather/PickaxeRepairPlugin.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/gather/mining/MiningSkillPulse.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/herblore/GrindItemPlugin.kt (93%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/hunter/PolarKebbitHunting.kt (100%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/hunter/tracking/CommonKebbitEast.kt (98%) create mode 100644 Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/CommonKebbitWest.kt rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/hunter/tracking/HunterTracking.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/hunter/tracking/PolarKebbitHunting.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/hunter/tracking/TrailDefinition.kt (89%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/runecrafting/PouchManager.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/runecrafting/RunePouchPlugin.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/skillcapeperks/Skillcape.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/skillcapeperks/SkillcapeEquipmentPlugin.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/skillcapeperks/SkillcapeOperatePlugin.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/skillcapeperks/SkillcapePerks.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/skill/thieving/Pickpocket.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/state/newsys/PlayerState.kt (52%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/state/newsys/State.kt (92%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/state/newsys/StateRepository.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/state/newsys/states/AvaDeviceState.kt (91%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/state/newsys/states/DiseasedState.kt (89%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/state/newsys/states/FarmingState.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/state/newsys/states/GodspellChargedState.kt (86%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/state/newsys/states/IncubatorState.kt (91%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/state/newsys/states/SeedlingState.kt (92%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/state/newsys/states/ShootingStarState.kt (87%) rename Server/src/main/kotlin/{core => rs09}/game/node/entity/state/newsys/states/SkulledState.kt (91%) rename Server/src/main/kotlin/{core => rs09}/game/system/SystemLogger.kt (88%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/Command.kt (93%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/CommandPlugin.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/CommandSystem.kt (93%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/MapDumpCommand.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/oldsys/AIPCommandPlugin.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/oldsys/SimpleDumpingCommands.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/oldsys/VisualCommand.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/rottenpotato/RPUseWithNPCDialogue.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/rottenpotato/RPUseWithPlayerDialogue.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/rottenpotato/RottenPotatoExtraDialogue.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/rottenpotato/RottenPotatoOptionHandler.kt (89%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/rottenpotato/RottenPotatoRSHDDialogue.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/rottenpotato/RottenPotatoUseWithHandler.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/sets/AnimationCommandSet.kt (93%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/sets/BottingCommandSet.kt (90%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/sets/CommandSet.kt (90%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/sets/ConfigCommandSet.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/sets/DevelopmentCommandSet.kt (85%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/sets/FunCommandSet.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/sets/MiscCommandSet.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/sets/ModerationCommandSet.kt (93%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/sets/MusicCommandSet.kt (93%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/sets/QuestCommandSet.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/sets/SlayerCommandSet.kt (93%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/sets/SpawnCommandSet.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/sets/SystemCommandSet.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/system/command/sets/TeleportCommandSet.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/system/config/ConfigParser.kt (91%) rename Server/src/main/kotlin/{core => rs09}/game/system/config/DoorConfigLoader.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/system/config/DropTableParser.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/system/config/GroundSpawnLoader.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/system/config/InterfaceConfigParser.kt (91%) rename Server/src/main/kotlin/{core => rs09}/game/system/config/ItemConfigParser.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/system/config/MusicConfigLoader.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/system/config/NPCConfigParser.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/system/config/NPCSpawner.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/system/config/ObjectConfigParser.kt (93%) rename Server/src/main/kotlin/{core => rs09}/game/system/config/RangedConfigLoader.kt (97%) rename Server/src/main/kotlin/{core => rs09}/game/system/config/ServerConfigParser.kt (88%) rename Server/src/main/kotlin/{core => rs09}/game/system/config/ShopParser.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/system/config/TableDump.kt (100%) rename Server/src/main/kotlin/{core => rs09}/game/system/config/XteaParser.kt (94%) rename Server/src/main/kotlin/{core => rs09}/game/world/DeadlockDetector.kt (90%) rename Server/src/main/kotlin/{core => rs09}/game/world/GameSettings.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/world/GameWorld.kt (91%) rename Server/src/main/kotlin/{core => rs09}/game/world/ImmerseWorld.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/world/PulseRunner.kt (95%) rename Server/src/main/kotlin/{core => rs09}/game/world/callback/CallbackHub.kt (75%) rename Server/src/main/kotlin/{core => rs09}/game/world/map/path/SmartPathfinder.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/world/repository/DisconnectionQueue.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/world/repository/Repository.kt (96%) rename Server/src/main/kotlin/{core => rs09}/game/world/update/MapChunkRenderer.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/world/update/NPCRenderer.kt (98%) rename Server/src/main/kotlin/{core => rs09}/game/world/update/PlayerRenderer.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/world/update/UpdateMasks.kt (99%) rename Server/src/main/kotlin/{core => rs09}/game/world/update/UpdateSequence.kt (97%) rename Server/src/main/kotlin/{core => rs09}/net/event/LoginReadEvent.kt (96%) rename Server/src/main/kotlin/{core => rs09}/net/packet/in/ItemOnGroundItemPacket.kt (96%) rename Server/src/main/kotlin/{core => rs09}/net/packet/in/QuickChatPacketHandler.kt (95%) rename Server/src/main/kotlin/{core => rs09}/plugin/CorePluginTypes/XPGainPlugins.kt (94%) rename Server/src/main/kotlin/{core => rs09}/plugin/PluginManager.kt (91%) rename Server/src/main/kotlin/{core => rs09}/tools/Components.kt (99%) rename Server/src/main/kotlin/{core => rs09}/tools/DialogueConst.kt (93%) rename Server/src/main/kotlin/{core => rs09}/tools/Interfaces.kt (99%) rename Server/src/main/kotlin/{core => rs09}/tools/Items.kt (99%) rename Server/src/main/kotlin/{core => rs09}/tools/NPCs.kt (99%) rename Server/src/main/kotlin/{core => rs09}/tools/TickUtils.kt (95%) rename Server/src/main/kotlin/{core => rs09}/tools/stringtools/StringTools.kt (96%) rename Server/src/main/kotlin/{core => rs09}/worker/MajorUpdateWorker.kt (89%) diff --git a/Server/build.gradle b/Server/build.gradle index 754f6d6dd..d61fbcf1a 100644 --- a/Server/build.gradle +++ b/Server/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'application' archivesBaseName = 'server' -mainClassName = 'core.Server' +mainClassName = 'rs09.Server' compileJava { options.encoding = "UTF-8" @@ -30,10 +30,10 @@ dependencies { implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2' } -sourceSets { - main.java.srcDirs = ['src/main/java/Server'] - main.kotlin.srcDirs = ['src/main/java/Server'] -} +/*sourceSets { + main.java.srcDirs = ['src/main/java'] + main.kotlin.srcDirs = ['src/main/kotlin'] +}*/ jar { manifest { diff --git a/Server/src/main/java/core/cache/Cache.java b/Server/src/main/java/core/cache/Cache.java index dd7ace771..da89ea948 100644 --- a/Server/src/main/java/core/cache/Cache.java +++ b/Server/src/main/java/core/cache/Cache.java @@ -4,13 +4,13 @@ import java.io.File; import java.io.RandomAccessFile; import java.nio.ByteBuffer; -import core.ServerConstants; +import rs09.ServerConstants; import core.cache.def.impl.AnimationDefinition; import core.cache.def.impl.GraphicDefinition; import core.cache.def.impl.ItemDefinition; import core.cache.def.impl.NPCDefinition; import core.cache.def.impl.ObjectDefinition; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; /** * A cache reader. diff --git a/Server/src/main/java/core/cache/def/impl/CS2Mapping.java b/Server/src/main/java/core/cache/def/impl/CS2Mapping.java index 4b510a14b..b5b7b9d5f 100644 --- a/Server/src/main/java/core/cache/def/impl/CS2Mapping.java +++ b/Server/src/main/java/core/cache/def/impl/CS2Mapping.java @@ -8,7 +8,7 @@ import java.util.Map; import core.cache.Cache; import core.cache.misc.buffer.ByteBufferUtils; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * The CS2 mapping. diff --git a/Server/src/main/java/core/cache/def/impl/ClothDefinition.java b/Server/src/main/java/core/cache/def/impl/ClothDefinition.java index cf133443a..fb34666fa 100644 --- a/Server/src/main/java/core/cache/def/impl/ClothDefinition.java +++ b/Server/src/main/java/core/cache/def/impl/ClothDefinition.java @@ -3,7 +3,7 @@ package core.cache.def.impl; import java.nio.ByteBuffer; import java.util.Arrays; -import core.ServerConstants; +import rs09.ServerConstants; import core.cache.Cache; /** diff --git a/Server/src/main/java/core/cache/def/impl/GraphicDefinition.java b/Server/src/main/java/core/cache/def/impl/GraphicDefinition.java index d16fc33e7..e10933de5 100644 --- a/Server/src/main/java/core/cache/def/impl/GraphicDefinition.java +++ b/Server/src/main/java/core/cache/def/impl/GraphicDefinition.java @@ -4,7 +4,7 @@ import java.nio.ByteBuffer; import java.util.HashMap; import java.util.Map; -import core.ServerConstants; +import rs09.ServerConstants; import core.cache.Cache; /** diff --git a/Server/src/main/java/core/cache/def/impl/ItemDefinition.java b/Server/src/main/java/core/cache/def/impl/ItemDefinition.java index 9eea3ec98..80c4c15b7 100644 --- a/Server/src/main/java/core/cache/def/impl/ItemDefinition.java +++ b/Server/src/main/java/core/cache/def/impl/ItemDefinition.java @@ -1,30 +1,29 @@ package core.cache.def.impl; +import core.cache.Cache; +import core.cache.def.Definition; +import core.cache.misc.buffer.ByteBufferUtils; +import core.game.container.Container; +import core.game.content.global.action.DropItemHandler; +import core.game.ge.GrandExchangeDatabase; +import core.game.interaction.OptionHandler; +import core.game.node.Node; +import core.game.node.entity.player.Player; +import core.game.node.entity.skill.Skills; +import core.game.node.item.Item; +import core.game.node.item.ItemPlugin; +import core.net.packet.PacketRepository; +import core.net.packet.out.WeightUpdate; +import core.plugin.Plugin; +import core.tools.StringUtils; +import rs09.game.system.SystemLogger; +import rs09.game.system.config.ItemConfigParser; + import java.nio.ByteBuffer; import java.text.DecimalFormat; import java.util.HashMap; import java.util.Map; -import core.game.system.SystemLogger; -import core.game.system.config.ItemConfigParser; -import core.plugin.Plugin; -import core.tools.StringUtils; -import core.cache.Cache; -import core.cache.def.Definition; -import core.cache.misc.buffer.ByteBufferUtils; -import core.game.container.Container; -import core.game.ge.GrandExchangeDatabase; -import core.game.content.global.action.DropItemHandler; -import core.game.content.global.action.EquipHandler; -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.item.Item; -import core.game.node.item.ItemPlugin; -import core.net.packet.PacketRepository; -import core.net.packet.out.WeightUpdate; - /** * Represents an item's definitions. * @author Jagex @@ -279,10 +278,6 @@ public class ItemDefinition extends Definition { setOptionHandler("destroy", handler); setOptionHandler("dissolve", handler); setOptionHandler("drop", handler); - final EquipHandler equipHandler = EquipHandler.SINGLETON; - setOptionHandler("wear", equipHandler); - setOptionHandler("wield", equipHandler); - setOptionHandler("equip", equipHandler); } /** diff --git a/Server/src/main/java/core/cache/def/impl/NPCDefinition.java b/Server/src/main/java/core/cache/def/impl/NPCDefinition.java index 0a20eeb7e..4a118143f 100644 --- a/Server/src/main/java/core/cache/def/impl/NPCDefinition.java +++ b/Server/src/main/java/core/cache/def/impl/NPCDefinition.java @@ -7,11 +7,11 @@ import core.game.interaction.OptionHandler; import core.game.node.entity.npc.NPC; import core.game.node.entity.npc.drop.NPCDropTables; import core.game.node.entity.player.Player; -import core.game.system.config.NPCConfigParser; -import core.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.tools.StringUtils; +import rs09.game.system.config.NPCConfigParser; +import rs09.game.world.GameWorld; import java.nio.ByteBuffer; import java.util.HashMap; diff --git a/Server/src/main/java/core/cache/def/impl/ObjectDefinition.java b/Server/src/main/java/core/cache/def/impl/ObjectDefinition.java index b968f1804..022ed5526 100644 --- a/Server/src/main/java/core/cache/def/impl/ObjectDefinition.java +++ b/Server/src/main/java/core/cache/def/impl/ObjectDefinition.java @@ -6,8 +6,8 @@ import core.cache.misc.buffer.ByteBufferUtils; import core.game.interaction.OptionHandler; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; -import core.game.system.SystemLogger; -import core.game.world.GameWorld; +import rs09.game.system.SystemLogger; +import rs09.game.world.GameWorld; import java.nio.ByteBuffer; import java.util.HashMap; diff --git a/Server/src/main/java/core/cache/def/impl/RenderAnimationDefinition.java b/Server/src/main/java/core/cache/def/impl/RenderAnimationDefinition.java index 9c830461b..9c3128595 100644 --- a/Server/src/main/java/core/cache/def/impl/RenderAnimationDefinition.java +++ b/Server/src/main/java/core/cache/def/impl/RenderAnimationDefinition.java @@ -1,8 +1,8 @@ package core.cache.def.impl; import core.cache.Cache; -import core.game.system.SystemLogger; -import core.game.world.GameWorld; +import rs09.game.system.SystemLogger; +import rs09.game.world.GameWorld; import java.lang.reflect.Array; import java.lang.reflect.Field; diff --git a/Server/src/main/java/core/cache/def/impl/VarbitDefinition.java b/Server/src/main/java/core/cache/def/impl/VarbitDefinition.java index 7bbc4c095..3c3489648 100644 --- a/Server/src/main/java/core/cache/def/impl/VarbitDefinition.java +++ b/Server/src/main/java/core/cache/def/impl/VarbitDefinition.java @@ -1,15 +1,13 @@ package core.cache.def.impl; +import core.cache.Cache; +import core.game.node.entity.player.Player; +import rs09.game.world.GameWorld; + import java.nio.ByteBuffer; import java.util.HashMap; import java.util.Map; -import core.cache.Cache; -import core.game.Varbit; -import core.game.node.entity.player.Player; -import core.game.system.SystemLogger; -import core.game.world.GameWorld; - /** * Handles config definition reading. * @author Emperor diff --git a/Server/src/main/java/core/game/component/InterfaceType.java b/Server/src/main/java/core/game/component/InterfaceType.java index 7eb520870..151bb5268 100644 --- a/Server/src/main/java/core/game/component/InterfaceType.java +++ b/Server/src/main/java/core/game/component/InterfaceType.java @@ -1,6 +1,7 @@ package core.game.component; -import static core.tools.Interfaces.*; + +import static rs09.tools.Interfaces.*; /** * Represents an interface type. diff --git a/Server/src/main/java/core/game/container/impl/BankContainer.java b/Server/src/main/java/core/game/container/impl/BankContainer.java index 01d3591ef..016dee8f9 100644 --- a/Server/src/main/java/core/game/container/impl/BankContainer.java +++ b/Server/src/main/java/core/game/container/impl/BankContainer.java @@ -1,14 +1,14 @@ package core.game.container.impl; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.component.Component; import core.game.container.*; import core.game.container.access.BitregisterAssembler; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.IronmanMode; import core.game.node.item.Item; -import core.game.system.config.ItemConfigParser; -import core.game.world.GameWorld; +import rs09.game.system.config.ItemConfigParser; +import rs09.game.world.GameWorld; import core.net.packet.PacketRepository; import core.net.packet.context.ContainerContext; import core.net.packet.out.ContainerPacket; diff --git a/Server/src/main/java/core/game/container/impl/EquipmentContainer.java b/Server/src/main/java/core/game/container/impl/EquipmentContainer.java index f464120ce..7d7d46291 100644 --- a/Server/src/main/java/core/game/container/impl/EquipmentContainer.java +++ b/Server/src/main/java/core/game/container/impl/EquipmentContainer.java @@ -5,16 +5,16 @@ import core.game.container.ContainerEvent; import core.game.container.ContainerListener; import core.game.node.entity.combat.equipment.WeaponInterface; import core.game.node.entity.player.Player; +import core.game.node.entity.skill.Skills; import core.game.node.item.Item; -import core.game.system.config.ItemConfigParser; import core.game.world.update.flag.player.AppearanceFlag; import core.net.packet.PacketRepository; import core.net.packet.context.ContainerContext; import core.net.packet.out.ContainerPacket; import core.net.packet.out.WeightUpdate; import core.plugin.Plugin; -import core.game.node.entity.skill.Skills; -import core.game.node.entity.skill.skillcapeperks.SkillcapePerks; +import rs09.game.node.entity.skill.skillcapeperks.SkillcapePerks; +import rs09.game.system.config.ItemConfigParser; /** * Represents the equipment container. diff --git a/Server/src/main/java/core/game/content/activity/ActivityManager.java b/Server/src/main/java/core/game/content/activity/ActivityManager.java index 5d30f18d6..700a369d8 100644 --- a/Server/src/main/java/core/game/content/activity/ActivityManager.java +++ b/Server/src/main/java/core/game/content/activity/ActivityManager.java @@ -1,8 +1,8 @@ package core.game.content.activity; import core.game.node.entity.player.Player; -import core.game.system.SystemLogger; -import core.game.world.GameWorld; +import rs09.game.system.SystemLogger; +import rs09.game.world.GameWorld; import java.util.HashMap; import java.util.Map; diff --git a/Server/src/main/java/core/game/content/activity/ActivityPlugin.java b/Server/src/main/java/core/game/content/activity/ActivityPlugin.java index fa16e9e49..1b9657e63 100644 --- a/Server/src/main/java/core/game/content/activity/ActivityPlugin.java +++ b/Server/src/main/java/core/game/content/activity/ActivityPlugin.java @@ -1,6 +1,6 @@ package core.game.content.activity; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/activity/CutscenePlugin.java b/Server/src/main/java/core/game/content/activity/CutscenePlugin.java index 049026479..b483c10ef 100644 --- a/Server/src/main/java/core/game/content/activity/CutscenePlugin.java +++ b/Server/src/main/java/core/game/content/activity/CutscenePlugin.java @@ -5,7 +5,7 @@ import core.game.node.entity.Entity; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.build.DynamicRegion; import core.net.packet.PacketRepository; 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 8e3a3b711..049d52d7b 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 @@ -4,8 +4,6 @@ import core.game.component.Component; import core.game.content.activity.ActivityPlugin; import core.game.content.global.action.ClimbActionHandler; import core.game.content.global.action.DoorActionHandler; -import core.plugin.Initializable; -import core.game.node.entity.skill.summoning.familiar.Familiar; import core.game.interaction.Option; import core.game.node.Node; import core.game.node.entity.Entity; @@ -17,21 +15,24 @@ import core.game.node.entity.npc.agg.AggressiveBehavior; 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.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.zone.ZoneBorders; import core.game.world.update.flag.context.Graphics; import core.net.packet.PacketRepository; import core.net.packet.context.CameraContext; -import core.net.packet.context.MinimapStateContext; import core.net.packet.context.CameraContext.CameraType; +import core.net.packet.context.MinimapStateContext; import core.net.packet.out.CameraViewPacket; import core.net.packet.out.MinimapState; -import core.plugin.PluginManager; +import core.plugin.Initializable; import core.tools.RandomFunction; +import rs09.game.content.activity.barrows.RewardChest; +import rs09.game.world.GameWorld; +import rs09.plugin.PluginManager; /** * Handles the barrows activity plugin. 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 755e6b6b4..91f7ed37b 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 @@ -7,7 +7,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/content/activity/bountyhunter/BountyEntry.java b/Server/src/main/java/core/game/content/activity/bountyhunter/BountyEntry.java index ccd64abf8..e92d7e1f1 100644 --- a/Server/src/main/java/core/game/content/activity/bountyhunter/BountyEntry.java +++ b/Server/src/main/java/core/game/content/activity/bountyhunter/BountyEntry.java @@ -1,7 +1,7 @@ package core.game.content.activity.bountyhunter; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * Holds a player's bounty hunter data. diff --git a/Server/src/main/java/core/game/content/activity/bountyhunter/BountyHunterActivity.java b/Server/src/main/java/core/game/content/activity/bountyhunter/BountyHunterActivity.java index dda7bc37a..7a48b1c66 100644 --- a/Server/src/main/java/core/game/content/activity/bountyhunter/BountyHunterActivity.java +++ b/Server/src/main/java/core/game/content/activity/bountyhunter/BountyHunterActivity.java @@ -18,7 +18,7 @@ import core.game.node.entity.player.link.prayer.PrayerType; import core.game.node.item.GroundItem; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.Point; import core.game.world.map.zone.ZoneBorders; @@ -28,7 +28,7 @@ import core.game.world.map.zone.impl.WildernessZone; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; import java.util.*; diff --git a/Server/src/main/java/core/game/content/activity/bountyhunter/BountyLocateSpell.java b/Server/src/main/java/core/game/content/activity/bountyhunter/BountyLocateSpell.java index e83fddd79..7007e1873 100644 --- a/Server/src/main/java/core/game/content/activity/bountyhunter/BountyLocateSpell.java +++ b/Server/src/main/java/core/game/content/activity/bountyhunter/BountyLocateSpell.java @@ -11,7 +11,7 @@ import core.game.node.entity.player.link.SpellBookManager.SpellBook; import core.game.node.entity.player.link.TeleportManager.TeleportType; import core.game.node.entity.state.EntityState; import core.game.node.item.Item; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.plugin.Plugin; 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 022600b38..050be2f06 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 @@ -21,7 +21,7 @@ import core.game.node.object.ObjectBuilder; import core.game.system.communication.ClanEntry; import core.game.system.communication.ClanRepository; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/activity/clanwars/ClanWarsChallengeRoom.java b/Server/src/main/java/core/game/content/activity/clanwars/ClanWarsChallengeRoom.java index c79a69385..4a44737fd 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 @@ -12,7 +12,7 @@ import core.game.world.map.zone.ZoneRestriction; import core.game.world.map.zone.impl.WildernessZone; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the clan wars challenge room. diff --git a/Server/src/main/java/core/game/content/activity/duel/DuelArea.java b/Server/src/main/java/core/game/content/activity/duel/DuelArea.java index 04e6d2f68..7e09ff9f2 100644 --- a/Server/src/main/java/core/game/content/activity/duel/DuelArea.java +++ b/Server/src/main/java/core/game/content/activity/duel/DuelArea.java @@ -3,7 +3,7 @@ package core.game.content.activity.duel; import java.util.ArrayList; import java.util.List; -import core.ServerConstants; +import rs09.ServerConstants; import core.cache.def.impl.ObjectDefinition; import core.game.container.Container; import core.game.container.impl.EquipmentContainer; @@ -23,7 +23,7 @@ import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.zone.MapZone; diff --git a/Server/src/main/java/core/game/content/activity/duel/DuelArenaActivity.java b/Server/src/main/java/core/game/content/activity/duel/DuelArenaActivity.java index d31cce22f..e268d0207 100644 --- a/Server/src/main/java/core/game/content/activity/duel/DuelArenaActivity.java +++ b/Server/src/main/java/core/game/content/activity/duel/DuelArenaActivity.java @@ -16,7 +16,7 @@ import core.game.world.map.Location; import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneBuilder; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** diff --git a/Server/src/main/java/core/game/content/activity/duel/DuelComponentPlugin.java b/Server/src/main/java/core/game/content/activity/duel/DuelComponentPlugin.java index 2ce967477..09deaee25 100644 --- a/Server/src/main/java/core/game/content/activity/duel/DuelComponentPlugin.java +++ b/Server/src/main/java/core/game/content/activity/duel/DuelComponentPlugin.java @@ -4,7 +4,7 @@ import core.game.component.Component; import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Plugin; /** diff --git a/Server/src/main/java/core/game/content/activity/duel/DuelSession.java b/Server/src/main/java/core/game/content/activity/duel/DuelSession.java index 97b6bba56..5bb2a813d 100644 --- a/Server/src/main/java/core/game/content/activity/duel/DuelSession.java +++ b/Server/src/main/java/core/game/content/activity/duel/DuelSession.java @@ -1,7 +1,5 @@ package core.game.content.activity.duel; -import java.text.DecimalFormat; - import core.game.component.CloseEvent; import core.game.component.Component; import core.game.component.ComponentDefinition; @@ -10,16 +8,18 @@ import core.game.container.Container; import core.game.container.ContainerType; import core.game.container.access.InterfaceContainer; import core.game.container.impl.EquipmentContainer; -import core.game.content.global.action.EquipHandler; import core.game.node.entity.player.Player; import core.game.node.entity.player.info.login.PlayerParser; import core.game.node.entity.player.link.RunScript; import core.game.node.entity.state.EntityState; import core.game.node.item.Item; -import core.game.system.config.ItemConfigParser; import core.game.system.monitor.PlayerMonitor; import core.plugin.Plugin; import core.tools.RandomFunction; +import rs09.game.content.global.action.EquipHandler; +import rs09.game.system.config.ItemConfigParser; + +import java.text.DecimalFormat; /** * Represents a duel session. diff --git a/Server/src/main/java/core/game/content/activity/fog/FOGActivityPlugin.java b/Server/src/main/java/core/game/content/activity/fog/FOGActivityPlugin.java index c9b6f5464..f9434cb85 100644 --- a/Server/src/main/java/core/game/content/activity/fog/FOGActivityPlugin.java +++ b/Server/src/main/java/core/game/content/activity/fog/FOGActivityPlugin.java @@ -8,7 +8,7 @@ import core.game.node.entity.player.Player; import core.game.world.map.Location; import core.game.world.map.zone.ZoneBorders; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the fist of guthix activity. 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 7c01126d5..fd207a7e9 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 @@ -12,7 +12,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.zone.ZoneBorders; 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 9bbe44dec..db366076d 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 @@ -15,7 +15,7 @@ import core.game.node.object.GameObject; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the hero guild. 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 6d04f1aa5..346039f7e 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 @@ -8,11 +8,11 @@ import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; import core.game.container.impl.EquipmentContainer; import core.plugin.Initializable; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.entity.Entity; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.link.diary.DiaryType; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; import core.game.content.dialogue.DialoguePlugin; import core.game.content.dialogue.FacialExpression; 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 a0bbc92ca..b7e101a3f 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 @@ -2,20 +2,20 @@ package core.game.content.activity.guild; import core.cache.def.impl.NPCDefinition; import core.cache.def.impl.ObjectDefinition; -import core.plugin.Initializable; import core.game.content.dialogue.DialoguePlugin; import core.game.content.global.Skillcape; import core.game.content.global.action.ClimbActionHandler; import core.game.content.global.action.DoorActionHandler; -import core.game.content.global.travel.EssenceTeleport; -import core.game.node.entity.skill.Skills; 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.entity.skill.Skills; import core.game.node.object.GameObject; import core.game.world.map.Location; +import core.plugin.Initializable; import core.plugin.Plugin; +import rs09.game.content.global.travel.EssenceTeleport; /** * Represents the wizard guild plugin. diff --git a/Server/src/main/java/core/game/content/activity/gwd/GWDGraardorSwingHandler.java b/Server/src/main/java/core/game/content/activity/gwd/GWDGraardorSwingHandler.java index 90523ded9..20d7c6525 100644 --- a/Server/src/main/java/core/game/content/activity/gwd/GWDGraardorSwingHandler.java +++ b/Server/src/main/java/core/game/content/activity/gwd/GWDGraardorSwingHandler.java @@ -6,7 +6,7 @@ import java.util.List; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.InteractionType; import core.game.node.entity.combat.equipment.ArmourSet; import core.game.node.entity.impl.Projectile; diff --git a/Server/src/main/java/core/game/content/activity/gwd/GWDKreeArraSwingHandler.java b/Server/src/main/java/core/game/content/activity/gwd/GWDKreeArraSwingHandler.java index 2738fe853..44f89be73 100644 --- a/Server/src/main/java/core/game/content/activity/gwd/GWDKreeArraSwingHandler.java +++ b/Server/src/main/java/core/game/content/activity/gwd/GWDKreeArraSwingHandler.java @@ -6,7 +6,7 @@ import java.util.List; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.InteractionType; import core.game.node.entity.combat.equipment.ArmourSet; import core.game.node.entity.impl.Projectile; diff --git a/Server/src/main/java/core/game/content/activity/gwd/GWDTsutsarothSwingHandler.java b/Server/src/main/java/core/game/content/activity/gwd/GWDTsutsarothSwingHandler.java index 8135c6cc0..a21b634db 100644 --- a/Server/src/main/java/core/game/content/activity/gwd/GWDTsutsarothSwingHandler.java +++ b/Server/src/main/java/core/game/content/activity/gwd/GWDTsutsarothSwingHandler.java @@ -3,7 +3,7 @@ package core.game.content.activity.gwd; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.InteractionType; import core.game.node.entity.combat.equipment.ArmourSet; import core.game.node.entity.impl.Projectile; diff --git a/Server/src/main/java/core/game/content/activity/gwd/GWDZilyanaSwingHandler.java b/Server/src/main/java/core/game/content/activity/gwd/GWDZilyanaSwingHandler.java index f82b81fe8..3d9404ac6 100644 --- a/Server/src/main/java/core/game/content/activity/gwd/GWDZilyanaSwingHandler.java +++ b/Server/src/main/java/core/game/content/activity/gwd/GWDZilyanaSwingHandler.java @@ -6,7 +6,7 @@ import java.util.List; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.InteractionType; import core.game.node.entity.combat.equipment.ArmourSet; import core.game.node.entity.impl.Animator.Priority; diff --git a/Server/src/main/java/core/game/content/activity/gwd/GodWarsMinionNPC.java b/Server/src/main/java/core/game/content/activity/gwd/GodWarsMinionNPC.java index 09898a565..ca2e69964 100644 --- a/Server/src/main/java/core/game/content/activity/gwd/GodWarsMinionNPC.java +++ b/Server/src/main/java/core/game/content/activity/gwd/GodWarsMinionNPC.java @@ -6,7 +6,7 @@ import core.game.node.entity.combat.DeathTask; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Initializable; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/activity/gwd/GodwarsBossNPC.java b/Server/src/main/java/core/game/content/activity/gwd/GodwarsBossNPC.java index b2b5a4697..99d92a8a9 100644 --- a/Server/src/main/java/core/game/content/activity/gwd/GodwarsBossNPC.java +++ b/Server/src/main/java/core/game/content/activity/gwd/GodwarsBossNPC.java @@ -3,9 +3,7 @@ package core.game.content.activity.gwd; import core.game.content.global.BossKillCounter; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; -import core.game.node.entity.combat.CombatPulse; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.DeathTask; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.npc.NPC; @@ -13,11 +11,13 @@ import core.game.node.entity.npc.agg.AggressiveBehavior; import core.game.node.entity.npc.agg.AggressiveHandler; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.prayer.PrayerType; -import core.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.zone.ZoneBorders; import core.plugin.Initializable; import core.tools.RandomFunction; +import rs09.game.node.entity.combat.CombatPulse; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.world.GameWorld; /** * Handles a god wars boss NPC. 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 1894de6df..ac5afa202 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 @@ -11,7 +11,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +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/content/activity/gwd/GodwarsMapzone.java b/Server/src/main/java/core/game/content/activity/gwd/GodwarsMapzone.java index 161287e49..905e23102 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 @@ -16,7 +16,7 @@ import core.game.node.entity.player.info.Rights; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.zone.MapZone; diff --git a/Server/src/main/java/core/game/content/activity/magearena/KolodionDialogue.java b/Server/src/main/java/core/game/content/activity/magearena/KolodionDialogue.java index 11ad28b7a..6e7ea0a43 100644 --- a/Server/src/main/java/core/game/content/activity/magearena/KolodionDialogue.java +++ b/Server/src/main/java/core/game/content/activity/magearena/KolodionDialogue.java @@ -4,7 +4,7 @@ import core.game.content.dialogue.DialoguePlugin; import core.game.node.entity.skill.Skills; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; 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/content/activity/magearena/KolodionNPC.java b/Server/src/main/java/core/game/content/activity/magearena/KolodionNPC.java index c9270195e..98c808d5a 100644 --- a/Server/src/main/java/core/game/content/activity/magearena/KolodionNPC.java +++ b/Server/src/main/java/core/game/content/activity/magearena/KolodionNPC.java @@ -4,16 +4,16 @@ import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatSpell; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; -import core.game.node.entity.combat.handlers.MagicSwingHandler; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.SpellBookManager.SpellBook; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.tools.RandomFunction; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.handlers.MagicSwingHandler; +import rs09.game.world.GameWorld; /** * Handles the kolodion npc. diff --git a/Server/src/main/java/core/game/content/activity/magearena/KolodionSession.java b/Server/src/main/java/core/game/content/activity/magearena/KolodionSession.java index 25ec390f3..1362b201d 100644 --- a/Server/src/main/java/core/game/content/activity/magearena/KolodionSession.java +++ b/Server/src/main/java/core/game/content/activity/magearena/KolodionSession.java @@ -3,7 +3,7 @@ package core.game.content.activity.magearena; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; /** diff --git a/Server/src/main/java/core/game/content/activity/magearena/LundailDialogue.java b/Server/src/main/java/core/game/content/activity/magearena/LundailDialogue.java index aa4f76376..a2ad927fb 100644 --- a/Server/src/main/java/core/game/content/activity/magearena/LundailDialogue.java +++ b/Server/src/main/java/core/game/content/activity/magearena/LundailDialogue.java @@ -3,7 +3,7 @@ package core.game.content.activity.magearena; import core.game.content.dialogue.DialoguePlugin; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * Handles the lundail dialogue. 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 2da8c9454..14b5e198d 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 @@ -4,23 +4,23 @@ import core.cache.def.impl.ItemDefinition; import core.cache.def.impl.ObjectDefinition; import core.game.content.dialogue.DialogueAction; import core.game.content.global.GodType; -import core.game.content.global.action.PickupHandler; -import core.game.node.entity.skill.agility.AgilityHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; +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.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; -import core.plugin.Plugin; import core.plugin.Initializable; -import core.plugin.PluginManager; +import core.plugin.Plugin; +import rs09.game.content.global.action.PickupHandler; +import rs09.game.world.GameWorld; +import rs09.plugin.PluginManager; /** * Handles the mage arena activity. diff --git a/Server/src/main/java/core/game/content/activity/magearena/MageArenaZone.java b/Server/src/main/java/core/game/content/activity/magearena/MageArenaZone.java index beaba6928..bb274329b 100644 --- a/Server/src/main/java/core/game/content/activity/magearena/MageArenaZone.java +++ b/Server/src/main/java/core/game/content/activity/magearena/MageArenaZone.java @@ -5,7 +5,7 @@ import core.game.node.entity.Entity; import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/activity/mta/AlchemySpell.java b/Server/src/main/java/core/game/content/activity/mta/AlchemySpell.java index 98507bce2..84aeea72a 100644 --- a/Server/src/main/java/core/game/content/activity/mta/AlchemySpell.java +++ b/Server/src/main/java/core/game/content/activity/mta/AlchemySpell.java @@ -2,7 +2,7 @@ package core.game.content.activity.mta; import core.game.node.entity.player.link.diary.DiaryType; import core.game.world.map.zone.ZoneBorders; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.entity.skill.magic.MagicSpell; import core.game.node.entity.skill.magic.Runes; import core.game.node.Node; diff --git a/Server/src/main/java/core/game/content/activity/mta/EntranceGuardianDialogue.java b/Server/src/main/java/core/game/content/activity/mta/EntranceGuardianDialogue.java index b8421e8d9..7fe6a502b 100644 --- a/Server/src/main/java/core/game/content/activity/mta/EntranceGuardianDialogue.java +++ b/Server/src/main/java/core/game/content/activity/mta/EntranceGuardianDialogue.java @@ -2,7 +2,7 @@ package core.game.content.activity.mta; import core.game.content.dialogue.DialoguePlugin; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * Handles the entrance guardian dialogue. diff --git a/Server/src/main/java/core/game/content/activity/mta/MTAShop.java b/Server/src/main/java/core/game/content/activity/mta/MTAShop.java index 2851507ca..5f1a814f4 100644 --- a/Server/src/main/java/core/game/content/activity/mta/MTAShop.java +++ b/Server/src/main/java/core/game/content/activity/mta/MTAShop.java @@ -12,7 +12,7 @@ import core.game.container.access.InterfaceContainer; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Plugin; /** diff --git a/Server/src/main/java/core/game/content/activity/mta/MTAZone.java b/Server/src/main/java/core/game/content/activity/mta/MTAZone.java index db6ab9ef9..ba8dbf9b9 100644 --- a/Server/src/main/java/core/game/content/activity/mta/MTAZone.java +++ b/Server/src/main/java/core/game/content/activity/mta/MTAZone.java @@ -1,6 +1,6 @@ package core.game.content.activity.mta; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.interaction.Option; import core.game.node.Node; import core.game.node.entity.Entity; diff --git a/Server/src/main/java/core/game/content/activity/mta/MageTrainingArenaPlugin.java b/Server/src/main/java/core/game/content/activity/mta/MageTrainingArenaPlugin.java index 262cd6000..0ccb3ff71 100644 --- a/Server/src/main/java/core/game/content/activity/mta/MageTrainingArenaPlugin.java +++ b/Server/src/main/java/core/game/content/activity/mta/MageTrainingArenaPlugin.java @@ -3,22 +3,22 @@ package core.game.content.activity.mta; import core.cache.def.impl.ItemDefinition; import core.cache.def.impl.NPCDefinition; import core.cache.def.impl.ObjectDefinition; -import core.plugin.Initializable; -import core.game.node.entity.skill.Skills; -import core.game.node.entity.skill.agility.AgilityHandler; +import core.game.content.activity.mta.impl.TelekineticZone; import core.game.interaction.OptionHandler; import core.game.node.Node; 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.GroundItem; import core.game.node.item.Item; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.zone.ZoneBuilder; import core.game.world.update.flag.context.Animation; +import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; - -import core.game.content.activity.mta.impl.TelekineticZone; +import rs09.game.content.activity.mta.EnchantSpell; +import rs09.plugin.PluginManager; /** * Handles the mage training area interactions. diff --git a/Server/src/main/java/core/game/content/activity/mta/TelekineticGrabSpell.java b/Server/src/main/java/core/game/content/activity/mta/TelekineticGrabSpell.java index d21aaa48f..581341e25 100644 --- a/Server/src/main/java/core/game/content/activity/mta/TelekineticGrabSpell.java +++ b/Server/src/main/java/core/game/content/activity/mta/TelekineticGrabSpell.java @@ -1,28 +1,27 @@ package core.game.content.activity.mta; -import core.game.content.global.action.PickupHandler; -import core.game.node.entity.combat.spell.SpellBlocks; -import core.game.node.entity.skill.magic.MagicSpell; -import core.game.node.entity.skill.magic.Runes; +import core.game.content.activity.mta.impl.TelekineticZone; import core.game.interaction.SpecialGroundItems; import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.combat.equipment.SpellType; +import core.game.node.entity.combat.spell.SpellBlocks; 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.entity.player.link.SpellBookManager.SpellBook; import core.game.node.entity.player.link.audio.Audio; +import core.game.node.entity.skill.magic.MagicSpell; +import core.game.node.entity.skill.magic.Runes; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; - -import core.game.content.activity.mta.impl.TelekineticZone; +import rs09.game.content.global.action.PickupHandler; +import rs09.game.world.GameWorld; /** * Represents the telekenitic grab spell. 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 b47a47316..5c06b2445 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 @@ -15,7 +15,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.zone.ZoneBorders; 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 7ddfe6172..9a415a541 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 @@ -15,7 +15,7 @@ import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.zone.ZoneBorders; 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 ef8d72082..03a70d40b 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 @@ -13,7 +13,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.zone.ZoneBorders; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/content/activity/mta/impl/TelekineticZone.java b/Server/src/main/java/core/game/content/activity/mta/impl/TelekineticZone.java index 003f79249..2652309ef 100644 --- a/Server/src/main/java/core/game/content/activity/mta/impl/TelekineticZone.java +++ b/Server/src/main/java/core/game/content/activity/mta/impl/TelekineticZone.java @@ -15,7 +15,7 @@ import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.build.DynamicRegion; 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 e42c52f75..ddbccc599 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 @@ -15,7 +15,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +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/content/activity/partyroom/PartyRoomPlugin.java b/Server/src/main/java/core/game/content/activity/partyroom/PartyRoomPlugin.java index 5e68ca3ff..51555fa55 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 @@ -21,12 +21,12 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the party room. 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 eeec9e08e..492c68711 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 @@ -1,12 +1,12 @@ package core.game.content.activity.pestcontrol; import core.cache.def.impl.ObjectDefinition; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.content.activity.ActivityManager; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import plugin.ai.pvmbots.PvMBotsBuilder; +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.GameObject; diff --git a/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlActivityPlugin.java b/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlActivityPlugin.java index 2d66c3758..4e0fbc6fe 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlActivityPlugin.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlActivityPlugin.java @@ -3,7 +3,7 @@ package core.game.content.activity.pestcontrol; import java.util.ArrayList; import java.util.List; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.component.Component; import core.game.content.activity.ActivityManager; import core.game.content.activity.ActivityPlugin; @@ -17,14 +17,14 @@ import core.game.node.entity.state.EntityState; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.build.DynamicRegion; import core.game.world.map.zone.RegionZone; import core.game.world.map.zone.ZoneBuilder; import core.game.world.map.zone.ZoneRestriction; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; import core.tools.StringUtils; import core.game.content.activity.pestcontrol.monsters.*; diff --git a/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCDefilerNPC.java b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCDefilerNPC.java index 1cc77a9fb..c8caae317 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCDefilerNPC.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCDefilerNPC.java @@ -1,16 +1,16 @@ package core.game.content.activity.pestcontrol.monsters; +import core.game.content.activity.pestcontrol.PestControlSession; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.InteractionType; -import core.game.node.entity.combat.handlers.RangeSwingHandler; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.world.map.Location; import core.game.world.map.MapDistance; -import core.game.content.activity.pestcontrol.PestControlSession; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.handlers.RangeSwingHandler; /** * Handles the Defiler NPCs. 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 516ffd6e4..bbe072ac4 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 @@ -9,7 +9,7 @@ import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.MapDistance; import core.game.world.map.path.Pathfinder; diff --git a/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCShifterNPC.java b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCShifterNPC.java index 329461964..df1e13e86 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCShifterNPC.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCShifterNPC.java @@ -1,26 +1,26 @@ package core.game.content.activity.pestcontrol.monsters; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - +import core.game.content.activity.pestcontrol.PestControlSession; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; -import core.game.node.entity.combat.CombatPulse; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.InteractionType; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.tools.RandomFunction; -import core.game.content.activity.pestcontrol.PestControlSession; +import rs09.game.node.entity.combat.CombatPulse; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.world.GameWorld; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; /** * Handles the pest control shifter NPCs. diff --git a/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCSpinnerNPC.java b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCSpinnerNPC.java index b842036d8..66adbc20b 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCSpinnerNPC.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCSpinnerNPC.java @@ -10,7 +10,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.state.EntityState; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +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/content/activity/pestcontrol/monsters/PCSplatterNPC.java b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCSplatterNPC.java index ef7a8e84a..dd2393a5d 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 @@ -11,7 +11,7 @@ import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +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/content/activity/pestcontrol/monsters/PCTorcherNPC.java b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCTorcherNPC.java index ac7d416e1..1347ef3fc 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCTorcherNPC.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCTorcherNPC.java @@ -1,15 +1,14 @@ package core.game.content.activity.pestcontrol.monsters; +import core.game.content.activity.pestcontrol.PestControlSession; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatSpell; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.InteractionType; import core.game.node.entity.combat.equipment.SpellType; -import core.game.node.entity.combat.handlers.MagicSwingHandler; -import core.game.node.entity.impl.Projectile; import core.game.node.entity.impl.Animator.Priority; +import core.game.node.entity.impl.Projectile; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.SpellBookManager.SpellBook; @@ -18,7 +17,8 @@ import core.game.world.map.MapDistance; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; -import core.game.content.activity.pestcontrol.PestControlSession; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.handlers.MagicSwingHandler; /** * Handles the torcher pest control NPC. diff --git a/Server/src/main/java/core/game/content/activity/pestcontrol/reward/PCIslandOptionPlugin.java b/Server/src/main/java/core/game/content/activity/pestcontrol/reward/PCIslandOptionPlugin.java index 6d608a87d..8ab61ef0d 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/reward/PCIslandOptionPlugin.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/reward/PCIslandOptionPlugin.java @@ -6,7 +6,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the option plugin used to handle the pc island related nodes. diff --git a/Server/src/main/java/core/game/content/activity/puropuro/ElnockInquisitorDialogue.java b/Server/src/main/java/core/game/content/activity/puropuro/ElnockInquisitorDialogue.java index 5b78a67d0..2a2058f69 100644 --- a/Server/src/main/java/core/game/content/activity/puropuro/ElnockInquisitorDialogue.java +++ b/Server/src/main/java/core/game/content/activity/puropuro/ElnockInquisitorDialogue.java @@ -9,7 +9,7 @@ import core.game.node.entity.skill.hunter.bnet.ImplingNode; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.game.content.activity.puropuro.ElnockInquisitorDialogue.ElnockExchangeInterfaceHandler.ElnockExchange; diff --git a/Server/src/main/java/core/game/content/activity/puropuro/ImpDefenderNPC.java b/Server/src/main/java/core/game/content/activity/puropuro/ImpDefenderNPC.java index 0e7010ed5..0dadcd0c4 100644 --- a/Server/src/main/java/core/game/content/activity/puropuro/ImpDefenderNPC.java +++ b/Server/src/main/java/core/game/content/activity/puropuro/ImpDefenderNPC.java @@ -9,7 +9,7 @@ import core.game.node.entity.skill.hunter.bnet.ImplingNode; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.tools.RandomFunction; 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 dedde30e2..173170d9f 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 @@ -20,7 +20,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.RegionManager; @@ -32,7 +32,7 @@ import core.net.packet.PacketRepository; import core.net.packet.context.MinimapStateContext; import core.net.packet.out.MinimapState; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** 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 27a1a11c0..fa7c874c8 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 @@ -1,13 +1,13 @@ package core.game.content.activity.pyramidplunder; -import core.game.Varp; + import core.game.content.global.action.ClimbActionHandler; -import core.game.node.entity.skill.Skills; import core.game.interaction.Option; import core.game.node.Node; import core.game.node.entity.Entity; -import core.game.node.entity.npc.NPC; 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.skill.Skills; import core.game.node.item.Item; import core.game.node.object.ObjectBuilder; import core.game.system.task.LocationLogoutTask; @@ -20,6 +20,8 @@ import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.plugin.Plugin; import core.tools.RandomFunction; +import rs09.game.Varp; +import rs09.game.content.activity.pyramidplunder.PlunderSession; /** * Defines the zones for the pyramid plunder rooms and their interactions 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 cb9cda222..2fd846778 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 @@ -9,7 +9,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +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/pyramidplunder/PyramidPlunderActivity.java b/Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidPlunderActivity.java index 278d4885a..a16111cf0 100644 --- a/Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidPlunderActivity.java +++ b/Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidPlunderActivity.java @@ -6,7 +6,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.world.map.Location; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.game.content.activity.pyramidplunder.PlunderSession; +import rs09.plugin.PluginManager; /** * Handles the Pyramid plunder activity. diff --git a/Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidPlunderNPC.java b/Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidPlunderNPC.java index eda87bbbf..c3b89ee1d 100644 --- a/Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidPlunderNPC.java +++ b/Server/src/main/java/core/game/content/activity/pyramidplunder/PyramidPlunderNPC.java @@ -5,7 +5,7 @@ import core.game.node.entity.Entity; import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.path.Pathfinder; 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 9df393215..2abc09a1a 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 @@ -17,14 +17,14 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneBuilder; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.plugin.Initializable; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/content/activity/stronghold/playersafety/GuardDialoguePlugin.java b/Server/src/main/java/core/game/content/activity/stronghold/playersafety/GuardDialoguePlugin.java index 903eaa2fe..5035c3731 100644 --- a/Server/src/main/java/core/game/content/activity/stronghold/playersafety/GuardDialoguePlugin.java +++ b/Server/src/main/java/core/game/content/activity/stronghold/playersafety/GuardDialoguePlugin.java @@ -5,9 +5,9 @@ import core.game.content.dialogue.DialoguePlugin; import core.game.content.dialogue.FacialExpression; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * @author Tyler Telis 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 5fea9d65a..26c855947 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 @@ -12,7 +12,7 @@ import core.net.packet.context.CameraContext.CameraType; import core.net.packet.out.CameraViewPacket; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * @author Tyler Telis diff --git a/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightCaveNPC.java b/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightCaveNPC.java index 8fadfc166..262367320 100644 --- a/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightCaveNPC.java +++ b/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightCaveNPC.java @@ -3,7 +3,7 @@ package core.game.content.activity.tzhaar; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.InteractionType; import core.game.node.entity.combat.ImpactHandler.HitsplatType; import core.game.node.entity.combat.equipment.ArmourSet; 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 f530ae0c6..ff93f6f97 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 @@ -18,11 +18,11 @@ import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.build.DynamicRegion; import core.game.world.map.zone.ZoneRestriction; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.plugin.Initializable; import core.tools.RandomFunction; 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 6dd636a05..21e53844f 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 @@ -24,7 +24,7 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.zone.ZoneBorders; 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 e69ac3c01..65b558646 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 @@ -14,7 +14,7 @@ import core.game.node.object.GameObject; import core.game.world.map.Location; import core.plugin.Plugin; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the warrior guild options. 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 81bd3fa2b..201b68f71 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 @@ -11,7 +11,7 @@ import core.game.node.object.GameObject; import core.game.system.task.ItemLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBorders; 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 b6c126b3e..aad5e4556 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 @@ -15,7 +15,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneBuilder; @@ -23,7 +23,7 @@ import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** 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 874b4cf28..a488c2f02 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 @@ -22,7 +22,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.zone.MapZone; @@ -30,7 +30,7 @@ import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneBuilder; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.plugin.Initializable; import core.tools.RandomFunction; 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 242da69bf..926356cb8 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 @@ -19,7 +19,7 @@ import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.path.Pathfinder; @@ -28,7 +28,7 @@ import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneBuilder; import core.game.world.map.zone.ZoneRestriction; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** 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 c1bc6cba0..a44fe7e78 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 @@ -11,7 +11,7 @@ import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.update.flag.chunk.AnimateObjectUpdateFlag; 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 6a935373f..bd5077697 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 @@ -18,11 +18,11 @@ import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** diff --git a/Server/src/main/java/core/game/content/ame/AntiMacroDialogue.java b/Server/src/main/java/core/game/content/ame/AntiMacroDialogue.java index 7e2dfda15..1208796a4 100644 --- a/Server/src/main/java/core/game/content/ame/AntiMacroDialogue.java +++ b/Server/src/main/java/core/game/content/ame/AntiMacroDialogue.java @@ -4,7 +4,7 @@ import core.game.content.dialogue.DialoguePlugin; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.PluginManifest; diff --git a/Server/src/main/java/core/game/content/ame/AntiMacroHandler.java b/Server/src/main/java/core/game/content/ame/AntiMacroHandler.java index 229c429a3..6eb635d2c 100644 --- a/Server/src/main/java/core/game/content/ame/AntiMacroHandler.java +++ b/Server/src/main/java/core/game/content/ame/AntiMacroHandler.java @@ -1,13 +1,13 @@ package core.game.content.ame; import core.cache.misc.buffer.ByteBufferUtils; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.game.world.map.zone.impl.WildernessZone; import core.game.node.entity.skill.Skills; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.zone.ZoneRestriction; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/content/ame/AntiMacroNPC.java b/Server/src/main/java/core/game/content/ame/AntiMacroNPC.java index 42a73517c..34e3de16c 100644 --- a/Server/src/main/java/core/game/content/ame/AntiMacroNPC.java +++ b/Server/src/main/java/core/game/content/ame/AntiMacroNPC.java @@ -6,7 +6,7 @@ import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.path.Pathfinder; diff --git a/Server/src/main/java/core/game/content/ame/events/drilldemon/DrillDemonEvent.java b/Server/src/main/java/core/game/content/ame/events/drilldemon/DrillDemonEvent.java index a464a572f..1060d4ec3 100644 --- a/Server/src/main/java/core/game/content/ame/events/drilldemon/DrillDemonEvent.java +++ b/Server/src/main/java/core/game/content/ame/events/drilldemon/DrillDemonEvent.java @@ -9,11 +9,11 @@ import core.game.node.entity.Entity; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Graphics; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the drill demon event. diff --git a/Server/src/main/java/core/game/content/ame/events/drunkdwarf/DrunkDwarfEvent.java b/Server/src/main/java/core/game/content/ame/events/drunkdwarf/DrunkDwarfEvent.java index 326ac09a2..d889b8216 100644 --- a/Server/src/main/java/core/game/content/ame/events/drunkdwarf/DrunkDwarfEvent.java +++ b/Server/src/main/java/core/game/content/ame/events/drunkdwarf/DrunkDwarfEvent.java @@ -11,7 +11,7 @@ import core.game.node.item.Item; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the drunken dward anti macro event. diff --git a/Server/src/main/java/core/game/content/ame/events/evilchicken/EvilChickenNPC.java b/Server/src/main/java/core/game/content/ame/events/evilchicken/EvilChickenNPC.java index 79c00ef0c..0de5c2f42 100644 --- a/Server/src/main/java/core/game/content/ame/events/evilchicken/EvilChickenNPC.java +++ b/Server/src/main/java/core/game/content/ame/events/evilchicken/EvilChickenNPC.java @@ -3,8 +3,6 @@ package core.game.content.ame.events.evilchicken; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; -import core.game.node.entity.combat.handlers.MagicSwingHandler; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; @@ -13,6 +11,8 @@ import core.game.node.item.Item; import core.game.world.map.Location; import core.game.world.update.flag.context.Graphics; import core.tools.RandomFunction; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.handlers.MagicSwingHandler; /** * Handles the evil chicken NPC. diff --git a/Server/src/main/java/core/game/content/ame/events/evilchicken/EvilChickenRandomEvent.java b/Server/src/main/java/core/game/content/ame/events/evilchicken/EvilChickenRandomEvent.java index e919df899..7a8f6bf8d 100644 --- a/Server/src/main/java/core/game/content/ame/events/evilchicken/EvilChickenRandomEvent.java +++ b/Server/src/main/java/core/game/content/ame/events/evilchicken/EvilChickenRandomEvent.java @@ -7,7 +7,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.HintIconManager; import core.game.world.map.Location; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the evil chicken random event. diff --git a/Server/src/main/java/core/game/content/ame/events/eviltwin/EvilTwinRandomEvent.java b/Server/src/main/java/core/game/content/ame/events/eviltwin/EvilTwinRandomEvent.java index c26741f94..d3c141fc3 100644 --- a/Server/src/main/java/core/game/content/ame/events/eviltwin/EvilTwinRandomEvent.java +++ b/Server/src/main/java/core/game/content/ame/events/eviltwin/EvilTwinRandomEvent.java @@ -2,7 +2,7 @@ package core.game.content.ame.events.eviltwin; import java.nio.ByteBuffer; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.component.CloseEvent; import core.game.component.Component; import core.game.content.ame.AntiMacroEvent; @@ -15,7 +15,7 @@ import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.build.DynamicRegion; @@ -25,7 +25,7 @@ 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.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** diff --git a/Server/src/main/java/core/game/content/ame/events/genie/GenieRandomEvent.java b/Server/src/main/java/core/game/content/ame/events/genie/GenieRandomEvent.java index 9d55728f0..fead9fa39 100644 --- a/Server/src/main/java/core/game/content/ame/events/genie/GenieRandomEvent.java +++ b/Server/src/main/java/core/game/content/ame/events/genie/GenieRandomEvent.java @@ -9,7 +9,7 @@ import core.game.content.dialogue.DialoguePlugin; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.world.map.Location; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the genie random event. diff --git a/Server/src/main/java/core/game/content/ame/events/lostandfound/LostFoundRandomEvent.java b/Server/src/main/java/core/game/content/ame/events/lostandfound/LostFoundRandomEvent.java index 00563bfc3..e9e75b0e5 100644 --- a/Server/src/main/java/core/game/content/ame/events/lostandfound/LostFoundRandomEvent.java +++ b/Server/src/main/java/core/game/content/ame/events/lostandfound/LostFoundRandomEvent.java @@ -2,7 +2,7 @@ package core.game.content.ame.events.lostandfound; import java.nio.ByteBuffer; -import core.ServerConstants; +import rs09.ServerConstants; import core.cache.def.impl.ObjectDefinition; import core.game.content.ame.AntiMacroEvent; import core.game.interaction.Option; @@ -14,13 +14,13 @@ import core.game.node.entity.player.link.TeleportManager; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.net.packet.PacketRepository; import core.net.packet.context.MinimapStateContext; import core.net.packet.out.MinimapState; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** diff --git a/Server/src/main/java/core/game/content/ame/events/lostpirate/CapnHandEvent.java b/Server/src/main/java/core/game/content/ame/events/lostpirate/CapnHandEvent.java index cae23cdbc..34f291f86 100644 --- a/Server/src/main/java/core/game/content/ame/events/lostpirate/CapnHandEvent.java +++ b/Server/src/main/java/core/game/content/ame/events/lostpirate/CapnHandEvent.java @@ -2,7 +2,7 @@ package core.game.content.ame.events.lostpirate; import java.nio.ByteBuffer; -import core.tools.Items; +import rs09.tools.Items; import core.game.content.ame.AntiMacroDialogue; import core.game.content.ame.AntiMacroEvent; import core.game.content.dialogue.DialoguePlugin; @@ -11,7 +11,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.ChanceItem; import core.game.node.item.Item; import core.game.world.map.Location; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.plugin.Initializable; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterDialogue.java b/Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterDialogue.java index 6722f50d2..84b93b614 100644 --- a/Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterDialogue.java +++ b/Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterDialogue.java @@ -10,7 +10,7 @@ import core.game.content.dialogue.FacialExpression; import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.net.packet.PacketRepository; import core.net.packet.context.DisplayModelContext; diff --git a/Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterEvent.java b/Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterEvent.java index b74d926fe..d26b26e84 100644 --- a/Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterEvent.java +++ b/Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterEvent.java @@ -2,7 +2,7 @@ package core.game.content.ame.events.quizmaster; import java.nio.ByteBuffer; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.content.ame.AntiMacroEvent; import core.game.node.entity.Entity; import core.game.node.entity.npc.NPC; @@ -14,7 +14,7 @@ import core.net.packet.context.CameraContext; import core.net.packet.context.CameraContext.CameraType; import core.net.packet.out.CameraViewPacket; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the quiz master random event. diff --git a/Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterNPC.java b/Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterNPC.java index 7e3684c40..3f74b3fca 100644 --- a/Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterNPC.java +++ b/Server/src/main/java/core/game/content/ame/events/quizmaster/QuizMasterNPC.java @@ -4,7 +4,7 @@ import core.game.content.ame.AntiMacroEvent; import core.game.content.ame.AntiMacroNPC; import core.game.node.entity.player.Player; import core.game.world.map.Location; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; /** * Handles the quiz master npc. diff --git a/Server/src/main/java/core/game/content/ame/events/rickturpentine/RickTurpentineEvent.java b/Server/src/main/java/core/game/content/ame/events/rickturpentine/RickTurpentineEvent.java index 862c48047..e3c19939a 100644 --- a/Server/src/main/java/core/game/content/ame/events/rickturpentine/RickTurpentineEvent.java +++ b/Server/src/main/java/core/game/content/ame/events/rickturpentine/RickTurpentineEvent.java @@ -10,10 +10,10 @@ import core.game.node.entity.player.Player; import core.game.node.item.ChanceItem; import core.game.node.item.Item; import core.game.world.map.Location; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.plugin.Initializable; import core.tools.RandomFunction; -import core.tools.Items; +import rs09.tools.Items; /** * Handles the rick turpentine anti macro event. diff --git a/Server/src/main/java/core/game/content/ame/events/rickturpentine/RickTurpentineNPC.java b/Server/src/main/java/core/game/content/ame/events/rickturpentine/RickTurpentineNPC.java index a917b48e9..0a2585faa 100644 --- a/Server/src/main/java/core/game/content/ame/events/rickturpentine/RickTurpentineNPC.java +++ b/Server/src/main/java/core/game/content/ame/events/rickturpentine/RickTurpentineNPC.java @@ -5,7 +5,7 @@ import core.game.content.ame.AntiMacroNPC; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; /** diff --git a/Server/src/main/java/core/game/content/consumable/Consumables.java b/Server/src/main/java/core/game/content/consumable/Consumables.java index 3c02fd15e..fc7569cf7 100644 --- a/Server/src/main/java/core/game/content/consumable/Consumables.java +++ b/Server/src/main/java/core/game/content/consumable/Consumables.java @@ -1,6 +1,6 @@ package core.game.content.consumable; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.entity.state.EntityState; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/content/consumable/effects/SetAttributeEffect.java b/Server/src/main/java/core/game/content/consumable/effects/SetAttributeEffect.java index 3b767d39f..6a2b6776c 100644 --- a/Server/src/main/java/core/game/content/consumable/effects/SetAttributeEffect.java +++ b/Server/src/main/java/core/game/content/consumable/effects/SetAttributeEffect.java @@ -1,7 +1,7 @@ package core.game.content.consumable.effects; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.content.consumable.ConsumableEffect; public class SetAttributeEffect extends ConsumableEffect { 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 0a01f49d7..3c9d270a7 100644 --- a/Server/src/main/java/core/game/content/cutscene/DBRCutscenePlugin.java +++ b/Server/src/main/java/core/game/content/cutscene/DBRCutscenePlugin.java @@ -22,7 +22,7 @@ import core.game.node.item.ItemPlugin; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.RegionManager; @@ -35,7 +35,7 @@ import core.net.packet.context.CameraContext; import core.net.packet.context.CameraContext.CameraType; import core.net.packet.out.CameraViewPacket; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the draynor bank robbery cutscene plugin. diff --git a/Server/src/main/java/core/game/content/cutscene/GECutscenePlugin.java b/Server/src/main/java/core/game/content/cutscene/GECutscenePlugin.java index bdd679d68..0106ab8f3 100644 --- a/Server/src/main/java/core/game/content/cutscene/GECutscenePlugin.java +++ b/Server/src/main/java/core/game/content/cutscene/GECutscenePlugin.java @@ -11,7 +11,7 @@ import core.game.ge.GEGuidePrice; import core.game.ge.GEGuidePrice.GuideType; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/cutscene/JulietCutscenePlugin.java b/Server/src/main/java/core/game/content/cutscene/JulietCutscenePlugin.java index 3e1645307..41a997c8c 100644 --- a/Server/src/main/java/core/game/content/cutscene/JulietCutscenePlugin.java +++ b/Server/src/main/java/core/game/content/cutscene/JulietCutscenePlugin.java @@ -14,7 +14,7 @@ import core.net.packet.context.CameraContext; import core.net.packet.context.CameraContext.CameraType; import core.net.packet.out.CameraViewPacket; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the romeo and juliet cutscene plugin. diff --git a/Server/src/main/java/core/game/content/cutscene/JulietDialogue.java b/Server/src/main/java/core/game/content/cutscene/JulietDialogue.java index dddc30d12..e78cd5112 100644 --- a/Server/src/main/java/core/game/content/cutscene/JulietDialogue.java +++ b/Server/src/main/java/core/game/content/cutscene/JulietDialogue.java @@ -10,10 +10,10 @@ import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.path.Path; import core.game.world.map.path.Pathfinder; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.game.world.update.flag.context.Animation; /** 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 387a6226a..24c4018d5 100644 --- a/Server/src/main/java/core/game/content/cutscene/OrganCutScene.java +++ b/Server/src/main/java/core/game/content/cutscene/OrganCutScene.java @@ -7,7 +7,7 @@ import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/RJCutscenePlugin.java b/Server/src/main/java/core/game/content/cutscene/RJCutscenePlugin.java index b42019fb2..ed94f6b8a 100644 --- a/Server/src/main/java/core/game/content/cutscene/RJCutscenePlugin.java +++ b/Server/src/main/java/core/game/content/cutscene/RJCutscenePlugin.java @@ -10,7 +10,7 @@ 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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.build.DynamicRegion; diff --git a/Server/src/main/java/core/game/content/dialogue/AablaDialogue.java b/Server/src/main/java/core/game/content/dialogue/AablaDialogue.java index e3c08a55d..5f85a8244 100644 --- a/Server/src/main/java/core/game/content/dialogue/AablaDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/AablaDialogue.java @@ -4,7 +4,7 @@ import core.game.node.entity.skill.Skills; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Initializable; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/content/dialogue/BrotherJeredDialogue.java b/Server/src/main/java/core/game/content/dialogue/BrotherJeredDialogue.java index bdb1ee515..445002778 100644 --- a/Server/src/main/java/core/game/content/dialogue/BrotherJeredDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/BrotherJeredDialogue.java @@ -2,7 +2,7 @@ package core.game.content.dialogue; import core.game.content.global.Skillcape; import core.game.node.item.Item; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.entity.skill.Skills; import core.game.node.entity.npc.NPC; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/content/dialogue/CaptainBentleyDialogue.java b/Server/src/main/java/core/game/content/dialogue/CaptainBentleyDialogue.java index 22052d3fb..9ba748def 100644 --- a/Server/src/main/java/core/game/content/dialogue/CaptainBentleyDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/CaptainBentleyDialogue.java @@ -4,7 +4,7 @@ import core.game.component.Component; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.net.packet.PacketRepository; import core.net.packet.context.MinimapStateContext; diff --git a/Server/src/main/java/core/game/content/dialogue/CaptainShanksDialogue.java b/Server/src/main/java/core/game/content/dialogue/CaptainShanksDialogue.java index 31ae90b8b..cfa69825f 100644 --- a/Server/src/main/java/core/game/content/dialogue/CaptainShanksDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/CaptainShanksDialogue.java @@ -1,7 +1,7 @@ package core.game.content.dialogue; import core.plugin.Initializable; -import core.tools.Items; +import rs09.tools.Items; import core.game.content.global.travel.ship.Ships; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/core/game/content/dialogue/DairyChurnDialogue.java b/Server/src/main/java/core/game/content/dialogue/DairyChurnDialogue.java index 439215ebf..60778dc37 100644 --- a/Server/src/main/java/core/game/content/dialogue/DairyChurnDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/DairyChurnDialogue.java @@ -2,7 +2,7 @@ package core.game.content.dialogue; import core.game.component.Component; import core.plugin.Initializable; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.entity.skill.cooking.dairy.DairyChurnPulse; import core.game.node.entity.skill.cooking.dairy.DairyProduct; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/core/game/content/dialogue/DialogueInterpreter.java b/Server/src/main/java/core/game/content/dialogue/DialogueInterpreter.java index 1cf0ced42..f9595bdae 100644 --- a/Server/src/main/java/core/game/content/dialogue/DialogueInterpreter.java +++ b/Server/src/main/java/core/game/content/dialogue/DialogueInterpreter.java @@ -3,8 +3,6 @@ package core.game.content.dialogue; import core.cache.def.impl.ItemDefinition; import core.cache.def.impl.NPCDefinition; import core.game.component.Component; -import core.game.system.SystemLogger; -import core.game.system.config.ItemConfigParser; import core.game.content.quest.tutorials.tutorialisland.TutorialSession; import core.game.node.entity.Entity; import core.game.node.entity.npc.NPC; @@ -18,13 +16,17 @@ import core.net.packet.context.ContainerContext; import core.net.packet.out.ContainerPacket; import core.plugin.PluginManifest; import core.plugin.PluginType; +import rs09.game.content.dialogue.DialogueFile; +import rs09.game.content.dialogue.EmptyPlugin; +import rs09.game.system.config.ItemConfigParser; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import static core.tools.DialogueConstKt.END_DIALOGUE; +import static rs09.tools.DialogueConstKt.END_DIALOGUE; + /** * Handles the dialogues. @@ -137,7 +139,7 @@ public final class DialogueInterpreter { return true; } - public void open(DialogueFile file,Object... args){ + public void open(DialogueFile file, Object... args){ this.dialogue = new EmptyPlugin(player,file); this.dialogue.open(args); } diff --git a/Server/src/main/java/core/game/content/dialogue/DialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/DialoguePlugin.java index 135509542..e871c241b 100644 --- a/Server/src/main/java/core/game/content/dialogue/DialoguePlugin.java +++ b/Server/src/main/java/core/game/content/dialogue/DialoguePlugin.java @@ -7,11 +7,12 @@ import core.game.node.entity.player.Player; import core.plugin.Plugin; import core.plugin.PluginManifest; import core.plugin.PluginType; +import rs09.game.content.dialogue.DialogueFile; import java.util.ArrayList; -import static core.tools.DialogueConstKt.DIALOGUE_INITIAL_OPTIONS_HANDLE; -import static core.tools.DialogueConstKt.START_DIALOGUE; +import static rs09.tools.DialogueConstKt.DIALOGUE_INITIAL_OPTIONS_HANDLE; +import static rs09.tools.DialogueConstKt.START_DIALOGUE; /** * Represents a dialogue plugin. @@ -73,7 +74,7 @@ public abstract class DialoguePlugin implements Plugin { /** * The current dialogue stage. */ - protected int stage; + public int stage; /** * If the dialogue is finished. diff --git a/Server/src/main/java/core/game/content/dialogue/DonieDialogue.java b/Server/src/main/java/core/game/content/dialogue/DonieDialogue.java index d1236b494..6ce8ea051 100644 --- a/Server/src/main/java/core/game/content/dialogue/DonieDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/DonieDialogue.java @@ -3,7 +3,7 @@ package core.game.content.dialogue; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.plugin.Initializable; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * Represents the dialogue plugin used for the donie npc. diff --git a/Server/src/main/java/core/game/content/dialogue/DoricDialogue.java b/Server/src/main/java/core/game/content/dialogue/DoricDialogue.java index 89779d01a..c5601462a 100644 --- a/Server/src/main/java/core/game/content/dialogue/DoricDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/DoricDialogue.java @@ -6,7 +6,7 @@ import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.plugin.Initializable; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * Represents the dialogue plugin used for the doric npc. diff --git a/Server/src/main/java/core/game/content/dialogue/EblisDialogue.java b/Server/src/main/java/core/game/content/dialogue/EblisDialogue.java index 3e630a03e..574f90fa8 100644 --- a/Server/src/main/java/core/game/content/dialogue/EblisDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/EblisDialogue.java @@ -4,7 +4,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.item.Item; import core.plugin.Initializable; import core.game.node.entity.player.Player; -import core.tools.Items; +import rs09.tools.Items; /** * Handles Eblis's dialogue. diff --git a/Server/src/main/java/core/game/content/dialogue/EventLocatorDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/EventLocatorDialoguePlugin.java index 87786d008..4925b502d 100644 --- a/Server/src/main/java/core/game/content/dialogue/EventLocatorDialoguePlugin.java +++ b/Server/src/main/java/core/game/content/dialogue/EventLocatorDialoguePlugin.java @@ -1,6 +1,6 @@ package core.game.content.dialogue; -import core.ServerConstants; +import rs09.ServerConstants; import core.plugin.Initializable; import core.game.node.entity.skill.Skills; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/core/game/content/dialogue/FaladorSquireDialogue.java b/Server/src/main/java/core/game/content/dialogue/FaladorSquireDialogue.java index 9aa8cdf81..d5d97c6b8 100644 --- a/Server/src/main/java/core/game/content/dialogue/FaladorSquireDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/FaladorSquireDialogue.java @@ -8,7 +8,7 @@ import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.plugin.Initializable; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * Represents the falador squire dialogue plugin. diff --git a/Server/src/main/java/core/game/content/dialogue/GalahadDialogue.java b/Server/src/main/java/core/game/content/dialogue/GalahadDialogue.java index 497892a9f..4209d95de 100644 --- a/Server/src/main/java/core/game/content/dialogue/GalahadDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/GalahadDialogue.java @@ -1,7 +1,7 @@ package core.game.content.dialogue; import core.plugin.Initializable; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; diff --git a/Server/src/main/java/core/game/content/dialogue/GertrudesCatDialogue.java b/Server/src/main/java/core/game/content/dialogue/GertrudesCatDialogue.java index b525aedf4..f9a8f35d0 100644 --- a/Server/src/main/java/core/game/content/dialogue/GertrudesCatDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/GertrudesCatDialogue.java @@ -4,7 +4,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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Initializable; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/content/dialogue/GnomeSpiritTreeDialogue.java b/Server/src/main/java/core/game/content/dialogue/GnomeSpiritTreeDialogue.java index 9af8e9c8a..403cca888 100644 --- a/Server/src/main/java/core/game/content/dialogue/GnomeSpiritTreeDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/GnomeSpiritTreeDialogue.java @@ -3,7 +3,7 @@ package core.game.content.dialogue; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/dialogue/GrandExchangeTutor.java b/Server/src/main/java/core/game/content/dialogue/GrandExchangeTutor.java index c9c92f9dc..63ff47cf7 100644 --- a/Server/src/main/java/core/game/content/dialogue/GrandExchangeTutor.java +++ b/Server/src/main/java/core/game/content/dialogue/GrandExchangeTutor.java @@ -3,7 +3,7 @@ package core.game.content.dialogue; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.plugin.Initializable; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * Represents the dialogue plugin used for the grand exchange tutor. diff --git a/Server/src/main/java/core/game/content/dialogue/HarryDialogue.java b/Server/src/main/java/core/game/content/dialogue/HarryDialogue.java index f41daebb5..f04139284 100644 --- a/Server/src/main/java/core/game/content/dialogue/HarryDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/HarryDialogue.java @@ -1,6 +1,6 @@ package core.game.content.dialogue; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.entity.npc.NPC; import core.game.node.item.Item; import core.plugin.Initializable; 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 19d2f80b7..c39690268 100644 --- a/Server/src/main/java/core/game/content/dialogue/IgnatiusVulcanDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/IgnatiusVulcanDialogue.java @@ -8,7 +8,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; -import core.game.world.GameWorld; +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/content/dialogue/InformationclerkMuseumDialogue.java b/Server/src/main/java/core/game/content/dialogue/InformationclerkMuseumDialogue.java index 5e3caf39a..6459c09ea 100644 --- a/Server/src/main/java/core/game/content/dialogue/InformationclerkMuseumDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/InformationclerkMuseumDialogue.java @@ -4,8 +4,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.plugin.Initializable; -import core.game.world.GameWorld; -import core.tools.Items; +import rs09.game.world.GameWorld; +import rs09.tools.Items; /** * Represents the information clerk museum dialogue plugin diff --git a/Server/src/main/java/core/game/content/dialogue/JiminuaDialogue.java b/Server/src/main/java/core/game/content/dialogue/JiminuaDialogue.java index 5c1581541..adf49aea8 100644 --- a/Server/src/main/java/core/game/content/dialogue/JiminuaDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/JiminuaDialogue.java @@ -1,14 +1,14 @@ package core.game.content.dialogue; import core.plugin.Initializable; -import core.tools.Items; +import rs09.tools.Items; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.npc.NPC; import core.game.node.item.Item; import core.game.node.entity.player.Player; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the jiminua dialogue plugin. diff --git a/Server/src/main/java/core/game/content/dialogue/KittenInteractDialogue.java b/Server/src/main/java/core/game/content/dialogue/KittenInteractDialogue.java index 48b8f431f..f9b024785 100644 --- a/Server/src/main/java/core/game/content/dialogue/KittenInteractDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/KittenInteractDialogue.java @@ -3,7 +3,7 @@ package core.game.content.dialogue; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.RegionManager; import core.game.world.map.path.Path; import core.game.world.map.path.Pathfinder; diff --git a/Server/src/main/java/core/game/content/dialogue/LeatherCraftDialogue.java b/Server/src/main/java/core/game/content/dialogue/LeatherCraftDialogue.java index c1ab6b422..bbeb23833 100644 --- a/Server/src/main/java/core/game/content/dialogue/LeatherCraftDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/LeatherCraftDialogue.java @@ -2,7 +2,7 @@ package core.game.content.dialogue; import core.cache.def.impl.ItemDefinition; import core.game.component.Component; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.game.node.entity.skill.crafting.armour.DragonCraftPulse; import core.game.node.entity.skill.crafting.armour.HardCraftPulse; import core.game.node.entity.skill.crafting.armour.LeatherCrafting; diff --git a/Server/src/main/java/core/game/content/dialogue/LokarSearunnerDialogue.java b/Server/src/main/java/core/game/content/dialogue/LokarSearunnerDialogue.java index fc307cecf..0a1271b41 100644 --- a/Server/src/main/java/core/game/content/dialogue/LokarSearunnerDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/LokarSearunnerDialogue.java @@ -4,7 +4,7 @@ import core.game.component.Component; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.net.packet.PacketRepository; import core.net.packet.context.MinimapStateContext; diff --git a/Server/src/main/java/core/game/content/dialogue/LumbridgeGuideDialogue.java b/Server/src/main/java/core/game/content/dialogue/LumbridgeGuideDialogue.java index a37cb9dd8..3a0275bc8 100644 --- a/Server/src/main/java/core/game/content/dialogue/LumbridgeGuideDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/LumbridgeGuideDialogue.java @@ -8,7 +8,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.info.Rights; import core.game.node.entity.player.link.IronmanMode; import core.game.node.entity.player.link.diary.DiaryType; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.zone.impl.ModeratorZone; import core.plugin.Initializable; import core.net.amsc.MSPacketRepository; diff --git a/Server/src/main/java/core/game/content/dialogue/ManDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/ManDialoguePlugin.java index 4e4aa2a1b..a2a33118e 100644 --- a/Server/src/main/java/core/game/content/dialogue/ManDialoguePlugin.java +++ b/Server/src/main/java/core/game/content/dialogue/ManDialoguePlugin.java @@ -1,7 +1,7 @@ package core.game.content.dialogue; import core.plugin.Initializable; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; diff --git a/Server/src/main/java/core/game/content/dialogue/MartinThwaitDialogue.java b/Server/src/main/java/core/game/content/dialogue/MartinThwaitDialogue.java index f0b584ebf..d01b5ee83 100644 --- a/Server/src/main/java/core/game/content/dialogue/MartinThwaitDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/MartinThwaitDialogue.java @@ -9,7 +9,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.plugin.Plugin; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the dialogue used for martin thwait. 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 baa6b5c8f..99cae6a54 100644 --- a/Server/src/main/java/core/game/content/dialogue/MithrilSeedsDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/MithrilSeedsDialogue.java @@ -5,7 +5,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.game.world.update.flag.player.FaceLocationFlag; 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 eb6717d3a..198a5f2b3 100644 --- a/Server/src/main/java/core/game/content/dialogue/MithrilSeedsPlugin.java +++ b/Server/src/main/java/core/game/content/dialogue/MithrilSeedsPlugin.java @@ -8,7 +8,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.player.FaceLocationFlag; diff --git a/Server/src/main/java/core/game/content/dialogue/PartyPeteDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/PartyPeteDialoguePlugin.java index 6c9fbb537..c42a8e77a 100644 --- a/Server/src/main/java/core/game/content/dialogue/PartyPeteDialoguePlugin.java +++ b/Server/src/main/java/core/game/content/dialogue/PartyPeteDialoguePlugin.java @@ -2,7 +2,7 @@ package core.game.content.dialogue; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Initializable; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/content/dialogue/PrinceAliDialogue.java b/Server/src/main/java/core/game/content/dialogue/PrinceAliDialogue.java index 4c43d3985..4d6fdfcba 100644 --- a/Server/src/main/java/core/game/content/dialogue/PrinceAliDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/PrinceAliDialogue.java @@ -6,7 +6,7 @@ import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; import core.game.system.task.Pulse; import core.plugin.Initializable; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * Represents the dialogue used to handle the Pricne Ali NPC. diff --git a/Server/src/main/java/core/game/content/dialogue/ProfessorOddensteinPlugin.java b/Server/src/main/java/core/game/content/dialogue/ProfessorOddensteinPlugin.java index afcd2d622..db91481cf 100644 --- a/Server/src/main/java/core/game/content/dialogue/ProfessorOddensteinPlugin.java +++ b/Server/src/main/java/core/game/content/dialogue/ProfessorOddensteinPlugin.java @@ -6,9 +6,9 @@ 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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.game.world.update.flag.context.Graphics; diff --git a/Server/src/main/java/core/game/content/dialogue/ResearcherDialogue.java b/Server/src/main/java/core/game/content/dialogue/ResearcherDialogue.java index 14f4a81d3..e106c720b 100644 --- a/Server/src/main/java/core/game/content/dialogue/ResearcherDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/ResearcherDialogue.java @@ -3,7 +3,7 @@ package core.game.content.dialogue; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.plugin.Initializable; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * Represents the dialogue plugin for the new Researcher NPC that sells unobtainable items. diff --git a/Server/src/main/java/core/game/content/dialogue/RomilyWeaklaxDialogue.java b/Server/src/main/java/core/game/content/dialogue/RomilyWeaklaxDialogue.java index 42468eac4..d25072b3d 100644 --- a/Server/src/main/java/core/game/content/dialogue/RomilyWeaklaxDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/RomilyWeaklaxDialogue.java @@ -1,6 +1,6 @@ package core.game.content.dialogue; -import core.tools.Items; +import rs09.tools.Items; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.npc.NPC; @@ -9,7 +9,7 @@ import core.game.node.item.Item; import core.plugin.Initializable; import core.game.node.entity.player.Player; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** diff --git a/Server/src/main/java/core/game/content/dialogue/RugMerchantDialogue.java b/Server/src/main/java/core/game/content/dialogue/RugMerchantDialogue.java index f271cb2f8..2493a12f0 100644 --- a/Server/src/main/java/core/game/content/dialogue/RugMerchantDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/RugMerchantDialogue.java @@ -10,14 +10,15 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; -import core.plugin.PluginManager; -import core.tools.Items; +import rs09.plugin.PluginManager; +import rs09.tools.Items; + +import static rs09.tools.stringtools.StringToolsKt.colorize; -import static core.tools.stringtools.StringToolsKt.colorize; /** * The dialogue plugin used for the rug merchant. diff --git a/Server/src/main/java/core/game/content/dialogue/SaniDialogue.java b/Server/src/main/java/core/game/content/dialogue/SaniDialogue.java index 6ba5cd88a..50b26e74c 100644 --- a/Server/src/main/java/core/game/content/dialogue/SaniDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/SaniDialogue.java @@ -1,10 +1,10 @@ package core.game.content.dialogue; -import core.game.system.config.ShopParser; -import core.plugin.Initializable; -import core.game.node.entity.skill.Skills; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; +import core.game.node.entity.skill.Skills; +import core.plugin.Initializable; +import rs09.game.system.config.ShopParser; /** * Handles the SaniDialogue dialogue. diff --git a/Server/src/main/java/core/game/content/dialogue/SeamanDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/SeamanDialoguePlugin.java index a5330fe1d..18e488244 100644 --- a/Server/src/main/java/core/game/content/dialogue/SeamanDialoguePlugin.java +++ b/Server/src/main/java/core/game/content/dialogue/SeamanDialoguePlugin.java @@ -2,7 +2,7 @@ package core.game.content.dialogue; import core.game.container.impl.EquipmentContainer; import core.plugin.Initializable; -import core.tools.Items; +import rs09.tools.Items; import core.game.content.global.travel.ship.Ships; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/core/game/content/dialogue/SeravelDialogue.java b/Server/src/main/java/core/game/content/dialogue/SeravelDialogue.java index e7b5ff147..2df86a4a9 100644 --- a/Server/src/main/java/core/game/content/dialogue/SeravelDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/SeravelDialogue.java @@ -4,7 +4,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.plugin.Initializable; -import core.tools.Items; +import rs09.tools.Items; @Initializable public class SeravelDialogue extends DialoguePlugin { diff --git a/Server/src/main/java/core/game/content/dialogue/ShantayDialogue.java b/Server/src/main/java/core/game/content/dialogue/ShantayDialogue.java index 16c9fa469..bcd5dcfa2 100644 --- a/Server/src/main/java/core/game/content/dialogue/ShantayDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/ShantayDialogue.java @@ -4,7 +4,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Initializable; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/dialogue/ShantayGuard.java b/Server/src/main/java/core/game/content/dialogue/ShantayGuard.java index 43ecd4b00..1e35e76ab 100644 --- a/Server/src/main/java/core/game/content/dialogue/ShantayGuard.java +++ b/Server/src/main/java/core/game/content/dialogue/ShantayGuard.java @@ -6,10 +6,10 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.path.Pathfinder; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; /** * Represents the dialogue used for a shantay guard. diff --git a/Server/src/main/java/core/game/content/dialogue/SigmundDialogue.java b/Server/src/main/java/core/game/content/dialogue/SigmundDialogue.java index 5f1e0cf5e..238aab13c 100644 --- a/Server/src/main/java/core/game/content/dialogue/SigmundDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/SigmundDialogue.java @@ -4,7 +4,8 @@ import core.game.node.entity.npc.NPC; import core.plugin.Initializable; import core.game.node.entity.player.Player; -import static core.tools.DialogueConstKt.END_DIALOGUE; +import static rs09.tools.DialogueConstKt.END_DIALOGUE; + /** * Handles the SigmundDialogue dialogue. diff --git a/Server/src/main/java/core/game/content/dialogue/SilkMerchantPlugin.java b/Server/src/main/java/core/game/content/dialogue/SilkMerchantPlugin.java index 859e177dc..7e358127a 100644 --- a/Server/src/main/java/core/game/content/dialogue/SilkMerchantPlugin.java +++ b/Server/src/main/java/core/game/content/dialogue/SilkMerchantPlugin.java @@ -4,7 +4,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Initializable; import core.game.world.map.RegionManager; diff --git a/Server/src/main/java/core/game/content/dialogue/SirReniteeDialogue.java b/Server/src/main/java/core/game/content/dialogue/SirReniteeDialogue.java index 413f0965c..becab0ba0 100644 --- a/Server/src/main/java/core/game/content/dialogue/SirReniteeDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/SirReniteeDialogue.java @@ -2,7 +2,7 @@ package core.game.content.dialogue; import core.Util; import core.plugin.Initializable; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; diff --git a/Server/src/main/java/core/game/content/dialogue/SkillDialoguePlugin.java b/Server/src/main/java/core/game/content/dialogue/SkillDialoguePlugin.java index acc57b927..a271db6b4 100644 --- a/Server/src/main/java/core/game/content/dialogue/SkillDialoguePlugin.java +++ b/Server/src/main/java/core/game/content/dialogue/SkillDialoguePlugin.java @@ -1,8 +1,9 @@ package core.game.content.dialogue; import core.game.node.entity.player.Player; -import core.plugin.Initializable; import core.game.node.entity.player.link.RunScript; +import core.plugin.Initializable; +import rs09.game.content.dialogue.SkillDialogueHandler; /** * Represents the dialogue plugin used to automatically handle skill dialogues with creation amounts. diff --git a/Server/src/main/java/core/game/content/dialogue/SorcceresDialouge.java b/Server/src/main/java/core/game/content/dialogue/SorcceresDialouge.java index 417aa5a88..439fc9acf 100644 --- a/Server/src/main/java/core/game/content/dialogue/SorcceresDialouge.java +++ b/Server/src/main/java/core/game/content/dialogue/SorcceresDialouge.java @@ -3,7 +3,7 @@ package core.game.content.dialogue; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Initializable; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/content/dialogue/StankersDialogue.java b/Server/src/main/java/core/game/content/dialogue/StankersDialogue.java index c3dbcee95..06645b970 100644 --- a/Server/src/main/java/core/game/content/dialogue/StankersDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/StankersDialogue.java @@ -1,6 +1,6 @@ package core.game.content.dialogue; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.AchievementDiary; diff --git a/Server/src/main/java/core/game/content/dialogue/TownCrierDialogue.java b/Server/src/main/java/core/game/content/dialogue/TownCrierDialogue.java index 0f4554c4c..583bfceb6 100644 --- a/Server/src/main/java/core/game/content/dialogue/TownCrierDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/TownCrierDialogue.java @@ -4,7 +4,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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/content/dialogue/TownCrierDialogue.java.orig b/Server/src/main/java/core/game/content/dialogue/TownCrierDialogue.java.orig index 72738fd3c..5caa8f54a 100644 --- a/Server/src/main/java/core/game/content/dialogue/TownCrierDialogue.java.orig +++ b/Server/src/main/java/core/game/content/dialogue/TownCrierDialogue.java.orig @@ -4,7 +4,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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.tools.RandomFunction; 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 1fa045edc..f9376e348 100644 --- a/Server/src/main/java/core/game/content/dialogue/TraibornDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/TraibornDialogue.java @@ -7,7 +7,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/content/dialogue/book/SecurityBookPlugin.java b/Server/src/main/java/core/game/content/dialogue/book/SecurityBookPlugin.java index 2f888913b..7dae0c0eb 100644 --- a/Server/src/main/java/core/game/content/dialogue/book/SecurityBookPlugin.java +++ b/Server/src/main/java/core/game/content/dialogue/book/SecurityBookPlugin.java @@ -4,7 +4,7 @@ import core.game.component.Component; import core.game.content.dialogue.DialoguePlugin; import core.game.node.entity.player.Player; import core.plugin.Initializable; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * Represents the strong hold of security book. diff --git a/Server/src/main/java/core/game/content/global/BirdNest.java b/Server/src/main/java/core/game/content/global/BirdNest.java index b90e2112e..6852a7dd2 100644 --- a/Server/src/main/java/core/game/content/global/BirdNest.java +++ b/Server/src/main/java/core/game/content/global/BirdNest.java @@ -1,6 +1,6 @@ package core.game.content.global; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.entity.npc.drop.NPCDropTables; import core.game.node.entity.player.Player; import core.game.node.item.ChanceItem; diff --git a/Server/src/main/java/core/game/content/global/EnchantedJewellery.java b/Server/src/main/java/core/game/content/global/EnchantedJewellery.java index 880cbfb92..6c8b1b9ee 100644 --- a/Server/src/main/java/core/game/content/global/EnchantedJewellery.java +++ b/Server/src/main/java/core/game/content/global/EnchantedJewellery.java @@ -4,7 +4,7 @@ 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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; 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/content/global/GodType.java b/Server/src/main/java/core/game/content/global/GodType.java index 5b6a49b40..15d72570a 100644 --- a/Server/src/main/java/core/game/content/global/GodType.java +++ b/Server/src/main/java/core/game/content/global/GodType.java @@ -7,7 +7,7 @@ import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.tools.StringUtils; diff --git a/Server/src/main/java/core/game/content/global/LightSource.java b/Server/src/main/java/core/game/content/global/LightSource.java index 5db547637..437c966b0 100644 --- a/Server/src/main/java/core/game/content/global/LightSource.java +++ b/Server/src/main/java/core/game/content/global/LightSource.java @@ -3,8 +3,10 @@ package core.game.content.global; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import static core.tools.Interfaces.*; -import static core.tools.Items.*; +import static rs09.tools.Interfaces.DARKNESS_LIGHT_97; +import static rs09.tools.Interfaces.DARKNESS_MEDIUM_98; +import static rs09.tools.Items.*; + /** * Represents a light source. diff --git a/Server/src/main/java/core/game/content/global/SkillingPets.java b/Server/src/main/java/core/game/content/global/SkillingPets.java index efd9e8a21..8c34f7d0c 100644 --- a/Server/src/main/java/core/game/content/global/SkillingPets.java +++ b/Server/src/main/java/core/game/content/global/SkillingPets.java @@ -3,7 +3,7 @@ package core.game.content.global; import core.game.node.entity.skill.Skills; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; /** * Represents the skilling pets obtained randomly. 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 d9f8e914f..55772b61d 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 @@ -1,14 +1,14 @@ package core.game.content.global.action; import core.game.container.impl.EquipmentContainer; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.entity.player.link.diary.DiaryType; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.game.content.dialogue.DialoguePlugin; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/global/action/DigSpadeHandler.java b/Server/src/main/java/core/game/content/global/action/DigSpadeHandler.java index b525d9a27..d3fe5c546 100644 --- a/Server/src/main/java/core/game/content/global/action/DigSpadeHandler.java +++ b/Server/src/main/java/core/game/content/global/action/DigSpadeHandler.java @@ -1,9 +1,9 @@ package core.game.content.global.action; import core.game.node.entity.player.Player; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; 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 e7becb234..9d18ad8c5 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 @@ -8,16 +8,15 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.object.Constructed; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; -import core.game.system.SystemLogger; -import core.game.system.config.DoorConfigLoader; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.path.Pathfinder; +import rs09.game.system.config.DoorConfigLoader; +import rs09.game.world.GameWorld; import java.awt.*; diff --git a/Server/src/main/java/core/game/content/global/action/DropItemHandler.java b/Server/src/main/java/core/game/content/global/action/DropItemHandler.java index 005757419..7801e62ba 100644 --- a/Server/src/main/java/core/game/content/global/action/DropItemHandler.java +++ b/Server/src/main/java/core/game/content/global/action/DropItemHandler.java @@ -6,8 +6,8 @@ import core.game.node.entity.player.info.login.PlayerParser; import core.game.node.entity.player.link.audio.Audio; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.system.SystemLogger; -import core.game.world.GameWorld; +import rs09.game.system.SystemLogger; +import rs09.game.world.GameWorld; /** * Handles the dropping of an item. diff --git a/Server/src/main/java/core/game/content/global/shop/Shop.java b/Server/src/main/java/core/game/content/global/shop/Shop.java index 3676cb6bc..69a8091c2 100644 --- a/Server/src/main/java/core/game/content/global/shop/Shop.java +++ b/Server/src/main/java/core/game/content/global/shop/Shop.java @@ -3,12 +3,12 @@ package core.game.content.global.shop; import core.cache.def.impl.ItemDefinition; import core.game.container.Container; import core.game.container.ContainerType; -import core.tools.Items; +import rs09.tools.Items; 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.system.config.ItemConfigParser; -import core.game.world.GameWorld; +import rs09.game.system.config.ItemConfigParser; +import rs09.game.world.GameWorld; import java.util.ArrayList; import java.util.Arrays; diff --git a/Server/src/main/java/core/game/content/global/travel/canoe/CanoeExtension.java b/Server/src/main/java/core/game/content/global/travel/canoe/CanoeExtension.java index 3589b4810..774c8bbd1 100644 --- a/Server/src/main/java/core/game/content/global/travel/canoe/CanoeExtension.java +++ b/Server/src/main/java/core/game/content/global/travel/canoe/CanoeExtension.java @@ -8,7 +8,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.net.packet.PacketRepository; import core.net.packet.context.MinimapStateContext; diff --git a/Server/src/main/java/core/game/content/global/travel/ship/ShipCharter.java b/Server/src/main/java/core/game/content/global/travel/ship/ShipCharter.java index cf7776a74..8695b5c2d 100644 --- a/Server/src/main/java/core/game/content/global/travel/ship/ShipCharter.java +++ b/Server/src/main/java/core/game/content/global/travel/ship/ShipCharter.java @@ -5,9 +5,9 @@ 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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; 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/content/global/worldevents/shootingstar/ScoreboardHandler.java b/Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardHandler.java index bc68f1fff..b51105cd9 100644 --- a/Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardHandler.java +++ b/Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardHandler.java @@ -4,7 +4,7 @@ import core.cache.def.impl.ObjectDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Plugin; public class ScoreboardHandler extends OptionHandler { diff --git a/Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardManager.java b/Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardManager.java index e06962d46..0fd20cb61 100644 --- a/Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardManager.java +++ b/Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardManager.java @@ -1,8 +1,8 @@ package core.game.content.global.worldevents.shootingstar; import core.game.node.entity.player.Player; -import core.game.system.SystemLogger; -import core.game.world.GameWorld; +import rs09.game.system.SystemLogger; +import rs09.game.world.GameWorld; import java.util.ArrayList; import java.util.List; diff --git a/Server/src/main/java/core/game/content/global/worldevents/shootingstar/StarChartPlugin.java b/Server/src/main/java/core/game/content/global/worldevents/shootingstar/StarChartPlugin.java index 02feb1f68..ac57c4a5b 100644 --- a/Server/src/main/java/core/game/content/global/worldevents/shootingstar/StarChartPlugin.java +++ b/Server/src/main/java/core/game/content/global/worldevents/shootingstar/StarChartPlugin.java @@ -8,7 +8,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.plugin.PluginManifest; @PluginManifest(name="ShootingStars") diff --git a/Server/src/main/java/core/game/content/holiday/HolidayEvent.java b/Server/src/main/java/core/game/content/holiday/HolidayEvent.java index b9ba4446f..ed374a90f 100644 --- a/Server/src/main/java/core/game/content/holiday/HolidayEvent.java +++ b/Server/src/main/java/core/game/content/holiday/HolidayEvent.java @@ -2,7 +2,7 @@ package core.game.content.holiday; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBuilder; import core.game.world.map.zone.ZoneRestriction; diff --git a/Server/src/main/java/core/game/content/holiday/HolidayItem.java b/Server/src/main/java/core/game/content/holiday/HolidayItem.java index 0c6d88578..b39a1d28b 100644 --- a/Server/src/main/java/core/game/content/holiday/HolidayItem.java +++ b/Server/src/main/java/core/game/content/holiday/HolidayItem.java @@ -4,7 +4,7 @@ import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Graphics; import core.tools.RandomFunction; 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 3da511e17..94a8d6d51 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 @@ -33,14 +33,14 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** diff --git a/Server/src/main/java/core/game/content/holiday/easter/BasketofEggsEvent.java b/Server/src/main/java/core/game/content/holiday/easter/BasketofEggsEvent.java index 929e81368..17d616ae8 100644 --- a/Server/src/main/java/core/game/content/holiday/easter/BasketofEggsEvent.java +++ b/Server/src/main/java/core/game/content/holiday/easter/BasketofEggsEvent.java @@ -18,12 +18,12 @@ import core.game.node.entity.player.link.emote.Emotes; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.plugin.Initializable; import core.tools.RandomFunction; 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 08fbf015b..2a3551aa0 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 @@ -3,7 +3,7 @@ package core.game.content.holiday.halloween; import java.util.ArrayList; import java.util.List; -import core.ServerConstants; +import rs09.ServerConstants; import core.cache.def.impl.ObjectDefinition; import core.game.component.Component; import core.plugin.Initializable; @@ -37,14 +37,14 @@ import core.game.node.object.GameObject; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneBuilder; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.net.packet.PacketRepository; @@ -52,7 +52,7 @@ import core.net.packet.context.CameraContext; import core.net.packet.context.CameraContext.CameraType; import core.net.packet.out.CameraViewPacket; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** diff --git a/Server/src/main/java/core/game/content/quest/free/ErnestTheChicken.java b/Server/src/main/java/core/game/content/quest/free/ErnestTheChicken.java index 6359b3541..d9eb30bc5 100644 --- a/Server/src/main/java/core/game/content/quest/free/ErnestTheChicken.java +++ b/Server/src/main/java/core/game/content/quest/free/ErnestTheChicken.java @@ -7,7 +7,7 @@ import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.world.map.Location; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the ernest the chicken quest. 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 aac9914b2..042dafa9b 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 @@ -10,9 +10,9 @@ import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/content/quest/free/blackknightsfortress/BlackKnightsFortress.java b/Server/src/main/java/core/game/content/quest/free/blackknightsfortress/BlackKnightsFortress.java index 3a054cccf..fca3763b8 100644 --- a/Server/src/main/java/core/game/content/quest/free/blackknightsfortress/BlackKnightsFortress.java +++ b/Server/src/main/java/core/game/content/quest/free/blackknightsfortress/BlackKnightsFortress.java @@ -4,7 +4,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the black knights fortress quest. diff --git a/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayer.java b/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayer.java index 46d4a4056..c1cad1f53 100644 --- a/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayer.java +++ b/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayer.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.link.quest.Quest; import core.game.node.item.Item; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the demon slayer quest. 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 4f558f283..f6957b8d9 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 @@ -16,7 +16,7 @@ import core.game.node.entity.player.link.quest.Quest; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.build.DynamicRegion; import core.game.world.map.path.Path; diff --git a/Server/src/main/java/core/game/content/quest/free/demonslayer/GypsyArisDialogue.java b/Server/src/main/java/core/game/content/quest/free/demonslayer/GypsyArisDialogue.java index b80f08ee2..5c4d4aa4a 100644 --- a/Server/src/main/java/core/game/content/quest/free/demonslayer/GypsyArisDialogue.java +++ b/Server/src/main/java/core/game/content/quest/free/demonslayer/GypsyArisDialogue.java @@ -10,7 +10,7 @@ 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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.update.flag.context.Animation; import core.net.packet.PacketRepository; diff --git a/Server/src/main/java/core/game/content/quest/free/demonslayer/SirPyrsinDialogue.java b/Server/src/main/java/core/game/content/quest/free/demonslayer/SirPyrsinDialogue.java index 273c5acda..059c66caf 100644 --- a/Server/src/main/java/core/game/content/quest/free/demonslayer/SirPyrsinDialogue.java +++ b/Server/src/main/java/core/game/content/quest/free/demonslayer/SirPyrsinDialogue.java @@ -5,7 +5,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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; 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 d3b293b0a..74c41ef90 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 @@ -9,7 +9,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/content/quest/free/demonslayer/WallyCutscenePlugin.java b/Server/src/main/java/core/game/content/quest/free/demonslayer/WallyCutscenePlugin.java index 796df85e7..b5bddd7dd 100644 --- a/Server/src/main/java/core/game/content/quest/free/demonslayer/WallyCutscenePlugin.java +++ b/Server/src/main/java/core/game/content/quest/free/demonslayer/WallyCutscenePlugin.java @@ -5,7 +5,7 @@ import core.game.content.activity.CutscenePlugin; import core.game.node.entity.player.Player; import core.game.world.map.Location; import core.game.world.map.build.DynamicRegion; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.net.packet.PacketRepository; import core.net.packet.context.CameraContext; import core.net.packet.context.CameraContext.CameraType; 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 a4fc61c88..e10ed83be 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 @@ -1,20 +1,21 @@ package core.game.content.quest.free.dragonslayer; import core.game.component.Component; -import core.game.content.dialogue.DukeHoracioDialogue; -import core.plugin.Initializable; -import core.game.node.entity.skill.Skills; -import core.game.node.entity.skill.agility.AgilityHandler; import core.game.node.entity.player.Player; 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.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; -import core.plugin.PluginManager; +import core.plugin.Initializable; +import rs09.game.content.dialogue.DukeHoracioDialogue; +import rs09.game.content.quest.free.dragonslayer.NedDialogue; +import rs09.game.world.GameWorld; +import rs09.plugin.PluginManager; /** * Represents the dragon slayer quest. diff --git a/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayerCutscene.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayerCutscene.java index 6b5b36dc7..7ef370ce8 100644 --- a/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayerCutscene.java +++ b/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayerCutscene.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.link.quest.Quest; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.build.DynamicRegion; import core.game.world.update.flag.context.Animation; 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 a07c123cb..cc38e841e 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 @@ -1,13 +1,10 @@ package core.game.content.quest.free.dragonslayer; -import java.util.List; - import core.cache.def.impl.ItemDefinition; import core.cache.def.impl.NPCDefinition; import core.cache.def.impl.ObjectDefinition; import core.game.content.global.action.ClimbActionHandler; import core.game.content.global.action.DoorActionHandler; -import core.game.content.global.action.EquipHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.Entity; @@ -24,6 +21,9 @@ 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.Listeners; + +import java.util.List; /** * Represents the plugin used to handle node interactions related to dragon slayer. @@ -147,7 +147,7 @@ public final class DragonSlayerPlugin extends OptionHandler { player.getPacketDispatch().sendMessage("You need to complete the Dragon Slayer Quest in order to wear this."); return true; } - EquipHandler.SINGLETON.handle(player, node, option); + Listeners.run(node.getId(),0,"equip",player,node); break; case 742: if (player.getQuestRepository().getQuest("Dragon Slayer").getStage(player) == 40 && (player.getInventory().containsItem(DragonSlayer.ELVARG_HEAD) || player.getInventory().containsItem(DragonSlayer.ELVARG_HEAD))) { 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 e28a4da9c..7634903a0 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 @@ -3,7 +3,7 @@ package core.game.content.quest.free.dragonslayer; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.InteractionType; import core.game.node.entity.combat.equipment.ArmourSet; import core.game.node.entity.combat.equipment.FireType; @@ -15,7 +15,7 @@ import core.game.node.item.GroundItemManager; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/quest/free/dragonslayer/MeldarMadNPC.java b/Server/src/main/java/core/game/content/quest/free/dragonslayer/MeldarMadNPC.java index 52b64e16c..1fd06c5f2 100644 --- a/Server/src/main/java/core/game/content/quest/free/dragonslayer/MeldarMadNPC.java +++ b/Server/src/main/java/core/game/content/quest/free/dragonslayer/MeldarMadNPC.java @@ -5,7 +5,7 @@ import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatSpell; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.DeathTask; import core.game.node.entity.combat.InteractionType; import core.game.node.entity.combat.equipment.ArmourSet; diff --git a/Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GDiplomacyCutscene.java b/Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GDiplomacyCutscene.java index 0ac578b50..b5d8ca474 100644 --- a/Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GDiplomacyCutscene.java +++ b/Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GDiplomacyCutscene.java @@ -11,13 +11,13 @@ 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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.build.DynamicRegion; import core.game.world.map.path.Pathfinder; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.game.world.update.flag.context.Animation; import core.net.packet.PacketRepository; import core.net.packet.context.CameraContext; diff --git a/Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GoblinDiplomacy.java b/Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GoblinDiplomacy.java index 07a90b327..59c70f6f8 100644 --- a/Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GoblinDiplomacy.java +++ b/Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GoblinDiplomacy.java @@ -6,7 +6,7 @@ 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.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the demon slayer quest. 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 b83768506..eadb65ae0 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 @@ -10,9 +10,9 @@ import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.node.object.GameObject; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.StringUtils; /** diff --git a/Server/src/main/java/core/game/content/quest/free/piratestreasure/PiratesTreasure.java b/Server/src/main/java/core/game/content/quest/free/piratestreasure/PiratesTreasure.java index 73a7f396d..d9bc2ed00 100644 --- a/Server/src/main/java/core/game/content/quest/free/piratestreasure/PiratesTreasure.java +++ b/Server/src/main/java/core/game/content/quest/free/piratestreasure/PiratesTreasure.java @@ -6,7 +6,7 @@ import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the pirates treasure quest. diff --git a/Server/src/main/java/core/game/content/quest/free/princealirescue/LadyKeliDialogue.java b/Server/src/main/java/core/game/content/quest/free/princealirescue/LadyKeliDialogue.java index 5b086d50b..d416caf68 100644 --- a/Server/src/main/java/core/game/content/quest/free/princealirescue/LadyKeliDialogue.java +++ b/Server/src/main/java/core/game/content/quest/free/princealirescue/LadyKeliDialogue.java @@ -8,7 +8,7 @@ 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.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.RegionManager; /** diff --git a/Server/src/main/java/core/game/content/quest/free/princealirescue/LadyKeliNPC.java b/Server/src/main/java/core/game/content/quest/free/princealirescue/LadyKeliNPC.java index b3c563c81..47f0cb6a0 100644 --- a/Server/src/main/java/core/game/content/quest/free/princealirescue/LadyKeliNPC.java +++ b/Server/src/main/java/core/game/content/quest/free/princealirescue/LadyKeliNPC.java @@ -2,7 +2,7 @@ package core.game.content.quest.free.princealirescue; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; /** diff --git a/Server/src/main/java/core/game/content/quest/free/princealirescue/PrinceAliRescue.java b/Server/src/main/java/core/game/content/quest/free/princealirescue/PrinceAliRescue.java index b947f7245..c161997c0 100644 --- a/Server/src/main/java/core/game/content/quest/free/princealirescue/PrinceAliRescue.java +++ b/Server/src/main/java/core/game/content/quest/free/princealirescue/PrinceAliRescue.java @@ -5,7 +5,7 @@ import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the prince ali rescue quest. 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 9d057b59e..6af80172d 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 @@ -9,7 +9,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.object.GameObject; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/free/shieldofarrav/ReldoDialogue.java b/Server/src/main/java/core/game/content/quest/free/shieldofarrav/ReldoDialogue.java index 490db4dac..57f94340f 100644 --- a/Server/src/main/java/core/game/content/quest/free/shieldofarrav/ReldoDialogue.java +++ b/Server/src/main/java/core/game/content/quest/free/shieldofarrav/ReldoDialogue.java @@ -1,6 +1,6 @@ package core.game.content.quest.free.shieldofarrav; -import core.tools.Items; +import rs09.tools.Items; import core.game.content.dialogue.DialoguePlugin; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; 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 170b94042..75ecbaabf 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 @@ -1,13 +1,10 @@ package core.game.content.quest.free.shieldofarrav; -import java.util.List; - import core.cache.def.impl.ItemDefinition; import core.cache.def.impl.ObjectDefinition; import core.game.component.Component; import core.game.content.global.action.ClimbActionHandler; import core.game.content.global.action.DoorActionHandler; -import core.game.content.global.action.PickupHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; @@ -20,9 +17,12 @@ import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; -import core.game.world.repository.Repository; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; +import rs09.game.content.global.action.PickupHandler; +import rs09.game.world.repository.Repository; + +import java.util.List; /** * Represents the shield of arrav plugin. diff --git a/Server/src/main/java/core/game/content/quest/free/shieldofarrav/ShieldofArrav.java b/Server/src/main/java/core/game/content/quest/free/shieldofarrav/ShieldofArrav.java index c283ac4d6..957d98c71 100644 --- a/Server/src/main/java/core/game/content/quest/free/shieldofarrav/ShieldofArrav.java +++ b/Server/src/main/java/core/game/content/quest/free/shieldofarrav/ShieldofArrav.java @@ -1,11 +1,11 @@ package core.game.content.quest.free.shieldofarrav; -import core.game.content.dialogue.KingRoaldDialogue; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.game.content.dialogue.KingRoaldDialogue; +import rs09.plugin.PluginManager; /** * Represents the shield of arrav quest. diff --git a/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhost.java b/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhost.java index ad39206d0..0108fadf3 100644 --- a/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhost.java +++ b/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhost.java @@ -6,7 +6,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the restless ghost quest. 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 3a6a821cd..6a327697c 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 @@ -13,7 +13,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/members/animalmagnetism/AliceHusbandDialogue.java b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AliceHusbandDialogue.java index f2d488590..d2efe20e5 100644 --- a/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AliceHusbandDialogue.java +++ b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AliceHusbandDialogue.java @@ -12,7 +12,7 @@ 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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.build.DynamicRegion; import core.game.world.map.path.Pathfinder; @@ -21,7 +21,7 @@ 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.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the husband of alice's npc dialogue. diff --git a/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AnimalMagnetism.java b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AnimalMagnetism.java index ad0366c8a..12a39c6b2 100644 --- a/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AnimalMagnetism.java +++ b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AnimalMagnetism.java @@ -4,7 +4,7 @@ import core.game.node.entity.skill.Skills; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.game.content.quest.members.animalmagnetism.AnimalMagnetismPlugin.ContainerHandler; import core.game.content.quest.members.animalmagnetism.AnimalMagnetismPlugin.HammerMagnetPlugin; diff --git a/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AnimalMagnetismPlugin.java b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AnimalMagnetismPlugin.java index 3c3591473..2031fb6c5 100644 --- a/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AnimalMagnetismPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AnimalMagnetismPlugin.java @@ -23,7 +23,7 @@ import core.game.node.entity.player.link.TeleportManager.TeleportType; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.zone.MapZone; @@ -31,7 +31,7 @@ import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneBuilder; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** diff --git a/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AvaDialogue.java b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AvaDialogue.java index 19fc32890..1fde217b6 100644 --- a/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AvaDialogue.java +++ b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AvaDialogue.java @@ -10,7 +10,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.world.GameWorld; +import rs09.game.world.GameWorld; /** * Handles the ava npc dialogue. diff --git a/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AvasDevicePlugin.java b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AvasDevicePlugin.java index f57629c0d..4b8eebd5c 100644 --- a/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AvasDevicePlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AvasDevicePlugin.java @@ -4,13 +4,10 @@ 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.entity.state.EntityState; -import core.game.node.entity.state.newsys.State; -import core.game.node.entity.state.newsys.StateRepository; -import core.game.node.entity.state.newsys.states.AvaDeviceState; import core.game.node.item.Item; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.game.node.entity.state.newsys.states.AvaDeviceState; +import rs09.plugin.PluginManager; /** * Handles the equippage event of an ava device. diff --git a/Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBane.java b/Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBane.java index 08d2a1136..4443bc4e3 100644 --- a/Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBane.java +++ b/Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBane.java @@ -3,7 +3,8 @@ package core.game.content.quest.members.asoulsbane; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.game.content.quest.members.asoulsbane.SoulsBaneLaunaDialogue; +import rs09.plugin.PluginManager; /** * Author: afaroutdude diff --git a/Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBanePlugin.java b/Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBanePlugin.java index a7ef9922f..af8d857df 100644 --- a/Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBanePlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBanePlugin.java @@ -1,7 +1,7 @@ package core.game.content.quest.members.asoulsbane; import core.cache.def.impl.ObjectDefinition; -import core.tools.Items; +import rs09.tools.Items; import core.game.interaction.MovementPulse; import core.game.interaction.NodeUsageEvent; import core.game.interaction.OptionHandler; @@ -13,11 +13,11 @@ import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Author: afaroutdude diff --git a/Server/src/main/java/core/game/content/quest/members/dwarfcannon/CannonBallPlugin.java b/Server/src/main/java/core/game/content/quest/members/dwarfcannon/CannonBallPlugin.java index 502f26365..b692b36a9 100644 --- a/Server/src/main/java/core/game/content/quest/members/dwarfcannon/CannonBallPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/dwarfcannon/CannonBallPlugin.java @@ -1,8 +1,8 @@ package core.game.content.quest.members.dwarfcannon; -import core.tools.Items; -import core.game.content.dialogue.SkillDialogueHandler; -import core.game.content.dialogue.SkillDialogueHandler.SkillDialogue; +import rs09.tools.Items; +import rs09.game.content.dialogue.SkillDialogueHandler; +import rs09.game.content.dialogue.SkillDialogueHandler.SkillDialogue; import core.game.node.entity.skill.SkillPulse; import core.game.node.entity.skill.Skills; import core.game.interaction.NodeUsageEvent; diff --git a/Server/src/main/java/core/game/content/quest/members/dwarfcannon/DwarfCannon.java b/Server/src/main/java/core/game/content/quest/members/dwarfcannon/DwarfCannon.java index aa2d16a12..20da23932 100644 --- a/Server/src/main/java/core/game/content/quest/members/dwarfcannon/DwarfCannon.java +++ b/Server/src/main/java/core/game/content/quest/members/dwarfcannon/DwarfCannon.java @@ -4,7 +4,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.game.node.entity.skill.Skills; /** diff --git a/Server/src/main/java/core/game/content/quest/members/dwarfcannon/DwarfCannonPlugin.java b/Server/src/main/java/core/game/content/quest/members/dwarfcannon/DwarfCannonPlugin.java index 610ed29f6..dbece0bd3 100644 --- a/Server/src/main/java/core/game/content/quest/members/dwarfcannon/DwarfCannonPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/dwarfcannon/DwarfCannonPlugin.java @@ -16,9 +16,9 @@ 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.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +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/quest/members/fishingcontest/FenceInteraction.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/FenceInteraction.java index 7e74f82da..5f1f0e2c8 100644 --- a/Server/src/main/java/core/game/content/quest/members/fishingcontest/FenceInteraction.java +++ b/Server/src/main/java/core/game/content/quest/members/fishingcontest/FenceInteraction.java @@ -4,7 +4,7 @@ import core.game.interaction.MovementPulse; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/members/fishingcontest/FishingContestCutscene.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/FishingContestCutscene.java index e27104df7..e85409c21 100644 --- a/Server/src/main/java/core/game/content/quest/members/fishingcontest/FishingContestCutscene.java +++ b/Server/src/main/java/core/game/content/quest/members/fishingcontest/FishingContestCutscene.java @@ -5,7 +5,7 @@ import core.game.node.entity.Entity; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; 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/fishingcontest/GarlicPipeInteraction.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/GarlicPipeInteraction.java index f4d9a6cb4..131f2a32e 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 @@ -9,7 +9,7 @@ import core.game.node.object.GameObject; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; -import core.tools.Items; +import rs09.tools.Items; import core.game.content.quest.PluginInteraction; import core.game.content.quest.PluginInteractionManager; 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 bc89700a1..2d49293d1 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 @@ -9,7 +9,7 @@ import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; import core.game.world.update.flag.context.Animation; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; import core.tools.StringUtils; diff --git a/Server/src/main/java/core/game/content/quest/members/lostcity/LostCity.java b/Server/src/main/java/core/game/content/quest/members/lostcity/LostCity.java index dfa33a0a0..347d9bbc9 100644 --- a/Server/src/main/java/core/game/content/quest/members/lostcity/LostCity.java +++ b/Server/src/main/java/core/game/content/quest/members/lostcity/LostCity.java @@ -5,7 +5,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * The main type for the lost city Quest. 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 f60b25749..e246bbfc8 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 @@ -4,21 +4,21 @@ import core.cache.def.impl.ItemDefinition; import core.cache.def.impl.ObjectDefinition; import core.game.content.dialogue.FacialExpression; import core.game.content.global.action.DoorActionHandler; -import core.game.content.global.action.EquipHandler; -import core.game.node.entity.skill.gather.GatheringSkillPulse; -import core.game.node.entity.skill.gather.SkillingTool; 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.entity.player.link.TeleportManager.TeleportType; 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.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.map.Location; import core.plugin.Plugin; +import rs09.game.interaction.Listeners; +import rs09.game.world.GameWorld; /** * Handles the lost city quest. @@ -94,7 +94,7 @@ public final class LostCityPlugin extends OptionHandler { player.getPacketDispatch().sendMessage("You need to have completed the Lost City quest in order to wield that weapon."); return true; } - return EquipHandler.SINGLETON.handle(player, node, option); + return Listeners.run(node.getId(),0,"equip",player,node); } return true; } diff --git a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/CandleMakerDialogue.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/CandleMakerDialogue.java index 88e0f8f10..ee078e04e 100644 --- a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/CandleMakerDialogue.java +++ b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/CandleMakerDialogue.java @@ -1,7 +1,6 @@ package core.game.content.quest.members.merlinscrystal; import core.cache.def.impl.NPCDefinition; -import core.game.system.config.ShopParser; import core.game.content.dialogue.DialoguePlugin; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -10,7 +9,8 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.game.system.config.ShopParser; +import rs09.plugin.PluginManager; /** * Represents the dialogue plugin used to handle the candle maker npc. diff --git a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/KingArthurDialogue.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/KingArthurDialogue.java index 42653bd0b..7312e2dab 100644 --- a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/KingArthurDialogue.java +++ b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/KingArthurDialogue.java @@ -1,6 +1,6 @@ package core.game.content.quest.members.merlinscrystal; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; import core.game.content.dialogue.DialoguePlugin; diff --git a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystal.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystal.java index 7fcd8394e..bfe82454c 100644 --- a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystal.java +++ b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystal.java @@ -3,7 +3,7 @@ package core.game.content.quest.members.merlinscrystal; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the merlin's crystal quest. 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 acea9cbd8..cbfcf9fc0 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 @@ -23,13 +23,13 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the Merlin's Crystal Dialogue/Interactions. diff --git a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/SirMordredNPC.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/SirMordredNPC.java index 423a04cfa..d49803fa0 100644 --- a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/SirMordredNPC.java +++ b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/SirMordredNPC.java @@ -6,7 +6,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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Graphics; diff --git a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/TheLadyOfTheLake.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/TheLadyOfTheLake.java index 32e586334..ec563074a 100644 --- a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/TheLadyOfTheLake.java +++ b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/TheLadyOfTheLake.java @@ -1,7 +1,7 @@ package core.game.content.quest.members.merlinscrystal; import core.game.container.impl.EquipmentContainer; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.entity.player.link.diary.DiaryType; import core.game.content.dialogue.DialoguePlugin; import core.game.node.entity.npc.NPC; diff --git a/Server/src/main/java/core/game/content/quest/members/rovingelves/MossGiantGuardianNPC.java b/Server/src/main/java/core/game/content/quest/members/rovingelves/MossGiantGuardianNPC.java index 0eae0aad4..63cab6fdf 100644 --- a/Server/src/main/java/core/game/content/quest/members/rovingelves/MossGiantGuardianNPC.java +++ b/Server/src/main/java/core/game/content/quest/members/rovingelves/MossGiantGuardianNPC.java @@ -12,7 +12,7 @@ import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.world.map.Location; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * The level 84 Moss Giant in Glarial's tomb. diff --git a/Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElves.java b/Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElves.java index fe008b98c..0971d62d1 100644 --- a/Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElves.java +++ b/Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElves.java @@ -5,7 +5,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * The Roving Elves quest. diff --git a/Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElvesPlugin.java b/Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElvesPlugin.java index a4c1f0e86..ff40664e7 100644 --- a/Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElvesPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElvesPlugin.java @@ -8,7 +8,7 @@ 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.system.task.Pulse; -import core.game.world.GameWorld; +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/quest/members/sheepherder/GateInteractionHandler.java b/Server/src/main/java/core/game/content/quest/members/sheepherder/GateInteractionHandler.java index 0c133bf0e..d9e718bbf 100644 --- a/Server/src/main/java/core/game/content/quest/members/sheepherder/GateInteractionHandler.java +++ b/Server/src/main/java/core/game/content/quest/members/sheepherder/GateInteractionHandler.java @@ -4,7 +4,7 @@ import core.game.interaction.DestinationFlag; import core.game.interaction.MovementPulse; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.plugin.Initializable; import core.plugin.Plugin; import core.game.content.dialogue.FacialExpression; diff --git a/Server/src/main/java/core/game/content/quest/members/sheepherder/HerderSheepNPC.java b/Server/src/main/java/core/game/content/quest/members/sheepherder/HerderSheepNPC.java index 05e9e6d38..ddd2368ab 100644 --- a/Server/src/main/java/core/game/content/quest/members/sheepherder/HerderSheepNPC.java +++ b/Server/src/main/java/core/game/content/quest/members/sheepherder/HerderSheepNPC.java @@ -3,7 +3,7 @@ package core.game.content.quest.members.sheepherder; import core.game.interaction.MovementPulse; import core.game.node.entity.Entity; import core.game.node.entity.npc.NPC; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.path.Pathfinder; 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 5d36b96df..d2f8002cc 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 @@ -6,7 +6,7 @@ import core.game.interaction.NodeUsageEvent; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; 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/sheepherder/ProdActionHandler.java b/Server/src/main/java/core/game/content/quest/members/sheepherder/ProdActionHandler.java index b1214c5cc..24e27750e 100644 --- a/Server/src/main/java/core/game/content/quest/members/sheepherder/ProdActionHandler.java +++ b/Server/src/main/java/core/game/content/quest/members/sheepherder/ProdActionHandler.java @@ -6,9 +6,9 @@ import core.game.interaction.Option; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/members/sheepherder/SheepHerder.java b/Server/src/main/java/core/game/content/quest/members/sheepherder/SheepHerder.java index 06d28051a..8164386f3 100644 --- a/Server/src/main/java/core/game/content/quest/members/sheepherder/SheepHerder.java +++ b/Server/src/main/java/core/game/content/quest/members/sheepherder/SheepHerder.java @@ -7,7 +7,7 @@ import core.game.node.item.Item; import core.game.world.map.Direction; import core.game.world.map.Location; import core.plugin.Initializable; -import core.tools.Items; +import rs09.tools.Items; import java.util.HashMap; diff --git a/Server/src/main/java/core/game/content/quest/members/sheepherder/SheepPoisonHandler.java b/Server/src/main/java/core/game/content/quest/members/sheepherder/SheepPoisonHandler.java index ab52094c6..6371dd680 100644 --- a/Server/src/main/java/core/game/content/quest/members/sheepherder/SheepPoisonHandler.java +++ b/Server/src/main/java/core/game/content/quest/members/sheepherder/SheepPoisonHandler.java @@ -8,7 +8,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/members/thetouristrap/AnaDialogue.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/AnaDialogue.java index 510777f15..ec03928ef 100644 --- a/Server/src/main/java/core/game/content/quest/members/thetouristrap/AnaDialogue.java +++ b/Server/src/main/java/core/game/content/quest/members/thetouristrap/AnaDialogue.java @@ -8,11 +8,11 @@ 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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * The dialogue plugin used to handle the ana npc. diff --git a/Server/src/main/java/core/game/content/quest/members/thetouristrap/DesertGuardDialogue.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/DesertGuardDialogue.java index bc77cc528..927f2ef5d 100644 --- a/Server/src/main/java/core/game/content/quest/members/thetouristrap/DesertGuardDialogue.java +++ b/Server/src/main/java/core/game/content/quest/members/thetouristrap/DesertGuardDialogue.java @@ -8,10 +8,10 @@ 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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** diff --git a/Server/src/main/java/core/game/content/quest/members/thetouristrap/MaleSlaveDialogue.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/MaleSlaveDialogue.java index aa75ad9c9..3aa5ab409 100644 --- a/Server/src/main/java/core/game/content/quest/members/thetouristrap/MaleSlaveDialogue.java +++ b/Server/src/main/java/core/game/content/quest/members/thetouristrap/MaleSlaveDialogue.java @@ -6,7 +6,7 @@ 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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/content/quest/members/thetouristrap/MercenaryCaptainDialogue.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/MercenaryCaptainDialogue.java index 3f35fc01e..43f74baf4 100644 --- a/Server/src/main/java/core/game/content/quest/members/thetouristrap/MercenaryCaptainDialogue.java +++ b/Server/src/main/java/core/game/content/quest/members/thetouristrap/MercenaryCaptainDialogue.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.world.map.Location; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the mercenary captain dialogue plugin. diff --git a/Server/src/main/java/core/game/content/quest/members/thetouristrap/MineSlaveNPC.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/MineSlaveNPC.java index c01f6b999..e9cbaf1b4 100644 --- a/Server/src/main/java/core/game/content/quest/members/thetouristrap/MineSlaveNPC.java +++ b/Server/src/main/java/core/game/content/quest/members/thetouristrap/MineSlaveNPC.java @@ -1,7 +1,7 @@ package core.game.content.quest.members.thetouristrap; import core.game.node.entity.npc.AbstractNPC; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/content/quest/members/thetouristrap/MiningCampZone.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/MiningCampZone.java index 28933afa0..b569aeceb 100644 --- a/Server/src/main/java/core/game/content/quest/members/thetouristrap/MiningCampZone.java +++ b/Server/src/main/java/core/game/content/quest/members/thetouristrap/MiningCampZone.java @@ -6,7 +6,7 @@ import core.game.node.entity.Entity; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/quest/members/thetouristrap/RowdySlaveNPC.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/RowdySlaveNPC.java index 6dafea57d..60f0ac084 100644 --- a/Server/src/main/java/core/game/content/quest/members/thetouristrap/RowdySlaveNPC.java +++ b/Server/src/main/java/core/game/content/quest/members/thetouristrap/RowdySlaveNPC.java @@ -11,7 +11,7 @@ import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.world.map.Location; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** diff --git a/Server/src/main/java/core/game/content/quest/members/thetouristrap/TouristTrap.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/TouristTrap.java index e811d62b3..6c68c59e2 100644 --- a/Server/src/main/java/core/game/content/quest/members/thetouristrap/TouristTrap.java +++ b/Server/src/main/java/core/game/content/quest/members/thetouristrap/TouristTrap.java @@ -7,11 +7,11 @@ 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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.zone.ZoneBorders; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * The main type for the tourist trap quest. 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 f3fe944d1..74179745f 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 @@ -26,13 +26,13 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.build.DynamicRegion; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; import core.game.content.quest.members.thetouristrap.TouristTrapPlugin.AnnaCartHandler.AnnaCartCutscene; diff --git a/Server/src/main/java/core/game/content/quest/members/waterfallquest/HadleyDialogue.java b/Server/src/main/java/core/game/content/quest/members/waterfallquest/HadleyDialogue.java index aca74c1e8..d3a51e5e3 100644 --- a/Server/src/main/java/core/game/content/quest/members/waterfallquest/HadleyDialogue.java +++ b/Server/src/main/java/core/game/content/quest/members/waterfallquest/HadleyDialogue.java @@ -4,7 +4,7 @@ import core.game.content.dialogue.DialogueInterpreter; import core.game.content.dialogue.DialoguePlugin; import core.game.content.dialogue.FacialExpression; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * Handles Almera's Dialogue for the Waterfall Quest. diff --git a/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterFall.java b/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterFall.java index 4c078204a..0b96c06d1 100644 --- a/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterFall.java +++ b/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterFall.java @@ -5,7 +5,7 @@ import core.game.node.entity.skill.Skills; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * The main type for the waterfall quest. 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 fe73e5399..ef7959115 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 @@ -27,7 +27,7 @@ import core.game.system.task.Pulse; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Master plugin file for the Waterfall quest. 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 fdc35d34e..cd3f0b1de 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 @@ -12,7 +12,7 @@ import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/quest/members/whatliesbelow/WLBelowPlugin.java b/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowPlugin.java index 3d3b22c4e..869eef40c 100644 --- a/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowPlugin.java @@ -14,11 +14,11 @@ 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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the what lies below options. diff --git a/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WhatLiesBelow.java b/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WhatLiesBelow.java index dfa02f33d..86ac19ba3 100644 --- a/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WhatLiesBelow.java +++ b/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WhatLiesBelow.java @@ -1,12 +1,12 @@ package core.game.content.quest.members.whatliesbelow; import core.plugin.Initializable; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.entity.skill.Skills; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * The what lies below quest. diff --git a/Server/src/main/java/core/game/content/quest/members/witchshouse/ExperimentSession.java b/Server/src/main/java/core/game/content/quest/members/witchshouse/ExperimentSession.java index 016372446..24d11b697 100644 --- a/Server/src/main/java/core/game/content/quest/members/witchshouse/ExperimentSession.java +++ b/Server/src/main/java/core/game/content/quest/members/witchshouse/ExperimentSession.java @@ -3,7 +3,7 @@ package core.game.content.quest.witchs_house; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; public final class ExperimentSession { diff --git a/Server/src/main/java/core/game/content/quest/members/witchshouse/MouseNPC.java b/Server/src/main/java/core/game/content/quest/members/witchshouse/MouseNPC.java index b04e75294..3bd8fdee2 100644 --- a/Server/src/main/java/core/game/content/quest/members/witchshouse/MouseNPC.java +++ b/Server/src/main/java/core/game/content/quest/members/witchshouse/MouseNPC.java @@ -2,7 +2,7 @@ package core.game.content.quest.members.witchshouse; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; /** diff --git a/Server/src/main/java/core/game/content/quest/members/witchshouse/NoraTHaggNPC.java b/Server/src/main/java/core/game/content/quest/members/witchshouse/NoraTHaggNPC.java index 7c8ddf9c8..b9395c572 100644 --- a/Server/src/main/java/core/game/content/quest/members/witchshouse/NoraTHaggNPC.java +++ b/Server/src/main/java/core/game/content/quest/members/witchshouse/NoraTHaggNPC.java @@ -1,12 +1,12 @@ package core.game.content.quest.members.witchshouse; import core.game.node.entity.Entity; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.DeathTask; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/content/quest/members/witchshouse/WitchsExperimentNPC.java b/Server/src/main/java/core/game/content/quest/members/witchshouse/WitchsExperimentNPC.java index 4b057d892..e2c6de9cf 100644 --- a/Server/src/main/java/core/game/content/quest/members/witchshouse/WitchsExperimentNPC.java +++ b/Server/src/main/java/core/game/content/quest/members/witchshouse/WitchsExperimentNPC.java @@ -5,7 +5,7 @@ import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/content/quest/members/witchshouse/WitchsHousePlugin.java b/Server/src/main/java/core/game/content/quest/members/witchshouse/WitchsHousePlugin.java index d6f45f33a..917ae78b5 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 @@ -18,7 +18,7 @@ import core.game.node.object.GameObject; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** 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 49f24dd69..feaa63313 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,7 +2,7 @@ package core.game.content.quest.miniquest.barcrawl; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.content.dialogue.DialogueInterpreter; import core.game.content.dialogue.DialoguePlugin; 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 index 6dc2a949a..28799c909 100644 --- 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 @@ -8,13 +8,13 @@ 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 core.game.world.GameWorld; +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 core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.plugin.Initializable; import core.tools.StringUtils; diff --git a/Server/src/main/java/core/game/content/quest/miniquest/surok/HuntForSurokPlugin.java b/Server/src/main/java/core/game/content/quest/miniquest/surok/HuntForSurokPlugin.java index e7faf1d4e..153f8115e 100644 --- a/Server/src/main/java/core/game/content/quest/miniquest/surok/HuntForSurokPlugin.java +++ b/Server/src/main/java/core/game/content/quest/miniquest/surok/HuntForSurokPlugin.java @@ -6,7 +6,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.world.map.Location; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the hunt for surok mini quest. diff --git a/Server/src/main/java/core/game/content/quest/tutorials/learningtheropes/LTRDragonFightCutscene.java b/Server/src/main/java/core/game/content/quest/tutorials/learningtheropes/LTRDragonFightCutscene.java index 1d798b190..2eb5f557a 100644 --- a/Server/src/main/java/core/game/content/quest/tutorials/learningtheropes/LTRDragonFightCutscene.java +++ b/Server/src/main/java/core/game/content/quest/tutorials/learningtheropes/LTRDragonFightCutscene.java @@ -9,7 +9,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.state.EntityState; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.build.DynamicRegion; diff --git a/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/CharacterDesign.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/CharacterDesign.java index 52277ee56..b65b174ee 100644 --- a/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/CharacterDesign.java +++ b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/CharacterDesign.java @@ -7,7 +7,7 @@ import core.game.node.entity.player.link.appearance.Gender; import core.game.node.entity.player.link.music.MusicEntry; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.net.amsc.MSPacketRepository; import core.net.amsc.WorldCommunicator; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/FinancialAdvisorDialogue.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/FinancialAdvisorDialogue.java index 6881023c1..598329829 100644 --- a/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/FinancialAdvisorDialogue.java +++ b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/FinancialAdvisorDialogue.java @@ -3,7 +3,7 @@ package core.game.content.quest.tutorials.tutorialisland; import core.game.content.dialogue.DialoguePlugin; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Initializable; /** diff --git a/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/RSGuideDialogue.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/RSGuideDialogue.java index cf2de8ab9..f4d67ffa1 100644 --- a/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/RSGuideDialogue.java +++ b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/RSGuideDialogue.java @@ -5,7 +5,7 @@ import core.game.content.dialogue.DialoguePlugin; import core.game.content.dialogue.FacialExpression; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Initializable; /** diff --git a/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialCompletionDialogue.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialCompletionDialogue.java index 05723bed1..e090ad81c 100644 --- a/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialCompletionDialogue.java +++ b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialCompletionDialogue.java @@ -8,7 +8,7 @@ import core.game.node.entity.player.link.HintIconManager; import core.game.node.entity.player.link.IronmanMode; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.net.amsc.MSPacketRepository; import core.net.amsc.WorldCommunicator; diff --git a/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialSession.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialSession.java index 5bc9da7be..58267a6a0 100644 --- a/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialSession.java +++ b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialSession.java @@ -2,7 +2,7 @@ package core.game.content.quest.tutorials.tutorialisland; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.net.packet.PacketRepository; import core.net.packet.context.InterfaceConfigContext; import core.net.packet.out.InterfaceConfig; 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 3c3ff8eaa..6aa70678d 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 @@ -5,12 +5,12 @@ 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.GameObject; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; /** * Represents a tutorial stage. diff --git a/Server/src/main/java/core/game/content/ttrail/ClueLevel.java b/Server/src/main/java/core/game/content/ttrail/ClueLevel.java index 0b6655517..546f3332a 100644 --- a/Server/src/main/java/core/game/content/ttrail/ClueLevel.java +++ b/Server/src/main/java/core/game/content/ttrail/ClueLevel.java @@ -8,7 +8,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.ChanceItem; import core.game.node.item.Item; import core.game.node.item.WeightedChanceItem; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.tools.RandomFunction; import java.text.NumberFormat; diff --git a/Server/src/main/java/core/game/content/ttrail/ClueScrollPlugin.java b/Server/src/main/java/core/game/content/ttrail/ClueScrollPlugin.java index 26f22d221..c8cfeb690 100644 --- a/Server/src/main/java/core/game/content/ttrail/ClueScrollPlugin.java +++ b/Server/src/main/java/core/game/content/ttrail/ClueScrollPlugin.java @@ -3,7 +3,7 @@ package core.game.content.ttrail; import core.game.component.Component; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; 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/ttrail/EmoteCluePlugin.java b/Server/src/main/java/core/game/content/ttrail/EmoteCluePlugin.java index f543d6ff4..e5241daaa 100644 --- a/Server/src/main/java/core/game/content/ttrail/EmoteCluePlugin.java +++ b/Server/src/main/java/core/game/content/ttrail/EmoteCluePlugin.java @@ -3,7 +3,7 @@ package core.game.content.ttrail; import core.game.node.entity.player.link.emote.Emotes; import core.game.world.map.zone.ZoneBorders; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Initializes the emote clue plugins. diff --git a/Server/src/main/java/core/game/content/ttrail/SaradominWizardNPC.java b/Server/src/main/java/core/game/content/ttrail/SaradominWizardNPC.java index 8545125b0..79202bdc4 100644 --- a/Server/src/main/java/core/game/content/ttrail/SaradominWizardNPC.java +++ b/Server/src/main/java/core/game/content/ttrail/SaradominWizardNPC.java @@ -3,15 +3,15 @@ package core.game.content.ttrail; import core.game.node.entity.Entity; import core.game.node.entity.combat.CombatSpell; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.equipment.SwitchAttack; -import core.game.node.entity.combat.handlers.MultiSwingHandler; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.SpellBookManager.SpellBook; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.plugin.Plugin; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.handlers.MultiSwingHandler; /** * Handles saradomin npc. diff --git a/Server/src/main/java/core/game/content/ttrail/TreasureTrailPlugin.java b/Server/src/main/java/core/game/content/ttrail/TreasureTrailPlugin.java index 13cc682bb..eda615013 100644 --- a/Server/src/main/java/core/game/content/ttrail/TreasureTrailPlugin.java +++ b/Server/src/main/java/core/game/content/ttrail/TreasureTrailPlugin.java @@ -5,20 +5,20 @@ import core.cache.def.impl.ObjectDefinition; import core.game.component.Component; import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; -import core.game.system.config.NPCConfigParser; -import core.plugin.Initializable; -import core.game.node.entity.skill.agility.AgilityHandler; 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.entity.skill.agility.AgilityHandler; import core.game.node.item.GroundItem; import core.game.node.item.Item; import core.game.node.item.ItemPlugin; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; +import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.game.system.config.NPCConfigParser; +import rs09.plugin.PluginManager; /** * Handles the clue scroll options. diff --git a/Server/src/main/java/core/game/content/ttrail/UriNPC.java b/Server/src/main/java/core/game/content/ttrail/UriNPC.java index 4a6ac8fd9..bddcad008 100644 --- a/Server/src/main/java/core/game/content/ttrail/UriNPC.java +++ b/Server/src/main/java/core/game/content/ttrail/UriNPC.java @@ -9,7 +9,7 @@ import core.game.node.entity.player.Player; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** 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 6c14c9a94..d0749983e 100644 --- a/Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java +++ b/Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java @@ -13,7 +13,7 @@ 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.GameObject; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBorders; @@ -22,7 +22,7 @@ import core.game.world.map.zone.ZoneRestriction; import core.game.world.update.flag.context.Graphics; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** diff --git a/Server/src/main/java/core/game/content/zone/DesertZone.java b/Server/src/main/java/core/game/content/zone/DesertZone.java index 92088ea4e..3cec91ff4 100644 --- a/Server/src/main/java/core/game/content/zone/DesertZone.java +++ b/Server/src/main/java/core/game/content/zone/DesertZone.java @@ -10,7 +10,7 @@ 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 core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/zone/IcePathZone.java b/Server/src/main/java/core/game/content/zone/IcePathZone.java index 1e219f73f..3d8e1ad20 100644 --- a/Server/src/main/java/core/game/content/zone/IcePathZone.java +++ b/Server/src/main/java/core/game/content/zone/IcePathZone.java @@ -5,7 +5,7 @@ import core.game.node.entity.Entity; import core.game.node.entity.combat.ImpactHandler.HitsplatType; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/zone/WildernessAreaZone.java b/Server/src/main/java/core/game/content/zone/WildernessAreaZone.java index 83ea6185b..1769a8f4e 100644 --- a/Server/src/main/java/core/game/content/zone/WildernessAreaZone.java +++ b/Server/src/main/java/core/game/content/zone/WildernessAreaZone.java @@ -20,14 +20,14 @@ 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.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneBuilder; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import java.util.ArrayList; import java.util.List; 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 fc4e29d7d..2c53b3fe9 100644 --- a/Server/src/main/java/core/game/content/zone/YanilleAgilityDungeon.java +++ b/Server/src/main/java/core/game/content/zone/YanilleAgilityDungeon.java @@ -16,7 +16,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.zone.MapZone; @@ -24,7 +24,7 @@ import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneBuilder; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.plugin.Initializable; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/content/zone/neitiznot/NeitiznotZone.java b/Server/src/main/java/core/game/content/zone/neitiznot/NeitiznotZone.java index a21c2971d..577471667 100644 --- a/Server/src/main/java/core/game/content/zone/neitiznot/NeitiznotZone.java +++ b/Server/src/main/java/core/game/content/zone/neitiznot/NeitiznotZone.java @@ -8,7 +8,7 @@ import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBuilder; import core.plugin.Plugin; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the neitiznot zone. diff --git a/Server/src/main/java/core/game/content/zone/neitiznot/YakArmourPlugin.java b/Server/src/main/java/core/game/content/zone/neitiznot/YakArmourPlugin.java index 5ad3169f5..f873c94b0 100644 --- a/Server/src/main/java/core/game/content/zone/neitiznot/YakArmourPlugin.java +++ b/Server/src/main/java/core/game/content/zone/neitiznot/YakArmourPlugin.java @@ -1,7 +1,7 @@ package core.game.content.zone.neitiznot; -import core.game.content.dialogue.SkillDialogueHandler; -import core.game.content.dialogue.SkillDialogueHandler.SkillDialogue; +import rs09.game.content.dialogue.SkillDialogueHandler; +import rs09.game.content.dialogue.SkillDialogueHandler.SkillDialogue; import core.game.node.entity.skill.SkillPulse; import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.crafting.armour.LeatherCrafting; diff --git a/Server/src/main/java/core/game/content/zone/phasmatys/GravingasNPC.java b/Server/src/main/java/core/game/content/zone/phasmatys/GravingasNPC.java index f53738cea..cd9960696 100644 --- a/Server/src/main/java/core/game/content/zone/phasmatys/GravingasNPC.java +++ b/Server/src/main/java/core/game/content/zone/phasmatys/GravingasNPC.java @@ -5,7 +5,7 @@ import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.world.map.Location; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** 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 c3e4164e8..32eab541a 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 @@ -23,7 +23,7 @@ import core.game.world.map.zone.ZoneBuilder; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import static java.lang.Thread.sleep; diff --git a/Server/src/main/java/core/game/content/zone/rellekka/JarvaldDialogue.java b/Server/src/main/java/core/game/content/zone/rellekka/JarvaldDialogue.java index e50ac39e9..332cb603a 100644 --- a/Server/src/main/java/core/game/content/zone/rellekka/JarvaldDialogue.java +++ b/Server/src/main/java/core/game/content/zone/rellekka/JarvaldDialogue.java @@ -8,7 +8,7 @@ import core.game.node.item.Item; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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 be2dc7835..eb74f5965 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 @@ -16,14 +16,14 @@ import core.game.node.object.GameObject; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneBuilder; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the rellekka zone. diff --git a/Server/src/main/java/core/game/content/zone/wbisland/SpinolypNPC.java b/Server/src/main/java/core/game/content/zone/wbisland/SpinolypNPC.java index 81f871162..e521bc8dd 100644 --- a/Server/src/main/java/core/game/content/zone/wbisland/SpinolypNPC.java +++ b/Server/src/main/java/core/game/content/zone/wbisland/SpinolypNPC.java @@ -4,15 +4,15 @@ import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatSpell; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.InteractionType; import core.game.node.entity.combat.equipment.SwitchAttack; -import core.game.node.entity.combat.handlers.MultiSwingHandler; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.link.SpellBookManager.SpellBook; import core.game.node.entity.state.EntityState; import core.game.world.map.Location; import core.tools.RandomFunction; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.handlers.MultiSwingHandler; /** * Represents a spinolyp npc. 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 a2432f2a1..15e36c2a7 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 @@ -19,16 +19,16 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneRestriction; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the waterbirth dungeon zone. diff --git a/Server/src/main/java/core/game/ge/BuyingLimitation.java b/Server/src/main/java/core/game/ge/BuyingLimitation.java index 3b2b4289f..9a059d16b 100644 --- a/Server/src/main/java/core/game/ge/BuyingLimitation.java +++ b/Server/src/main/java/core/game/ge/BuyingLimitation.java @@ -1,7 +1,7 @@ package core.game.ge; import core.cache.def.impl.ItemDefinition; -import core.game.system.config.ItemConfigParser; +import rs09.game.system.config.ItemConfigParser; import java.util.HashMap; import java.util.Map; diff --git a/Server/src/main/java/core/game/ge/GrandExchangeDatabase.java b/Server/src/main/java/core/game/ge/GrandExchangeDatabase.java index b0a37eca9..c914cc778 100644 --- a/Server/src/main/java/core/game/ge/GrandExchangeDatabase.java +++ b/Server/src/main/java/core/game/ge/GrandExchangeDatabase.java @@ -1,8 +1,8 @@ package core.game.ge; -import core.ServerConstants; +import rs09.ServerConstants; import core.cache.def.impl.ItemDefinition; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/Server/src/main/java/core/game/interaction/Interaction.java b/Server/src/main/java/core/game/interaction/Interaction.java index 4fcba7c95..31662ff79 100644 --- a/Server/src/main/java/core/game/interaction/Interaction.java +++ b/Server/src/main/java/core/game/interaction/Interaction.java @@ -6,13 +6,14 @@ 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.GameObject; -import core.game.system.SystemLogger; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.update.flag.player.FaceLocationFlag; import core.net.packet.PacketRepository; import core.net.packet.context.InteractionOptionContext; import core.net.packet.out.InteractionOption; +import rs09.game.interaction.Listeners; +import rs09.game.system.SystemLogger; +import rs09.game.world.GameWorld; /** * Handles interaction between nodes. diff --git a/Server/src/main/java/core/game/interaction/OptionHandler.java b/Server/src/main/java/core/game/interaction/OptionHandler.java index 5850d269b..74feff999 100644 --- a/Server/src/main/java/core/game/interaction/OptionHandler.java +++ b/Server/src/main/java/core/game/interaction/OptionHandler.java @@ -3,7 +3,7 @@ package core.game.interaction; import core.cache.def.impl.ObjectDefinition; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.game.world.map.Location; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/UseWithHandler.java b/Server/src/main/java/core/game/interaction/UseWithHandler.java index 20349286e..735eb3b98 100644 --- a/Server/src/main/java/core/game/interaction/UseWithHandler.java +++ b/Server/src/main/java/core/game/interaction/UseWithHandler.java @@ -6,7 +6,7 @@ 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.GameObject; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.game.system.task.Pulse; import core.game.world.map.Location; import core.game.world.update.flag.player.FaceLocationFlag; diff --git a/Server/src/main/java/core/game/interaction/city/BrimhavenDungeonPlugin.java b/Server/src/main/java/core/game/interaction/city/BrimhavenDungeonPlugin.java index 135275366..07c9a1f15 100644 --- a/Server/src/main/java/core/game/interaction/city/BrimhavenDungeonPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/BrimhavenDungeonPlugin.java @@ -14,7 +14,7 @@ import core.game.node.object.ObjectBuilder; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/interaction/city/DraynorManorPlugin.java b/Server/src/main/java/core/game/interaction/city/DraynorManorPlugin.java index d85afd8ae..be8d31963 100644 --- a/Server/src/main/java/core/game/interaction/city/DraynorManorPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/DraynorManorPlugin.java @@ -13,7 +13,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.path.Pathfinder; 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 6acfa0bde..b44feda67 100644 --- a/Server/src/main/java/core/game/interaction/city/DraynorNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/DraynorNodePlugin.java @@ -16,7 +16,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/interaction/city/EntranaObjectPlugin.java b/Server/src/main/java/core/game/interaction/city/EntranaObjectPlugin.java index 066cb3743..2eb2bdb7d 100644 --- a/Server/src/main/java/core/game/interaction/city/EntranaObjectPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/EntranaObjectPlugin.java @@ -6,7 +6,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.TeleportManager; import core.game.world.map.Location; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; 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 193bf6c09..2d8ec96a3 100644 --- a/Server/src/main/java/core/game/interaction/city/FaladorNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/FaladorNodePlugin.java @@ -16,7 +16,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +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/interaction/city/GnomeStrongholdPlugin.java b/Server/src/main/java/core/game/interaction/city/GnomeStrongholdPlugin.java index daa3c1692..ffcd8c4af 100644 --- a/Server/src/main/java/core/game/interaction/city/GnomeStrongholdPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/GnomeStrongholdPlugin.java @@ -10,7 +10,7 @@ import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/interaction/city/HamHideoutPlugin.java b/Server/src/main/java/core/game/interaction/city/HamHideoutPlugin.java index b7a3313c4..b2256c89a 100644 --- a/Server/src/main/java/core/game/interaction/city/HamHideoutPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/HamHideoutPlugin.java @@ -7,7 +7,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +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/interaction/city/KaramajaOptionPlugin.java b/Server/src/main/java/core/game/interaction/city/KaramajaOptionPlugin.java index 6d17d7844..7cde36d57 100644 --- a/Server/src/main/java/core/game/interaction/city/KaramajaOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/KaramajaOptionPlugin.java @@ -4,9 +4,9 @@ import core.cache.def.impl.NPCDefinition; import core.cache.def.impl.ObjectDefinition; import core.game.component.Component; import core.plugin.Initializable; -import core.tools.Items; +import rs09.tools.Items; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.content.dialogue.FacialExpression; import core.game.content.global.action.ClimbActionHandler; import core.game.content.global.action.DoorActionHandler; @@ -19,7 +19,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.world.map.Location; -import core.game.world.repository.Repository; +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 9c79b83b8..ea41d72ae 100644 --- a/Server/src/main/java/core/game/interaction/city/LumbridgeNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/LumbridgeNodePlugin.java @@ -16,7 +16,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/PortSarimPlugin.java b/Server/src/main/java/core/game/interaction/city/PortSarimPlugin.java index d416bf138..08db1cc59 100644 --- a/Server/src/main/java/core/game/interaction/city/PortSarimPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/PortSarimPlugin.java @@ -9,7 +9,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +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/interaction/city/ShiloVillagePlugin.java b/Server/src/main/java/core/game/interaction/city/ShiloVillagePlugin.java index bee04b4ce..ded81f237 100644 --- a/Server/src/main/java/core/game/interaction/city/ShiloVillagePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/ShiloVillagePlugin.java @@ -13,7 +13,7 @@ import core.game.node.item.Item; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles shilo village interactions. 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 afdd6eb6f..4daa657ca 100644 --- a/Server/src/main/java/core/game/interaction/city/TrollheimPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/TrollheimPlugin.java @@ -20,13 +20,13 @@ import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneBuilder; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.game.world.update.flag.context.Animation; import core.net.packet.PacketRepository; import core.net.packet.context.CameraContext; @@ -34,7 +34,7 @@ import core.net.packet.context.CameraContext.CameraType; import core.net.packet.out.CameraViewPacket; import core.plugin.Plugin; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the plugin used to handle all trollheim node interations. 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 c380138ee..64f47c498 100644 --- a/Server/src/main/java/core/game/interaction/city/VarrockNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/VarrockNodePlugin.java @@ -12,7 +12,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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 591f7ae93..a082d95be 100644 --- a/Server/src/main/java/core/game/interaction/city/WizardTowerPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/WizardTowerPlugin.java @@ -3,13 +3,10 @@ package core.game.interaction.city; import core.cache.def.impl.NPCDefinition; import core.cache.def.impl.ObjectDefinition; import core.game.component.Component; -import core.game.node.entity.player.link.diary.DiaryType; import core.game.content.dialogue.DialoguePlugin; import core.game.content.global.Skillcape; import core.game.content.global.action.ClimbActionHandler; import core.game.content.global.action.DoorActionHandler; -import core.game.content.global.travel.EssenceTeleport; -import core.game.node.entity.skill.Skills; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.Entity; @@ -20,24 +17,27 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.RunScript; import core.game.node.entity.player.link.SpellBookManager.SpellBook; +import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.entity.player.link.quest.Quest; +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.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.net.packet.PacketRepository; import core.net.packet.context.ChildPositionContext; import core.net.packet.out.RepositionChild; -import core.plugin.Plugin; -import core.plugin.PluginManager; -import core.tools.RandomFunction; import core.plugin.Initializable; +import core.plugin.Plugin; +import core.tools.RandomFunction; import core.tools.StringUtils; +import rs09.game.content.global.travel.EssenceTeleport; +import rs09.game.world.GameWorld; +import rs09.plugin.PluginManager; /** * Represents the plugins used related to the wizard tower. 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 ab028131b..0bcb3e619 100644 --- a/Server/src/main/java/core/game/interaction/city/ZanarisPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/ZanarisPlugin.java @@ -13,7 +13,7 @@ import core.game.node.entity.player.link.TeleportManager.TeleportType; import core.game.node.object.GameObject; import core.game.world.map.Location; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the zanaris city plugin. diff --git a/Server/src/main/java/core/game/interaction/inter/CombatTabInterface.java b/Server/src/main/java/core/game/interaction/inter/CombatTabInterface.java index 72cd609bd..11e01665c 100644 --- a/Server/src/main/java/core/game/interaction/inter/CombatTabInterface.java +++ b/Server/src/main/java/core/game/interaction/inter/CombatTabInterface.java @@ -4,12 +4,12 @@ import core.game.component.Component; import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.equipment.WeaponInterface; import core.game.node.entity.combat.equipment.WeaponInterface.WeaponInterfaces; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/inter/EquipmentInterface.java b/Server/src/main/java/core/game/interaction/inter/EquipmentInterface.java index 9f0e55a46..bac61cc6d 100644 --- a/Server/src/main/java/core/game/interaction/inter/EquipmentInterface.java +++ b/Server/src/main/java/core/game/interaction/inter/EquipmentInterface.java @@ -10,20 +10,20 @@ import core.game.container.ContainerListener; import core.game.container.access.BitregisterAssembler; import core.game.container.access.InterfaceContainer; import core.game.container.impl.EquipmentContainer; -import core.game.content.global.action.EquipHandler; -import core.game.interaction.Listeners; import core.game.interaction.OptionHandler; import core.game.node.entity.combat.DeathTask; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.prayer.PrayerType; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.net.packet.PacketRepository; import core.net.packet.context.ContainerContext; import core.net.packet.out.ContainerPacket; import core.plugin.Initializable; import core.plugin.Plugin; +import rs09.game.content.global.action.EquipHandler; +import rs09.game.interaction.Listeners; +import rs09.game.world.GameWorld; /** * Represents the equipment interface. diff --git a/Server/src/main/java/core/game/interaction/inter/GameInterface.java b/Server/src/main/java/core/game/interaction/inter/GameInterface.java index 1fb366010..a606fc965 100644 --- a/Server/src/main/java/core/game/interaction/inter/GameInterface.java +++ b/Server/src/main/java/core/game/interaction/inter/GameInterface.java @@ -10,7 +10,7 @@ import core.game.node.entity.combat.equipment.WeaponInterface; import core.game.node.entity.combat.equipment.WeaponInterface.WeaponInterfaces; import core.game.node.entity.player.Player; import core.game.node.entity.player.info.Rights; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.RegionManager; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/inter/GlassInterface.java b/Server/src/main/java/core/game/interaction/inter/GlassInterface.java index c6ba188ce..840c605e3 100644 --- a/Server/src/main/java/core/game/interaction/inter/GlassInterface.java +++ b/Server/src/main/java/core/game/interaction/inter/GlassInterface.java @@ -9,7 +9,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.RunScript; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/inter/GrandExchangeInterface.java b/Server/src/main/java/core/game/interaction/inter/GrandExchangeInterface.java index e8fc896d0..5388981cf 100644 --- a/Server/src/main/java/core/game/interaction/inter/GrandExchangeInterface.java +++ b/Server/src/main/java/core/game/interaction/inter/GrandExchangeInterface.java @@ -5,19 +5,24 @@ import core.cache.def.impl.ItemDefinition; import core.game.component.Component; import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; -import core.game.ge.*; +import core.game.ge.GEGuidePrice; +import core.game.ge.GEItemSet; +import core.game.ge.GrandExchangeDatabase; +import core.game.ge.OfferState; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.RunScript; import core.game.node.entity.player.link.audio.Audio; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.net.packet.PacketRepository; import core.net.packet.context.ContainerContext; import core.net.packet.out.ContainerPacket; import core.plugin.Initializable; import core.plugin.Plugin; -import core.game.interaction.npc.BogrogPouchSwapper; +import rs09.game.ge.GrandExchangeOffer; +import rs09.game.ge.PlayerGrandExchange; +import rs09.game.interaction.npc.BogrogPouchSwapper; +import rs09.game.world.GameWorld; /** * Handles the Grand Exchange interface options. diff --git a/Server/src/main/java/core/game/interaction/inter/LogoutInterface.java b/Server/src/main/java/core/game/interaction/inter/LogoutInterface.java index 2a916e1e2..9a37ab1e7 100644 --- a/Server/src/main/java/core/game/interaction/inter/LogoutInterface.java +++ b/Server/src/main/java/core/game/interaction/inter/LogoutInterface.java @@ -4,7 +4,7 @@ import core.game.component.Component; import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/inter/MagicBookInterface.java b/Server/src/main/java/core/game/interaction/inter/MagicBookInterface.java index 71f98568d..eff3d37fd 100644 --- a/Server/src/main/java/core/game/interaction/inter/MagicBookInterface.java +++ b/Server/src/main/java/core/game/interaction/inter/MagicBookInterface.java @@ -7,7 +7,7 @@ import core.plugin.Initializable; import core.game.node.entity.skill.magic.MagicSpell; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.SpellBookManager.SpellBook; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Plugin; /** diff --git a/Server/src/main/java/core/game/interaction/inter/MysticStaffEnchantingPlugin.java b/Server/src/main/java/core/game/interaction/inter/MysticStaffEnchantingPlugin.java index 663aa3ef0..cdfccf565 100644 --- a/Server/src/main/java/core/game/interaction/inter/MysticStaffEnchantingPlugin.java +++ b/Server/src/main/java/core/game/interaction/inter/MysticStaffEnchantingPlugin.java @@ -3,7 +3,7 @@ package core.game.interaction.inter; import core.game.component.Component; import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/inter/OrbViewingInterface.java b/Server/src/main/java/core/game/interaction/inter/OrbViewingInterface.java index d6b2be5f4..e37833850 100644 --- a/Server/src/main/java/core/game/interaction/inter/OrbViewingInterface.java +++ b/Server/src/main/java/core/game/interaction/inter/OrbViewingInterface.java @@ -1,6 +1,6 @@ package core.game.interaction.inter; -import core.ServerConstants; +import rs09.ServerConstants; import core.cache.def.impl.ObjectDefinition; import core.game.component.CloseEvent; import core.game.component.Component; @@ -13,7 +13,7 @@ import core.game.system.task.Pulse; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles an orb viewing interface. diff --git a/Server/src/main/java/core/game/interaction/inter/SilverInterface.java b/Server/src/main/java/core/game/interaction/inter/SilverInterface.java index ab9af3e80..7265c8ec9 100644 --- a/Server/src/main/java/core/game/interaction/inter/SilverInterface.java +++ b/Server/src/main/java/core/game/interaction/inter/SilverInterface.java @@ -13,7 +13,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.RunScript; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/inter/SkillTabInterface.java b/Server/src/main/java/core/game/interaction/inter/SkillTabInterface.java index 1bf7cd339..aba424f2d 100644 --- a/Server/src/main/java/core/game/interaction/inter/SkillTabInterface.java +++ b/Server/src/main/java/core/game/interaction/inter/SkillTabInterface.java @@ -7,7 +7,7 @@ import core.game.node.entity.skill.LevelUp; import core.game.node.entity.skill.Skills; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.RunScript; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/item/DragonfireShieldPlugin.java b/Server/src/main/java/core/game/interaction/item/DragonfireShieldPlugin.java index 1121ce5a4..35dbe93c1 100644 --- a/Server/src/main/java/core/game/interaction/item/DragonfireShieldPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/DragonfireShieldPlugin.java @@ -1,14 +1,11 @@ package core.game.interaction.item; -import java.util.concurrent.TimeUnit; - import core.cache.def.impl.ItemDefinition; import core.game.container.impl.EquipmentContainer; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; -import core.game.node.entity.combat.CombatPulse; import core.game.node.entity.combat.InteractionType; import core.game.node.entity.combat.equipment.SwitchAttack; import core.game.node.entity.combat.handlers.DragonfireSwingHandler; @@ -16,12 +13,15 @@ import core.game.node.entity.impl.Projectile; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.node.item.ItemPlugin; -import core.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.game.node.entity.combat.CombatPulse; +import rs09.game.world.GameWorld; +import rs09.plugin.PluginManager; + +import java.util.concurrent.TimeUnit; /** * Handles the dragonfire shield options. diff --git a/Server/src/main/java/core/game/interaction/item/FaladorShieldPlugin.java b/Server/src/main/java/core/game/interaction/item/FaladorShieldPlugin.java index 11d47b7c8..60fed09f0 100644 --- a/Server/src/main/java/core/game/interaction/item/FaladorShieldPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/FaladorShieldPlugin.java @@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit; import core.cache.def.impl.ItemDefinition; import core.game.node.entity.Entity; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.game.content.consumable.effects.PrayerEffect; diff --git a/Server/src/main/java/core/game/interaction/item/FishbowlPlugin.java b/Server/src/main/java/core/game/interaction/item/FishbowlPlugin.java index aaf5ec665..0a390f361 100644 --- a/Server/src/main/java/core/game/interaction/item/FishbowlPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/FishbowlPlugin.java @@ -3,7 +3,7 @@ package core.game.interaction.item; import core.Util; import core.cache.def.impl.ItemDefinition; import core.cache.def.impl.ObjectDefinition; -import core.tools.Items; +import rs09.tools.Items; import core.game.interaction.NodeUsageEvent; import core.game.interaction.OptionHandler; import core.game.interaction.UseWithHandler; @@ -15,7 +15,7 @@ import core.game.node.item.WeightedChanceItem; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; import core.game.content.dialogue.DialogueInterpreter; import core.game.content.dialogue.DialoguePlugin; 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 03e06d0c7..217b148ab 100644 --- a/Server/src/main/java/core/game/interaction/item/GodBookPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/GodBookPlugin.java @@ -14,11 +14,11 @@ import core.game.node.item.GroundItem; import core.game.node.item.Item; import core.game.node.item.ItemPlugin; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the god books. diff --git a/Server/src/main/java/core/game/interaction/item/KeldagrimVotingBond.java b/Server/src/main/java/core/game/interaction/item/KeldagrimVotingBond.java index 2b440ffa4..cc36c8fa1 100644 --- a/Server/src/main/java/core/game/interaction/item/KeldagrimVotingBond.java +++ b/Server/src/main/java/core/game/interaction/item/KeldagrimVotingBond.java @@ -13,9 +13,9 @@ //import core.game.node.entity.player.Player; //import core.game.node.entity.state.EntityState; //import core.game.node.item.Item; -//import core.game.world.repository.Repository; +//import rs09.game.world.repository.Repository; //import core.plugin.Plugin; -//import core.plugin.PluginManager; +//import rs09.plugin.PluginManager; //import core.plugin.InitializablePlugin; //import core.tools.RandomFunction; // diff --git a/Server/src/main/java/core/game/interaction/item/MorphItemPlugin.java b/Server/src/main/java/core/game/interaction/item/MorphItemPlugin.java index 353152aa4..eaa230697 100644 --- a/Server/src/main/java/core/game/interaction/item/MorphItemPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/MorphItemPlugin.java @@ -7,10 +7,10 @@ import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** diff --git a/Server/src/main/java/core/game/interaction/item/PharoahSceptre.java b/Server/src/main/java/core/game/interaction/item/PharoahSceptre.java index 13a49414f..00929d04f 100644 --- a/Server/src/main/java/core/game/interaction/item/PharoahSceptre.java +++ b/Server/src/main/java/core/game/interaction/item/PharoahSceptre.java @@ -8,7 +8,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; 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/interaction/item/PickupPlugin.java b/Server/src/main/java/core/game/interaction/item/PickupPlugin.java index 60224afab..02c3730c0 100644 --- a/Server/src/main/java/core/game/interaction/item/PickupPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/PickupPlugin.java @@ -1,7 +1,6 @@ package core.game.interaction.item; import core.cache.def.impl.ItemDefinition; -import core.game.content.global.action.PickupHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -9,6 +8,7 @@ import core.game.node.item.GroundItem; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; +import rs09.game.content.global.action.PickupHandler; /** * Represents the option handler used for ground items. diff --git a/Server/src/main/java/core/game/interaction/item/QuestCapePlugin.java b/Server/src/main/java/core/game/interaction/item/QuestCapePlugin.java index 5a3c64f22..7c424f81c 100644 --- a/Server/src/main/java/core/game/interaction/item/QuestCapePlugin.java +++ b/Server/src/main/java/core/game/interaction/item/QuestCapePlugin.java @@ -1,12 +1,12 @@ package core.game.interaction.item; import core.cache.def.impl.ItemDefinition; -import core.game.content.global.action.EquipHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.plugin.Initializable; import core.plugin.Plugin; +import rs09.game.interaction.Listeners; /** * Represents the plugin used for the quest cape and hood item. @@ -29,7 +29,7 @@ public final class QuestCapePlugin extends OptionHandler { player.getPacketDispatch().sendMessage("You cannot wear this " + node.getName().toLowerCase() + " yet."); return true; } - return EquipHandler.SINGLETON.handle(player, node, option); + return Listeners.run(node.getId(),0,"equip",player,node); } @Override diff --git a/Server/src/main/java/core/game/interaction/item/toys/SnowGlobePlugin.java b/Server/src/main/java/core/game/interaction/item/toys/SnowGlobePlugin.java index b27eb8ac6..22e5454b7 100644 --- a/Server/src/main/java/core/game/interaction/item/toys/SnowGlobePlugin.java +++ b/Server/src/main/java/core/game/interaction/item/toys/SnowGlobePlugin.java @@ -13,7 +13,7 @@ import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; @Initializable public class SnowGlobePlugin extends OptionHandler { diff --git a/Server/src/main/java/core/game/interaction/item/withitem/CapeDyeingPlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/CapeDyeingPlugin.java index 205668399..f644c37a9 100644 --- a/Server/src/main/java/core/game/interaction/item/withitem/CapeDyeingPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withitem/CapeDyeingPlugin.java @@ -1,7 +1,7 @@ /* package core.game.interaction.item.withitem; -import core.tools.Items; +import rs09.tools.Items; import core.game.content.global.Dyes; import core.game.content.global.action.SpecialLadders; import core.game.interaction.NodeUsageEvent; diff --git a/Server/src/main/java/core/game/interaction/item/withitem/DarkBowDyePlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/DarkBowDyePlugin.java index 67ad1dab6..881f75e7c 100644 --- a/Server/src/main/java/core/game/interaction/item/withitem/DarkBowDyePlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withitem/DarkBowDyePlugin.java @@ -6,7 +6,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.plugin.Plugin; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * The plugin used to dye a dark bow into a more one. diff --git a/Server/src/main/java/core/game/interaction/item/withitem/FishfoodPlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/FishfoodPlugin.java index 33a02d078..367f9a5d4 100644 --- a/Server/src/main/java/core/game/interaction/item/withitem/FishfoodPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withitem/FishfoodPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.item.withitem; -import core.tools.Items; +import rs09.tools.Items; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/core/game/interaction/item/withitem/FruitCuttingPlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/FruitCuttingPlugin.java index be63c6eee..2959ba4f6 100644 --- a/Server/src/main/java/core/game/interaction/item/withitem/FruitCuttingPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withitem/FruitCuttingPlugin.java @@ -2,7 +2,7 @@ package core.game.interaction.item.withitem; import core.game.component.Component; import core.plugin.Initializable; -import core.tools.Items; +import rs09.tools.Items; import core.game.content.dialogue.DialoguePlugin; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; diff --git a/Server/src/main/java/core/game/interaction/item/withitem/GraniteMaulPlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/GraniteMaulPlugin.java index 8c6f3bb73..b2cddcb7a 100644 --- a/Server/src/main/java/core/game/interaction/item/withitem/GraniteMaulPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withitem/GraniteMaulPlugin.java @@ -10,7 +10,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * The plugin used to make the granite maul into the ornamental version. diff --git a/Server/src/main/java/core/game/interaction/item/withitem/LavaScalePlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/LavaScalePlugin.java index 426978a2a..e445ef51c 100644 --- a/Server/src/main/java/core/game/interaction/item/withitem/LavaScalePlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withitem/LavaScalePlugin.java @@ -7,7 +7,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.plugin.Initializable; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/interaction/item/withitem/SoftclayPlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/SoftclayPlugin.java index 312507dc1..694194176 100644 --- a/Server/src/main/java/core/game/interaction/item/withitem/SoftclayPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withitem/SoftclayPlugin.java @@ -2,9 +2,9 @@ package core.game.interaction.item.withitem; import core.game.node.entity.player.link.diary.DiaryType; import core.plugin.Initializable; -import core.tools.Items; -import core.game.content.dialogue.SkillDialogueHandler; -import core.game.content.dialogue.SkillDialogueHandler.SkillDialogue; +import rs09.tools.Items; +import rs09.game.content.dialogue.SkillDialogueHandler; +import rs09.game.content.dialogue.SkillDialogueHandler.SkillDialogue; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/core/game/interaction/item/withnpc/ForestersArmsCiderPlugin.java b/Server/src/main/java/core/game/interaction/item/withnpc/ForestersArmsCiderPlugin.java index 5b6b518aa..b86e7c41e 100644 --- a/Server/src/main/java/core/game/interaction/item/withnpc/ForestersArmsCiderPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withnpc/ForestersArmsCiderPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.item.withnpc; -import core.tools.Items; +import rs09.tools.Items; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.npc.NPC; diff --git a/Server/src/main/java/core/game/interaction/item/withnpc/GertrudeCatUsePlugin.java b/Server/src/main/java/core/game/interaction/item/withnpc/GertrudeCatUsePlugin.java index 0443d6d99..1275872c5 100644 --- a/Server/src/main/java/core/game/interaction/item/withnpc/GertrudeCatUsePlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withnpc/GertrudeCatUsePlugin.java @@ -7,7 +7,7 @@ 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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.path.Path; import core.game.world.map.path.Pathfinder; diff --git a/Server/src/main/java/core/game/interaction/item/withnpc/KingArthurPoisonChalicePlugin.java b/Server/src/main/java/core/game/interaction/item/withnpc/KingArthurPoisonChalicePlugin.java index fe9ce9a1b..b949a7bcd 100644 --- a/Server/src/main/java/core/game/interaction/item/withnpc/KingArthurPoisonChalicePlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withnpc/KingArthurPoisonChalicePlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.item.withnpc; -import core.tools.Items; +import rs09.tools.Items; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.npc.NPC; diff --git a/Server/src/main/java/core/game/interaction/item/withnpc/LadyKeliRopePlugin.java b/Server/src/main/java/core/game/interaction/item/withnpc/LadyKeliRopePlugin.java index 4ce189727..ec0b56dec 100644 --- a/Server/src/main/java/core/game/interaction/item/withnpc/LadyKeliRopePlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withnpc/LadyKeliRopePlugin.java @@ -5,7 +5,7 @@ import core.game.interaction.UseWithHandler; 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.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/interaction/item/withobject/EctophialFillPlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/EctophialFillPlugin.java index 403f45a79..d9d726b01 100644 --- a/Server/src/main/java/core/game/interaction/item/withobject/EctophialFillPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withobject/EctophialFillPlugin.java @@ -5,7 +5,7 @@ import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/item/withobject/HairdresserCheesePlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/HairdresserCheesePlugin.java index 1da1bc9f4..7403d7cef 100644 --- a/Server/src/main/java/core/game/interaction/item/withobject/HairdresserCheesePlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withobject/HairdresserCheesePlugin.java @@ -1,14 +1,14 @@ package core.game.interaction.item.withobject; import core.plugin.Initializable; -import core.tools.Items; +import rs09.tools.Items; import core.game.interaction.NodeUsageEvent; 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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Plugin; /** diff --git a/Server/src/main/java/core/game/interaction/item/withobject/IncubatorPlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/IncubatorPlugin.java index 950b7acd5..68560d078 100644 --- a/Server/src/main/java/core/game/interaction/item/withobject/IncubatorPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withobject/IncubatorPlugin.java @@ -1,21 +1,19 @@ package core.game.interaction.item.withobject; import core.cache.def.impl.ObjectDefinition; -import core.game.node.entity.skill.Skills; -import core.game.node.entity.skill.summoning.pet.IncubatorEgg; import core.game.interaction.NodeUsageEvent; 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.entity.state.EntityState; -import core.game.node.entity.state.newsys.StateRepository; -import core.game.node.entity.state.newsys.states.IncubatorState; +import core.game.node.entity.skill.Skills; +import core.game.node.entity.skill.summoning.pet.IncubatorEgg; import core.game.node.item.GroundItemManager; -import core.plugin.Plugin; -import core.plugin.PluginManager; import core.plugin.Initializable; +import core.plugin.Plugin; import core.tools.StringUtils; +import rs09.game.node.entity.state.newsys.states.IncubatorState; +import rs09.plugin.PluginManager; /** * Handles the incubator. diff --git a/Server/src/main/java/core/game/interaction/item/withobject/PoisonFountainPlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/PoisonFountainPlugin.java index 46fc43866..6307f16b6 100644 --- a/Server/src/main/java/core/game/interaction/item/withobject/PoisonFountainPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withobject/PoisonFountainPlugin.java @@ -5,7 +5,7 @@ import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/item/withobject/SmithingPlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/SmithingPlugin.java index b7e7c602f..d945ea3b8 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 @@ -13,7 +13,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.plugin.Plugin; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the option handler used for smithing. diff --git a/Server/src/main/java/core/game/interaction/item/withobject/SpiritShieldBlessPlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/SpiritShieldBlessPlugin.java index 92927d90a..ca02c3f2e 100644 --- a/Server/src/main/java/core/game/interaction/item/withobject/SpiritShieldBlessPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withobject/SpiritShieldBlessPlugin.java @@ -6,11 +6,11 @@ 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.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the blessing of Spirit shields. diff --git a/Server/src/main/java/core/game/interaction/item/withobject/TutorialItemHandler.java b/Server/src/main/java/core/game/interaction/item/withobject/TutorialItemHandler.java index 62a10693d..6d87919c9 100644 --- a/Server/src/main/java/core/game/interaction/item/withobject/TutorialItemHandler.java +++ b/Server/src/main/java/core/game/interaction/item/withobject/TutorialItemHandler.java @@ -10,7 +10,7 @@ import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; 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 69314d73d..ed952f03e 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 @@ -1,7 +1,7 @@ package core.game.interaction.item.withobject; import core.plugin.Initializable; -import core.tools.Items; +import rs09.tools.Items; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/core/game/interaction/npc/BogrogPlugin.java b/Server/src/main/java/core/game/interaction/npc/BogrogPlugin.java index 92ce71e08..bc6d8a378 100644 --- a/Server/src/main/java/core/game/interaction/npc/BogrogPlugin.java +++ b/Server/src/main/java/core/game/interaction/npc/BogrogPlugin.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.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the bogrog npc. diff --git a/Server/src/main/java/core/game/interaction/npc/BurthorpeTrainNPC.java b/Server/src/main/java/core/game/interaction/npc/BurthorpeTrainNPC.java index 77231d2aa..bff5a6a5e 100644 --- a/Server/src/main/java/core/game/interaction/npc/BurthorpeTrainNPC.java +++ b/Server/src/main/java/core/game/interaction/npc/BurthorpeTrainNPC.java @@ -5,7 +5,7 @@ import java.util.List; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.npc.NPC; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/npc/CanafisWereWolfPlugin.java b/Server/src/main/java/core/game/interaction/npc/CanafisWereWolfPlugin.java index b464579fe..d0388a626 100644 --- a/Server/src/main/java/core/game/interaction/npc/CanafisWereWolfPlugin.java +++ b/Server/src/main/java/core/game/interaction/npc/CanafisWereWolfPlugin.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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/npc/GabootyTrade.java b/Server/src/main/java/core/game/interaction/npc/GabootyTrade.java index 07f762f95..08d5dc4ae 100644 --- a/Server/src/main/java/core/game/interaction/npc/GabootyTrade.java +++ b/Server/src/main/java/core/game/interaction/npc/GabootyTrade.java @@ -1,14 +1,13 @@ package core.game.interaction.npc; import core.cache.def.impl.NPCDefinition; - 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.system.config.ShopParser; import core.plugin.Initializable; import core.plugin.Plugin; +import rs09.game.system.config.ShopParser; /** * Represents the plugin used for trading with Gabooty diff --git a/Server/src/main/java/core/game/interaction/npc/NPCTalkPlugin.java b/Server/src/main/java/core/game/interaction/npc/NPCTalkPlugin.java index 54a3b2710..fd98de6d1 100644 --- a/Server/src/main/java/core/game/interaction/npc/NPCTalkPlugin.java +++ b/Server/src/main/java/core/game/interaction/npc/NPCTalkPlugin.java @@ -1,6 +1,7 @@ package core.game.interaction.npc; import core.cache.def.impl.NPCDefinition; +import core.game.content.dialogue.FacialExpression; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; @@ -9,12 +10,11 @@ import core.game.node.item.Item; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; -import core.game.content.activity.gnomecooking.GnomeCookingJob; -import core.game.content.activity.gnomecooking.GnomeTipper; -import core.game.content.dialogue.FacialExpression; +import rs09.game.content.activity.gnomecooking.GnomeCookingJob; +import rs09.game.content.activity.gnomecooking.GnomeTipper; -import static core.game.content.activity.gnomecooking.GnomeCookingConstantsKt.*; -import static core.tools.stringtools.StringToolsKt.colorize; +import static rs09.game.content.activity.gnomecooking.GnomeCookingConstantsKt.*; +import static rs09.tools.stringtools.StringToolsKt.colorize; /** * Handles the NPC talk-to option. diff --git a/Server/src/main/java/core/game/interaction/npc/SecurityGuardPlugin.java b/Server/src/main/java/core/game/interaction/npc/SecurityGuardPlugin.java index 32cbf3384..47855f805 100644 --- a/Server/src/main/java/core/game/interaction/npc/SecurityGuardPlugin.java +++ b/Server/src/main/java/core/game/interaction/npc/SecurityGuardPlugin.java @@ -8,8 +8,8 @@ import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; -import core.tools.Items; +import rs09.plugin.PluginManager; +import rs09.tools.Items; @Initializable public final class SecurityGuardPlugin extends OptionHandler { diff --git a/Server/src/main/java/core/game/interaction/npc/SheepShearPlugin.java b/Server/src/main/java/core/game/interaction/npc/SheepShearPlugin.java index 3551b72e9..11e698970 100644 --- a/Server/src/main/java/core/game/interaction/npc/SheepShearPlugin.java +++ b/Server/src/main/java/core/game/interaction/npc/SheepShearPlugin.java @@ -7,7 +7,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/interaction/npc/ZahurOptionPlugin.java b/Server/src/main/java/core/game/interaction/npc/ZahurOptionPlugin.java index 8725a377f..499ef0515 100644 --- a/Server/src/main/java/core/game/interaction/npc/ZahurOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/npc/ZahurOptionPlugin.java @@ -8,7 +8,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.game.node.entity.skill.herblore.PotionDecantingPlugin; diff --git a/Server/src/main/java/core/game/interaction/npc/bob/BobRepairItem.java b/Server/src/main/java/core/game/interaction/npc/bob/BobRepairItem.java index 5a6ea01a3..2cfcd22ba 100644 --- a/Server/src/main/java/core/game/interaction/npc/bob/BobRepairItem.java +++ b/Server/src/main/java/core/game/interaction/npc/bob/BobRepairItem.java @@ -7,7 +7,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.plugin.Plugin; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the plugin used to handle an item being used on bob. diff --git a/Server/src/main/java/core/game/interaction/npc/sorceress_app/SorceressApprenticeDialogue.java b/Server/src/main/java/core/game/interaction/npc/sorceress_app/SorceressApprenticeDialogue.java index 9f76157b4..1a87a12ff 100644 --- a/Server/src/main/java/core/game/interaction/npc/sorceress_app/SorceressApprenticeDialogue.java +++ b/Server/src/main/java/core/game/interaction/npc/sorceress_app/SorceressApprenticeDialogue.java @@ -6,7 +6,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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Graphics; 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 8d205c27c..f4dd52c87 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 @@ -12,7 +12,7 @@ import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Teleport option for Sorceress Apprentice 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 2c66040c9..2b8a43a67 100644 --- a/Server/src/main/java/core/game/interaction/object/BankingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/BankingPlugin.java @@ -7,11 +7,9 @@ import core.game.component.Component; import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; import core.game.container.access.InterfaceContainer; -import core.game.node.entity.player.link.diary.DiaryType; import core.game.content.dialogue.DialogueAction; import core.game.content.dialogue.DialoguePlugin; import core.game.content.dialogue.FacialExpression; -import core.game.ge.GrandExchangeOffer; import core.game.content.quest.tutorials.tutorialisland.TutorialSession; import core.game.content.quest.tutorials.tutorialisland.TutorialStage; import core.game.interaction.OptionHandler; @@ -21,16 +19,18 @@ 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.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.plugin.Plugin; +import rs09.game.ge.GrandExchangeOffer; +import rs09.game.world.GameWorld; import java.text.NumberFormat; diff --git a/Server/src/main/java/core/game/interaction/object/BarrowsBoatPlugin.java b/Server/src/main/java/core/game/interaction/object/BarrowsBoatPlugin.java index 542bcb95f..1419c2e32 100644 --- a/Server/src/main/java/core/game/interaction/object/BarrowsBoatPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/BarrowsBoatPlugin.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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/BeehivePlugin.java b/Server/src/main/java/core/game/interaction/object/BeehivePlugin.java index 578a9d0a7..b1d4546b7 100644 --- a/Server/src/main/java/core/game/interaction/object/BeehivePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/BeehivePlugin.java @@ -1,14 +1,14 @@ package core.game.interaction.object; import core.cache.def.impl.ObjectDefinition; -import core.tools.Items; +import rs09.tools.Items; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.combat.ImpactHandler; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/interaction/object/BrokenCartBypass.java b/Server/src/main/java/core/game/interaction/object/BrokenCartBypass.java index 77c1879dc..1d1471872 100644 --- a/Server/src/main/java/core/game/interaction/object/BrokenCartBypass.java +++ b/Server/src/main/java/core/game/interaction/object/BrokenCartBypass.java @@ -5,7 +5,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/BuyCrateOptionPlugin.java b/Server/src/main/java/core/game/interaction/object/BuyCrateOptionPlugin.java index e756e0fa2..a29d954d2 100644 --- a/Server/src/main/java/core/game/interaction/object/BuyCrateOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/BuyCrateOptionPlugin.java @@ -4,9 +4,9 @@ import core.cache.def.impl.ObjectDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.system.config.ShopParser; import core.plugin.Initializable; import core.plugin.Plugin; +import rs09.game.system.config.ShopParser; /** * Represents the buy crate option plugin for the seers village city. 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 81d740ac2..9a59d0d36 100644 --- a/Server/src/main/java/core/game/interaction/object/ChefGuildDoorPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ChefGuildDoorPlugin.java @@ -1,7 +1,7 @@ package core.game.interaction.object; import core.cache.def.impl.ObjectDefinition; -import core.tools.Items; +import rs09.tools.Items; import core.game.content.global.action.DoorActionHandler; import core.game.node.item.Item; import core.game.node.entity.skill.Skills; 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 42d24fb44..611fed2da 100644 --- a/Server/src/main/java/core/game/interaction/object/CowMilkingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/CowMilkingPlugin.java @@ -12,7 +12,7 @@ import core.game.system.task.Pulse; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the plugin used to milk a cow. diff --git a/Server/src/main/java/core/game/interaction/object/CrystalChestPlugin.java b/Server/src/main/java/core/game/interaction/object/CrystalChestPlugin.java index e22de3988..cd7d6509e 100644 --- a/Server/src/main/java/core/game/interaction/object/CrystalChestPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/CrystalChestPlugin.java @@ -8,7 +8,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.plugin.Initializable; import core.tools.RandomFunction; 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 d52c44cf7..b76aeedfc 100644 --- a/Server/src/main/java/core/game/interaction/object/CulinomancerChestPliugin.java +++ b/Server/src/main/java/core/game/interaction/object/CulinomancerChestPliugin.java @@ -6,11 +6,11 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; -import core.game.system.config.ShopParser; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.plugin.Initializable; import core.plugin.Plugin; +import rs09.game.system.config.ShopParser; /** * Handles the culinomancer chest. 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 08419187b..eb6486111 100644 --- a/Server/src/main/java/core/game/interaction/object/DropPartyLeverOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/DropPartyLeverOptionPlugin.java @@ -6,7 +6,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; 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 b42748d4a..063948dd6 100644 --- a/Server/src/main/java/core/game/interaction/object/ErnestTheChickenPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ErnestTheChickenPlugin.java @@ -13,7 +13,7 @@ import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBuilder; 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 85fb4e118..750ab251b 100644 --- a/Server/src/main/java/core/game/interaction/object/FieldPickingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/FieldPickingPlugin.java @@ -11,7 +11,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/interaction/object/GrandExchangeShortcut.java b/Server/src/main/java/core/game/interaction/object/GrandExchangeShortcut.java index 20c39e28a..fac33bfb2 100644 --- a/Server/src/main/java/core/game/interaction/object/GrandExchangeShortcut.java +++ b/Server/src/main/java/core/game/interaction/object/GrandExchangeShortcut.java @@ -10,7 +10,7 @@ import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +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/interaction/object/KalphiteEntranceHandler.java b/Server/src/main/java/core/game/interaction/object/KalphiteEntranceHandler.java index 520b0645c..d3c43dbc3 100644 --- a/Server/src/main/java/core/game/interaction/object/KalphiteEntranceHandler.java +++ b/Server/src/main/java/core/game/interaction/object/KalphiteEntranceHandler.java @@ -9,7 +9,7 @@ import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/LumbridgeBasementPlugin.java b/Server/src/main/java/core/game/interaction/object/LumbridgeBasementPlugin.java index 3f80259b0..d8e417be8 100644 --- a/Server/src/main/java/core/game/interaction/object/LumbridgeBasementPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/LumbridgeBasementPlugin.java @@ -13,13 +13,13 @@ import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.path.Pathfinder; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.plugin.Initializable; import core.tools.RandomFunction; 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 eb1668b9c..eb436307d 100644 --- a/Server/src/main/java/core/game/interaction/object/PortsObjectPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/PortsObjectPlugin.java @@ -7,7 +7,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.world.map.Location; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; 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/ProspectOrePlugin.java b/Server/src/main/java/core/game/interaction/object/ProspectOrePlugin.java index 69cabd4cf..3a34ee45d 100644 --- a/Server/src/main/java/core/game/interaction/object/ProspectOrePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ProspectOrePlugin.java @@ -11,7 +11,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +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 16d202ab9..3c8ca4860 100644 --- a/Server/src/main/java/core/game/interaction/object/PyreSitePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/PyreSitePlugin.java @@ -21,12 +21,12 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** 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 2c80a090b..2f4b900f0 100644 --- a/Server/src/main/java/core/game/interaction/object/SinclairFlourBarrelPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/SinclairFlourBarrelPlugin.java @@ -1,7 +1,7 @@ package core.game.interaction.object; import core.cache.def.impl.ObjectDefinition; -import core.tools.Items; +import rs09.tools.Items; import core.game.interaction.NodeUsageEvent; import core.game.interaction.OptionHandler; import core.game.interaction.UseWithHandler; @@ -12,7 +12,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +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 925570eb8..6be799164 100644 --- a/Server/src/main/java/core/game/interaction/object/SlashWebPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/SlashWebPlugin.java @@ -4,7 +4,7 @@ import core.cache.def.impl.ObjectDefinition; import core.game.container.Container; import core.game.container.impl.EquipmentContainer; import core.plugin.Initializable; -import core.tools.Items; +import rs09.tools.Items; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.combat.equipment.WeaponInterface; 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 046dfdc34..de5c48168 100644 --- a/Server/src/main/java/core/game/interaction/object/ThievingGuidePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ThievingGuidePlugin.java @@ -17,7 +17,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/TollGateOptionPlugin.java b/Server/src/main/java/core/game/interaction/object/TollGateOptionPlugin.java index 1f82e1c81..0438205c5 100644 --- a/Server/src/main/java/core/game/interaction/object/TollGateOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/TollGateOptionPlugin.java @@ -7,12 +7,12 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.node.object.GameObject; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.plugin.Initializable; import core.plugin.Plugin; -import static core.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_BASE; -import static core.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_ALKHARID_GATE; +import static rs09.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_ALKHARID_GATE; +import static rs09.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_BASE; @Initializable public class TollGateOptionPlugin extends OptionHandler { 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 a59805085..b6d6008e9 100644 --- a/Server/src/main/java/core/game/interaction/object/WildernessLeverPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/WildernessLeverPlugin.java @@ -12,11 +12,11 @@ import core.game.node.entity.player.link.audio.Audio; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles wilderness levers. 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 4e12a8425..a61112beb 100644 --- a/Server/src/main/java/core/game/interaction/object/WildernessObeliskPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/WildernessObeliskPlugin.java @@ -8,7 +8,7 @@ import core.game.node.entity.player.link.TeleportManager.TeleportType; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.update.flag.chunk.GraphicUpdateFlag; 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 7f2e4c164..0b287eb6d 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 @@ -2,7 +2,7 @@ package core.game.interaction.object.dmc; import core.game.node.entity.skill.Skills; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.ImpactHandler.HitsplatType; import core.game.node.entity.impl.Projectile; import core.game.node.entity.npc.NPC; @@ -12,7 +12,7 @@ import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/object/dmc/DwarfMultiCannonPlugin.java b/Server/src/main/java/core/game/interaction/object/dmc/DwarfMultiCannonPlugin.java index ff96d3f04..7fae23995 100644 --- a/Server/src/main/java/core/game/interaction/object/dmc/DwarfMultiCannonPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/dmc/DwarfMultiCannonPlugin.java @@ -11,7 +11,7 @@ import core.game.node.entity.player.info.Rights; import core.game.node.item.Item; import core.plugin.Plugin; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the Dwarf multi-cannon. diff --git a/Server/src/main/java/core/game/interaction/object/sorceress/GardenObjectsPlugin.java b/Server/src/main/java/core/game/interaction/object/sorceress/GardenObjectsPlugin.java index 1ef2c51e4..f8a8884d7 100644 --- a/Server/src/main/java/core/game/interaction/object/sorceress/GardenObjectsPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/sorceress/GardenObjectsPlugin.java @@ -18,7 +18,7 @@ import core.game.node.object.GameObject; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; @@ -26,7 +26,7 @@ import core.net.packet.PacketRepository; import core.net.packet.context.MinimapStateContext; import core.net.packet.out.MinimapState; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** 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 216f006c2..9e697f2c1 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 @@ -9,7 +9,7 @@ import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the plugin to handle the crossing. diff --git a/Server/src/main/java/core/game/interaction/player/LoginValidationPlugin.java b/Server/src/main/java/core/game/interaction/player/LoginValidationPlugin.java index 767f81a79..fa71c8f97 100644 --- a/Server/src/main/java/core/game/interaction/player/LoginValidationPlugin.java +++ b/Server/src/main/java/core/game/interaction/player/LoginValidationPlugin.java @@ -6,7 +6,7 @@ import core.game.content.activity.ActivityManager; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.system.SystemManager; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Plugin; import core.plugin.PluginManifest; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/node/entity/Entity.java b/Server/src/main/java/core/game/node/entity/Entity.java index b6f6348d5..a0f07e7df 100644 --- a/Server/src/main/java/core/game/node/entity/Entity.java +++ b/Server/src/main/java/core/game/node/entity/Entity.java @@ -1,28 +1,32 @@ package core.game.node.entity; import core.game.content.holiday.HolidayEvent; -import core.game.node.entity.skill.Skills; import core.game.interaction.DestinationFlag; import core.game.node.Node; -import core.game.node.entity.combat.*; +import core.game.node.entity.combat.BattleState; +import core.game.node.entity.combat.CombatStyle; +import core.game.node.entity.combat.DeathTask; +import core.game.node.entity.combat.ImpactHandler; import core.game.node.entity.combat.equipment.ArmourSet; import core.game.node.entity.impl.*; import core.game.node.entity.lock.ActionLocks; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.TeleportManager; +import core.game.node.entity.skill.Skills; import core.game.node.entity.state.EntityState; import core.game.node.entity.state.StateManager; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.Viewport; import core.game.world.map.path.Path; import core.game.world.map.path.Pathfinder; import core.game.world.map.zone.ZoneMonitor; -import core.game.world.update.UpdateMasks; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.world.update.UpdateMasks; import java.util.HashMap; import java.util.Map; diff --git a/Server/src/main/java/core/game/node/entity/combat/CombatStyle.java b/Server/src/main/java/core/game/node/entity/combat/CombatStyle.java index 09689c458..cf751001a 100644 --- a/Server/src/main/java/core/game/node/entity/combat/CombatStyle.java +++ b/Server/src/main/java/core/game/node/entity/combat/CombatStyle.java @@ -1,9 +1,10 @@ package core.game.node.entity.combat; -import core.game.node.entity.combat.handlers.MagicSwingHandler; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; -import core.game.node.entity.combat.handlers.RangeSwingHandler; import core.game.node.entity.player.link.prayer.PrayerType; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.handlers.MagicSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.RangeSwingHandler; /** * Represents the different styles of combat. diff --git a/Server/src/main/java/core/game/node/entity/combat/DeathTask.java b/Server/src/main/java/core/game/node/entity/combat/DeathTask.java index 9a116b323..d2286f619 100644 --- a/Server/src/main/java/core/game/node/entity/combat/DeathTask.java +++ b/Server/src/main/java/core/game/node/entity/combat/DeathTask.java @@ -15,7 +15,7 @@ import core.game.node.entity.player.link.prayer.PrayerType; import core.game.node.item.Item; import core.game.system.task.NodeTask; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; /** diff --git a/Server/src/main/java/core/game/node/entity/combat/ImpactHandler.java b/Server/src/main/java/core/game/node/entity/combat/ImpactHandler.java index 4cecc8c51..843f31d78 100644 --- a/Server/src/main/java/core/game/node/entity/combat/ImpactHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/ImpactHandler.java @@ -1,6 +1,6 @@ package core.game.node.entity.combat; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.container.impl.EquipmentContainer; import core.game.content.quest.tutorials.tutorialisland.TutorialSession; import core.game.node.entity.skill.Skills; @@ -12,7 +12,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.prayer.PrayerType; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.zone.ZoneType; import java.util.HashMap; diff --git a/Server/src/main/java/core/game/node/entity/combat/equipment/BoltEffect.java b/Server/src/main/java/core/game/node/entity/combat/equipment/BoltEffect.java index f75c57112..8b3e30008 100644 --- a/Server/src/main/java/core/game/node/entity/combat/equipment/BoltEffect.java +++ b/Server/src/main/java/core/game/node/entity/combat/equipment/BoltEffect.java @@ -8,7 +8,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; import core.game.node.entity.state.EntityState; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Graphics; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/node/entity/combat/equipment/SwitchAttack.java b/Server/src/main/java/core/game/node/entity/combat/equipment/SwitchAttack.java index 7a11c7eb3..c707e343b 100644 --- a/Server/src/main/java/core/game/node/entity/combat/equipment/SwitchAttack.java +++ b/Server/src/main/java/core/game/node/entity/combat/equipment/SwitchAttack.java @@ -3,7 +3,7 @@ package core.game.node.entity.combat.equipment; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.impl.Projectile; 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/combat/equipment/WeaponInterface.java b/Server/src/main/java/core/game/node/entity/combat/equipment/WeaponInterface.java index 6e1b85b67..6ac086b99 100644 --- a/Server/src/main/java/core/game/node/entity/combat/equipment/WeaponInterface.java +++ b/Server/src/main/java/core/game/node/entity/combat/equipment/WeaponInterface.java @@ -9,7 +9,7 @@ import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.SpellBookManager; import core.game.node.item.Item; -import core.game.system.config.ItemConfigParser; +import rs09.game.system.config.ItemConfigParser; import core.game.world.update.flag.context.Animation; import core.net.packet.PacketRepository; import core.net.packet.context.InterfaceConfigContext; @@ -19,7 +19,8 @@ import core.net.packet.out.Interface; import core.net.packet.out.InterfaceConfig; import core.net.packet.out.StringPacket; -import static core.tools.Interfaces.*; +import static rs09.tools.Interfaces.*; + /** * Represents the weapon interface component. diff --git a/Server/src/main/java/core/game/node/entity/combat/handlers/ChinchompaSwingHandler.java b/Server/src/main/java/core/game/node/entity/combat/handlers/ChinchompaSwingHandler.java index 60f69f8ac..3a5958848 100644 --- a/Server/src/main/java/core/game/node/entity/combat/handlers/ChinchompaSwingHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/handlers/ChinchompaSwingHandler.java @@ -1,6 +1,5 @@ package core.game.node.entity.combat.handlers; -import core.game.node.entity.skill.Skills; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; @@ -11,9 +10,11 @@ import core.game.node.entity.combat.equipment.Weapon; import core.game.node.entity.combat.equipment.WeaponInterface; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; +import core.game.node.entity.skill.Skills; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Graphics; import core.tools.RandomFunction; +import rs09.game.node.entity.combat.handlers.RangeSwingHandler; import java.util.List; diff --git a/Server/src/main/java/core/game/node/entity/combat/handlers/DragonfireSwingHandler.java b/Server/src/main/java/core/game/node/entity/combat/handlers/DragonfireSwingHandler.java index 0c9ff895d..40340c0f2 100644 --- a/Server/src/main/java/core/game/node/entity/combat/handlers/DragonfireSwingHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/handlers/DragonfireSwingHandler.java @@ -4,7 +4,7 @@ import core.game.container.impl.EquipmentContainer; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.InteractionType; import core.game.node.entity.combat.equipment.SwitchAttack; import core.game.node.entity.impl.Projectile; @@ -12,7 +12,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.state.EntityState; import core.game.node.item.Item; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/AncientMaceSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/AncientMaceSpecialHandler.java index 2ad155abd..57175920e 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/AncientMaceSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/AncientMaceSpecialHandler.java @@ -3,7 +3,7 @@ package core.game.node.entity.combat.special; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/BackstabSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/BackstabSpecialHandler.java index b10ec0e9c..46887e0eb 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/BackstabSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/BackstabSpecialHandler.java @@ -4,7 +4,7 @@ import core.game.node.entity.skill.Skills; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/ChainhitSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/ChainhitSpecialHandler.java index 22377fe6f..ac17e8d78 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/ChainhitSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/ChainhitSpecialHandler.java @@ -1,29 +1,29 @@ package core.game.node.entity.combat.special; -import java.util.Iterator; -import java.util.List; - import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.combat.DeathTask; import core.game.node.entity.combat.ImpactHandler.HitsplatType; -import core.game.node.entity.combat.handlers.RangeSwingHandler; -import core.game.node.entity.impl.Projectile; import core.game.node.entity.impl.Animator.Priority; +import core.game.node.entity.impl.Projectile; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.MapDistance; import core.game.world.map.RegionManager; -import core.game.world.repository.Repository; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Initializable; import core.plugin.Plugin; import core.tools.RandomFunction; +import rs09.game.node.entity.combat.handlers.RangeSwingHandler; +import rs09.game.world.GameWorld; +import rs09.game.world.repository.Repository; + +import java.util.Iterator; +import java.util.List; /** * Handles the Rune throwing axe special attack "Chain-hit". diff --git a/Server/src/main/java/core/game/node/entity/combat/special/CleaveSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/CleaveSpecialHandler.java index c1c9d17c2..822469f0b 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/CleaveSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/CleaveSpecialHandler.java @@ -3,7 +3,7 @@ package core.game.node.entity.combat.special; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/ClobberSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/ClobberSpecialHandler.java index c5e43ad99..86417df5c 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/ClobberSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/ClobberSpecialHandler.java @@ -5,7 +5,7 @@ import core.game.node.entity.skill.Skills; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/DescentOfDarknessSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/DescentOfDarknessSpecialHandler.java index 9009c6291..247e308da 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/DescentOfDarknessSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/DescentOfDarknessSpecialHandler.java @@ -8,7 +8,6 @@ import core.game.node.entity.combat.equipment.Ammunition; import core.game.node.entity.combat.equipment.RangeWeapon; import core.game.node.entity.combat.equipment.Weapon; import core.game.node.entity.combat.equipment.Weapon.WeaponType; -import core.game.node.entity.combat.handlers.RangeSwingHandler; import core.game.node.entity.impl.Projectile; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; @@ -16,6 +15,7 @@ import core.game.world.update.flag.context.Graphics; import core.plugin.Initializable; import core.plugin.Plugin; import core.tools.RandomFunction; +import rs09.game.node.entity.combat.handlers.RangeSwingHandler; /** * Represents the descent of darkness sepcial handler. diff --git a/Server/src/main/java/core/game/node/entity/combat/special/EnergyDrainSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/EnergyDrainSpecialHandler.java index 228e347ed..990ef9846 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/EnergyDrainSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/EnergyDrainSpecialHandler.java @@ -3,7 +3,7 @@ package core.game.node.entity.combat.special; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/ExcaliburSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/ExcaliburSpecialHandler.java index d630cf763..927c7e679 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/ExcaliburSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/ExcaliburSpecialHandler.java @@ -5,7 +5,7 @@ import core.game.node.entity.skill.Skills; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/FeintSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/FeintSpecialHandler.java index ea19e250c..70394b9a4 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/FeintSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/FeintSpecialHandler.java @@ -3,7 +3,7 @@ package core.game.node.entity.combat.special; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/HealingBladeSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/HealingBladeSpecialHandler.java index dead91c19..194ff93fd 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/HealingBladeSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/HealingBladeSpecialHandler.java @@ -3,7 +3,7 @@ package core.game.node.entity.combat.special; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/IceCleaveSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/IceCleaveSpecialHandler.java index 3b596897d..39b6881b8 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/IceCleaveSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/IceCleaveSpecialHandler.java @@ -3,7 +3,7 @@ package core.game.node.entity.combat.special; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.node.entity.state.EntityState; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/ImpaleSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/ImpaleSpecialHandler.java index 2c1dc39f1..11b412c66 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/ImpaleSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/ImpaleSpecialHandler.java @@ -3,7 +3,7 @@ package core.game.node.entity.combat.special; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.node.entity.player.info.Rights; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/JudgementSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/JudgementSpecialHandler.java index 4e49f6b9e..fd2341d47 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/JudgementSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/JudgementSpecialHandler.java @@ -3,7 +3,7 @@ package core.game.node.entity.combat.special; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/PowershotSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/PowershotSpecialHandler.java index 0c0edc511..e92c9a394 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/PowershotSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/PowershotSpecialHandler.java @@ -3,13 +3,13 @@ package core.game.node.entity.combat.special; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.RangeSwingHandler; import core.game.node.entity.impl.Projectile; import core.game.node.entity.player.Player; import core.game.world.update.flag.context.Graphics; import core.plugin.Initializable; import core.plugin.Plugin; import core.tools.RandomFunction; +import rs09.game.node.entity.combat.handlers.RangeSwingHandler; /** * Handles the Magic longbow special attack "Powershot". diff --git a/Server/src/main/java/core/game/node/entity/combat/special/PowerstabSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/PowerstabSpecialHandler.java index dbdb678ee..2854da54f 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/PowerstabSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/PowerstabSpecialHandler.java @@ -6,7 +6,7 @@ import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.combat.InteractionType; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/PunctureSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/PunctureSpecialHandler.java index a93469bad..006070d7e 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/PunctureSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/PunctureSpecialHandler.java @@ -3,7 +3,7 @@ package core.game.node.entity.combat.special; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/QuickSmashSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/QuickSmashSpecialHandler.java index 8aa518b95..d93eb8316 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/QuickSmashSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/QuickSmashSpecialHandler.java @@ -3,11 +3,11 @@ package core.game.node.entity.combat.special; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/combat/special/RampageSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/RampageSpecialHandler.java index dfb2160d6..8a75bc4fa 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/RampageSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/RampageSpecialHandler.java @@ -4,7 +4,7 @@ import core.game.node.entity.skill.Skills; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/SaradominsLightningHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/SaradominsLightningHandler.java index a5dfff61c..c8ec6a078 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/SaradominsLightningHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/SaradominsLightningHandler.java @@ -3,7 +3,7 @@ package core.game.node.entity.combat.special; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/SeverSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/SeverSpecialHandler.java index 734c90f15..7b37f31e1 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/SeverSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/SeverSpecialHandler.java @@ -3,7 +3,7 @@ package core.game.node.entity.combat.special; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.prayer.PrayerType; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/ShatterSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/ShatterSpecialHandler.java index 870e56c93..b9bc223a4 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/ShatterSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/ShatterSpecialHandler.java @@ -3,7 +3,7 @@ package core.game.node.entity.combat.special; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/ShoveSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/ShoveSpecialHandler.java index 3b5f92e5c..ae67f2a0c 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/ShoveSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/ShoveSpecialHandler.java @@ -3,7 +3,7 @@ package core.game.node.entity.combat.special; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.node.entity.state.EntityState; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/SliceAndDiceSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/SliceAndDiceSpecialHandler.java index ac402c0ac..511f9dc8e 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/SliceAndDiceSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/SliceAndDiceSpecialHandler.java @@ -3,7 +3,7 @@ package core.game.node.entity.combat.special; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/SmashSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/SmashSpecialHandler.java index dac0313a8..fdb96887b 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/SmashSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/SmashSpecialHandler.java @@ -5,7 +5,7 @@ import core.game.node.entity.skill.Skills; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/SnapshotSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/SnapshotSpecialHandler.java index 6ef4d6cb8..634e62391 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/SnapshotSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/SnapshotSpecialHandler.java @@ -3,17 +3,17 @@ package core.game.node.entity.combat.special; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.RangeSwingHandler; -import core.game.node.entity.impl.Projectile; import core.game.node.entity.impl.Animator.Priority; +import core.game.node.entity.impl.Projectile; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; -import core.plugin.Plugin; import core.plugin.Initializable; +import core.plugin.Plugin; import core.tools.RandomFunction; +import rs09.game.node.entity.combat.handlers.RangeSwingHandler; +import rs09.game.world.GameWorld; /** * Handles the magic shortbow special attack "Snapshot". diff --git a/Server/src/main/java/core/game/node/entity/combat/special/SnipeSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/SnipeSpecialHandler.java index f8eea1133..1a1aa5d25 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/SnipeSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/SnipeSpecialHandler.java @@ -1,17 +1,17 @@ package core.game.node.entity.combat.special; -import core.plugin.Initializable; -import core.game.node.entity.skill.Skills; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.RangeSwingHandler; -import core.game.node.entity.impl.Projectile; import core.game.node.entity.impl.Animator.Priority; +import core.game.node.entity.impl.Projectile; import core.game.node.entity.player.Player; +import core.game.node.entity.skill.Skills; import core.game.world.update.flag.context.Animation; +import core.plugin.Initializable; import core.plugin.Plugin; import core.tools.RandomFunction; +import rs09.game.node.entity.combat.handlers.RangeSwingHandler; /** * Represents the Dorgeshuun crossbow's special attack - snipe. diff --git a/Server/src/main/java/core/game/node/entity/combat/special/SpearWallSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/SpearWallSpecialHandler.java index 77a5c1183..af10d33a3 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/SpearWallSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/SpearWallSpecialHandler.java @@ -6,7 +6,7 @@ import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.combat.InteractionType; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/SweepSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/SweepSpecialHandler.java index b70f3b02a..73ee3867c 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/SweepSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/SweepSpecialHandler.java @@ -8,7 +8,7 @@ import core.game.node.entity.skill.summoning.familiar.Familiar; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/core/game/node/entity/combat/special/WarstrikeSpecialHandler.java b/Server/src/main/java/core/game/node/entity/combat/special/WarstrikeSpecialHandler.java index 88bc9bc66..0e6bbd4c4 100644 --- a/Server/src/main/java/core/game/node/entity/combat/special/WarstrikeSpecialHandler.java +++ b/Server/src/main/java/core/game/node/entity/combat/special/WarstrikeSpecialHandler.java @@ -4,7 +4,7 @@ import core.game.node.entity.skill.Skills; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; diff --git a/Server/src/main/java/core/game/node/entity/combat/spell/BindSpell.java b/Server/src/main/java/core/game/node/entity/combat/spell/BindSpell.java index 14bec353e..7c8e9b61d 100644 --- a/Server/src/main/java/core/game/node/entity/combat/spell/BindSpell.java +++ b/Server/src/main/java/core/game/node/entity/combat/spell/BindSpell.java @@ -12,7 +12,7 @@ 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.item.Item; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/node/entity/combat/spell/IceSpells.java b/Server/src/main/java/core/game/node/entity/combat/spell/IceSpells.java index 227eda674..9f4e0b757 100644 --- a/Server/src/main/java/core/game/node/entity/combat/spell/IceSpells.java +++ b/Server/src/main/java/core/game/node/entity/combat/spell/IceSpells.java @@ -14,7 +14,7 @@ import core.game.node.entity.player.link.SpellBookManager.SpellBook; import core.game.node.entity.player.link.audio.Audio; import core.game.node.entity.state.EntityState; import core.game.node.item.Item; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/combat/spell/MiasmicSpells.java b/Server/src/main/java/core/game/node/entity/combat/spell/MiasmicSpells.java index bc8407406..5dbbe9df5 100644 --- a/Server/src/main/java/core/game/node/entity/combat/spell/MiasmicSpells.java +++ b/Server/src/main/java/core/game/node/entity/combat/spell/MiasmicSpells.java @@ -16,7 +16,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.SpellBookManager.SpellBook; import core.game.node.entity.state.EntityState; import core.game.node.item.Item; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/node/entity/combat/spell/SpellBlocks.java b/Server/src/main/java/core/game/node/entity/combat/spell/SpellBlocks.java index ec2e95b27..d0d4b779c 100644 --- a/Server/src/main/java/core/game/node/entity/combat/spell/SpellBlocks.java +++ b/Server/src/main/java/core/game/node/entity/combat/spell/SpellBlocks.java @@ -1,7 +1,7 @@ package core.game.node.entity.combat.spell; import core.game.node.Node; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import java.util.ArrayList; import java.util.HashMap; diff --git a/Server/src/main/java/core/game/node/entity/impl/Animator.java b/Server/src/main/java/core/game/node/entity/impl/Animator.java index caece2816..843464524 100644 --- a/Server/src/main/java/core/game/node/entity/impl/Animator.java +++ b/Server/src/main/java/core/game/node/entity/impl/Animator.java @@ -2,7 +2,7 @@ package core.game.node.entity.impl; import core.game.node.entity.Entity; import core.game.node.entity.npc.NPC; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.game.world.update.flag.npc.NPCAnimation; diff --git a/Server/src/main/java/core/game/node/entity/impl/ForceMovement.java b/Server/src/main/java/core/game/node/entity/impl/ForceMovement.java index 38cacf0c6..ba935984e 100644 --- a/Server/src/main/java/core/game/node/entity/impl/ForceMovement.java +++ b/Server/src/main/java/core/game/node/entity/impl/ForceMovement.java @@ -2,7 +2,7 @@ package core.game.node.entity.impl; import core.game.node.entity.Entity; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/impl/GameAttributes.java b/Server/src/main/java/core/game/node/entity/impl/GameAttributes.java index db629a03a..e97916f5f 100644 --- a/Server/src/main/java/core/game/node/entity/impl/GameAttributes.java +++ b/Server/src/main/java/core/game/node/entity/impl/GameAttributes.java @@ -1,6 +1,6 @@ package core.game.node.entity.impl; -import core.ServerConstants; +import rs09.ServerConstants; import org.w3c.dom.*; import javax.xml.parsers.DocumentBuilder; diff --git a/Server/src/main/java/core/game/node/entity/impl/Properties.java b/Server/src/main/java/core/game/node/entity/impl/Properties.java index 6fcdd3ddd..e2438f442 100644 --- a/Server/src/main/java/core/game/node/entity/impl/Properties.java +++ b/Server/src/main/java/core/game/node/entity/impl/Properties.java @@ -3,7 +3,6 @@ package core.game.node.entity.impl; import core.game.container.Container; import core.game.container.impl.EquipmentContainer; import core.game.node.entity.Entity; -import core.game.node.entity.combat.CombatPulse; import core.game.node.entity.combat.CombatSpell; import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.combat.equipment.ArmourSet; @@ -11,10 +10,11 @@ import core.game.node.entity.combat.equipment.WeaponInterface; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.system.config.ItemConfigParser; -import core.game.system.config.NPCConfigParser; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; +import rs09.game.node.entity.combat.CombatPulse; +import rs09.game.system.config.ItemConfigParser; +import rs09.game.system.config.NPCConfigParser; /** * Holds an entity's properties. diff --git a/Server/src/main/java/core/game/node/entity/impl/PulseManager.java b/Server/src/main/java/core/game/node/entity/impl/PulseManager.java index c96270f41..f7cafd0cf 100644 --- a/Server/src/main/java/core/game/node/entity/impl/PulseManager.java +++ b/Server/src/main/java/core/game/node/entity/impl/PulseManager.java @@ -2,11 +2,11 @@ package core.game.node.entity.impl; import core.game.interaction.MovementPulse; import core.game.node.entity.Entity; -import core.game.node.entity.combat.CombatPulse; import core.game.node.entity.combat.DeathTask; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.node.entity.combat.CombatPulse; +import rs09.game.world.GameWorld; /** * Represents an entity's pulse manager. diff --git a/Server/src/main/java/core/game/node/entity/impl/WalkingQueue.java b/Server/src/main/java/core/game/node/entity/impl/WalkingQueue.java index 159bb41b7..d41cd1a5f 100644 --- a/Server/src/main/java/core/game/node/entity/impl/WalkingQueue.java +++ b/Server/src/main/java/core/game/node/entity/impl/WalkingQueue.java @@ -1,13 +1,13 @@ package core.game.node.entity.impl; -import core.game.node.entity.skill.Skills; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; +import core.game.node.entity.skill.Skills; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.Point; import core.game.world.map.RegionManager; -import core.game.node.entity.skill.skillcapeperks.SkillcapePerks; +import rs09.game.node.entity.skill.skillcapeperks.SkillcapePerks; import java.util.Deque; import java.util.LinkedList; diff --git a/Server/src/main/java/core/game/node/entity/lock/ActionLocks.java b/Server/src/main/java/core/game/node/entity/lock/ActionLocks.java index af76575a1..f24ea9a9a 100644 --- a/Server/src/main/java/core/game/node/entity/lock/ActionLocks.java +++ b/Server/src/main/java/core/game/node/entity/lock/ActionLocks.java @@ -1,7 +1,7 @@ package core.game.node.entity.lock; import core.game.node.Node; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import java.util.HashMap; import java.util.Map; diff --git a/Server/src/main/java/core/game/node/entity/lock/Lock.java b/Server/src/main/java/core/game/node/entity/lock/Lock.java index efa739c03..005e55e64 100644 --- a/Server/src/main/java/core/game/node/entity/lock/Lock.java +++ b/Server/src/main/java/core/game/node/entity/lock/Lock.java @@ -1,6 +1,6 @@ package core.game.node.entity.lock; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * Represents a lock. diff --git a/Server/src/main/java/core/game/node/entity/npc/AbstractNPC.java b/Server/src/main/java/core/game/node/entity/npc/AbstractNPC.java index 7d03735ee..402f2fce5 100644 --- a/Server/src/main/java/core/game/node/entity/npc/AbstractNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/AbstractNPC.java @@ -1,6 +1,6 @@ package core.game.node.entity.npc; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.game.world.map.Location; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/node/entity/npc/Metamorphosis.java b/Server/src/main/java/core/game/node/entity/npc/Metamorphosis.java index db5b42415..80d0fb3c7 100644 --- a/Server/src/main/java/core/game/node/entity/npc/Metamorphosis.java +++ b/Server/src/main/java/core/game/node/entity/npc/Metamorphosis.java @@ -9,7 +9,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** diff --git a/Server/src/main/java/core/game/node/entity/npc/NPC.java b/Server/src/main/java/core/game/node/entity/npc/NPC.java index 3b6f786e6..da1e44f90 100644 --- a/Server/src/main/java/core/game/node/entity/npc/NPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/NPC.java @@ -1,21 +1,14 @@ package core.game.node.entity.npc; import core.cache.def.impl.NPCDefinition; -import core.game.system.config.NPCConfigParser; -import core.game.system.config.ShopParser; import core.game.content.dialogue.DialoguePlugin; import core.game.content.global.shop.Shop; -import core.game.content.jobs.JobManager; -import core.game.node.entity.skill.Skills; -import core.game.node.entity.skill.slayer.Tasks; -import core.game.node.entity.skill.summoning.familiar.Familiar; import core.game.interaction.Interaction; import core.game.interaction.MovementPulse; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatSpell; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.equipment.DefaultCombatSpell; import core.game.node.entity.combat.equipment.WeaponInterface; import core.game.node.entity.npc.agg.AggressiveBehavior; @@ -23,21 +16,29 @@ import core.game.node.entity.npc.agg.AggressiveHandler; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.SpellBookManager; import core.game.node.entity.player.link.audio.Audio; -import core.game.world.GameWorld; +import core.game.node.entity.skill.Skills; +import core.game.node.entity.skill.slayer.Tasks; +import core.game.node.entity.skill.summoning.familiar.Familiar; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.build.DynamicRegion; import core.game.world.map.path.Pathfinder; -import core.game.world.repository.Repository; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.npc.NPCFaceEntity; import core.game.world.update.flag.npc.NPCFaceLocation; import core.game.world.update.flag.npc.NPCForceChat; import core.game.world.update.flag.npc.NPCSwitchId; import core.tools.RandomFunction; +import rs09.game.content.jobs.JobManager; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.system.config.NPCConfigParser; +import rs09.game.system.config.ShopParser; +import rs09.game.world.GameWorld; +import rs09.game.world.repository.Repository; -import static core.game.node.entity.player.info.stats.StatAttributeKeysKt.*; +import static rs09.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_BASE; +import static rs09.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_ENEMIES_KILLED; /** * Represents a non-player character. diff --git a/Server/src/main/java/core/game/node/entity/npc/agg/AggressiveBehavior.java b/Server/src/main/java/core/game/node/entity/npc/agg/AggressiveBehavior.java index fd266f86c..2af054451 100644 --- a/Server/src/main/java/core/game/node/entity/npc/agg/AggressiveBehavior.java +++ b/Server/src/main/java/core/game/node/entity/npc/agg/AggressiveBehavior.java @@ -4,7 +4,7 @@ import core.game.node.entity.Entity; import core.game.node.entity.combat.DeathTask; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.RegionManager; import java.util.ArrayList; diff --git a/Server/src/main/java/core/game/node/entity/npc/agg/AggressiveHandler.java b/Server/src/main/java/core/game/node/entity/npc/agg/AggressiveHandler.java index 152376091..b8281035e 100644 --- a/Server/src/main/java/core/game/node/entity/npc/agg/AggressiveHandler.java +++ b/Server/src/main/java/core/game/node/entity/npc/agg/AggressiveHandler.java @@ -1,11 +1,11 @@ package core.game.node.entity.npc.agg; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.node.entity.Entity; import core.game.node.entity.combat.DeathTask; import core.game.node.entity.player.Player; import core.game.node.entity.player.info.Rights; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.tools.RandomFunction; /** diff --git a/Server/src/main/java/core/game/node/entity/npc/bosses/GiantMoleNPC.java b/Server/src/main/java/core/game/node/entity/npc/bosses/GiantMoleNPC.java index f921cab50..c0ba2b519 100644 --- a/Server/src/main/java/core/game/node/entity/npc/bosses/GiantMoleNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/bosses/GiantMoleNPC.java @@ -20,7 +20,7 @@ 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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/node/entity/npc/bosses/KalphiteQueenNPC.java b/Server/src/main/java/core/game/node/entity/npc/bosses/KalphiteQueenNPC.java index a11ca1ce3..ddc2ba90e 100644 --- a/Server/src/main/java/core/game/node/entity/npc/bosses/KalphiteQueenNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/bosses/KalphiteQueenNPC.java @@ -7,7 +7,7 @@ import core.game.content.global.BossKillCounter; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.InteractionType; import core.game.node.entity.combat.equipment.ArmourSet; import core.game.node.entity.impl.Projectile; @@ -16,7 +16,7 @@ import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +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/npc/bosses/TormentedDemonNPC.java b/Server/src/main/java/core/game/node/entity/npc/bosses/TormentedDemonNPC.java index c734654d1..41142075a 100644 --- a/Server/src/main/java/core/game/node/entity/npc/bosses/TormentedDemonNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/bosses/TormentedDemonNPC.java @@ -5,7 +5,7 @@ import java.util.concurrent.TimeUnit; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.InteractionType; import core.game.node.entity.impl.Projectile; import core.game.node.entity.npc.AbstractNPC; diff --git a/Server/src/main/java/core/game/node/entity/npc/bosses/TzRekJadNPC.java b/Server/src/main/java/core/game/node/entity/npc/bosses/TzRekJadNPC.java index 3a5e35a16..6222554f6 100644 --- a/Server/src/main/java/core/game/node/entity/npc/bosses/TzRekJadNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/bosses/TzRekJadNPC.java @@ -9,9 +9,9 @@ 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.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.plugin.Initializable; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/node/entity/npc/bosses/corp/CorporealBeastNPC.java b/Server/src/main/java/core/game/node/entity/npc/bosses/corp/CorporealBeastNPC.java index 0868409f4..49647df4c 100644 --- a/Server/src/main/java/core/game/node/entity/npc/bosses/corp/CorporealBeastNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/bosses/corp/CorporealBeastNPC.java @@ -1,30 +1,30 @@ package core.game.node.entity.npc.bosses.corp; -import java.util.ArrayList; -import java.util.List; - import core.game.content.global.BossKillCounter; -import core.game.node.entity.skill.Skills; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.ImpactHandler.HitsplatType; import core.game.node.entity.combat.equipment.SwitchAttack; -import core.game.node.entity.combat.handlers.MultiSwingHandler; import core.game.node.entity.impl.Projectile; 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.skill.Skills; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; -import core.plugin.Plugin; import core.plugin.Initializable; +import core.plugin.Plugin; import core.tools.RandomFunction; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.handlers.MultiSwingHandler; +import rs09.game.world.GameWorld; + +import java.util.ArrayList; +import java.util.List; /** * Handles the Corporeal beast NPC. diff --git a/Server/src/main/java/core/game/node/entity/npc/bosses/corp/DarkEnergyCoreNPC.java b/Server/src/main/java/core/game/node/entity/npc/bosses/corp/DarkEnergyCoreNPC.java index e26bf785b..0da933b84 100644 --- a/Server/src/main/java/core/game/node/entity/npc/bosses/corp/DarkEnergyCoreNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/bosses/corp/DarkEnergyCoreNPC.java @@ -8,7 +8,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.state.EntityState; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.plugin.Initializable; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/node/entity/npc/bosses/wilderness/ChaosElementalNPC.java b/Server/src/main/java/core/game/node/entity/npc/bosses/wilderness/ChaosElementalNPC.java index c4be2a619..0660e4477 100644 --- a/Server/src/main/java/core/game/node/entity/npc/bosses/wilderness/ChaosElementalNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/bosses/wilderness/ChaosElementalNPC.java @@ -4,9 +4,7 @@ import core.game.content.global.BossKillCounter; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.equipment.SwitchAttack; -import core.game.node.entity.combat.handlers.MultiSwingHandler; import core.game.node.entity.impl.Projectile; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; @@ -17,6 +15,8 @@ import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Initializable; import core.tools.RandomFunction; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.handlers.MultiSwingHandler; /** * Handles the chaos elemental npc. diff --git a/Server/src/main/java/core/game/node/entity/npc/bosses/wilderness/KingBlackDragonNPC.java b/Server/src/main/java/core/game/node/entity/npc/bosses/wilderness/KingBlackDragonNPC.java index b737a984c..c594c54cf 100644 --- a/Server/src/main/java/core/game/node/entity/npc/bosses/wilderness/KingBlackDragonNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/bosses/wilderness/KingBlackDragonNPC.java @@ -4,7 +4,7 @@ import core.game.content.global.BossKillCounter; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.InteractionType; import core.game.node.entity.combat.equipment.ArmourSet; import core.game.node.entity.combat.equipment.FireType; diff --git a/Server/src/main/java/core/game/node/entity/npc/city/pollnivneach/AliTheCamelHandler.java b/Server/src/main/java/core/game/node/entity/npc/city/pollnivneach/AliTheCamelHandler.java index 0b4fe9629..f8a43b7cf 100644 --- a/Server/src/main/java/core/game/node/entity/npc/city/pollnivneach/AliTheCamelHandler.java +++ b/Server/src/main/java/core/game/node/entity/npc/city/pollnivneach/AliTheCamelHandler.java @@ -9,7 +9,7 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/node/entity/npc/city/sophanem/WallShortcut.java b/Server/src/main/java/core/game/node/entity/npc/city/sophanem/WallShortcut.java index e501d1bc9..1722cb460 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 @@ -9,7 +9,7 @@ import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +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/node/entity/npc/city/varrock/VarrockEastBartenderDialogue.java b/Server/src/main/java/core/game/node/entity/npc/city/varrock/VarrockEastBartenderDialogue.java index 22d052e8d..586be5d82 100644 --- a/Server/src/main/java/core/game/node/entity/npc/city/varrock/VarrockEastBartenderDialogue.java +++ b/Server/src/main/java/core/game/node/entity/npc/city/varrock/VarrockEastBartenderDialogue.java @@ -6,7 +6,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.plugin.Initializable; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * Handles the VarrockEastBartenderDialogue dialogue. diff --git a/Server/src/main/java/core/game/node/entity/npc/drop/NPCDropTables.java b/Server/src/main/java/core/game/node/entity/npc/drop/NPCDropTables.java index 4eb2a9809..4c910a25e 100644 --- a/Server/src/main/java/core/game/node/entity/npc/drop/NPCDropTables.java +++ b/Server/src/main/java/core/game/node/entity/npc/drop/NPCDropTables.java @@ -2,20 +2,19 @@ package core.game.node.entity.npc.drop; import core.cache.def.impl.NPCDefinition; import core.game.node.item.*; -import core.game.system.config.ItemConfigParser; -import plugin.ai.AIPlayer; -import plugin.ai.AIRepository; -import plugin.ai.general.GeneralBotCreator; +import rs09.game.system.config.ItemConfigParser; +import rs09.game.ai.AIPlayer; +import rs09.game.ai.AIRepository; +import rs09.game.ai.general.GeneralBotCreator; import core.game.ge.GrandExchangeDatabase; import core.game.content.global.Bones; import core.game.node.entity.skill.Skills; import core.game.node.entity.Entity; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.system.SystemLogger; import core.game.world.map.Location; import core.game.world.map.RegionManager; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.tools.RandomFunction; import core.tools.StringUtils; diff --git a/Server/src/main/java/core/game/node/entity/npc/drop/RareDropTable.java b/Server/src/main/java/core/game/node/entity/npc/drop/RareDropTable.java index 673493e8f..f71464d28 100644 --- a/Server/src/main/java/core/game/node/entity/npc/drop/RareDropTable.java +++ b/Server/src/main/java/core/game/node/entity/npc/drop/RareDropTable.java @@ -1,9 +1,9 @@ package core.game.node.entity.npc.drop; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.node.item.Item; import core.game.node.item.WeightedChanceItem; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.tools.RandomFunction; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/Server/src/main/java/core/game/node/entity/npc/drop/SharedTables.java b/Server/src/main/java/core/game/node/entity/npc/drop/SharedTables.java index 2a1d0a316..57fb57faf 100644 --- a/Server/src/main/java/core/game/node/entity/npc/drop/SharedTables.java +++ b/Server/src/main/java/core/game/node/entity/npc/drop/SharedTables.java @@ -1,6 +1,6 @@ package core.game.node.entity.npc.drop; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.item.WeightedChanceItem; public enum SharedTables { 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 b1850c362..75b884f75 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 @@ -9,7 +9,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.path.Pathfinder; import core.game.world.update.flag.context.Animation; diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/BunyipNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/BunyipNPC.java index df61725be..4bfe71b42 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/BunyipNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/BunyipNPC.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.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/CockatriceFamiliarNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/CockatriceFamiliarNPC.java index 57119f4fd..079d1d662 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/CockatriceFamiliarNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/CockatriceFamiliarNPC.java @@ -10,12 +10,12 @@ import core.game.node.entity.impl.Projectile; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the loading of a cockatrice familiar. 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 9c37a7b96..43e2858b6 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 @@ -17,7 +17,7 @@ import core.game.node.object.GameObject; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** 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 eaf51e327..244ab622c 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 @@ -22,14 +22,14 @@ import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the Desert Wyrm familiar. diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/DreadfowlNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/DreadfowlNPC.java index 1ab2ccb69..783dcd95f 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/DreadfowlNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/DreadfowlNPC.java @@ -8,15 +8,15 @@ import core.game.node.entity.skill.summoning.familiar.FamiliarSpecial; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.InteractionType; import core.game.node.entity.combat.equipment.WeaponInterface; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.impl.Projectile; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.tools.RandomFunction; 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 e1725817a..45a4824d0 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 @@ -9,13 +9,13 @@ import core.game.node.item.GroundItemManager; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.player.FaceLocationFlag; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.firemaking.FireMakingPulse; import core.game.node.entity.skill.firemaking.Log; diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/FruitBatNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/FruitBatNPC.java index ebc9ac574..aeb410d58 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/FruitBatNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/FruitBatNPC.java @@ -8,12 +8,12 @@ import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Initializable; import core.tools.RandomFunction; -import core.tools.Items; +import rs09.tools.Items; import java.util.Collections; import java.util.LinkedList; import java.util.List; diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/GiantChinchompaNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/GiantChinchompaNPC.java index 2c0e527e2..2d6e46a6d 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/GiantChinchompaNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/GiantChinchompaNPC.java @@ -10,7 +10,7 @@ import core.game.node.entity.combat.ImpactHandler.HitsplatType; import core.game.node.entity.combat.equipment.WeaponInterface; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.RegionManager; 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/npc/familiar/IbisNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/IbisNPC.java index b7f084ad3..0fe94ef0f 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/IbisNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/IbisNPC.java @@ -10,7 +10,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +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/npc/familiar/IronTitanNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/IronTitanNPC.java index 8c797fc2a..1dc684199 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/IronTitanNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/IronTitanNPC.java @@ -1,18 +1,18 @@ package core.game.node.entity.npc.familiar; -import core.game.node.entity.skill.summoning.familiar.Familiar; -import core.game.node.entity.skill.summoning.familiar.FamiliarSpecial; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.combat.equipment.SwitchAttack; import core.game.node.entity.combat.equipment.WeaponInterface; -import core.game.node.entity.combat.handlers.MultiSwingHandler; import core.game.node.entity.player.Player; +import core.game.node.entity.skill.summoning.familiar.Familiar; +import core.game.node.entity.skill.summoning.familiar.FamiliarSpecial; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Initializable; import core.tools.RandomFunction; +import rs09.game.node.entity.combat.handlers.MultiSwingHandler; /** * Represents the Iron Titan familiar. diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/MacawNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/MacawNPC.java index 34650c008..8c54317cb 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/MacawNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/MacawNPC.java @@ -10,11 +10,11 @@ import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.plugin.Initializable; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/MinotaurFamiliarNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/MinotaurFamiliarNPC.java index 8fb9c1e10..e6f6319c6 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/MinotaurFamiliarNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/MinotaurFamiliarNPC.java @@ -9,11 +9,11 @@ import core.game.node.entity.impl.Projectile; import core.game.node.entity.player.Player; import core.game.node.entity.state.EntityState; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.plugin.Initializable; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/PackYakNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/PackYakNPC.java index 6f3014dd8..7841dd807 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/PackYakNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/PackYakNPC.java @@ -1,6 +1,6 @@ package core.game.node.entity.npc.familiar; -import core.game.system.config.ItemConfigParser; +import rs09.game.system.config.ItemConfigParser; import core.plugin.Initializable; import core.game.node.entity.skill.summoning.SummoningScroll; import core.game.node.entity.skill.summoning.familiar.BurdenBeast; 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 dab68306e..2168c5a68 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 @@ -18,13 +18,13 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.game.world.update.flag.player.FaceLocationFlag; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the Pyrelord familiar. diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritKalphiteNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritKalphiteNPC.java index dadf635f1..43f8caecd 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritKalphiteNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritKalphiteNPC.java @@ -10,7 +10,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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritSpiderNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritSpiderNPC.java index 65b8f386b..59e8f2404 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritSpiderNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritSpiderNPC.java @@ -7,7 +7,7 @@ import core.game.node.entity.combat.equipment.WeaponInterface; import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.world.GameWorld; +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/npc/familiar/SpiritWolfNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritWolfNPC.java index e5bf3c153..a7d4897b8 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritWolfNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/SpiritWolfNPC.java @@ -10,7 +10,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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.path.Path; diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/SteelTitanNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/SteelTitanNPC.java index 82b330b56..e55e6b1b4 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/SteelTitanNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/SteelTitanNPC.java @@ -1,19 +1,19 @@ package core.game.node.entity.npc.familiar; -import core.game.node.entity.skill.summoning.familiar.Familiar; -import core.game.node.entity.skill.summoning.familiar.FamiliarSpecial; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.combat.equipment.SwitchAttack; import core.game.node.entity.combat.equipment.WeaponInterface; -import core.game.node.entity.combat.handlers.MultiSwingHandler; import core.game.node.entity.impl.Projectile; import core.game.node.entity.player.Player; +import core.game.node.entity.skill.summoning.familiar.Familiar; +import core.game.node.entity.skill.summoning.familiar.FamiliarSpecial; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Initializable; import core.tools.RandomFunction; +import rs09.game.node.entity.combat.handlers.MultiSwingHandler; /** * Handles the Steel titan familiar. diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/ThornySnailNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/ThornySnailNPC.java index 61311e2f2..7c6b38c01 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/ThornySnailNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/ThornySnailNPC.java @@ -11,7 +11,7 @@ import core.game.node.entity.impl.Projectile; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/UnicornStallionNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/UnicornStallionNPC.java index 7243d8f36..36d1f01ce 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/UnicornStallionNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/UnicornStallionNPC.java @@ -13,7 +13,7 @@ import core.game.node.entity.state.EntityState; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the Unicorn Stallion familiar. diff --git a/Server/src/main/java/core/game/node/entity/npc/familiar/VoidFamiliarNPC.java b/Server/src/main/java/core/game/node/entity/npc/familiar/VoidFamiliarNPC.java index abfd09a63..255cd6c62 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/VoidFamiliarNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/VoidFamiliarNPC.java @@ -13,12 +13,12 @@ import core.game.node.entity.combat.equipment.WeaponInterface; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * The plugin used to load void familiar npcs. 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 b5583c9cc..7c48e9e57 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 @@ -4,7 +4,7 @@ import core.game.node.entity.npc.AbstractNPC; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Initializable; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/node/entity/npc/other/BorkNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/BorkNPC.java index 8d3e5d3e8..d2423351b 100644 --- a/Server/src/main/java/core/game/node/entity/npc/other/BorkNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/other/BorkNPC.java @@ -14,7 +14,7 @@ import core.game.node.item.ChanceItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.build.DynamicRegion; import core.game.world.update.flag.context.Animation; @@ -27,7 +27,7 @@ import core.net.packet.out.CameraViewPacket; import core.net.packet.out.MinimapState; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; import core.game.content.activity.ActivityPlugin; import core.game.content.activity.CutscenePlugin; diff --git a/Server/src/main/java/core/game/node/entity/npc/other/CatableponNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/CatableponNPC.java index bea52f57f..284652414 100644 --- a/Server/src/main/java/core/game/node/entity/npc/other/CatableponNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/other/CatableponNPC.java @@ -2,14 +2,14 @@ package core.game.node.entity.npc.other; import core.game.node.entity.combat.CombatSpell; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.equipment.SwitchAttack; -import core.game.node.entity.combat.handlers.MultiSwingHandler; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.link.SpellBookManager.SpellBook; import core.game.world.map.Location; -import core.plugin.Initializable; import core.game.world.update.flag.context.Animation; +import core.plugin.Initializable; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.handlers.MultiSwingHandler; /** * Represents the catablepon npc type. diff --git a/Server/src/main/java/core/game/node/entity/npc/other/ChromaticDragonNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/ChromaticDragonNPC.java index 9ac7eb04d..a333414e2 100644 --- a/Server/src/main/java/core/game/node/entity/npc/other/ChromaticDragonNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/other/ChromaticDragonNPC.java @@ -1,16 +1,16 @@ package core.game.node.entity.npc.other; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.equipment.SwitchAttack; import core.game.node.entity.combat.handlers.DragonfireSwingHandler; -import core.game.node.entity.combat.handlers.MultiSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.npc.AbstractNPC; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; -import core.plugin.Initializable; import core.game.world.update.flag.context.Graphics; +import core.plugin.Initializable; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.handlers.MultiSwingHandler; /** * Handles a chromatic dragon (green, blue, red, ..). diff --git a/Server/src/main/java/core/game/node/entity/npc/other/DraynorTreeNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/DraynorTreeNPC.java index 20ad91ee9..f136479ef 100644 --- a/Server/src/main/java/core/game/node/entity/npc/other/DraynorTreeNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/other/DraynorTreeNPC.java @@ -6,7 +6,7 @@ import core.game.node.entity.combat.ImpactHandler.HitsplatType; 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.world.GameWorld; +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/npc/other/ElementalWizardNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/ElementalWizardNPC.java index 245186ffe..1440c25df 100644 --- a/Server/src/main/java/core/game/node/entity/npc/other/ElementalWizardNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/other/ElementalWizardNPC.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.link.SpellBookManager.SpellBook; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; 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/npc/other/FishingNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/FishingNPC.java index 70deaef13..88dcd7b75 100644 --- a/Server/src/main/java/core/game/node/entity/npc/other/FishingNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/other/FishingNPC.java @@ -2,7 +2,7 @@ package core.game.node.entity.npc.other; import core.game.node.entity.skill.fishing.FishSpots; import core.game.node.entity.npc.AbstractNPC; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/npc/other/GraveStoneNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/GraveStoneNPC.java index 7fa7ccddf..774ac2807 100644 --- a/Server/src/main/java/core/game/node/entity/npc/other/GraveStoneNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/other/GraveStoneNPC.java @@ -15,14 +15,14 @@ import core.game.node.entity.player.link.HintIconManager; import core.game.node.entity.player.link.grave.GraveManager; import core.game.node.entity.player.link.grave.GraveType; import core.game.node.item.GroundItem; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; import core.plugin.Initializable; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles a gravestone npc. diff --git a/Server/src/main/java/core/game/node/entity/npc/other/LumberKittenNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/LumberKittenNPC.java index 89b17e451..5d8d9d99e 100644 --- a/Server/src/main/java/core/game/node/entity/npc/other/LumberKittenNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/other/LumberKittenNPC.java @@ -3,7 +3,7 @@ package core.game.node.entity.npc.other; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.plugin.Initializable; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/node/entity/npc/other/MetalDragonNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/MetalDragonNPC.java index ef4a54fdb..c557cd54a 100644 --- a/Server/src/main/java/core/game/node/entity/npc/other/MetalDragonNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/other/MetalDragonNPC.java @@ -2,18 +2,18 @@ package core.game.node.entity.npc.other; import core.game.node.entity.Entity; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.equipment.SwitchAttack; import core.game.node.entity.combat.handlers.DragonfireSwingHandler; -import core.game.node.entity.combat.handlers.MultiSwingHandler; -import core.game.node.entity.impl.Projectile; import core.game.node.entity.impl.Animator.Priority; +import core.game.node.entity.impl.Projectile; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.world.map.Location; -import core.plugin.Initializable; import core.game.world.update.flag.context.Animation; +import core.plugin.Initializable; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.handlers.MultiSwingHandler; /** * Handles a metal dragon (bronze, iron, steel). diff --git a/Server/src/main/java/core/game/node/entity/npc/other/MonkNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/MonkNPC.java index 0a0bf4849..7fbd6675a 100644 --- a/Server/src/main/java/core/game/node/entity/npc/other/MonkNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/other/MonkNPC.java @@ -2,8 +2,8 @@ package core.game.node.entity.npc.other; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; -import core.game.node.entity.combat.CombatSwingHandler; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.npc.AbstractNPC; 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/npc/other/SorceressElementalNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/SorceressElementalNPC.java index 213f83244..fb52bdb5f 100644 --- a/Server/src/main/java/core/game/node/entity/npc/other/SorceressElementalNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/other/SorceressElementalNPC.java @@ -4,12 +4,12 @@ import java.util.List; import core.game.component.Component; import core.game.node.entity.Entity; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.DeathTask; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/npc/other/TribesmanNPC.java b/Server/src/main/java/core/game/node/entity/npc/other/TribesmanNPC.java index ab9d4b545..dfb40dc23 100644 --- a/Server/src/main/java/core/game/node/entity/npc/other/TribesmanNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/other/TribesmanNPC.java @@ -1,9 +1,9 @@ package core.game.node.entity.npc.other; import core.game.node.entity.npc.AbstractNPC; -import core.game.system.config.NPCConfigParser; -import core.plugin.Initializable; import core.game.world.map.Location; +import core.plugin.Initializable; +import rs09.game.system.config.NPCConfigParser; /** * Represents the tribesamn npc. diff --git a/Server/src/main/java/core/game/node/entity/npc/quest/pirates_treasure/GardenerNPC.java b/Server/src/main/java/core/game/node/entity/npc/quest/pirates_treasure/GardenerNPC.java index c233b0458..bca136edc 100644 --- a/Server/src/main/java/core/game/node/entity/npc/quest/pirates_treasure/GardenerNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/quest/pirates_treasure/GardenerNPC.java @@ -5,7 +5,7 @@ import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Initializable; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/node/entity/npc/revenant/CorruptEquipment.java b/Server/src/main/java/core/game/node/entity/npc/revenant/CorruptEquipment.java index 59a7641f1..9d6f8f401 100644 --- a/Server/src/main/java/core/game/node/entity/npc/revenant/CorruptEquipment.java +++ b/Server/src/main/java/core/game/node/entity/npc/revenant/CorruptEquipment.java @@ -5,7 +5,7 @@ import core.game.node.entity.Entity; import core.game.node.entity.combat.equipment.DegradableEquipment; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the degrading of corrupt equipment. diff --git a/Server/src/main/java/core/game/node/entity/npc/revenant/PVPEquipment.java b/Server/src/main/java/core/game/node/entity/npc/revenant/PVPEquipment.java index 1d691864b..c7f65b5d6 100644 --- a/Server/src/main/java/core/game/node/entity/npc/revenant/PVPEquipment.java +++ b/Server/src/main/java/core/game/node/entity/npc/revenant/PVPEquipment.java @@ -4,7 +4,7 @@ import core.game.node.entity.Entity; import core.game.node.entity.combat.equipment.DegradableEquipment; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the degrading of PVP armour. diff --git a/Server/src/main/java/core/game/node/entity/npc/revenant/RevenantCombatHandler.java b/Server/src/main/java/core/game/node/entity/npc/revenant/RevenantCombatHandler.java index 5ff3e0dc5..e71a4883c 100644 --- a/Server/src/main/java/core/game/node/entity/npc/revenant/RevenantCombatHandler.java +++ b/Server/src/main/java/core/game/node/entity/npc/revenant/RevenantCombatHandler.java @@ -4,15 +4,15 @@ import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.combat.equipment.SwitchAttack; -import core.game.node.entity.combat.handlers.MultiSwingHandler; import core.game.node.entity.impl.Projectile; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.prayer.PrayerType; import core.game.node.entity.state.EntityState; -import core.game.world.GameWorld; import core.game.world.map.zone.impl.WildernessZone; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; +import rs09.game.node.entity.combat.handlers.MultiSwingHandler; +import rs09.game.world.GameWorld; /** * Handles the multi swing combat handler for revenants. diff --git a/Server/src/main/java/core/game/node/entity/npc/revenant/RevenantNPC.java b/Server/src/main/java/core/game/node/entity/npc/revenant/RevenantNPC.java index 8783ab170..e090bb78a 100644 --- a/Server/src/main/java/core/game/node/entity/npc/revenant/RevenantNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/revenant/RevenantNPC.java @@ -1,17 +1,14 @@ package core.game.node.entity.npc.revenant; -import core.game.system.config.NPCConfigParser; -import core.game.node.entity.skill.Skills; -import core.game.node.entity.skill.summoning.familiar.Familiar; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.DeathTask; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; -import core.game.world.GameWorld; +import core.game.node.entity.skill.Skills; +import core.game.node.entity.skill.summoning.familiar.Familiar; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.path.Pathfinder; @@ -19,6 +16,9 @@ import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.impl.WildernessZone; import core.game.world.update.flag.context.Animation; import core.tools.RandomFunction; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.system.config.NPCConfigParser; +import rs09.game.world.GameWorld; /** * Handles a revenant NPC. diff --git a/Server/src/main/java/core/game/node/entity/npc/revenant/RevenantPlugin.java b/Server/src/main/java/core/game/node/entity/npc/revenant/RevenantPlugin.java index 26a2ced48..b9b233b41 100644 --- a/Server/src/main/java/core/game/node/entity/npc/revenant/RevenantPlugin.java +++ b/Server/src/main/java/core/game/node/entity/npc/revenant/RevenantPlugin.java @@ -7,7 +7,7 @@ import core.game.node.entity.npc.NPC; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** diff --git a/Server/src/main/java/core/game/node/entity/player/Player.java b/Server/src/main/java/core/game/node/entity/player/Player.java index 19bac1751..397be82be 100644 --- a/Server/src/main/java/core/game/node/entity/player/Player.java +++ b/Server/src/main/java/core/game/node/entity/player/Player.java @@ -1,38 +1,20 @@ package core.game.node.entity.player; -import java.util.*; - -import core.ServerConstants; -import core.game.VarpManager; import core.game.component.Component; import core.game.container.Container; import core.game.container.impl.BankContainer; import core.game.container.impl.EquipmentContainer; import core.game.container.impl.InventoryListener; -import core.game.node.entity.combat.equipment.EquipmentDegrader; -import core.game.node.entity.state.newsys.State; -import core.game.node.entity.state.newsys.StateRepository; -import core.game.system.task.Pulse; -import core.game.world.map.path.Pathfinder; -import core.game.world.update.flag.context.Animation; -import core.game.world.update.flag.context.Graphics; -import core.tools.RandomFunction; -import core.tools.TickUtilsKt; +import core.game.content.activity.pyramidplunder.PlunderObjectManager; import core.game.content.ame.AntiMacroHandler; import core.game.content.dialogue.DialogueInterpreter; -import core.game.ge.PlayerGrandExchange; -import core.game.node.entity.skill.runecrafting.PouchManager; +import core.game.content.quest.miniquest.barcrawl.BarcrawlManager; import core.game.content.ttrail.TreasureTrailManager; -import core.game.node.entity.skill.Skills; -import core.game.node.entity.skill.construction.HouseManager; -import core.game.node.entity.skill.hunter.HunterManager; -import core.game.node.entity.skill.slayer.SlayerManager; -import core.game.node.entity.skill.summoning.familiar.FamiliarManager; import core.game.interaction.Interaction; +import core.game.interaction.item.brawling_gloves.BrawlingGlovesManager; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.DeathTask; import core.game.node.entity.combat.ImpactHandler.HitsplatType; import core.game.node.entity.combat.handlers.ChinchompaSwingHandler; @@ -42,20 +24,7 @@ import core.game.node.entity.player.info.RenderInfo; import core.game.node.entity.player.info.Rights; import core.game.node.entity.player.info.UIDInfo; import core.game.node.entity.player.info.login.LoginConfiguration; -import core.game.node.entity.player.link.BankPinManager; -import core.game.content.quest.miniquest.barcrawl.BarcrawlManager; -import core.game.node.entity.player.link.ConfigurationManager; -import core.game.node.entity.player.link.GlobalData; -import core.game.node.entity.player.link.HintIconManager; -import core.game.node.entity.player.link.InterfaceManager; -import core.game.node.entity.player.link.IronmanManager; -import core.game.node.entity.player.link.IronmanMode; -import core.game.node.entity.player.link.PacketDispatch; -import core.game.node.entity.player.link.SavedData; -import core.game.node.entity.player.link.Settings; -import core.game.node.entity.player.link.SkullManager; -import core.game.node.entity.player.link.SpellBookManager; -import core.game.node.entity.player.link.WarningMessages; +import core.game.node.entity.player.link.*; import core.game.node.entity.player.link.appearance.Appearance; import core.game.node.entity.player.link.audio.AudioManager; import core.game.node.entity.player.link.diary.AchievementDiaryManager; @@ -67,27 +36,29 @@ import core.game.node.entity.player.link.prayer.PrayerType; import core.game.node.entity.player.link.quest.QuestRepository; import core.game.node.entity.player.link.request.RequestManager; import core.game.node.entity.player.link.skillertasks.SkillerTasks; +import core.game.node.entity.skill.Skills; +import core.game.node.entity.skill.construction.HouseManager; +import core.game.node.entity.skill.hunter.HunterManager; +import core.game.node.entity.skill.slayer.SlayerManager; +import core.game.node.entity.skill.summoning.familiar.FamiliarManager; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.system.communication.CommunicationInfo; import core.game.system.monitor.PlayerMonitor; import core.game.system.task.LogoutTask; -import core.game.world.GameWorld; -import core.game.world.map.Direction; -import core.game.world.map.Location; -import core.game.world.map.Region; -import core.game.world.map.RegionChunk; -import core.game.world.map.RegionManager; -import core.game.world.map.Viewport; +import core.game.system.task.Pulse; +import core.game.world.map.*; import core.game.world.map.build.DynamicRegion; +import core.game.world.map.path.Pathfinder; import core.game.world.map.zone.ZoneType; -import core.game.world.repository.Repository; -import core.game.world.update.MapChunkRenderer; -import core.game.world.update.NPCRenderer; -import core.game.world.update.PlayerRenderer; -import core.game.world.update.UpdateSequence; +import rs09.game.world.update.MapChunkRenderer; +import rs09.game.world.update.NPCRenderer; +import rs09.game.world.update.PlayerRenderer; +import rs09.game.world.update.UpdateSequence; import core.game.world.update.flag.PlayerFlags; +import core.game.world.update.flag.context.Animation; +import core.game.world.update.flag.context.Graphics; import core.game.world.update.flag.player.FaceEntityFlag; import core.game.world.update.flag.player.FaceLocationFlag; import core.game.world.update.flag.player.ForceChatFlag; @@ -100,14 +71,25 @@ import core.net.packet.out.BuildDynamicScene; import core.net.packet.out.SkillLevel; import core.net.packet.out.UpdateSceneGraph; import core.plugin.Plugin; +import core.tools.RandomFunction; import core.tools.StringUtils; +import rs09.ServerConstants; +import rs09.game.VarpManager; +import rs09.game.ge.PlayerGrandExchange; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.equipment.EquipmentDegrader; +import rs09.game.node.entity.skill.runecrafting.PouchManager; +import rs09.game.node.entity.state.newsys.State; +import rs09.game.node.entity.state.newsys.StateRepository; +import rs09.game.world.GameWorld; +import rs09.game.world.repository.Repository; +import rs09.tools.TickUtilsKt; -import core.game.content.activity.pyramidplunder.PlunderObjectManager; -import core.game.interaction.item.brawling_gloves.BrawlingGlovesManager; +import java.util.*; -import static core.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_BASE; -import static core.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_DEATHS; -import static core.tools.stringtools.StringToolsKt.colorize; +import static rs09.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_BASE; +import static rs09.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_DEATHS; +import static rs09.tools.stringtools.StringToolsKt.colorize; /** * Represents a player entity. diff --git a/Server/src/main/java/core/game/node/entity/player/info/RenderInfo.java b/Server/src/main/java/core/game/node/entity/player/info/RenderInfo.java index 3aa6a7a07..ff2749ea4 100644 --- a/Server/src/main/java/core/game/node/entity/player/info/RenderInfo.java +++ b/Server/src/main/java/core/game/node/entity/player/info/RenderInfo.java @@ -1,6 +1,6 @@ package core.game.node.entity.player.info; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.node.entity.Entity; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/core/game/node/entity/player/info/Rights.java b/Server/src/main/java/core/game/node/entity/player/info/Rights.java index f464a98b7..498cb32a5 100644 --- a/Server/src/main/java/core/game/node/entity/player/info/Rights.java +++ b/Server/src/main/java/core/game/node/entity/player/info/Rights.java @@ -1,7 +1,7 @@ package core.game.node.entity.player.info; import core.game.node.entity.player.Player; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; /** * Represent the rights of a player. diff --git a/Server/src/main/java/core/game/node/entity/player/info/login/LoginConfiguration.java b/Server/src/main/java/core/game/node/entity/player/info/login/LoginConfiguration.java index b559b099f..d9b276cbc 100644 --- a/Server/src/main/java/core/game/node/entity/player/info/login/LoginConfiguration.java +++ b/Server/src/main/java/core/game/node/entity/player/info/login/LoginConfiguration.java @@ -2,12 +2,10 @@ package core.game.node.entity.player.info.login; import core.game.component.CloseEvent; import core.game.component.Component; +import core.game.content.quest.tutorials.tutorialisland.TutorialSession; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.emote.Emotes; -import core.game.world.GameWorld; import core.game.world.map.RegionManager; -import core.game.world.repository.Repository; -import core.game.world.update.UpdateSequence; import core.game.world.update.flag.player.AppearanceFlag; import core.net.amsc.MSPacketRepository; import core.net.amsc.WorldCommunicator; @@ -15,7 +13,9 @@ import core.net.packet.PacketRepository; import core.net.packet.context.InterfaceContext; import core.net.packet.out.Interface; import core.plugin.Plugin; -import core.game.content.quest.tutorials.tutorialisland.TutorialSession; +import rs09.game.world.GameWorld; +import rs09.game.world.repository.Repository; +import rs09.game.world.update.UpdateSequence; import java.util.ArrayList; import java.util.Date; diff --git a/Server/src/main/java/core/game/node/entity/player/info/login/PlayerParser.java b/Server/src/main/java/core/game/node/entity/player/info/login/PlayerParser.java index 613d4dbc4..a59b46fbf 100644 --- a/Server/src/main/java/core/game/node/entity/player/info/login/PlayerParser.java +++ b/Server/src/main/java/core/game/node/entity/player/info/login/PlayerParser.java @@ -1,18 +1,12 @@ package core.game.node.entity.player.info.login; -import core.ServerConstants; -import core.game.node.entity.combat.CombatSpell; import core.game.node.entity.player.Player; -import core.game.node.entity.player.link.SpellBookManager; -import core.game.node.entity.player.link.emote.Emotes; -import core.game.system.SystemLogger; -import core.game.world.map.Location; +import rs09.ServerConstants; +import rs09.game.node.entity.player.info.login.PlayerSaveParser; +import rs09.game.node.entity.player.info.login.PlayerSaver; +import rs09.game.system.SystemLogger; import java.io.*; -import java.nio.ByteBuffer; -import java.nio.channels.FileChannel; -import java.nio.channels.FileChannel.MapMode; -import java.util.Arrays; /** * Class used to abstract the process of loading a player save. diff --git a/Server/src/main/java/core/game/node/entity/player/link/BankPinManager.java b/Server/src/main/java/core/game/node/entity/player/link/BankPinManager.java index 4ee83f5a2..7503b879d 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/BankPinManager.java +++ b/Server/src/main/java/core/game/node/entity/player/link/BankPinManager.java @@ -5,7 +5,7 @@ import core.game.component.CloseEvent; import core.game.component.Component; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.net.packet.PacketRepository; import core.net.packet.context.ChildPositionContext; import core.net.packet.context.StringContext; diff --git a/Server/src/main/java/core/game/node/entity/player/link/ConfigurationManager.java b/Server/src/main/java/core/game/node/entity/player/link/ConfigurationManager.java index a096a95a3..2f75f4f4d 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/ConfigurationManager.java +++ b/Server/src/main/java/core/game/node/entity/player/link/ConfigurationManager.java @@ -3,7 +3,7 @@ package core.game.node.entity.player.link; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.net.packet.PacketRepository; import core.net.packet.context.ConfigContext; import core.net.packet.out.Config; diff --git a/Server/src/main/java/core/game/node/entity/player/link/InterfaceManager.java b/Server/src/main/java/core/game/node/entity/player/link/InterfaceManager.java index 9cc2f3998..48a7b5b0c 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/InterfaceManager.java +++ b/Server/src/main/java/core/game/node/entity/player/link/InterfaceManager.java @@ -2,18 +2,20 @@ package core.game.node.entity.player.link; import core.game.component.Component; import core.game.component.InterfaceType; +import core.game.content.quest.tutorials.tutorialisland.TutorialSession; import core.game.node.entity.combat.equipment.WeaponInterface; import core.game.node.entity.player.Player; -import core.game.system.SystemLogger; import core.net.packet.PacketRepository; import core.net.packet.context.InterfaceContext; import core.net.packet.context.WindowsPaneContext; import core.net.packet.out.CloseInterface; import core.net.packet.out.Interface; import core.net.packet.out.WindowsPane; -import core.game.content.quest.tutorials.tutorialisland.TutorialSession; +import rs09.game.system.SystemLogger; +import rs09.tools.Components; + +import static rs09.tools.Interfaces.*; -import static core.tools.Interfaces.*; /** * Manages a player's interfaces. @@ -772,7 +774,7 @@ public final class InterfaceManager { */ public int getWindowPaneId() { if (windowsPane == null) { - return TOPLEVEL_548; + return Components.toplevel_548; } return windowsPane.getId(); } 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 647abaca4..eadb5f98f 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 @@ -1,12 +1,12 @@ package core.game.node.entity.player.link; -import core.game.Varp; +import rs09.game.Varp; import core.game.content.quest.tutorials.tutorialisland.TutorialSession; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.update.flag.chunk.AnimateObjectUpdateFlag; diff --git a/Server/src/main/java/core/game/node/entity/player/link/SavedData.java b/Server/src/main/java/core/game/node/entity/player/link/SavedData.java index 77385e32a..82feb9db9 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/SavedData.java +++ b/Server/src/main/java/core/game/node/entity/player/link/SavedData.java @@ -3,7 +3,7 @@ package core.game.node.entity.player.link; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.spawn.SpawnData; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import java.nio.ByteBuffer; diff --git a/Server/src/main/java/core/game/node/entity/player/link/Settings.java b/Server/src/main/java/core/game/node/entity/player/link/Settings.java index 0c3640111..6eeb661d6 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/Settings.java +++ b/Server/src/main/java/core/game/node/entity/player/link/Settings.java @@ -1,12 +1,12 @@ package core.game.node.entity.player.link; -import core.game.system.config.ItemConfigParser; +import rs09.game.system.config.ItemConfigParser; import org.json.simple.JSONObject; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.system.communication.CommunicationInfo; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.net.packet.IoBuffer; import java.nio.ByteBuffer; diff --git a/Server/src/main/java/core/game/node/entity/player/link/TeleportManager.java b/Server/src/main/java/core/game/node/entity/player/link/TeleportManager.java index 97398bd21..a9b9eed80 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/TeleportManager.java +++ b/Server/src/main/java/core/game/node/entity/player/link/TeleportManager.java @@ -1,13 +1,13 @@ package core.game.node.entity.player.link; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.content.quest.tutorials.tutorialisland.TutorialSession; import core.game.node.entity.Entity; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; 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/player/link/appearance/Appearance.java b/Server/src/main/java/core/game/node/entity/player/link/appearance/Appearance.java index 9576ba590..21803fe73 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/appearance/Appearance.java +++ b/Server/src/main/java/core/game/node/entity/player/link/appearance/Appearance.java @@ -8,7 +8,7 @@ import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.system.config.ItemConfigParser; +import rs09.game.system.config.ItemConfigParser; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.player.AppearanceFlag; import org.json.simple.JSONArray; diff --git a/Server/src/main/java/core/game/node/entity/player/link/diary/AchievementDiary.java b/Server/src/main/java/core/game/node/entity/player/link/diary/AchievementDiary.java index b95c84c05..0b5917945 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/diary/AchievementDiary.java +++ b/Server/src/main/java/core/game/node/entity/player/link/diary/AchievementDiary.java @@ -3,11 +3,10 @@ package core.game.node.entity.player.link.diary; import core.cache.def.impl.NPCDefinition; import core.game.component.Component; import core.game.node.entity.player.Player; - import org.json.simple.JSONArray; import org.json.simple.JSONObject; +import rs09.game.node.entity.player.link.diary.DiaryLevel; -import java.nio.ByteBuffer; import java.util.ArrayList; /** diff --git a/Server/src/main/java/core/game/node/entity/player/link/diary/AchievementDiaryManager.java b/Server/src/main/java/core/game/node/entity/player/link/diary/AchievementDiaryManager.java index 477917dd9..2f51e4caa 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/diary/AchievementDiaryManager.java +++ b/Server/src/main/java/core/game/node/entity/player/link/diary/AchievementDiaryManager.java @@ -2,15 +2,11 @@ package core.game.node.entity.player.link.diary; import core.game.component.Component; import core.game.container.impl.EquipmentContainer; -import core.game.system.SystemLogger; +import core.game.node.entity.player.Player; +import core.game.node.entity.skill.smithing.smelting.Bar; +import core.game.node.item.Item; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import core.game.node.entity.skill.smithing.smelting.Bar; -import core.game.node.entity.player.Player; - -import core.game.node.item.Item; - -import java.nio.ByteBuffer; /** * Manages the achievement diary of a player. diff --git a/Server/src/main/java/core/game/node/entity/player/link/diary/DiaryType.java b/Server/src/main/java/core/game/node/entity/player/link/diary/DiaryType.java index d12408166..306fb0381 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/diary/DiaryType.java +++ b/Server/src/main/java/core/game/node/entity/player/link/diary/DiaryType.java @@ -1,6 +1,6 @@ package core.game.node.entity.player.link.diary; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.item.Item; /** diff --git a/Server/src/main/java/core/game/node/entity/player/link/emote/Emotes.java b/Server/src/main/java/core/game/node/entity/player/link/emote/Emotes.java index 91def0a92..472be5a55 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/emote/Emotes.java +++ b/Server/src/main/java/core/game/node/entity/player/link/emote/Emotes.java @@ -5,14 +5,14 @@ import core.game.node.entity.player.info.Rights; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.RegionManager; -import core.tools.Items; +import rs09.tools.Items; import core.game.content.quest.tutorials.tutorialisland.TutorialSession; import core.game.content.quest.tutorials.tutorialisland.TutorialStage; 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.system.task.Pulse; -import core.game.world.GameWorld; +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/player/link/grave/GraveManager.java b/Server/src/main/java/core/game/node/entity/player/link/grave/GraveManager.java index 71455f353..88720461d 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/grave/GraveManager.java +++ b/Server/src/main/java/core/game/node/entity/player/link/grave/GraveManager.java @@ -8,7 +8,7 @@ import core.game.node.entity.player.info.Rights; import core.game.node.entity.player.link.HintIconManager; import core.game.node.entity.player.link.prayer.PrayerType; import core.game.node.item.GroundItem; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import java.nio.ByteBuffer; import java.util.HashMap; diff --git a/Server/src/main/java/core/game/node/entity/player/link/music/MusicPlayer.java b/Server/src/main/java/core/game/node/entity/player/link/music/MusicPlayer.java index b3c6f7c35..54a3cdae8 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/music/MusicPlayer.java +++ b/Server/src/main/java/core/game/node/entity/player/link/music/MusicPlayer.java @@ -3,7 +3,7 @@ package core.game.node.entity.player.link.music; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.emote.Emotes; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.net.packet.PacketRepository; import core.net.packet.context.MusicContext; import core.net.packet.context.StringContext; diff --git a/Server/src/main/java/core/game/node/entity/player/link/prayer/DrainTask.java b/Server/src/main/java/core/game/node/entity/player/link/prayer/DrainTask.java index 5aec89809..932769bae 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/prayer/DrainTask.java +++ b/Server/src/main/java/core/game/node/entity/player/link/prayer/DrainTask.java @@ -6,7 +6,7 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.system.task.NodeTask; import core.game.world.map.zone.ZoneBorders; import core.tools.RandomFunction; -import core.game.node.entity.skill.skillcapeperks.SkillcapePerks; +import rs09.game.node.entity.skill.skillcapeperks.SkillcapePerks; /** * Represents an event used to drain prayer points. diff --git a/Server/src/main/java/core/game/node/entity/player/link/quest/QuestRepository.java b/Server/src/main/java/core/game/node/entity/player/link/quest/QuestRepository.java index b4bbbfa56..2b3918321 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/quest/QuestRepository.java +++ b/Server/src/main/java/core/game/node/entity/player/link/quest/QuestRepository.java @@ -2,7 +2,7 @@ package core.game.node.entity.player.link.quest; import core.game.node.entity.player.Player; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import org.json.simple.JSONArray; import org.json.simple.JSONObject; diff --git a/Server/src/main/java/core/game/node/entity/player/link/request/RequestManager.java b/Server/src/main/java/core/game/node/entity/player/link/request/RequestManager.java index a4dd0534f..d6a6de116 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/request/RequestManager.java +++ b/Server/src/main/java/core/game/node/entity/player/link/request/RequestManager.java @@ -2,7 +2,7 @@ package core.game.node.entity.player.link.request; import core.game.content.quest.tutorials.tutorialisland.TutorialSession; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * Represents a managing class for requests of a player. diff --git a/Server/src/main/java/core/game/node/entity/player/link/request/assist/AssistSession.java b/Server/src/main/java/core/game/node/entity/player/link/request/assist/AssistSession.java index 0d3253099..1d225f7d4 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/request/assist/AssistSession.java +++ b/Server/src/main/java/core/game/node/entity/player/link/request/assist/AssistSession.java @@ -6,7 +6,7 @@ import core.game.node.entity.skill.Skills; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.request.RequestModule; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +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/player/link/request/trade/TradeContainer.java b/Server/src/main/java/core/game/node/entity/player/link/request/trade/TradeContainer.java index 7925be588..a6a496a0e 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/request/trade/TradeContainer.java +++ b/Server/src/main/java/core/game/node/entity/player/link/request/trade/TradeContainer.java @@ -5,7 +5,7 @@ import core.game.container.*; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.net.packet.PacketRepository; import core.net.packet.context.ContainerContext; import core.net.packet.out.ContainerPacket; diff --git a/Server/src/main/java/core/game/node/entity/player/link/spawn/PKTitle.java b/Server/src/main/java/core/game/node/entity/player/link/spawn/PKTitle.java index 95176507a..599220643 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/spawn/PKTitle.java +++ b/Server/src/main/java/core/game/node/entity/player/link/spawn/PKTitle.java @@ -1,7 +1,7 @@ package core.game.node.entity.player.link.spawn; import core.game.node.entity.player.Player; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.tools.StringUtils; import java.util.ArrayList; diff --git a/Server/src/main/java/core/game/node/entity/player/link/spawn/SpawnData.java b/Server/src/main/java/core/game/node/entity/player/link/spawn/SpawnData.java index 6bbffa4cc..4f8d63b97 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/spawn/SpawnData.java +++ b/Server/src/main/java/core/game/node/entity/player/link/spawn/SpawnData.java @@ -6,8 +6,8 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.SavedData; import core.game.node.entity.player.link.SpellBookManager; -import core.game.world.GameWorld; -import core.game.world.repository.Repository; +import rs09.game.world.GameWorld; +import rs09.game.world.repository.Repository; import core.net.packet.PacketRepository; import core.net.packet.context.ChildPositionContext; import core.net.packet.out.RepositionChild; diff --git a/Server/src/main/java/core/game/node/entity/skill/LevelUp.java b/Server/src/main/java/core/game/node/entity/skill/LevelUp.java index 679896a48..3d72294c4 100644 --- a/Server/src/main/java/core/game/node/entity/skill/LevelUp.java +++ b/Server/src/main/java/core/game/node/entity/skill/LevelUp.java @@ -5,7 +5,7 @@ import core.game.content.global.Skillcape; import core.game.content.quest.tutorials.tutorialisland.TutorialSession; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.emote.Emotes; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.net.packet.PacketRepository; import core.net.packet.context.MusicContext; import core.net.packet.out.MusicPacket; diff --git a/Server/src/main/java/core/game/node/entity/skill/SkillRestoration.java b/Server/src/main/java/core/game/node/entity/skill/SkillRestoration.java index e66c86059..460f10b5e 100644 --- a/Server/src/main/java/core/game/node/entity/skill/SkillRestoration.java +++ b/Server/src/main/java/core/game/node/entity/skill/SkillRestoration.java @@ -3,8 +3,8 @@ package core.game.node.entity.skill; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.prayer.PrayerType; -import core.game.world.GameWorld; -import core.game.node.entity.skill.skillcapeperks.SkillcapePerks; +import rs09.game.node.entity.skill.skillcapeperks.SkillcapePerks; +import rs09.game.world.GameWorld; /** * Handles the skill restoration data. diff --git a/Server/src/main/java/core/game/node/entity/skill/Skills.java b/Server/src/main/java/core/game/node/entity/skill/Skills.java index caa4e1cc3..fd003096a 100644 --- a/Server/src/main/java/core/game/node/entity/skill/Skills.java +++ b/Server/src/main/java/core/game/node/entity/skill/Skills.java @@ -1,25 +1,25 @@ package core.game.node.entity.skill; -import core.game.world.GameWorld; -import core.tools.Items; -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; -import core.plugin.CorePluginTypes.XPGainPlugins; import core.game.content.ame.ExperienceMonitor; import core.game.content.quest.tutorials.tutorialisland.TutorialSession; +import core.game.interaction.item.brawling_gloves.BrawlingGloves; import core.game.node.entity.Entity; 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.request.assist.AssistSession; import core.game.node.item.Item; -import core.game.world.repository.Repository; import core.game.world.update.flag.player.AppearanceFlag; import core.net.packet.PacketRepository; import core.net.packet.context.SkillContext; import core.net.packet.out.SkillLevel; -import core.game.interaction.item.brawling_gloves.BrawlingGloves; -import core.game.node.entity.skill.skillcapeperks.SkillcapePerks; +import org.json.simple.JSONArray; +import org.json.simple.JSONObject; +import rs09.game.node.entity.skill.skillcapeperks.SkillcapePerks; +import rs09.game.world.GameWorld; +import rs09.game.world.repository.Repository; +import rs09.plugin.CorePluginTypes.XPGainPlugins; +import rs09.tools.Items; import java.nio.ByteBuffer; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/AgilityHandler.java b/Server/src/main/java/core/game/node/entity/skill/agility/AgilityHandler.java index a57aacbb8..742e75021 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/AgilityHandler.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/AgilityHandler.java @@ -8,7 +8,7 @@ import core.game.node.entity.player.Player; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/brimhaven/BladeTrap.java b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BladeTrap.java index 45ad3a2dc..02d6e6ca8 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BladeTrap.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BladeTrap.java @@ -7,7 +7,7 @@ import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.MovementHook; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/node/entity/skill/agility/brimhaven/BrimhavenArena.java b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BrimhavenArena.java index 753692520..14273c22c 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 @@ -15,7 +15,7 @@ import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.MovementHook; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.*; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBuilder; 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 be0a0a9f5..1f2691768 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 @@ -12,7 +12,7 @@ import core.game.node.object.GameObject; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/brimhaven/DartTrap.java b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/DartTrap.java index 65266a689..9c92be1b4 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/DartTrap.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/DartTrap.java @@ -9,7 +9,7 @@ import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.MovementHook; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/brimhaven/FloorSpikes.java b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/FloorSpikes.java index da4be55f3..af83eceb2 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/FloorSpikes.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/FloorSpikes.java @@ -8,7 +8,7 @@ import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.MovementHook; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/node/entity/skill/agility/brimhaven/PressurePad.java b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/PressurePad.java index 22fdbef4d..239878227 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/PressurePad.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/PressurePad.java @@ -8,7 +8,7 @@ import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.MovementHook; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/brimhaven/SpinningBlades.java b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/SpinningBlades.java index d084670cd..a9b45eca9 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/SpinningBlades.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/SpinningBlades.java @@ -8,7 +8,7 @@ import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.MovementHook; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/node/entity/skill/agility/pyramid/AgilityPyramidCourse.java b/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/AgilityPyramidCourse.java index a880e4665..15b25b644 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 @@ -13,11 +13,11 @@ import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the agility pryamid course. diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/MovingBlockNPC.java b/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/MovingBlockNPC.java index c1d0acfdd..292b445ce 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/MovingBlockNPC.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/MovingBlockNPC.java @@ -6,7 +6,7 @@ import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.system.task.MovementHook; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/node/entity/skill/agility/pyramid/RollingBlock.java b/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/RollingBlock.java index 86a048779..3396b5f3a 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 @@ -8,7 +8,7 @@ import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.MovementHook; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/node/entity/skill/agility/shortcuts/FaladorGrapplePlugin.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/FaladorGrapplePlugin.java index 41c00321d..96032148f 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/FaladorGrapplePlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/FaladorGrapplePlugin.java @@ -2,7 +2,7 @@ package core.game.node.entity.skill.agility.shortcuts; import core.cache.def.impl.ObjectDefinition; import core.game.component.Component; -import core.tools.Items; +import rs09.tools.Items; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; @@ -10,7 +10,7 @@ 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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; 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/agility/shortcuts/FenceJumpShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/FenceJumpShortcut.java index d842e0878..adfd2e257 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 @@ -7,7 +7,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/KaramjaGrapple.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/KaramjaGrapple.java index 5b4f8d31c..80543f377 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 @@ -2,7 +2,7 @@ package core.game.node.entity.skill.agility.shortcuts; import core.cache.def.impl.ObjectDefinition; import core.game.component.Component; -import core.tools.Items; +import rs09.tools.Items; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -10,7 +10,7 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/node/entity/skill/agility/shortcuts/MonkeyBarShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/MonkeyBarShortcut.java index d54501239..2f5dfad7e 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 @@ -10,7 +10,7 @@ import core.game.node.object.GameObject; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/StileShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/StileShortcut.java index 97799431d..4271fec55 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 @@ -8,7 +8,7 @@ import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/StrangeFloorShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/StrangeFloorShortcut.java index 8629eed22..a34355e4b 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 @@ -9,7 +9,7 @@ import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/TunnelShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/TunnelShortcut.java index 5421ba01b..651ef6510 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 @@ -7,7 +7,7 @@ import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/WaterOrbGrapple.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/WaterOrbGrapple.java index 8dccdb6aa..e3005400a 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 @@ -2,7 +2,7 @@ package core.game.node.entity.skill.agility.shortcuts; import core.cache.def.impl.ObjectDefinition; import core.game.component.Component; -import core.tools.Items; +import rs09.tools.Items; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -11,7 +11,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +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/agility/shortcuts/YanilleGrapple.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/YanilleGrapple.java index 504df9eaf..fe48f9383 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/YanilleGrapple.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/YanilleGrapple.java @@ -8,7 +8,7 @@ import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; 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/construction/BuildOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/BuildOptionPlugin.java index 60aa757fc..443771f40 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 @@ -9,10 +9,11 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; -import core.game.system.SystemLogger; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.game.node.entity.skill.construction.Hotspot; +import rs09.game.system.SystemLogger; +import rs09.plugin.PluginManager; /** * The build option handling plugin. 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 787a7dbd5..55c8e72c9 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 @@ -7,7 +7,6 @@ import core.game.node.entity.skill.Skills; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; -import core.game.system.SystemLogger; import core.game.system.task.Pulse; import core.game.world.map.BuildRegionChunk; import core.game.world.map.Direction; @@ -18,6 +17,8 @@ import core.net.packet.PacketRepository; import core.net.packet.context.ContainerContext; import core.net.packet.out.ContainerPacket; import org.jetbrains.annotations.NotNull; +import rs09.game.node.entity.skill.construction.Hotspot; +import rs09.game.system.SystemLogger; import java.util.ArrayList; import java.util.Arrays; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/ConstructionGuideBook.java b/Server/src/main/java/core/game/node/entity/skill/construction/ConstructionGuideBook.java index fa33fed8a..02357da97 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/ConstructionGuideBook.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/ConstructionGuideBook.java @@ -7,7 +7,7 @@ import core.game.content.dialogue.book.Book; import core.game.content.dialogue.book.Page; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Initializable; /** 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 e8eec0ec3..b4b114746 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 @@ -5,12 +5,13 @@ import core.cache.def.impl.ItemDefinition; import core.game.component.Component; import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; -import core.game.system.SystemLogger; -import core.plugin.Initializable; -import core.game.node.entity.skill.Skills; import core.game.node.entity.player.Player; +import core.game.node.entity.skill.Skills; import core.game.node.object.GameObject; +import core.plugin.Initializable; import core.plugin.Plugin; +import rs09.game.node.entity.skill.construction.Hotspot; +import rs09.game.system.SystemLogger; /** * Handles the creating of a decoration object. diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/CrestType.java b/Server/src/main/java/core/game/node/entity/skill/construction/CrestType.java index 4ba5a665f..a250faa84 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/CrestType.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/CrestType.java @@ -1,7 +1,7 @@ package core.game.node.entity.skill.construction; import core.game.node.entity.player.Player; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.entity.skill.Skills; /** 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 c51424a45..71308e499 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 @@ -5,6 +5,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.world.map.Location; +import rs09.game.node.entity.skill.construction.Hotspot; /** * Represents the decorations. 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 f2d34532a..e306dfb35 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 @@ -4,22 +4,22 @@ package core.game.node.entity.skill.construction; //import org.arios.game.content.global.DeadmanTimedAction; //import org.arios.game.node.entity.player.info.login.SavingModule; -import core.game.system.SystemLogger; -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; import core.game.content.dialogue.FacialExpression; -import core.game.node.entity.skill.Skills; 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.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.map.*; import core.game.world.map.build.DynamicRegion; import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneBuilder; import core.game.world.update.flag.context.Animation; +import org.json.simple.JSONArray; +import org.json.simple.JSONObject; +import rs09.game.node.entity.skill.construction.Hotspot; +import rs09.game.system.SystemLogger; +import rs09.game.world.GameWorld; import java.awt.*; import java.nio.ByteBuffer; 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 ac8602ed1..41cbb95f2 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 @@ -9,8 +9,12 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.RunScript; import core.game.node.object.GameObject; -import core.game.world.repository.Repository; -import core.plugin.*; +import core.plugin.Initializable; +import core.plugin.Plugin; +import core.plugin.PluginManifest; +import core.plugin.PluginType; +import rs09.game.world.repository.Repository; +import rs09.plugin.PluginManager; /** * Handles the house portal options. diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/RemovalDialogue.java b/Server/src/main/java/core/game/node/entity/skill/construction/RemovalDialogue.java index eff725641..91ebb92f5 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/RemovalDialogue.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/RemovalDialogue.java @@ -5,6 +5,7 @@ import core.game.content.dialogue.DialogueInterpreter; import core.game.content.dialogue.DialoguePlugin; import core.game.node.entity.player.Player; import core.plugin.Initializable; +import rs09.game.node.entity.skill.construction.Hotspot; /** * Removal dialogue for room & decorations in construction 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 5560a3fa3..724f5969f 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 @@ -5,6 +5,7 @@ import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.world.map.*; +import rs09.game.node.entity.skill.construction.Hotspot; /** * 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 4968be95e..2b231aa79 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 @@ -6,13 +6,14 @@ import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; -import core.game.system.SystemLogger; import core.game.world.map.BuildRegionChunk; import core.game.world.map.Direction; import core.game.world.map.Location; import core.net.packet.PacketRepository; import core.net.packet.context.ContainerContext; import core.net.packet.out.ContainerPacket; +import rs09.game.node.entity.skill.construction.Hotspot; +import rs09.game.system.SystemLogger; import java.util.Arrays; 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 cd6541992..7800f8e5f 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 @@ -5,6 +5,7 @@ import core.game.node.object.GameObject; import core.game.world.map.Region; import core.game.world.map.RegionChunk; import core.game.world.map.RegionManager; +import rs09.game.node.entity.skill.construction.Hotspot; /** * Represents the room properties. 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 d38f6bae6..9d0a26c01 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 @@ -11,7 +11,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; 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 c037af161..202e7b75b 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 @@ -1,21 +1,25 @@ package core.game.node.entity.skill.construction.decoration; import core.cache.def.impl.ObjectDefinition; -import core.plugin.Initializable; import core.game.content.dialogue.DialogueInterpreter; import core.game.content.dialogue.DialoguePlugin; -import core.game.node.entity.skill.construction.*; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; +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.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; +import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.game.node.entity.skill.construction.Hotspot; +import rs09.game.world.GameWorld; +import rs09.plugin.PluginManager; /** * Handles construction staircases. 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 b77fa214a..ae8c7684d 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 @@ -11,7 +11,7 @@ import core.game.node.entity.player.link.audio.Audio; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +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/LarderPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/LarderPlugin.java index 2a6aa02e9..2577ceec1 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/LarderPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/LarderPlugin.java @@ -9,7 +9,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the interactions for the three Larders. diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/ShelfPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/ShelfPlugin.java index 7804524b7..4bb56838c 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/ShelfPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/ShelfPlugin.java @@ -9,7 +9,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the shelves in the kitchen room. 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 cf36b7fe7..08eb4d2e4 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 @@ -4,18 +4,18 @@ package core.game.node.entity.skill.construction.decoration.portalchamber; import core.cache.def.impl.ObjectDefinition; import core.game.content.dialogue.DialogueInterpreter; import core.game.content.dialogue.DialoguePlugin; -import core.game.node.entity.skill.runecrafting.Rune; -import core.game.node.entity.skill.construction.Decoration; -import core.game.node.entity.skill.construction.Hotspot; import core.game.interaction.OptionHandler; import core.game.node.Node; 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.GameObject; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.game.node.entity.skill.construction.Hotspot; +import rs09.plugin.PluginManager; /** * PortalChamberPlugin diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/questhall/MountedGloryPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/questhall/MountedGloryPlugin.java index 3359e0950..018b326ea 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/questhall/MountedGloryPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/questhall/MountedGloryPlugin.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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; 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/construction/decoration/workshop/ClockmakersBenchPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/workshop/ClockmakersBenchPlugin.java index 3c94645c7..9bf0d284d 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 @@ -15,7 +15,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the clockmakers bench in the workshop 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 bb91f05c3..2bf2afc0b 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 @@ -12,7 +12,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import java.util.ArrayList; import java.util.List; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/npc/HouseServantDialogue.java b/Server/src/main/java/core/game/node/entity/skill/construction/npc/HouseServantDialogue.java index e883aa687..d6b4727d7 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/npc/HouseServantDialogue.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/npc/HouseServantDialogue.java @@ -13,7 +13,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.IronmanMode; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.path.Pathfinder; import core.game.interaction.inter.SawmillPlankInterface.Plank; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/npc/HouseServantPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/npc/HouseServantPlugin.java index 09385ff3f..84a2a3995 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/npc/HouseServantPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/npc/HouseServantPlugin.java @@ -5,7 +5,7 @@ import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles interaction with the house servant. diff --git a/Server/src/main/java/core/game/node/entity/skill/cooking/CookableItems.java b/Server/src/main/java/core/game/node/entity/skill/cooking/CookableItems.java index a85c2c555..91f9741ad 100644 --- a/Server/src/main/java/core/game/node/entity/skill/cooking/CookableItems.java +++ b/Server/src/main/java/core/game/node/entity/skill/cooking/CookableItems.java @@ -1,6 +1,6 @@ package core.game.node.entity.skill.cooking; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.item.Item; import java.util.HashMap; diff --git a/Server/src/main/java/core/game/node/entity/skill/cooking/CookingRewrite.java b/Server/src/main/java/core/game/node/entity/skill/cooking/CookingRewrite.java index 4d53c780d..c31f0589b 100644 --- a/Server/src/main/java/core/game/node/entity/skill/cooking/CookingRewrite.java +++ b/Server/src/main/java/core/game/node/entity/skill/cooking/CookingRewrite.java @@ -7,7 +7,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.plugin.Initializable; import core.plugin.Plugin; -import core.tools.Items; +import rs09.tools.Items; //author: Ceik @Initializable 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 a71fdbb2b..3d4de1dc7 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 @@ -1,7 +1,7 @@ package core.game.node.entity.skill.cooking; import core.game.container.impl.EquipmentContainer; -import core.tools.Items; +import rs09.tools.Items; import core.game.world.map.Location; import core.game.content.quest.tutorials.tutorialisland.TutorialSession; import core.game.content.quest.tutorials.tutorialisland.TutorialStage; diff --git a/Server/src/main/java/core/game/node/entity/skill/cooking/WineFermentPlugin.java b/Server/src/main/java/core/game/node/entity/skill/cooking/WineFermentPlugin.java index bc9e3ef8e..b9a8a3d80 100644 --- a/Server/src/main/java/core/game/node/entity/skill/cooking/WineFermentPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/cooking/WineFermentPlugin.java @@ -7,7 +7,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.world.GameWorld; +import rs09.game.world.GameWorld; import core.plugin.Plugin; /** diff --git a/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/OomlieWrap.java b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/OomlieWrap.java index dd7181263..d278b59fd 100644 --- a/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/OomlieWrap.java +++ b/Server/src/main/java/core/game/node/entity/skill/cooking/recipe/OomlieWrap.java @@ -1,6 +1,6 @@ package core.game.node.entity.skill.cooking.recipe; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.entity.skill.Skills; import core.game.interaction.NodeUsageEvent; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/core/game/node/entity/skill/crafting/GemCutPlugin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/GemCutPlugin.java index 0fdf09f55..22dc62260 100644 --- a/Server/src/main/java/core/game/node/entity/skill/crafting/GemCutPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/crafting/GemCutPlugin.java @@ -1,7 +1,7 @@ package core.game.node.entity.skill.crafting; -import core.game.content.dialogue.SkillDialogueHandler; -import core.game.content.dialogue.SkillDialogueHandler.SkillDialogue; +import rs09.game.content.dialogue.SkillDialogueHandler; +import rs09.game.content.dialogue.SkillDialogueHandler.SkillDialogue; import core.game.node.entity.skill.crafting.gem.GemCutPulse; import core.game.node.entity.skill.crafting.gem.Gems; import core.game.interaction.NodeUsageEvent; diff --git a/Server/src/main/java/core/game/node/entity/skill/crafting/PotteryPlugin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/PotteryPlugin.java index e16600211..79df4ae97 100644 --- a/Server/src/main/java/core/game/node/entity/skill/crafting/PotteryPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/crafting/PotteryPlugin.java @@ -2,8 +2,8 @@ package core.game.node.entity.skill.crafting; import core.cache.def.impl.ObjectDefinition; import core.plugin.Initializable; -import core.game.content.dialogue.SkillDialogueHandler; -import core.game.content.dialogue.SkillDialogueHandler.SkillDialogue; +import rs09.game.content.dialogue.SkillDialogueHandler; +import rs09.game.content.dialogue.SkillDialogueHandler.SkillDialogue; import core.game.node.entity.skill.crafting.pottery.FirePotteryPulse; import core.game.node.entity.skill.crafting.pottery.PotteryItem; import core.game.node.entity.skill.crafting.pottery.PotteryPulse; diff --git a/Server/src/main/java/core/game/node/entity/skill/crafting/SnakeSkinPlugin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/SnakeSkinPlugin.java index 243195cb0..78b409649 100644 --- a/Server/src/main/java/core/game/node/entity/skill/crafting/SnakeSkinPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/crafting/SnakeSkinPlugin.java @@ -1,8 +1,8 @@ package core.game.node.entity.skill.crafting; import core.plugin.Initializable; -import core.game.content.dialogue.SkillDialogueHandler; -import core.game.content.dialogue.SkillDialogueHandler.SkillDialogue; +import rs09.game.content.dialogue.SkillDialogueHandler; +import rs09.game.content.dialogue.SkillDialogueHandler.SkillDialogue; import core.game.node.entity.skill.crafting.armour.SnakeSkin; import core.game.node.entity.skill.crafting.armour.SnakeSkinPulse; import core.game.interaction.NodeUsageEvent; diff --git a/Server/src/main/java/core/game/node/entity/skill/crafting/StuddedArmourPlugin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/StuddedArmourPlugin.java index a2669691c..b8f1e3526 100644 --- a/Server/src/main/java/core/game/node/entity/skill/crafting/StuddedArmourPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/crafting/StuddedArmourPlugin.java @@ -1,8 +1,8 @@ package core.game.node.entity.skill.crafting; import core.plugin.Initializable; -import core.game.content.dialogue.SkillDialogueHandler; -import core.game.content.dialogue.SkillDialogueHandler.SkillDialogue; +import rs09.game.content.dialogue.SkillDialogueHandler; +import rs09.game.content.dialogue.SkillDialogueHandler.SkillDialogue; import core.game.node.entity.skill.SkillPulse; import core.game.node.entity.skill.Skills; import core.game.interaction.NodeUsageEvent; 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 ab65e24de..2ef1d8fc9 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 @@ -4,8 +4,8 @@ import core.cache.def.impl.ObjectDefinition; import core.game.node.entity.player.link.diary.DiaryType; import core.game.world.map.Location; import core.plugin.Initializable; -import core.game.content.dialogue.SkillDialogueHandler; -import core.game.content.dialogue.SkillDialogueHandler.SkillDialogue; +import rs09.game.content.dialogue.SkillDialogueHandler; +import rs09.game.content.dialogue.SkillDialogueHandler.SkillDialogue; import core.game.node.entity.skill.SkillPulse; import core.game.node.entity.skill.Skills; import core.game.interaction.OptionHandler; 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 9c742318e..fea2509da 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 @@ -12,7 +12,7 @@ import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.player.FaceLocationFlag; diff --git a/Server/src/main/java/core/game/node/entity/skill/fishing/FishingPulse.java b/Server/src/main/java/core/game/node/entity/skill/fishing/FishingPulse.java index 08a3bce20..a259329a8 100644 --- a/Server/src/main/java/core/game/node/entity/skill/fishing/FishingPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/fishing/FishingPulse.java @@ -3,25 +3,25 @@ package core.game.node.entity.skill.fishing; 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.entity.skill.SkillPulse; -import core.game.node.entity.skill.Skills; -import core.game.node.entity.skill.summoning.familiar.Forager; 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.entity.player.link.skillertasks.SkillTasks; +import core.game.node.entity.skill.SkillPulse; +import core.game.node.entity.skill.Skills; +import core.game.node.entity.skill.summoning.familiar.Forager; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.path.Pathfinder; import core.game.world.update.flag.context.Animation; import core.tools.RandomFunction; -import core.game.node.entity.skill.skillcapeperks.SkillcapePerks; +import rs09.game.node.entity.skill.skillcapeperks.SkillcapePerks; +import rs09.game.world.GameWorld; -import static core.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_BASE; -import static core.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_FISH; -import static core.tools.stringtools.StringToolsKt.colorize; +import static rs09.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_BASE; +import static rs09.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_FISH; +import static rs09.tools.stringtools.StringToolsKt.colorize; /** * Handles a fishing pulse. diff --git a/Server/src/main/java/core/game/node/entity/skill/fletching/ArrowCreatePlugin.java b/Server/src/main/java/core/game/node/entity/skill/fletching/ArrowCreatePlugin.java index 567240357..2ff49ff19 100644 --- a/Server/src/main/java/core/game/node/entity/skill/fletching/ArrowCreatePlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/fletching/ArrowCreatePlugin.java @@ -1,8 +1,8 @@ package core.game.node.entity.skill.fletching; import core.plugin.Initializable; -import core.game.content.dialogue.SkillDialogueHandler; -import core.game.content.dialogue.SkillDialogueHandler.SkillDialogue; +import rs09.game.content.dialogue.SkillDialogueHandler; +import rs09.game.content.dialogue.SkillDialogueHandler.SkillDialogue; import core.game.node.entity.skill.fletching.items.arrow.ArrowHeadPulse; import core.game.node.entity.skill.fletching.items.arrow.HeadlessArrowPulse; import core.game.interaction.NodeUsageEvent; diff --git a/Server/src/main/java/core/game/node/entity/skill/fletching/BoltCreatePlugin.java b/Server/src/main/java/core/game/node/entity/skill/fletching/BoltCreatePlugin.java index a7c7d2db1..222f319a3 100644 --- a/Server/src/main/java/core/game/node/entity/skill/fletching/BoltCreatePlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/fletching/BoltCreatePlugin.java @@ -1,8 +1,8 @@ /* package core.game.node.entity.skill.fletching; -import core.game.content.dialogue.SkillDialogueHandler; -import core.game.content.dialogue.SkillDialogueHandler.SkillDialogue; +import rs09.game.content.dialogue.SkillDialogueHandler; +import rs09.game.content.dialogue.SkillDialogueHandler.SkillDialogue; import core.game.node.entity.skill.fletching.items.bolts.Bolt; import core.game.node.entity.skill.fletching.items.bolts.BoltPulse; import org.crandor.game.interaction.NodeUsageEvent; diff --git a/Server/src/main/java/core/game/node/entity/skill/fletching/BoltGemPlugin.java b/Server/src/main/java/core/game/node/entity/skill/fletching/BoltGemPlugin.java index 3c4aaee72..8867bf0b1 100644 --- a/Server/src/main/java/core/game/node/entity/skill/fletching/BoltGemPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/fletching/BoltGemPlugin.java @@ -1,7 +1,7 @@ //package core.game.node.entity.skill.fletching; // -//import core.game.content.dialogue.SkillDialogueHandler; -//import core.game.content.dialogue.SkillDialogueHandler.SkillDialogue; +//import rs09.game.content.dialogue.SkillDialogueHandler; +//import rs09.game.content.dialogue.SkillDialogueHandler.SkillDialogue; //import core.game.node.entity.skill.fletching.items.gem.GemBolt; //import core.game.node.entity.skill.fletching.items.gem.GemBoltPulse; //import org.crandor.game.interaction.NodeUsageEvent; diff --git a/Server/src/main/java/core/game/node/entity/skill/fletching/Fletching.java b/Server/src/main/java/core/game/node/entity/skill/fletching/Fletching.java index e86cf67a0..340ab392c 100644 --- a/Server/src/main/java/core/game/node/entity/skill/fletching/Fletching.java +++ b/Server/src/main/java/core/game/node/entity/skill/fletching/Fletching.java @@ -163,17 +163,17 @@ public class Fletching { } } public enum GemBolts { - OPAL(877, core.tools.Items.OPAL_1609, 45, 879, 11, 1.5), - PEARL(9140, core.tools.Items.OYSTER_PEARL_411, 46, 880, 41, 3.2), - PEARLS(9140, core.tools.Items.OYSTER_PEARLS_413, 46, 880, 41, 3.2), - JADE(9139, core.tools.Items.JADE_1611, 9187, 9335, 26, 2.4), - RED_TOPAZ(9141, core.tools.Items.RED_TOPAZ_1613, 9188, 9336, 48, 3.9), - SAPPHIRE(9142, core.tools.Items.SAPPHIRE_1607, 9189, 9337, 56, 4), - EMERALD(9142, core.tools.Items.EMERALD_1605, 9190, 9338, 58, 5.5), - RUBY(9143, core.tools.Items.RUBY_1603, 9191, 9339, 63, 6.3), - DIAMOND(9143, core.tools.Items.DIAMOND_1601, 9192, 9340, 65, 7), - DRAGONSTONE(9144, core.tools.Items.DRAGONSTONE_1615, 9193, 9341, 71, 8.2), - ONYX(9144, core.tools.Items.ONYX_6573, 9194, 9342, 73, 9.4); + OPAL(877, rs09.tools.Items.OPAL_1609, 45, 879, 11, 1.5), + PEARL(9140, rs09.tools.Items.OYSTER_PEARL_411, 46, 880, 41, 3.2), + PEARLS(9140, rs09.tools.Items.OYSTER_PEARLS_413, 46, 880, 41, 3.2), + JADE(9139, rs09.tools.Items.JADE_1611, 9187, 9335, 26, 2.4), + RED_TOPAZ(9141, rs09.tools.Items.RED_TOPAZ_1613, 9188, 9336, 48, 3.9), + SAPPHIRE(9142, rs09.tools.Items.SAPPHIRE_1607, 9189, 9337, 56, 4), + EMERALD(9142, rs09.tools.Items.EMERALD_1605, 9190, 9338, 58, 5.5), + RUBY(9143, rs09.tools.Items.RUBY_1603, 9191, 9339, 63, 6.3), + DIAMOND(9143, rs09.tools.Items.DIAMOND_1601, 9192, 9340, 65, 7), + DRAGONSTONE(9144, rs09.tools.Items.DRAGONSTONE_1615, 9193, 9341, 71, 8.2), + ONYX(9144, rs09.tools.Items.ONYX_6573, 9194, 9342, 73, 9.4); public int gem,tip,base,product,level; public double experience; diff --git a/Server/src/main/java/core/game/node/entity/skill/fletching/FletchingPlugin.java b/Server/src/main/java/core/game/node/entity/skill/fletching/FletchingPlugin.java index 928022b1f..16e609bd7 100644 --- a/Server/src/main/java/core/game/node/entity/skill/fletching/FletchingPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/fletching/FletchingPlugin.java @@ -1,7 +1,7 @@ package core.game.node.entity.skill.fletching; -import core.game.content.dialogue.SkillDialogueHandler; -import core.game.content.dialogue.SkillDialogueHandler.SkillDialogue; +import rs09.game.content.dialogue.SkillDialogueHandler; +import rs09.game.content.dialogue.SkillDialogueHandler.SkillDialogue; import core.game.node.entity.skill.fletching.items.bolts.BoltPulse; import core.game.node.entity.skill.fletching.items.darts.DartPulse; import core.game.interaction.NodeUsageEvent; diff --git a/Server/src/main/java/core/game/node/entity/skill/fletching/GemBoltPlugin.java b/Server/src/main/java/core/game/node/entity/skill/fletching/GemBoltPlugin.java index a23aeb9f7..cbbcab30f 100644 --- a/Server/src/main/java/core/game/node/entity/skill/fletching/GemBoltPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/fletching/GemBoltPlugin.java @@ -1,19 +1,19 @@ package core.game.node.entity.skill.fletching; -import core.plugin.Initializable; -import core.tools.Items; -import core.game.content.dialogue.SkillDialogueHandler; -import core.game.content.dialogue.SkillDialogueHandler.SkillDialogue; -import core.game.node.entity.skill.fletching.items.gem.GemBoltCutPulse; -import core.game.node.entity.skill.fletching.items.gem.GemBoltPulse; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; +import core.game.node.entity.skill.fletching.items.gem.GemBoltPulse; import core.game.node.item.Item; import core.net.packet.PacketRepository; import core.net.packet.context.ChildPositionContext; import core.net.packet.out.RepositionChild; +import core.plugin.Initializable; import core.plugin.Plugin; +import rs09.game.content.dialogue.SkillDialogueHandler; +import rs09.game.content.dialogue.SkillDialogueHandler.SkillDialogue; +import rs09.game.node.entity.skill.fletching.items.gem.GemBoltCutPulse; +import rs09.tools.Items; /** * Represents the gem bolt creating plugin. diff --git a/Server/src/main/java/core/game/node/entity/skill/fletching/MakeCrossbowPlugin.java b/Server/src/main/java/core/game/node/entity/skill/fletching/MakeCrossbowPlugin.java index 3439e0700..b42858950 100644 --- a/Server/src/main/java/core/game/node/entity/skill/fletching/MakeCrossbowPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/fletching/MakeCrossbowPlugin.java @@ -1,6 +1,6 @@ package core.game.node.entity.skill.fletching; -import core.game.content.dialogue.SkillDialogueHandler; +import rs09.game.content.dialogue.SkillDialogueHandler; import core.game.node.entity.skill.fletching.items.crossbow.LimbPulse; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; diff --git a/Server/src/main/java/core/game/node/entity/skill/fletching/StringbowPlugin.java b/Server/src/main/java/core/game/node/entity/skill/fletching/StringbowPlugin.java index 2bf001813..157fef1f4 100644 --- a/Server/src/main/java/core/game/node/entity/skill/fletching/StringbowPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/fletching/StringbowPlugin.java @@ -1,7 +1,7 @@ package core.game.node.entity.skill.fletching; import core.plugin.Initializable; -import core.game.content.dialogue.SkillDialogueHandler; +import rs09.game.content.dialogue.SkillDialogueHandler; import core.game.node.entity.skill.fletching.items.bow.StringPulse; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; diff --git a/Server/src/main/java/core/game/node/entity/skill/fletching/items/arrow/HeadlessArrowPulse.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/arrow/HeadlessArrowPulse.java index cbb1bf67b..14942cb29 100644 --- a/Server/src/main/java/core/game/node/entity/skill/fletching/items/arrow/HeadlessArrowPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/fletching/items/arrow/HeadlessArrowPulse.java @@ -1,6 +1,6 @@ package core.game.node.entity.skill.fletching.items.arrow; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.entity.skill.SkillPulse; import core.game.node.entity.skill.Skills; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/core/game/node/entity/skill/fletching/items/bolts/BoltPulse.java b/Server/src/main/java/core/game/node/entity/skill/fletching/items/bolts/BoltPulse.java index 48f78adb6..0b1ddfc8d 100644 --- a/Server/src/main/java/core/game/node/entity/skill/fletching/items/bolts/BoltPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/fletching/items/bolts/BoltPulse.java @@ -1,6 +1,6 @@ package core.game.node.entity.skill.fletching.items.bolts; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.entity.skill.SkillPulse; import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.fletching.Fletching; diff --git a/Server/src/main/java/core/game/node/entity/skill/gather/GatheringSkillOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/gather/GatheringSkillOptionPlugin.java index 27e93429b..d358cc77e 100644 --- a/Server/src/main/java/core/game/node/entity/skill/gather/GatheringSkillOptionPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/gather/GatheringSkillOptionPlugin.java @@ -1,13 +1,13 @@ package core.game.node.entity.skill.gather; import core.cache.def.impl.ObjectDefinition; -import core.game.node.entity.skill.gather.mining.MiningSkillPulse; -import core.game.node.entity.skill.gather.woodcutting.WoodcuttingSkillPulse; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; +import core.game.node.entity.skill.gather.woodcutting.WoodcuttingSkillPulse; import core.plugin.Initializable; import core.plugin.Plugin; +import rs09.game.node.entity.skill.gather.mining.MiningSkillPulse; /** * Handles the gathering skill option handler plugin. 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 5d1e76cbe..2c722bc3b 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 @@ -14,7 +14,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/SkillingResource.java b/Server/src/main/java/core/game/node/entity/skill/gather/SkillingResource.java index 36d3554d9..b6e7bb1c5 100644 --- a/Server/src/main/java/core/game/node/entity/skill/gather/SkillingResource.java +++ b/Server/src/main/java/core/game/node/entity/skill/gather/SkillingResource.java @@ -1,9 +1,9 @@ package core.game.node.entity.skill.gather; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.node.entity.skill.Skills; -import core.game.system.SystemLogger; -import core.game.world.repository.Repository; +import rs09.game.system.SystemLogger; +import rs09.game.world.repository.Repository; import core.game.world.update.flag.context.Animation; import java.util.HashMap; diff --git a/Server/src/main/java/core/game/node/entity/skill/gather/mining/MiningNode.java b/Server/src/main/java/core/game/node/entity/skill/gather/mining/MiningNode.java index ba7e1dff2..652591975 100644 --- a/Server/src/main/java/core/game/node/entity/skill/gather/mining/MiningNode.java +++ b/Server/src/main/java/core/game/node/entity/skill/gather/mining/MiningNode.java @@ -1,8 +1,8 @@ package core.game.node.entity.skill.gather.mining; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.node.item.WeightedChanceItem; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import java.util.ArrayList; import java.util.HashMap; @@ -449,7 +449,7 @@ public enum MiningNode{ } int full,empty,respawnRate,reward,level; double rate,experience; - byte identifier; + public byte identifier; MiningNode(int full, int empty, byte identifier){ this.full = full; 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 7bdbdb0b0..888ee69cf 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 @@ -1,7 +1,7 @@ package core.game.node.entity.skill.gather.woodcutting; -import core.ServerConstants; -import core.game.world.repository.Repository; +import rs09.ServerConstants; +import rs09.game.world.repository.Repository; import java.util.HashMap; 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 85d6b84cf..6bb8382bb 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 @@ -2,20 +2,17 @@ package core.game.node.entity.skill.gather.woodcutting; import core.cache.def.impl.ItemDefinition; import core.game.container.impl.EquipmentContainer; -import core.game.node.entity.skill.farming.FarmingPatch; -import core.game.node.entity.skill.farming.Patch; -import core.tools.Items; import core.game.content.dialogue.FacialExpression; import core.game.content.global.BirdNest; 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.entity.skill.Skills; -import core.game.node.entity.skill.gather.SkillingTool; import core.game.node.entity.impl.Animator; import core.game.node.entity.impl.Projectile; import core.game.node.entity.player.Player; 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.GameObject; import core.game.node.object.ObjectBuilder; @@ -23,12 +20,13 @@ import core.game.system.task.Pulse; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.tools.RandomFunction; -import core.game.node.entity.skill.skillcapeperks.SkillcapePerks; +import rs09.game.node.entity.skill.farming.FarmingPatch; +import rs09.game.node.entity.skill.farming.Patch; +import rs09.game.node.entity.skill.skillcapeperks.SkillcapePerks; +import rs09.tools.Items; -import java.util.concurrent.TimeUnit; - -import static core.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_BASE; -import static core.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_LOGS; +import static rs09.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_BASE; +import static rs09.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_LOGS; /** * Woodcutting skill pulse diff --git a/Server/src/main/java/core/game/node/entity/skill/herblore/FinishedPotionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/herblore/FinishedPotionPlugin.java index 625302262..9e6ca3ab7 100644 --- a/Server/src/main/java/core/game/node/entity/skill/herblore/FinishedPotionPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/herblore/FinishedPotionPlugin.java @@ -1,8 +1,8 @@ package core.game.node.entity.skill.herblore; import core.plugin.Initializable; -import core.game.content.dialogue.SkillDialogueHandler; -import core.game.content.dialogue.SkillDialogueHandler.SkillDialogue; +import rs09.game.content.dialogue.SkillDialogueHandler; +import rs09.game.content.dialogue.SkillDialogueHandler.SkillDialogue; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/core/game/node/entity/skill/herblore/GrindingItem.java b/Server/src/main/java/core/game/node/entity/skill/herblore/GrindingItem.java index 11d39b40e..9c5e3f8fe 100644 --- a/Server/src/main/java/core/game/node/entity/skill/herblore/GrindingItem.java +++ b/Server/src/main/java/core/game/node/entity/skill/herblore/GrindingItem.java @@ -1,6 +1,6 @@ package core.game.node.entity.skill.herblore; -import core.tools.Items; +import rs09.tools.Items; import core.game.node.item.Item; /** diff --git a/Server/src/main/java/core/game/node/entity/skill/herblore/HerbTarPlugin.java b/Server/src/main/java/core/game/node/entity/skill/herblore/HerbTarPlugin.java index 069729866..c7e8f66b1 100644 --- a/Server/src/main/java/core/game/node/entity/skill/herblore/HerbTarPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/herblore/HerbTarPlugin.java @@ -7,7 +7,7 @@ import core.net.packet.context.ChildPositionContext; import core.net.packet.out.RepositionChild; import core.plugin.Initializable; import core.plugin.Plugin; -import core.game.content.dialogue.SkillDialogueHandler; +import rs09.game.content.dialogue.SkillDialogueHandler; /** * Represents the plugin used to create a herb tar. diff --git a/Server/src/main/java/core/game/node/entity/skill/herblore/MakeSuperCombatPotionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/herblore/MakeSuperCombatPotionPlugin.java index d1a3fa28e..4d4afd77a 100644 --- a/Server/src/main/java/core/game/node/entity/skill/herblore/MakeSuperCombatPotionPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/herblore/MakeSuperCombatPotionPlugin.java @@ -1,8 +1,8 @@ package core.game.node.entity.skill.herblore; import core.plugin.Initializable; -import core.game.content.dialogue.SkillDialogueHandler; -import core.game.content.dialogue.SkillDialogueHandler.SkillDialogue; +import rs09.game.content.dialogue.SkillDialogueHandler; +import rs09.game.content.dialogue.SkillDialogueHandler.SkillDialogue; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/core/game/node/entity/skill/herblore/UnfinishedPotionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/herblore/UnfinishedPotionPlugin.java index a89fda25f..6ab24f85e 100644 --- a/Server/src/main/java/core/game/node/entity/skill/herblore/UnfinishedPotionPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/herblore/UnfinishedPotionPlugin.java @@ -1,8 +1,8 @@ package core.game.node.entity.skill.herblore; import core.plugin.Initializable; -import core.game.content.dialogue.SkillDialogueHandler; -import core.game.content.dialogue.SkillDialogueHandler.SkillDialogue; +import rs09.game.content.dialogue.SkillDialogueHandler; +import rs09.game.content.dialogue.SkillDialogueHandler.SkillDialogue; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/FalconryActivityPlugin.java b/Server/src/main/java/core/game/node/entity/skill/hunter/FalconryActivityPlugin.java index 6151205bd..af1ea2c16 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/FalconryActivityPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/FalconryActivityPlugin.java @@ -17,7 +17,7 @@ import core.game.node.item.Item; import core.game.world.map.Location; import core.game.world.map.zone.ZoneBorders; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents the activity used during falconry practice. diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/HunterNPC.java b/Server/src/main/java/core/game/node/entity/skill/hunter/HunterNPC.java index 4ff92a069..dc7d2173d 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/HunterNPC.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/HunterNPC.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.hunter; import core.game.node.entity.Entity; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.tools.RandomFunction; 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 6e8594127..0ece66534 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 @@ -21,7 +21,7 @@ import core.game.node.object.GameObject; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import java.util.ArrayList; import java.util.List; diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/ImpBoxPlugin.java b/Server/src/main/java/core/game/node/entity/skill/hunter/ImpBoxPlugin.java index 4c680ef9a..cc737d922 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/ImpBoxPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/ImpBoxPlugin.java @@ -16,7 +16,7 @@ import core.net.packet.PacketRepository; import core.net.packet.context.ContainerContext; import core.net.packet.out.ContainerPacket; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/ImpetuousImpulses.java b/Server/src/main/java/core/game/node/entity/skill/hunter/ImpetuousImpulses.java index 013612050..782aa991d 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/ImpetuousImpulses.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/ImpetuousImpulses.java @@ -2,7 +2,7 @@ package core.game.node.entity.skill.hunter; import core.game.node.entity.skill.hunter.bnet.BNetTypes; import core.game.node.entity.skill.hunter.bnet.ImplingNode; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.callback.CallBack; import core.game.world.map.Location; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/ImplingNPC.java b/Server/src/main/java/core/game/node/entity/skill/hunter/ImplingNPC.java index ba7444c29..e797ae9ea 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/ImplingNPC.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/ImplingNPC.java @@ -1,18 +1,18 @@ package core.game.node.entity.skill.hunter; -import core.game.system.config.NPCConfigParser; -import core.game.node.entity.skill.hunter.bnet.ImplingNode; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; +import core.game.node.entity.skill.hunter.bnet.ImplingNode; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.path.Pathfinder; import core.game.world.update.flag.context.Graphics; import core.tools.RandomFunction; +import rs09.game.system.config.NPCConfigParser; +import rs09.game.world.GameWorld; /** * Handles an impling npc. diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/TrapHook.java b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapHook.java index 6c58899f5..18a04d9fe 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/TrapHook.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapHook.java @@ -1,6 +1,6 @@ package core.game.node.entity.skill.hunter; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.tools.RandomFunction; 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 524b346a2..96f19b252 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 @@ -11,7 +11,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.tools.RandomFunction; 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 8bbe35882..178a843f3 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 @@ -5,7 +5,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; -import core.game.world.GameWorld; +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 d33e17f32..6599b72d7 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 @@ -5,7 +5,7 @@ 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.GameObject; -import core.game.system.SystemLogger; +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/hunter/bnet/BNetPulse.java b/Server/src/main/java/core/game/node/entity/skill/hunter/bnet/BNetPulse.java index 510fda729..29b19c2fb 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/bnet/BNetPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/bnet/BNetPulse.java @@ -7,7 +7,7 @@ import core.game.node.entity.combat.DeathTask; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.tools.RandomFunction; import core.tools.StringUtils; diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/falconry/FalconryCatchPulse.java b/Server/src/main/java/core/game/node/entity/skill/hunter/falconry/FalconryCatchPulse.java index 5953efe2f..d068f613a 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/falconry/FalconryCatchPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/falconry/FalconryCatchPulse.java @@ -9,9 +9,9 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.HintIconManager; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.tools.RandomFunction; /** diff --git a/Server/src/main/java/core/game/node/entity/skill/magic/HouseTeleportPlugin.java b/Server/src/main/java/core/game/node/entity/skill/magic/HouseTeleportPlugin.java index 4833d6ebe..7ba265bf8 100644 --- a/Server/src/main/java/core/game/node/entity/skill/magic/HouseTeleportPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/magic/HouseTeleportPlugin.java @@ -7,7 +7,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.SpellBookManager.SpellBook; import core.game.node.entity.player.link.TeleportManager.TeleportType; import core.game.node.item.Item; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.plugin.Plugin; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/node/entity/skill/magic/MagicSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/MagicSpell.java index 3cf050b45..2035786d1 100644 --- a/Server/src/main/java/core/game/node/entity/skill/magic/MagicSpell.java +++ b/Server/src/main/java/core/game/node/entity/skill/magic/MagicSpell.java @@ -5,14 +5,14 @@ import core.game.node.entity.skill.Skills; import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.combat.CombatSpell; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.equipment.SpellType; import core.game.node.entity.combat.equipment.WeaponInterface; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.SpellBookManager.SpellBook; import core.game.node.entity.player.link.audio.Audio; import core.game.node.item.Item; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.MapDistance; 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/magic/ModernTeleportPlugin.java b/Server/src/main/java/core/game/node/entity/skill/magic/ModernTeleportPlugin.java index e2a57e4e7..28cad7c3f 100644 --- a/Server/src/main/java/core/game/node/entity/skill/magic/ModernTeleportPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/magic/ModernTeleportPlugin.java @@ -1,6 +1,6 @@ package core.game.node.entity.skill.magic; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.combat.equipment.SpellType; @@ -8,7 +8,7 @@ import core.game.node.entity.player.link.SpellBookManager.SpellBook; import core.game.node.entity.player.link.TeleportManager.TeleportType; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/magic/Runes.java b/Server/src/main/java/core/game/node/entity/skill/magic/Runes.java index 2eb542494..4e8a3ee55 100644 --- a/Server/src/main/java/core/game/node/entity/skill/magic/Runes.java +++ b/Server/src/main/java/core/game/node/entity/skill/magic/Runes.java @@ -2,7 +2,7 @@ package core.game.node.entity.skill.magic; import core.game.node.entity.combat.equipment.SpellType; import core.game.node.item.Item; -import core.tools.Items; +import rs09.tools.Items; /** * Represents the Constants of runes. diff --git a/Server/src/main/java/core/game/node/entity/skill/magic/ancient/AncientTeleportPlugin.java b/Server/src/main/java/core/game/node/entity/skill/magic/ancient/AncientTeleportPlugin.java index 7da6a9d9c..b05c1d9be 100644 --- a/Server/src/main/java/core/game/node/entity/skill/magic/ancient/AncientTeleportPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/magic/ancient/AncientTeleportPlugin.java @@ -9,7 +9,7 @@ import core.game.node.entity.combat.equipment.SpellType; import core.game.node.entity.player.link.SpellBookManager.SpellBook; import core.game.node.entity.player.link.TeleportManager.TeleportType; import core.game.node.item.Item; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/magic/lunar/CurePlantSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/CurePlantSpell.java index d6fce7c11..765b81c2a 100644 --- a/Server/src/main/java/core/game/node/entity/skill/magic/lunar/CurePlantSpell.java +++ b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/CurePlantSpell.java @@ -4,7 +4,6 @@ import core.plugin.Initializable; import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.magic.MagicSpell; import core.game.node.entity.skill.magic.Runes; -import core.game.node.entity.skill.farming.FarmingPatch; import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.combat.equipment.SpellType; diff --git a/Server/src/main/java/core/game/node/entity/skill/magic/lunar/DreamSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/DreamSpell.java index 78e7338ef..3c41c39f9 100644 --- a/Server/src/main/java/core/game/node/entity/skill/magic/lunar/DreamSpell.java +++ b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/DreamSpell.java @@ -10,7 +10,7 @@ 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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/magic/lunar/FertileSoilSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/FertileSoilSpell.java index 2ee2b743c..d46f3fd3d 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 @@ -2,7 +2,6 @@ package core.game.node.entity.skill.magic.lunar; import core.game.node.entity.skill.magic.MagicSpell; import core.game.node.entity.skill.magic.Runes; -import core.game.node.entity.skill.farming.FarmingPatch; import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.combat.equipment.SpellType; diff --git a/Server/src/main/java/core/game/node/entity/skill/magic/lunar/MagicImbueSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/MagicImbueSpell.java index f93138a61..312467fea 100644 --- a/Server/src/main/java/core/game/node/entity/skill/magic/lunar/MagicImbueSpell.java +++ b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/MagicImbueSpell.java @@ -9,7 +9,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.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/node/entity/skill/magic/lunar/PlankMeSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/PlankMeSpell.java index c60e4ca4d..78587dec3 100644 --- a/Server/src/main/java/core/game/node/entity/skill/magic/lunar/PlankMeSpell.java +++ b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/PlankMeSpell.java @@ -9,7 +9,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.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/node/entity/skill/magic/lunar/SpellbookSwapSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/SpellbookSwapSpell.java index 158c27011..8e786c2eb 100644 --- a/Server/src/main/java/core/game/node/entity/skill/magic/lunar/SpellbookSwapSpell.java +++ b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/SpellbookSwapSpell.java @@ -10,7 +10,7 @@ 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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/magic/lunar/StatBoostSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/StatBoostSpell.java index 0578bc2f0..b7b7bed88 100644 --- a/Server/src/main/java/core/game/node/entity/skill/magic/lunar/StatBoostSpell.java +++ b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/StatBoostSpell.java @@ -8,7 +8,7 @@ import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.combat.equipment.SpellType; import core.game.node.entity.player.Player; -import plugin.ai.AIPlayer; +import rs09.game.ai.AIPlayer; import core.game.node.entity.player.link.SpellBookManager.SpellBook; import core.game.node.item.Item; import core.game.world.map.RegionManager; diff --git a/Server/src/main/java/core/game/node/entity/skill/magic/lunar/StatRestoreSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/StatRestoreSpell.java index c71fffb89..fcb3eaae8 100644 --- a/Server/src/main/java/core/game/node/entity/skill/magic/lunar/StatRestoreSpell.java +++ b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/StatRestoreSpell.java @@ -9,7 +9,7 @@ import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.combat.equipment.SpellType; import core.game.node.entity.player.Player; -import plugin.ai.AIPlayer; +import rs09.game.ai.AIPlayer; import core.game.node.entity.player.link.SpellBookManager.SpellBook; import core.game.node.item.Item; import core.game.world.map.RegionManager; diff --git a/Server/src/main/java/core/game/node/entity/skill/magic/lunar/VengeanceSpell.java b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/VengeanceSpell.java index 3373bfa67..44579d70a 100644 --- a/Server/src/main/java/core/game/node/entity/skill/magic/lunar/VengeanceSpell.java +++ b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/VengeanceSpell.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.world.GameWorld; +import rs09.game.world.GameWorld; 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/prayer/BoneBuryingOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/prayer/BoneBuryingOptionPlugin.java index af1997f34..cd2f0d833 100644 --- a/Server/src/main/java/core/game/node/entity/skill/prayer/BoneBuryingOptionPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/prayer/BoneBuryingOptionPlugin.java @@ -10,7 +10,7 @@ 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.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; 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 3e5320c9f..755be2f23 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 @@ -7,7 +7,7 @@ import core.game.node.entity.player.info.Rights; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/game/node/entity/skill/runecrafting/RuneCraftPulse.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/RuneCraftPulse.java index a9b334029..6da870aba 100644 --- a/Server/src/main/java/core/game/node/entity/skill/runecrafting/RuneCraftPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/runecrafting/RuneCraftPulse.java @@ -7,7 +7,7 @@ import core.game.node.entity.impl.Animator.Priority; 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.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.tools.RandomFunction; 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 a7cb9de7d..43f1490d1 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 @@ -5,24 +5,25 @@ import core.cache.def.impl.NPCDefinition; import core.cache.def.impl.ObjectDefinition; import core.game.component.Component; import core.game.content.global.action.ClimbActionHandler; -import core.game.content.global.travel.EssenceTeleport; 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.entity.player.info.Rights; +import core.game.node.entity.skill.runecrafting.abyss.AbyssPlugin; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.map.Location; import core.net.packet.PacketRepository; import core.net.packet.context.MinimapStateContext; import core.net.packet.out.MinimapState; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; -import core.game.node.entity.skill.runecrafting.abyss.AbyssPlugin; +import rs09.game.content.global.travel.EssenceTeleport; +import rs09.game.node.entity.skill.runecrafting.RunePouchPlugin; +import rs09.game.world.GameWorld; +import rs09.plugin.PluginManager; /** * Handles runecraftign related options. diff --git a/Server/src/main/java/core/game/node/entity/skill/runecrafting/abyss/AbyssPlugin.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/abyss/AbyssPlugin.java index e56404a2b..d814b8ac2 100644 --- a/Server/src/main/java/core/game/node/entity/skill/runecrafting/abyss/AbyssPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/runecrafting/abyss/AbyssPlugin.java @@ -11,12 +11,12 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/AberrantSpectreNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/AberrantSpectreNPC.java index fdfc7fce1..7f4b25562 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/AberrantSpectreNPC.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/AberrantSpectreNPC.java @@ -1,14 +1,14 @@ package core.game.node.entity.skill.slayer; -import core.game.node.entity.skill.Skills; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; -import core.game.node.entity.combat.CombatSwingHandler; -import core.game.node.entity.combat.handlers.MagicSwingHandler; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; +import core.game.node.entity.skill.Skills; import core.game.world.map.Location; import core.plugin.Initializable; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.handlers.MagicSwingHandler; /** * Handles the aberrant spectre npc. diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/AbyssalDemonNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/AbyssalDemonNPC.java index e386f276c..1b41b6f3c 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/AbyssalDemonNPC.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/AbyssalDemonNPC.java @@ -2,8 +2,8 @@ package core.game.node.entity.skill.slayer; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; -import core.game.node.entity.combat.CombatSwingHandler; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.world.map.Direction; diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/BansheeNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/BansheeNPC.java index 8b28b0c8f..dae375572 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/BansheeNPC.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/BansheeNPC.java @@ -5,13 +5,13 @@ import core.game.node.entity.skill.Skills; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.InteractionType; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; 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.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.tools.RandomFunction; diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/BasiliskNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/BasiliskNPC.java index 632f4b5bd..9efecbe7f 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/BasiliskNPC.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/BasiliskNPC.java @@ -1,7 +1,7 @@ package core.game.node.entity.skill.slayer; import core.game.node.entity.combat.BattleState; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.npc.AbstractNPC; import core.game.world.map.Location; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/BrutalDragonNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/BrutalDragonNPC.java index 8f98916b6..fb44f8870 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/BrutalDragonNPC.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/BrutalDragonNPC.java @@ -2,10 +2,8 @@ package core.game.node.entity.skill.slayer; import core.game.node.entity.Entity; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.equipment.SwitchAttack; import core.game.node.entity.combat.handlers.DragonfireSwingHandler; -import core.game.node.entity.combat.handlers.MultiSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.impl.Projectile; import core.game.node.entity.npc.AbstractNPC; @@ -13,6 +11,8 @@ import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Initializable; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.handlers.MultiSwingHandler; /** * Handles a brutal dragon npc. diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/CaveHorrorNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/CaveHorrorNPC.java index 05d6fb796..b8846b460 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/CaveHorrorNPC.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/CaveHorrorNPC.java @@ -3,9 +3,9 @@ package core.game.node.entity.skill.slayer; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.InteractionType; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.world.map.Location; diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/CockatriceNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/CockatriceNPC.java index 3fddadcc9..d418de456 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/CockatriceNPC.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/CockatriceNPC.java @@ -1,7 +1,7 @@ package core.game.node.entity.skill.slayer; import core.game.node.entity.combat.BattleState; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.npc.AbstractNPC; import core.game.world.map.Location; import core.plugin.Initializable; diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/DustDevilNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/DustDevilNPC.java index 11ae630e6..14618f10d 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/DustDevilNPC.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/DustDevilNPC.java @@ -5,9 +5,9 @@ import core.game.node.entity.skill.Skills; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.InteractionType; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.world.map.Location; 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 d120bdf90..da4f73f4a 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 @@ -17,7 +17,7 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/slayer/GargoyleNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/GargoyleNPC.java index a6760e218..06a1711ad 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/GargoyleNPC.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/GargoyleNPC.java @@ -10,7 +10,7 @@ import core.game.node.entity.player.Player; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the gargoyle npc. diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/MirrorShieldHandler.java b/Server/src/main/java/core/game/node/entity/skill/slayer/MirrorShieldHandler.java index 1c219c422..717917bf0 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/MirrorShieldHandler.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/MirrorShieldHandler.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.slayer; import core.game.node.entity.skill.Skills; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; -import core.game.node.entity.combat.handlers.MeleeSwingHandler; +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler; import core.game.node.entity.player.Player; /** diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/MithrilDragonNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/MithrilDragonNPC.java index 9a08c307f..b75b510d8 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/MithrilDragonNPC.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/MithrilDragonNPC.java @@ -3,10 +3,8 @@ package core.game.node.entity.skill.slayer; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.equipment.SwitchAttack; import core.game.node.entity.combat.handlers.DragonfireSwingHandler; -import core.game.node.entity.combat.handlers.MultiSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.impl.Projectile; import core.game.node.entity.npc.AbstractNPC; @@ -15,6 +13,8 @@ import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Initializable; import core.tools.RandomFunction; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.handlers.MultiSwingHandler; /** * Handles a mithril dragon npc. diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/NechryaelNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/NechryaelNPC.java index ea5b81b5c..dcfee7128 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/NechryaelNPC.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/NechryaelNPC.java @@ -5,7 +5,7 @@ import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/slayer/RockSlugPlugin.java b/Server/src/main/java/core/game/node/entity/skill/slayer/RockSlugPlugin.java index c4fe24d1d..8cf5a5c68 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/RockSlugPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/RockSlugPlugin.java @@ -12,7 +12,7 @@ import core.game.world.map.Location; import core.game.world.map.path.Pathfinder; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the interactions of a rock slug. diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/SkeletalWyvernNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/SkeletalWyvernNPC.java index a0cd00d84..cb8588c6c 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/SkeletalWyvernNPC.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/SkeletalWyvernNPC.java @@ -4,10 +4,8 @@ import core.game.container.impl.EquipmentContainer; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.equipment.SwitchAttack; import core.game.node.entity.combat.handlers.DragonfireSwingHandler; -import core.game.node.entity.combat.handlers.MultiSwingHandler; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; @@ -18,6 +16,8 @@ import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Initializable; import core.tools.RandomFunction; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.handlers.MultiSwingHandler; /** * Handles the skeletal wyvern npc. diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerManager.java b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerManager.java index 26fe0f049..4f1bad735 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerManager.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerManager.java @@ -1,7 +1,7 @@ package core.game.node.entity.skill.slayer; import core.cache.def.impl.NPCDefinition; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import core.game.node.entity.skill.Skills; diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerMasterDialogue.java b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerMasterDialogue.java index 36859cce4..164e902ee 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerMasterDialogue.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerMasterDialogue.java @@ -1,6 +1,6 @@ package core.game.node.entity.skill.slayer; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.content.dialogue.DialoguePlugin; import core.game.content.dialogue.FacialExpression; import core.game.content.global.Skillcape; diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerRewardPlugin.java b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerRewardPlugin.java index d7f820885..6f5488e4a 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerRewardPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerRewardPlugin.java @@ -14,7 +14,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the slayer reward interface plugin. diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/WaterFiendNPC.java b/Server/src/main/java/core/game/node/entity/skill/slayer/WaterFiendNPC.java index 0f5900d54..7a91eb928 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/WaterFiendNPC.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/WaterFiendNPC.java @@ -2,15 +2,15 @@ package core.game.node.entity.skill.slayer; import core.game.node.entity.Entity; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.equipment.SwitchAttack; -import core.game.node.entity.combat.handlers.MultiSwingHandler; import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.impl.Projectile; import core.game.node.entity.npc.AbstractNPC; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.handlers.MultiSwingHandler; /** * Handles the water fiend npc. 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 46f506aff..049516d61 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 @@ -16,7 +16,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBorders; @@ -27,7 +27,7 @@ import core.net.packet.PacketRepository; import core.net.packet.context.MinimapStateContext; import core.net.packet.out.MinimapState; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; /** 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 db9df789c..1fbedd62d 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 @@ -10,7 +10,7 @@ import core.game.node.entity.combat.ImpactHandler.HitsplatType; import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.zone.MapZone; diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/LumbridgeDungeon.java b/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/LumbridgeDungeon.java index 2a9c1825d..fdc2b21d3 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/LumbridgeDungeon.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/LumbridgeDungeon.java @@ -9,7 +9,7 @@ import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.zone.MapZone; @@ -18,7 +18,7 @@ import core.game.world.map.zone.ZoneBuilder; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; import java.util.HashMap; diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/SmokeDungeon.java b/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/SmokeDungeon.java index 0e3e6437d..4d24c5219 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/SmokeDungeon.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/SmokeDungeon.java @@ -9,14 +9,14 @@ import core.game.node.entity.Entity; import core.game.node.entity.combat.ImpactHandler.HitsplatType; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneBuilder; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; import core.tools.RandomFunction; import java.util.ArrayList; 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 fb0fddda2..4497fb24f 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 @@ -14,7 +14,7 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/smithing/SmithingPulse.java b/Server/src/main/java/core/game/node/entity/skill/smithing/SmithingPulse.java index 73fb8206a..6b105f859 100644 --- a/Server/src/main/java/core/game/node/entity/skill/smithing/SmithingPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/smithing/SmithingPulse.java @@ -1,17 +1,17 @@ package core.game.node.entity.skill.smithing; import core.cache.def.impl.ItemDefinition; -import core.game.world.map.Location; import core.game.content.quest.tutorials.tutorialisland.TutorialSession; import core.game.content.quest.tutorials.tutorialisland.TutorialStage; -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.entity.player.link.diary.DiaryType; +import core.game.node.entity.skill.SkillPulse; +import core.game.node.entity.skill.Skills; import core.game.node.item.Item; +import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.tools.StringUtils; -import core.game.node.entity.skill.skillcapeperks.SkillcapePerks; +import rs09.game.node.entity.skill.skillcapeperks.SkillcapePerks; /** * Represents the pulse used to smith a bar. diff --git a/Server/src/main/java/core/game/node/entity/skill/smithing/smelting/SmeltingPulse.java b/Server/src/main/java/core/game/node/entity/skill/smithing/smelting/SmeltingPulse.java index 7c81b6d49..1977b704c 100644 --- a/Server/src/main/java/core/game/node/entity/skill/smithing/smelting/SmeltingPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/smithing/smelting/SmeltingPulse.java @@ -1,7 +1,7 @@ package core.game.node.entity.skill.smithing.smelting; import core.game.container.impl.EquipmentContainer; -import core.tools.Items; +import rs09.tools.Items; import core.game.world.map.Location; import core.game.node.entity.skill.SkillPulse; import core.game.node.entity.skill.Skills; diff --git a/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningCreationPlugin.java b/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningCreationPlugin.java index 2d12eab0a..0d608a0fa 100644 --- a/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningCreationPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningCreationPlugin.java @@ -10,7 +10,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.RunScript; import core.plugin.Initializable; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Represents a component plugin used to handle the summoning creation of a 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 8dc51034f..18f8f0c02 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 @@ -18,7 +18,7 @@ import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.build.DynamicRegion; import core.game.world.map.path.Pathfinder; @@ -31,7 +31,7 @@ import core.net.packet.context.MinimapStateContext; import core.net.packet.out.CameraViewPacket; import core.net.packet.out.MinimapState; import core.plugin.Plugin; -import core.plugin.PluginManager; +import rs09.plugin.PluginManager; /** * Handles the summoning training room. diff --git a/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/BurdenBeast.java b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/BurdenBeast.java index f4fc48d23..34e3c8128 100644 --- a/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/BurdenBeast.java +++ b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/BurdenBeast.java @@ -4,7 +4,7 @@ import core.game.component.CloseEvent; import core.game.component.Component; import core.game.container.Container; import core.game.container.access.InterfaceContainer; -import core.game.system.config.ItemConfigParser; +import rs09.game.system.config.ItemConfigParser; import core.game.node.entity.skill.summoning.SummoningPouch; import core.game.node.entity.combat.equipment.WeaponInterface; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/Familiar.java b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/Familiar.java index 159d946e1..f72e3e7de 100644 --- a/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/Familiar.java +++ b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/Familiar.java @@ -1,24 +1,20 @@ package core.game.node.entity.skill.summoning.familiar; import core.cache.def.impl.NPCDefinition; -import core.game.node.entity.skill.SkillBonus; -import core.game.node.entity.skill.Skills; -import core.game.node.entity.skill.summoning.SummoningScroll; -import core.game.node.entity.skill.summoning.pet.Pet; import core.game.interaction.MovementPulse; import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; -import core.game.node.entity.combat.CombatPulse; import core.game.node.entity.combat.CombatStyle; -import core.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.combat.equipment.WeaponInterface; 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.entity.skill.SkillBonus; +import core.game.node.entity.skill.Skills; +import core.game.node.entity.skill.summoning.SummoningScroll; +import core.game.node.entity.skill.summoning.pet.Pet; import core.game.node.item.Item; -import core.game.system.SystemLogger; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.path.Pathfinder; @@ -27,6 +23,10 @@ import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Plugin; import core.tools.RandomFunction; +import rs09.game.node.entity.combat.CombatPulse; +import rs09.game.node.entity.combat.CombatSwingHandler; +import rs09.game.system.SystemLogger; +import rs09.game.world.GameWorld; import java.util.ArrayList; import java.util.List; diff --git a/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/FamiliarManager.java b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/FamiliarManager.java index 647cd677e..50c302832 100644 --- a/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/FamiliarManager.java +++ b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/FamiliarManager.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.summoning.familiar; import core.cache.def.impl.ItemDefinition; import core.game.component.Component; import core.game.container.Container; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import core.game.node.entity.skill.Skills; diff --git a/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/Forager.java b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/Forager.java index e8cd9f669..82e62387e 100644 --- a/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/Forager.java +++ b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/Forager.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.summoning.familiar; import core.game.node.entity.combat.equipment.WeaponInterface; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.tools.RandomFunction; /** diff --git a/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/RemoteViewer.java b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/RemoteViewer.java index 864304442..b30d66f85 100644 --- a/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/RemoteViewer.java +++ b/Server/src/main/java/core/game/node/entity/skill/summoning/familiar/RemoteViewer.java @@ -2,7 +2,7 @@ package core.game.node.entity.skill.summoning.familiar; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/thieving/PickpocketPulse.java b/Server/src/main/java/core/game/node/entity/skill/thieving/PickpocketPulse.java index ecb53fccc..772bfa033 100644 --- a/Server/src/main/java/core/game/node/entity/skill/thieving/PickpocketPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/thieving/PickpocketPulse.java @@ -1,8 +1,5 @@ package core.game.node.entity.skill.thieving; -import core.game.world.map.zone.ZoneBorders; -import core.game.node.entity.skill.SkillPulse; -import core.game.node.entity.skill.Skills; import core.game.node.entity.Entity; import core.game.node.entity.combat.DeathTask; import core.game.node.entity.combat.ImpactHandler.HitsplatType; @@ -10,12 +7,16 @@ import core.game.node.entity.npc.NPC; 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.entity.skill.SkillPulse; +import core.game.node.entity.skill.Skills; import core.game.node.entity.state.EntityState; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.world.GameWorld; +import core.game.world.map.zone.ZoneBorders; import core.game.world.update.flag.context.Animation; import core.tools.RandomFunction; +import rs09.game.node.entity.skill.thieving.Pickpocket; +import rs09.game.world.GameWorld; import java.util.List; 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 d8e3b2d0e..3e30a2ddd 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 @@ -8,7 +8,7 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; -import core.game.world.GameWorld; +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/thieving/ThievableChestPlugin.java b/Server/src/main/java/core/game/node/entity/skill/thieving/ThievableChestPlugin.java index 7fcc4a09a..f11546869 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 @@ -10,7 +10,7 @@ import core.game.node.item.Item; import core.game.node.object.GameObject; import core.game.node.object.ObjectBuilder; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; 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/thieving/ThievingOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/thieving/ThievingOptionPlugin.java index 4f930cc7a..2047724d8 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 @@ -9,6 +9,7 @@ import core.game.node.entity.player.Player; import core.game.node.object.GameObject; import core.plugin.Initializable; import core.plugin.Plugin; +import rs09.game.node.entity.skill.thieving.Pickpocket; /** * Represents the plugin used to handle thieving options. diff --git a/Server/src/main/java/core/game/node/entity/state/StatePulse.java b/Server/src/main/java/core/game/node/entity/state/StatePulse.java index c4f006be0..21c3b55d7 100644 --- a/Server/src/main/java/core/game/node/entity/state/StatePulse.java +++ b/Server/src/main/java/core/game/node/entity/state/StatePulse.java @@ -2,7 +2,7 @@ package core.game.node.entity.state; import core.game.node.entity.Entity; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import java.nio.ByteBuffer; diff --git a/Server/src/main/java/core/game/node/entity/state/impl/FireResistantPulse.java b/Server/src/main/java/core/game/node/entity/state/impl/FireResistantPulse.java index b00e4cbbd..e99a0de1a 100644 --- a/Server/src/main/java/core/game/node/entity/state/impl/FireResistantPulse.java +++ b/Server/src/main/java/core/game/node/entity/state/impl/FireResistantPulse.java @@ -3,7 +3,7 @@ package core.game.node.entity.state.impl; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; import core.game.node.entity.state.StatePulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import java.nio.ByteBuffer; diff --git a/Server/src/main/java/core/game/node/entity/state/impl/FrozenStatePulse.java b/Server/src/main/java/core/game/node/entity/state/impl/FrozenStatePulse.java index ac22619e9..d2467002e 100644 --- a/Server/src/main/java/core/game/node/entity/state/impl/FrozenStatePulse.java +++ b/Server/src/main/java/core/game/node/entity/state/impl/FrozenStatePulse.java @@ -3,7 +3,7 @@ package core.game.node.entity.state.impl; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; import core.game.node.entity.state.StatePulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import java.nio.ByteBuffer; diff --git a/Server/src/main/java/core/game/node/entity/state/impl/MiasmicStatePulse.java b/Server/src/main/java/core/game/node/entity/state/impl/MiasmicStatePulse.java index 628934bd8..0a4c629f4 100644 --- a/Server/src/main/java/core/game/node/entity/state/impl/MiasmicStatePulse.java +++ b/Server/src/main/java/core/game/node/entity/state/impl/MiasmicStatePulse.java @@ -3,7 +3,7 @@ package core.game.node.entity.state.impl; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; import core.game.node.entity.state.StatePulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import java.nio.ByteBuffer; diff --git a/Server/src/main/java/core/game/node/item/GroundItem.java b/Server/src/main/java/core/game/node/item/GroundItem.java index 1ad9864b6..c67501267 100644 --- a/Server/src/main/java/core/game/node/item/GroundItem.java +++ b/Server/src/main/java/core/game/node/item/GroundItem.java @@ -1,7 +1,7 @@ package core.game.node.item; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; /** diff --git a/Server/src/main/java/core/game/node/item/GroundItemManager.java b/Server/src/main/java/core/game/node/item/GroundItemManager.java index 04f2080a6..4b34e34e2 100644 --- a/Server/src/main/java/core/game/node/item/GroundItemManager.java +++ b/Server/src/main/java/core/game/node/item/GroundItemManager.java @@ -1,14 +1,14 @@ package core.game.node.item; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.update.flag.chunk.ItemUpdateFlag; import core.net.packet.PacketRepository; import core.net.packet.context.BuildItemContext; import core.net.packet.out.UpdateGroundItemAmount; -import plugin.ai.AIRepository; +import rs09.game.ai.AIRepository; import java.util.ArrayList; import java.util.List; diff --git a/Server/src/main/java/core/game/node/object/ObjectBuilder.java b/Server/src/main/java/core/game/node/object/ObjectBuilder.java index 69272fe5e..40b59f090 100644 --- a/Server/src/main/java/core/game/node/object/ObjectBuilder.java +++ b/Server/src/main/java/core/game/node/object/ObjectBuilder.java @@ -2,9 +2,9 @@ package core.game.node.object; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.build.LandscapeParser; diff --git a/Server/src/main/java/core/game/system/SystemManager.java b/Server/src/main/java/core/game/system/SystemManager.java index 5c1ba185a..48685fdb3 100644 --- a/Server/src/main/java/core/game/system/SystemManager.java +++ b/Server/src/main/java/core/game/system/SystemManager.java @@ -1,7 +1,7 @@ package core.game.system; import core.game.system.security.EncryptionManager; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * Manages the "game system" states, such as updating or terminating. diff --git a/Server/src/main/java/core/game/system/SystemShutdownHook.java b/Server/src/main/java/core/game/system/SystemShutdownHook.java index ad1a28fa2..707a4ae2c 100644 --- a/Server/src/main/java/core/game/system/SystemShutdownHook.java +++ b/Server/src/main/java/core/game/system/SystemShutdownHook.java @@ -1,5 +1,7 @@ package core.game.system; +import rs09.game.system.SystemLogger; + /** * Handles the shutdown hook. * @author Emperor diff --git a/Server/src/main/java/core/game/system/SystemTermination.java b/Server/src/main/java/core/game/system/SystemTermination.java index f46e5749c..26b936897 100644 --- a/Server/src/main/java/core/game/system/SystemTermination.java +++ b/Server/src/main/java/core/game/system/SystemTermination.java @@ -1,12 +1,13 @@ package core.game.system; -import core.ServerConstants; import core.game.ge.GrandExchangeDatabase; +import core.game.interaction.object.dmc.DMCHandler; import core.game.node.entity.player.Player; import core.game.node.entity.player.info.login.PlayerParser; -import core.game.world.repository.Repository; -import core.game.ge.OfferManager; -import core.game.interaction.object.dmc.DMCHandler; +import rs09.ServerConstants; +import rs09.game.ge.OfferManager; +import rs09.game.system.SystemLogger; +import rs09.game.world.repository.Repository; import java.io.File; import java.util.Iterator; diff --git a/Server/src/main/java/core/game/system/SystemUpdate.java b/Server/src/main/java/core/game/system/SystemUpdate.java index bb5375ea0..9df42b872 100644 --- a/Server/src/main/java/core/game/system/SystemUpdate.java +++ b/Server/src/main/java/core/game/system/SystemUpdate.java @@ -1,10 +1,10 @@ package core.game.system; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.node.entity.player.Player; import core.game.system.task.Pulse; -import core.game.world.GameWorld; -import core.game.world.repository.Repository; +import rs09.game.world.GameWorld; +import rs09.game.world.repository.Repository; import java.util.Iterator; import java.util.concurrent.Executors; diff --git a/Server/src/main/java/core/game/system/command/CommandSet.java b/Server/src/main/java/core/game/system/command/CommandSet.java index 449b4362d..2263fe75e 100644 --- a/Server/src/main/java/core/game/system/command/CommandSet.java +++ b/Server/src/main/java/core/game/system/command/CommandSet.java @@ -2,7 +2,8 @@ package core.game.system.command; import core.game.node.entity.player.Player; import core.game.node.entity.player.info.Rights; -import core.game.world.GameWorld; +import rs09.game.system.command.CommandPlugin; +import rs09.game.world.GameWorld; import java.util.ArrayList; import java.util.List; diff --git a/Server/src/main/java/core/game/system/communication/ClanEntry.java b/Server/src/main/java/core/game/system/communication/ClanEntry.java index 4e293d7f9..1e74baa80 100644 --- a/Server/src/main/java/core/game/system/communication/ClanEntry.java +++ b/Server/src/main/java/core/game/system/communication/ClanEntry.java @@ -1,7 +1,7 @@ package core.game.system.communication; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * Represents a player in a clan chat. diff --git a/Server/src/main/java/core/game/system/communication/ClanRepository.java b/Server/src/main/java/core/game/system/communication/ClanRepository.java index 56dc16e20..b26098a1a 100644 --- a/Server/src/main/java/core/game/system/communication/ClanRepository.java +++ b/Server/src/main/java/core/game/system/communication/ClanRepository.java @@ -6,8 +6,8 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.info.PlayerDetails; import core.game.node.entity.player.info.Rights; import core.game.system.monitor.PlayerMonitor; -import core.game.world.GameWorld; -import core.game.world.repository.Repository; +import rs09.game.world.GameWorld; +import rs09.game.world.repository.Repository; import core.net.amsc.WorldCommunicator; import core.net.packet.PacketRepository; import core.net.packet.context.ClanContext; diff --git a/Server/src/main/java/core/game/system/communication/CommunicationInfo.java b/Server/src/main/java/core/game/system/communication/CommunicationInfo.java index 1b44a8dc5..28fefd434 100644 --- a/Server/src/main/java/core/game/system/communication/CommunicationInfo.java +++ b/Server/src/main/java/core/game/system/communication/CommunicationInfo.java @@ -2,12 +2,12 @@ package core.game.system.communication; import core.cache.misc.buffer.ByteBufferUtils; import core.game.node.entity.player.Player; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.game.system.monitor.PlayerMonitor; import core.game.system.mysql.SQLTable; import core.game.system.task.Pulse; -import core.game.world.GameWorld; -import core.game.world.repository.Repository; +import rs09.game.world.GameWorld; +import rs09.game.world.repository.Repository; import core.net.amsc.MSPacketRepository; import core.net.amsc.WorldCommunicator; import core.net.packet.PacketRepository; diff --git a/Server/src/main/java/core/game/system/monitor/DuplicationLog.java b/Server/src/main/java/core/game/system/monitor/DuplicationLog.java index de1d380ba..9ac4969f4 100644 --- a/Server/src/main/java/core/game/system/monitor/DuplicationLog.java +++ b/Server/src/main/java/core/game/system/monitor/DuplicationLog.java @@ -1,6 +1,6 @@ package core.game.system.monitor; -import core.ServerConstants; +import rs09.ServerConstants; /** * Handles duplication-related logging. diff --git a/Server/src/main/java/core/game/system/mysql/SQLEntryHandler.java b/Server/src/main/java/core/game/system/mysql/SQLEntryHandler.java index fc2c66335..3da9131de 100644 --- a/Server/src/main/java/core/game/system/mysql/SQLEntryHandler.java +++ b/Server/src/main/java/core/game/system/mysql/SQLEntryHandler.java @@ -1,6 +1,6 @@ package core.game.system.mysql; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/Server/src/main/java/core/game/system/mysql/SQLManager.java b/Server/src/main/java/core/game/system/mysql/SQLManager.java index 3a4c6ae26..6a39723f1 100644 --- a/Server/src/main/java/core/game/system/mysql/SQLManager.java +++ b/Server/src/main/java/core/game/system/mysql/SQLManager.java @@ -1,7 +1,7 @@ package core.game.system.mysql; -import core.ServerConstants; -import core.game.system.SystemLogger; +import rs09.ServerConstants; +import rs09.game.system.SystemLogger; import core.game.system.SystemManager; import java.sql.Connection; diff --git a/Server/src/main/java/core/game/system/mysql/impl/HighscoreSQLHandler.java b/Server/src/main/java/core/game/system/mysql/impl/HighscoreSQLHandler.java index f7bb9d342..e2d48807a 100644 --- a/Server/src/main/java/core/game/system/mysql/impl/HighscoreSQLHandler.java +++ b/Server/src/main/java/core/game/system/mysql/impl/HighscoreSQLHandler.java @@ -1,12 +1,12 @@ package core.game.system.mysql.impl; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.node.entity.skill.Skills; import core.game.node.entity.player.Player; import core.game.node.entity.player.info.Rights; import core.game.system.mysql.SQLEntryHandler; import core.game.system.mysql.SQLManager; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/Server/src/main/java/core/game/system/mysql/impl/PlayerLogSQLHandler.java b/Server/src/main/java/core/game/system/mysql/impl/PlayerLogSQLHandler.java index 1fc6d1043..0fd2fc084 100644 --- a/Server/src/main/java/core/game/system/mysql/impl/PlayerLogSQLHandler.java +++ b/Server/src/main/java/core/game/system/mysql/impl/PlayerLogSQLHandler.java @@ -1,6 +1,6 @@ package core.game.system.mysql.impl; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.system.monitor.MessageLog; import core.game.system.monitor.PlayerMonitor; import core.game.system.mysql.SQLEntryHandler; diff --git a/Server/src/main/java/core/game/system/mysql/impl/PlayerSQLHandler.java b/Server/src/main/java/core/game/system/mysql/impl/PlayerSQLHandler.java index 811b65182..d6acf22cd 100644 --- a/Server/src/main/java/core/game/system/mysql/impl/PlayerSQLHandler.java +++ b/Server/src/main/java/core/game/system/mysql/impl/PlayerSQLHandler.java @@ -1,6 +1,6 @@ package core.game.system.mysql.impl; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.node.entity.player.info.PlayerDetails; import core.game.system.mysql.SQLColumn; import core.game.system.mysql.SQLEntryHandler; diff --git a/Server/src/main/java/core/game/system/script/ScriptCompiler.java b/Server/src/main/java/core/game/system/script/ScriptCompiler.java index 8a22c61f4..2e5645f88 100644 --- a/Server/src/main/java/core/game/system/script/ScriptCompiler.java +++ b/Server/src/main/java/core/game/system/script/ScriptCompiler.java @@ -1,14 +1,14 @@ package core.game.system.script; -import core.ServerConstants; -import core.game.system.SystemLogger; -import plugin.ai.AIPBuilder; -import plugin.ai.AIPlayer; +import rs09.ServerConstants; +import rs09.game.system.SystemLogger; +import rs09.game.ai.AIPBuilder; +import rs09.game.ai.AIPlayer; import core.game.system.script.exc.InvalidGOTOException; import core.game.system.script.exc.InvalidInstructionException; import core.game.system.script.exc.InvalidInterpreterException; import core.game.system.script.exc.ScriptException; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import java.io.BufferedReader; import java.io.File; diff --git a/Server/src/main/java/core/game/system/script/ScriptManager.java b/Server/src/main/java/core/game/system/script/ScriptManager.java index 3610d4eb4..51f03cd40 100644 --- a/Server/src/main/java/core/game/system/script/ScriptManager.java +++ b/Server/src/main/java/core/game/system/script/ScriptManager.java @@ -1,8 +1,8 @@ package core.game.system.script; -import core.ServerConstants; -import core.game.system.SystemLogger; -import core.game.world.GameWorld; +import rs09.ServerConstants; +import rs09.game.system.SystemLogger; +import rs09.game.world.GameWorld; import java.io.File; diff --git a/Server/src/main/java/core/game/system/script/context/OptionDialInstruction.java b/Server/src/main/java/core/game/system/script/context/OptionDialInstruction.java index 276c6f0f6..edbf104b0 100644 --- a/Server/src/main/java/core/game/system/script/context/OptionDialInstruction.java +++ b/Server/src/main/java/core/game/system/script/context/OptionDialInstruction.java @@ -1,7 +1,7 @@ package core.game.system.script.context; import core.game.node.entity.player.Player; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.game.system.script.ParamCall; import core.game.system.script.ScriptCompiler; import core.game.system.script.ScriptContext; diff --git a/Server/src/main/java/core/game/system/script/context/PauseInstruction.java b/Server/src/main/java/core/game/system/script/context/PauseInstruction.java index d2d2bfa8d..d36c86301 100644 --- a/Server/src/main/java/core/game/system/script/context/PauseInstruction.java +++ b/Server/src/main/java/core/game/system/script/context/PauseInstruction.java @@ -3,7 +3,7 @@ package core.game.system.script.context; import core.game.system.script.ScriptContext; import core.game.system.script.ScriptManager; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * Used for pausing the script. diff --git a/Server/src/main/java/core/game/system/task/LogoutTask.java b/Server/src/main/java/core/game/system/task/LogoutTask.java index a8584282b..241724641 100644 --- a/Server/src/main/java/core/game/system/task/LogoutTask.java +++ b/Server/src/main/java/core/game/system/task/LogoutTask.java @@ -1,7 +1,7 @@ package core.game.system.task; import core.game.node.entity.player.Player; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * A task called upon when a player disconnects from the game. diff --git a/Server/src/main/java/core/game/system/task/NodeTask.java b/Server/src/main/java/core/game/system/task/NodeTask.java index 113d2f2a9..e827aa696 100644 --- a/Server/src/main/java/core/game/system/task/NodeTask.java +++ b/Server/src/main/java/core/game/system/task/NodeTask.java @@ -1,7 +1,7 @@ package core.game.system.task; import core.game.node.Node; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; /** * Represents "Node pulse", which is used to execute methods with node 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 b79cc819b..ebbd1f388 100644 --- a/Server/src/main/java/core/game/world/map/BuildRegionChunk.java +++ b/Server/src/main/java/core/game/world/map/BuildRegionChunk.java @@ -6,7 +6,7 @@ import core.game.node.item.GroundItem; import core.game.node.item.Item; import core.game.node.object.Constructed; import core.game.node.object.GameObject; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.game.world.map.build.LandscapeParser; import core.net.packet.IoBuffer; import core.net.packet.out.ClearObject; diff --git a/Server/src/main/java/core/game/world/map/Region.java b/Server/src/main/java/core/game/world/map/Region.java index 2b5b298e8..d79b2980a 100644 --- a/Server/src/main/java/core/game/world/map/Region.java +++ b/Server/src/main/java/core/game/world/map/Region.java @@ -4,15 +4,15 @@ import core.cache.Cache; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.music.MusicZone; -import core.game.system.SystemLogger; -import core.game.system.config.XteaParser; import core.game.system.task.Pulse; -import core.game.world.GameWorld; import core.game.world.map.build.DynamicRegion; import core.game.world.map.build.LandscapeParser; import core.game.world.map.build.MapscapeParser; import core.game.world.map.zone.RegionZone; -import core.game.world.repository.Repository; +import rs09.game.system.SystemLogger; +import rs09.game.system.config.XteaParser; +import rs09.game.world.GameWorld; +import rs09.game.world.repository.Repository; import java.nio.ByteBuffer; import java.util.ArrayList; 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 7442b295e..87723bfd1 100644 --- a/Server/src/main/java/core/game/world/map/RegionChunk.java +++ b/Server/src/main/java/core/game/world/map/RegionChunk.java @@ -4,7 +4,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.Item; import core.game.node.object.GameObject; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.game.world.map.build.DynamicRegion; import core.game.world.map.build.LandscapeParser; import core.game.world.update.flag.UpdateFlag; diff --git a/Server/src/main/java/core/game/world/map/RegionManager.java b/Server/src/main/java/core/game/world/map/RegionManager.java index 29e6d6ab7..985b9e4d1 100644 --- a/Server/src/main/java/core/game/world/map/RegionManager.java +++ b/Server/src/main/java/core/game/world/map/RegionManager.java @@ -5,7 +5,7 @@ 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.GameObject; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.game.world.map.zone.ZoneBorders; import core.tools.RandomFunction; 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 c20503083..1ab5b9a96 100644 --- a/Server/src/main/java/core/game/world/map/RegionPlane.java +++ b/Server/src/main/java/core/game/world/map/RegionPlane.java @@ -6,7 +6,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.Item; import core.game.node.object.GameObject; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; 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/path/Pathfinder.java b/Server/src/main/java/core/game/world/map/path/Pathfinder.java index e18de12a9..c5036c6d8 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 @@ -6,6 +6,7 @@ import core.game.node.item.GroundItem; import core.game.node.object.GameObject; import core.game.world.map.Location; import core.game.world.map.RegionManager; +import rs09.game.world.map.path.SmartPathfinder; public abstract class Pathfinder { @@ -27,42 +28,42 @@ public abstract class Pathfinder { /** * The south direction flag. */ - static final int SOUTH_FLAG = 0x1; + public static final int SOUTH_FLAG = 0x1; /** * The west direction flag. */ - static final int WEST_FLAG = 0x2; + public static final int WEST_FLAG = 0x2; /** * The north direction flag. */ - static final int NORTH_FLAG = 0x4; + public static final int NORTH_FLAG = 0x4; /** * The east direction flag. */ - static final int EAST_FLAG = 0x8; + public static final int EAST_FLAG = 0x8; /** * The south-west direction flag. */ - static final int SOUTH_WEST_FLAG = SOUTH_FLAG | WEST_FLAG; + public static final int SOUTH_WEST_FLAG = SOUTH_FLAG | WEST_FLAG; /** * The north-west direction flag. */ - static final int NORTH_WEST_FLAG = NORTH_FLAG | WEST_FLAG; + public static final int NORTH_WEST_FLAG = NORTH_FLAG | WEST_FLAG; /** * The south-east direction flag. */ - static final int SOUTH_EAST_FLAG = SOUTH_FLAG | EAST_FLAG; + public static final int SOUTH_EAST_FLAG = SOUTH_FLAG | EAST_FLAG; /** * The north-east direction flag. */ - static final int NORTH_EAST_FLAG = NORTH_FLAG | EAST_FLAG; + public static final int NORTH_EAST_FLAG = NORTH_FLAG | EAST_FLAG; /** * Finds a path from the location to the end location. diff --git a/Server/src/main/java/core/game/world/map/zone/impl/DarkZone.java b/Server/src/main/java/core/game/world/map/zone/impl/DarkZone.java index 0861ca16f..8b525d2e6 100644 --- a/Server/src/main/java/core/game/world/map/zone/impl/DarkZone.java +++ b/Server/src/main/java/core/game/world/map/zone/impl/DarkZone.java @@ -10,11 +10,11 @@ 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 core.game.world.GameWorld; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.RegionZone; import core.game.world.map.zone.ZoneBorders; -import core.game.node.entity.skill.skillcapeperks.SkillcapePerks; +import rs09.game.node.entity.skill.skillcapeperks.SkillcapePerks; +import rs09.game.world.GameWorld; /** * Handles a dark area. diff --git a/Server/src/main/java/core/game/world/map/zone/impl/ModeratorZone.java b/Server/src/main/java/core/game/world/map/zone/impl/ModeratorZone.java index 1c8b113dd..01af31d33 100644 --- a/Server/src/main/java/core/game/world/map/zone/impl/ModeratorZone.java +++ b/Server/src/main/java/core/game/world/map/zone/impl/ModeratorZone.java @@ -1,6 +1,6 @@ package core.game.world.map.zone.impl; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.interaction.Option; import core.game.node.Node; import core.game.node.entity.Entity; diff --git a/Server/src/main/java/core/game/world/map/zone/impl/WildernessZone.java b/Server/src/main/java/core/game/world/map/zone/impl/WildernessZone.java index a0d8c54be..017ec8b7e 100644 --- a/Server/src/main/java/core/game/world/map/zone/impl/WildernessZone.java +++ b/Server/src/main/java/core/game/world/map/zone/impl/WildernessZone.java @@ -2,38 +2,39 @@ package core.game.world.map.zone.impl; import core.game.component.Component; import core.game.container.Container; -import core.game.node.entity.combat.DeathTask; -import core.game.node.entity.player.link.IronmanMode; -import core.game.node.item.GroundItem; -import core.game.system.config.NPCConfigParser; import core.game.content.ame.AntiMacroNPC; -import core.game.node.entity.skill.summoning.familiar.Familiar; +import core.game.content.ttrail.UriNPC; import core.game.interaction.Option; +import core.game.interaction.item.brawling_gloves.BrawlingGloves; import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.combat.CombatStyle; +import core.game.node.entity.combat.DeathTask; import core.game.node.entity.npc.NPC; import core.game.node.entity.npc.agg.AggressiveBehavior; import core.game.node.entity.npc.agg.AggressiveHandler; import core.game.node.entity.player.Player; import core.game.node.entity.player.info.Rights; +import core.game.node.entity.player.link.IronmanMode; +import core.game.node.entity.skill.summoning.familiar.Familiar; +import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.RegionZone; import core.game.world.map.zone.ZoneBorders; -import core.game.world.repository.Repository; import core.tools.RandomFunction; -import core.game.interaction.item.brawling_gloves.BrawlingGloves; -import core.game.content.ttrail.UriNPC; +import rs09.game.system.config.NPCConfigParser; +import rs09.game.world.GameWorld; +import rs09.game.world.repository.Repository; import java.util.ArrayList; import java.util.List; -import static core.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_BASE; -import static core.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_DEATHS; +import static rs09.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_BASE; +import static rs09.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_DEATHS; + /** * Handles the wilderness zone. 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 b9a8b25c3..d3d0e5c8a 100644 --- a/Server/src/main/java/core/game/world/objectparser/ObjectParser.java +++ b/Server/src/main/java/core/game/world/objectparser/ObjectParser.java @@ -1,8 +1,8 @@ package core.game.world.objectparser; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.node.object.GameObject; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.build.LandscapeParser; import core.plugin.Initializable; import core.plugin.Plugin; diff --git a/Server/src/main/java/core/gui/component/PlayerViewer.java b/Server/src/main/java/core/gui/component/PlayerViewer.java index 2540f27fb..671e3efb6 100644 --- a/Server/src/main/java/core/gui/component/PlayerViewer.java +++ b/Server/src/main/java/core/gui/component/PlayerViewer.java @@ -5,8 +5,8 @@ import core.game.container.Container; import core.game.node.entity.player.Player; import core.game.node.entity.player.info.PlayerDetails; import core.game.node.item.Item; -import core.game.world.GameWorld; -import core.game.world.repository.Repository; +import rs09.game.world.GameWorld; +import rs09.game.world.repository.Repository; import core.gui.ConsoleFrame; import core.tools.PlayerLoader; import core.tools.StringUtils; diff --git a/Server/src/main/java/core/gui/tab/GrandExchangeTab.java b/Server/src/main/java/core/gui/tab/GrandExchangeTab.java index c497b131b..2d4d10c41 100644 --- a/Server/src/main/java/core/gui/tab/GrandExchangeTab.java +++ b/Server/src/main/java/core/gui/tab/GrandExchangeTab.java @@ -4,8 +4,8 @@ package core.gui.tab; import core.game.node.entity.player.Player; import core.gui.ConsoleFrame; import core.gui.ConsoleTab; -import core.game.ge.GrandExchangeOffer; -import core.game.ge.OfferManager; +import rs09.game.ge.GrandExchangeOffer; +import rs09.game.ge.OfferManager; import javax.swing.*; import java.awt.*; diff --git a/Server/src/main/java/core/gui/tab/PlayerTab.java b/Server/src/main/java/core/gui/tab/PlayerTab.java index 8127488a4..5aefe6844 100644 --- a/Server/src/main/java/core/gui/tab/PlayerTab.java +++ b/Server/src/main/java/core/gui/tab/PlayerTab.java @@ -1,7 +1,7 @@ package core.gui.tab; -import core.ServerConstants; +import rs09.ServerConstants; import core.gui.ConsoleTab; import core.gui.component.PlayerViewer; diff --git a/Server/src/main/java/core/gui/tab/StatisticsTab.java b/Server/src/main/java/core/gui/tab/StatisticsTab.java index 627032b96..be5a5d8a5 100644 --- a/Server/src/main/java/core/gui/tab/StatisticsTab.java +++ b/Server/src/main/java/core/gui/tab/StatisticsTab.java @@ -1,15 +1,15 @@ package core.gui.tab; -import core.Server; -import core.ServerConstants; import core.game.node.item.GroundItemManager; import core.game.system.SystemManager; import core.game.system.SystemState; -import core.game.world.GameWorld; import core.game.world.map.RegionManager; -import core.game.world.repository.Repository; import core.gui.ConsoleTab; +import rs09.Server; +import rs09.ServerConstants; +import rs09.game.world.GameWorld; +import rs09.game.world.repository.Repository; import javax.swing.*; import javax.swing.border.TitledBorder; diff --git a/Server/src/main/java/core/net/IoSession.java b/Server/src/main/java/core/net/IoSession.java index 96e87f42b..bca36b403 100644 --- a/Server/src/main/java/core/net/IoSession.java +++ b/Server/src/main/java/core/net/IoSession.java @@ -5,7 +5,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.info.ClientInfo; import core.game.node.entity.player.info.login.Response; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.net.producer.HSEventProducer; import core.net.producer.LoginEventProducer; diff --git a/Server/src/main/java/core/net/amsc/MSEventHandler.java b/Server/src/main/java/core/net/amsc/MSEventHandler.java index c39712451..074efa367 100644 --- a/Server/src/main/java/core/net/amsc/MSEventHandler.java +++ b/Server/src/main/java/core/net/amsc/MSEventHandler.java @@ -1,6 +1,6 @@ package core.net.amsc; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.net.IoEventHandler; import core.net.IoSession; diff --git a/Server/src/main/java/core/net/amsc/MSPacketRepository.java b/Server/src/main/java/core/net/amsc/MSPacketRepository.java index 0e849e30f..7d87f2452 100644 --- a/Server/src/main/java/core/net/amsc/MSPacketRepository.java +++ b/Server/src/main/java/core/net/amsc/MSPacketRepository.java @@ -3,14 +3,10 @@ package core.net.amsc; import core.game.node.entity.player.Player; import core.game.node.entity.player.info.PlayerDetails; import core.game.node.entity.player.info.Rights; -import core.game.node.entity.player.info.login.LoginParser; import core.game.node.entity.player.info.login.Response; -import core.game.system.SystemLogger; import core.game.system.SystemManager; import core.game.system.SystemState; import core.game.system.communication.*; -import core.game.world.GameWorld; -import core.game.world.repository.Repository; import core.net.packet.IoBuffer; import core.net.packet.PacketHeader; import core.net.packet.PacketRepository; @@ -20,6 +16,10 @@ import core.net.packet.context.MessageContext; import core.net.packet.out.CommunicationMessage; import core.net.packet.out.ContactPackets; import core.net.packet.out.UpdateClanChat; +import rs09.game.node.entity.player.info.login.LoginParser; +import rs09.game.system.SystemLogger; +import rs09.game.world.GameWorld; +import rs09.game.world.repository.Repository; import java.nio.ByteBuffer; diff --git a/Server/src/main/java/core/net/amsc/ManagementServerState.java b/Server/src/main/java/core/net/amsc/ManagementServerState.java index 81db14310..8a9d91a23 100644 --- a/Server/src/main/java/core/net/amsc/ManagementServerState.java +++ b/Server/src/main/java/core/net/amsc/ManagementServerState.java @@ -1,7 +1,7 @@ package core.net.amsc; import core.game.node.entity.player.Player; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.net.packet.PacketRepository; import core.net.packet.context.ContactContext; import core.net.packet.out.ContactPackets; diff --git a/Server/src/main/java/core/net/amsc/WorldCommunicator.java b/Server/src/main/java/core/net/amsc/WorldCommunicator.java index 86bc6b7ab..39e9dc193 100644 --- a/Server/src/main/java/core/net/amsc/WorldCommunicator.java +++ b/Server/src/main/java/core/net/amsc/WorldCommunicator.java @@ -1,15 +1,15 @@ package core.net.amsc; import core.game.node.entity.player.info.Rights; -import core.game.node.entity.player.info.login.LoginParser; import core.game.node.entity.player.info.login.Response; -import core.game.system.SystemLogger; import core.game.system.task.TaskExecutor; -import core.game.world.GameWorld; import core.net.EventProducer; import core.net.IoSession; import core.net.NioReactor; import core.net.producer.MSHSEventProducer; +import rs09.game.node.entity.player.info.login.LoginParser; +import rs09.game.system.SystemLogger; +import rs09.game.world.GameWorld; import java.io.IOException; import java.net.InetAddress; diff --git a/Server/src/main/java/core/net/event/GameReadEvent.java b/Server/src/main/java/core/net/event/GameReadEvent.java index 5c4a8e464..27544148e 100644 --- a/Server/src/main/java/core/net/event/GameReadEvent.java +++ b/Server/src/main/java/core/net/event/GameReadEvent.java @@ -1,7 +1,7 @@ package core.net.event; -import core.game.system.SystemLogger; -import core.game.world.GameWorld; +import rs09.game.system.SystemLogger; +import rs09.game.world.GameWorld; import core.net.IoReadEvent; import core.net.IoSession; import core.net.packet.IncomingPacket; diff --git a/Server/src/main/java/core/net/event/MSReadEvent.java b/Server/src/main/java/core/net/event/MSReadEvent.java index 84a340b3d..77592ba15 100644 --- a/Server/src/main/java/core/net/event/MSReadEvent.java +++ b/Server/src/main/java/core/net/event/MSReadEvent.java @@ -1,6 +1,6 @@ package core.net.event; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.net.IoReadEvent; import core.net.IoSession; import core.net.amsc.MSPacketRepository; diff --git a/Server/src/main/java/core/net/event/RegistryReadEvent.java b/Server/src/main/java/core/net/event/RegistryReadEvent.java index 42a6f51b1..2d3d4a4d1 100644 --- a/Server/src/main/java/core/net/event/RegistryReadEvent.java +++ b/Server/src/main/java/core/net/event/RegistryReadEvent.java @@ -1,7 +1,7 @@ package core.net.event; -import core.game.system.SystemLogger; -import core.game.world.GameWorld; +import rs09.game.system.SystemLogger; +import rs09.game.world.GameWorld; import core.net.IoReadEvent; import core.net.IoSession; import core.net.amsc.ManagementServerState; diff --git a/Server/src/main/java/core/net/event/RegistryWriteEvent.java b/Server/src/main/java/core/net/event/RegistryWriteEvent.java index 6e94e58c0..0a0b40521 100644 --- a/Server/src/main/java/core/net/event/RegistryWriteEvent.java +++ b/Server/src/main/java/core/net/event/RegistryWriteEvent.java @@ -1,7 +1,7 @@ package core.net.event; import core.cache.misc.buffer.ByteBufferUtils; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.net.Constants; import core.net.IoSession; import core.net.IoWriteEvent; diff --git a/Server/src/main/java/core/net/lobby/WorldDefinition.java b/Server/src/main/java/core/net/lobby/WorldDefinition.java index 92baf066c..a67d4c1b4 100644 --- a/Server/src/main/java/core/net/lobby/WorldDefinition.java +++ b/Server/src/main/java/core/net/lobby/WorldDefinition.java @@ -1,7 +1,7 @@ package core.net.lobby; -import core.game.world.GameWorld; -import core.game.world.repository.Repository; +import rs09.game.world.GameWorld; +import rs09.game.world.repository.Repository; /** * Represents a world's definition. diff --git a/Server/src/main/java/core/net/lobby/WorldList.java b/Server/src/main/java/core/net/lobby/WorldList.java index 0da990c44..dc23a0301 100644 --- a/Server/src/main/java/core/net/lobby/WorldList.java +++ b/Server/src/main/java/core/net/lobby/WorldList.java @@ -1,6 +1,6 @@ package core.net.lobby; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.net.IoSession; import core.net.packet.IoBuffer; diff --git a/Server/src/main/java/core/net/packet/PacketRepository.java b/Server/src/main/java/core/net/packet/PacketRepository.java index 5ca6a2ee3..350d63682 100644 --- a/Server/src/main/java/core/net/packet/PacketRepository.java +++ b/Server/src/main/java/core/net/packet/PacketRepository.java @@ -1,9 +1,11 @@ package core.net.packet; -import core.game.system.SystemLogger; import core.net.packet.in.*; -import core.net.packet.out.*; import core.net.packet.out.GrandExchangePacket; +import core.net.packet.out.*; +import rs09.game.system.SystemLogger; +import rs09.net.packet.in.ItemOnGroundItemPacket; +import rs09.net.packet.in.QuickChatPacketHandler; import java.util.HashMap; import java.util.Map; diff --git a/Server/src/main/java/core/net/packet/context/CameraContext.java b/Server/src/main/java/core/net/packet/context/CameraContext.java index 057104712..b125fae0b 100644 --- a/Server/src/main/java/core/net/packet/context/CameraContext.java +++ b/Server/src/main/java/core/net/packet/context/CameraContext.java @@ -1,7 +1,7 @@ package core.net.packet.context; import core.game.node.entity.player.Player; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.net.packet.Context; /** diff --git a/Server/src/main/java/core/net/packet/in/ActionButtonPacket.java b/Server/src/main/java/core/net/packet/in/ActionButtonPacket.java index 1b8d512cd..48fe73274 100644 --- a/Server/src/main/java/core/net/packet/in/ActionButtonPacket.java +++ b/Server/src/main/java/core/net/packet/in/ActionButtonPacket.java @@ -10,7 +10,7 @@ import core.game.node.entity.player.info.login.LoginConfiguration; import core.game.node.entity.player.link.request.assist.AssistSession; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.net.packet.IncomingPacket; import core.net.packet.IoBuffer; diff --git a/Server/src/main/java/core/net/packet/in/ChatPacket.java b/Server/src/main/java/core/net/packet/in/ChatPacket.java index 78b2e5434..af419b473 100644 --- a/Server/src/main/java/core/net/packet/in/ChatPacket.java +++ b/Server/src/main/java/core/net/packet/in/ChatPacket.java @@ -3,7 +3,7 @@ package core.net.packet.in; import core.game.node.entity.player.Player; import core.game.system.monitor.PlayerMonitor; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.update.flag.context.ChatMessage; import core.game.world.update.flag.player.ChatFlag; import core.net.amsc.MSPacketRepository; diff --git a/Server/src/main/java/core/net/packet/in/ClanPacketHandler.java b/Server/src/main/java/core/net/packet/in/ClanPacketHandler.java index 98a78e3c8..5fc8ba5d8 100644 --- a/Server/src/main/java/core/net/packet/in/ClanPacketHandler.java +++ b/Server/src/main/java/core/net/packet/in/ClanPacketHandler.java @@ -4,7 +4,7 @@ import core.game.node.entity.player.Player; import core.game.system.communication.ClanRank; import core.game.system.communication.ClanRepository; import core.game.system.communication.CommunicationInfo; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.net.amsc.MSPacketRepository; import core.net.amsc.WorldCommunicator; import core.net.packet.IncomingPacket; diff --git a/Server/src/main/java/core/net/packet/in/CommandPacket.java b/Server/src/main/java/core/net/packet/in/CommandPacket.java index 3a299895e..96cfed378 100644 --- a/Server/src/main/java/core/net/packet/in/CommandPacket.java +++ b/Server/src/main/java/core/net/packet/in/CommandPacket.java @@ -1,9 +1,9 @@ package core.net.packet.in; import core.game.node.entity.player.Player; -import core.game.system.command.CommandSystem; +import rs09.game.system.command.CommandSystem; import core.game.system.monitor.PlayerMonitor; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.net.packet.IncomingPacket; import core.net.packet.IoBuffer; diff --git a/Server/src/main/java/core/net/packet/in/DummyPacket.java b/Server/src/main/java/core/net/packet/in/DummyPacket.java index 349ccd10e..8798bf414 100644 --- a/Server/src/main/java/core/net/packet/in/DummyPacket.java +++ b/Server/src/main/java/core/net/packet/in/DummyPacket.java @@ -1,7 +1,7 @@ package core.net.packet.in; import core.game.node.entity.player.Player; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import core.net.packet.IncomingPacket; import core.net.packet.IoBuffer; diff --git a/Server/src/main/java/core/net/packet/in/IdlePacketHandler.java b/Server/src/main/java/core/net/packet/in/IdlePacketHandler.java index 7da242108..0acb48c24 100644 --- a/Server/src/main/java/core/net/packet/in/IdlePacketHandler.java +++ b/Server/src/main/java/core/net/packet/in/IdlePacketHandler.java @@ -4,7 +4,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.info.Rights; import core.net.packet.IncomingPacket; import core.net.packet.IoBuffer; -import plugin.ai.general.GeneralBotCreator; +import rs09.game.ai.general.GeneralBotCreator; /** * Handles the idle packet handler. 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 a5dbd9d86..be5d998b4 100644 --- a/Server/src/main/java/core/net/packet/in/InteractionPacket.java +++ b/Server/src/main/java/core/net/packet/in/InteractionPacket.java @@ -1,29 +1,30 @@ package core.net.packet.in; -import core.ServerConstants; import core.cache.def.impl.ObjectDefinition; import core.cache.def.impl.VarbitDefinition; -import core.game.interaction.*; +import core.game.content.quest.PluginInteractionManager; +import core.game.interaction.Interaction; +import core.game.interaction.MovementPulse; +import core.game.interaction.Option; +import core.game.interaction.SpecialGroundItems; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.system.SystemLogger; -import core.game.system.task.Pulse; -import plugin.ai.AIPlayer; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.object.GameObject; import core.game.world.map.Location; import core.game.world.map.RegionManager; -import core.game.world.repository.Repository; import core.net.packet.IncomingPacket; import core.net.packet.IoBuffer; import core.net.packet.PacketRepository; import core.net.packet.context.PlayerContext; import core.net.packet.out.ClearMinimapFlag; -import core.game.content.quest.PluginInteractionManager; +import rs09.ServerConstants; +import rs09.game.ai.AIPlayer; +import rs09.game.interaction.Listeners; +import rs09.game.world.repository.Repository; -import java.util.Arrays; import java.util.List; /** 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 803e077b1..693d5fb04 100644 --- a/Server/src/main/java/core/net/packet/in/InterfaceUseOnPacket.java +++ b/Server/src/main/java/core/net/packet/in/InterfaceUseOnPacket.java @@ -1,20 +1,20 @@ package core.net.packet.in; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.node.entity.skill.magic.MagicSpell; import core.game.node.entity.skill.summoning.familiar.FamiliarSpecial; import core.game.interaction.MovementPulse; -import core.game.node.entity.combat.CombatSwingHandler; +import rs09.game.node.entity.combat.CombatSwingHandler; import core.game.node.entity.npc.NPC; 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.GameObject; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.net.packet.IncomingPacket; import core.net.packet.IoBuffer; import core.net.packet.PacketRepository; 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 d7eca1095..e026cd433 100644 --- a/Server/src/main/java/core/net/packet/in/ItemActionPacket.java +++ b/Server/src/main/java/core/net/packet/in/ItemActionPacket.java @@ -1,25 +1,29 @@ package core.net.packet.in; -import core.game.interaction.*; +import core.game.content.quest.PluginInteractionManager; +import core.game.interaction.DestinationFlag; +import core.game.interaction.MovementPulse; +import core.game.interaction.NodeUsageEvent; +import core.game.interaction.UseWithHandler; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.entity.skill.farming.CompostBins; -import core.game.node.entity.skill.farming.FarmingPatch; -import core.game.node.entity.skill.farming.UseWithBinHandler; -import core.game.node.entity.skill.farming.UseWithPatchHandler; import core.game.node.item.Item; import core.game.node.object.GameObject; -import core.game.system.SystemLogger; import core.game.world.map.RegionManager; -import core.game.world.repository.Repository; import core.net.packet.IncomingPacket; import core.net.packet.IoBuffer; import core.net.packet.PacketRepository; import core.net.packet.context.PlayerContext; import core.net.packet.out.ClearMinimapFlag; -import core.tools.Items; -import core.game.system.command.rottenpotato.RottenPotatoUseWithHandler; -import core.game.content.quest.PluginInteractionManager; +import rs09.game.interaction.ItemOnBankBooth; +import rs09.game.node.entity.skill.farming.CompostBins; +import rs09.game.node.entity.skill.farming.FarmingPatch; +import rs09.game.node.entity.skill.farming.UseWithBinHandler; +import rs09.game.node.entity.skill.farming.UseWithPatchHandler; +import rs09.game.system.SystemLogger; +import rs09.game.system.command.rottenpotato.RottenPotatoUseWithHandler; +import rs09.game.world.repository.Repository; +import rs09.tools.Items; /** * The incoming item reward packet. diff --git a/Server/src/main/java/core/net/packet/in/ReportAbusePacket.java b/Server/src/main/java/core/net/packet/in/ReportAbusePacket.java index 8cc4f2682..466f65e15 100644 --- a/Server/src/main/java/core/net/packet/in/ReportAbusePacket.java +++ b/Server/src/main/java/core/net/packet/in/ReportAbusePacket.java @@ -1,6 +1,6 @@ package core.net.packet.in; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.content.global.report.AbuseReport; import core.game.content.global.report.Rule; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/core/net/packet/in/WalkPacket.java b/Server/src/main/java/core/net/packet/in/WalkPacket.java index 36e83c692..36809bff2 100644 --- a/Server/src/main/java/core/net/packet/in/WalkPacket.java +++ b/Server/src/main/java/core/net/packet/in/WalkPacket.java @@ -3,7 +3,7 @@ package core.net.packet.in; import core.game.interaction.MovementPulse; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; -import plugin.ai.AIPlayer; +import rs09.game.ai.AIPlayer; import core.game.world.map.Location; import core.net.packet.IncomingPacket; import core.net.packet.IoBuffer; diff --git a/Server/src/main/java/core/net/packet/out/BuildDynamicScene.java b/Server/src/main/java/core/net/packet/out/BuildDynamicScene.java index 74d9b8d87..2835d77e9 100644 --- a/Server/src/main/java/core/net/packet/out/BuildDynamicScene.java +++ b/Server/src/main/java/core/net/packet/out/BuildDynamicScene.java @@ -1,7 +1,6 @@ package core.net.packet.out; import core.game.node.entity.player.Player; -import core.game.system.config.XteaParser; import core.game.world.map.Region; import core.game.world.map.RegionChunk; import core.game.world.map.RegionManager; @@ -10,6 +9,7 @@ import core.net.packet.IoBuffer; import core.net.packet.OutgoingPacket; import core.net.packet.PacketHeader; import core.net.packet.context.DynamicSceneContext; +import rs09.game.system.config.XteaParser; import java.util.ArrayList; import java.util.List; diff --git a/Server/src/main/java/core/net/packet/out/CommunicationMessage.java b/Server/src/main/java/core/net/packet/out/CommunicationMessage.java index 40beeb97b..cd0a80aec 100644 --- a/Server/src/main/java/core/net/packet/out/CommunicationMessage.java +++ b/Server/src/main/java/core/net/packet/out/CommunicationMessage.java @@ -7,7 +7,7 @@ import core.net.packet.OutgoingPacket; import core.net.packet.PacketHeader; import core.net.packet.context.MessageContext; import core.tools.StringUtils; -import plugin.ai.AIPlayer; +import rs09.game.ai.AIPlayer; import java.util.Random; diff --git a/Server/src/main/java/core/net/packet/out/UpdateSceneGraph.java b/Server/src/main/java/core/net/packet/out/UpdateSceneGraph.java index 19d76661e..489a6cbeb 100644 --- a/Server/src/main/java/core/net/packet/out/UpdateSceneGraph.java +++ b/Server/src/main/java/core/net/packet/out/UpdateSceneGraph.java @@ -1,11 +1,11 @@ package core.net.packet.out; import core.game.node.entity.player.Player; -import core.game.system.config.XteaParser; import core.net.packet.IoBuffer; import core.net.packet.OutgoingPacket; import core.net.packet.PacketHeader; import core.net.packet.context.SceneGraphContext; +import rs09.game.system.config.XteaParser; /** * The update scene graph outgoing packet. diff --git a/Server/src/main/java/core/net/producer/LoginEventProducer.java b/Server/src/main/java/core/net/producer/LoginEventProducer.java index 9f5a30776..59c81fa5a 100644 --- a/Server/src/main/java/core/net/producer/LoginEventProducer.java +++ b/Server/src/main/java/core/net/producer/LoginEventProducer.java @@ -4,8 +4,8 @@ import core.net.EventProducer; import core.net.IoReadEvent; import core.net.IoSession; import core.net.IoWriteEvent; -import core.net.event.LoginReadEvent; import core.net.event.LoginWriteEvent; +import rs09.net.event.LoginReadEvent; import java.nio.ByteBuffer; diff --git a/Server/src/main/java/core/net/registry/AccountRegister.java b/Server/src/main/java/core/net/registry/AccountRegister.java index 1b1da78ff..38bfd74d3 100644 --- a/Server/src/main/java/core/net/registry/AccountRegister.java +++ b/Server/src/main/java/core/net/registry/AccountRegister.java @@ -1,26 +1,22 @@ package core.net.registry; -import java.nio.ByteBuffer; -import java.sql.Connection; -import java.sql.Date; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Timestamp; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import core.ServerConstants; import core.cache.misc.buffer.ByteBufferUtils; import core.game.node.entity.player.info.portal.PlayerSQLManager; -import core.game.system.SystemLogger; import core.game.system.SystemManager; import core.game.system.mysql.SQLEntryHandler; import core.game.system.mysql.SQLManager; import core.game.system.task.TaskExecutor; -import core.game.world.GameWorld; import core.net.Constants; import core.net.IoSession; -import core.net.event.LoginReadEvent; +import rs09.ServerConstants; +import rs09.game.system.SystemLogger; +import rs09.game.world.GameWorld; +import rs09.net.event.LoginReadEvent; + +import java.nio.ByteBuffer; +import java.sql.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * Handles the registry of new accounts. diff --git a/Server/src/main/java/core/plugin/CorePluginTypes/Managers.java b/Server/src/main/java/core/plugin/CorePluginTypes/Managers.java index 440be0c7c..f008d3c17 100644 --- a/Server/src/main/java/core/plugin/CorePluginTypes/Managers.java +++ b/Server/src/main/java/core/plugin/CorePluginTypes/Managers.java @@ -1,6 +1,6 @@ package core.plugin.CorePluginTypes; -import core.game.system.SystemLogger; +import rs09.game.system.SystemLogger; import java.util.ArrayList; import java.util.List; diff --git a/Server/src/main/java/core/tools/mysql/DatabaseManager.java b/Server/src/main/java/core/tools/mysql/DatabaseManager.java index e8a031ad1..8da768606 100644 --- a/Server/src/main/java/core/tools/mysql/DatabaseManager.java +++ b/Server/src/main/java/core/tools/mysql/DatabaseManager.java @@ -8,8 +8,8 @@ import java.sql.Statement; import java.util.HashMap; import java.util.Map; -import core.ServerConstants; -import core.game.system.SystemLogger; +import rs09.ServerConstants; +import rs09.game.system.SystemLogger; public class DatabaseManager { diff --git a/Server/src/main/java/core/worker/MajorUpdateWorker.java b/Server/src/main/java/core/worker/MajorUpdateWorker.java index c3f412d4d..28c719f08 100644 --- a/Server/src/main/java/core/worker/MajorUpdateWorker.java +++ b/Server/src/main/java/core/worker/MajorUpdateWorker.java @@ -5,8 +5,8 @@ import java.util.concurrent.Executor; import java.util.concurrent.Executors; import core.game.system.SystemManager; -import core.game.world.GameWorld; -import core.game.world.repository.Repository; +import rs09.game.world.GameWorld; +import rs09.game.world.repository.Repository; import core.game.world.update.UpdateSequence; import core.gui.tab.StatisticsTab; import core.plugin.CorePluginTypes.Managers; diff --git a/Server/src/main/java/plugin/ai/system/android/CombatDroid.java b/Server/src/main/java/plugin/ai/system/android/CombatDroid.java deleted file mode 100644 index 375e389d5..000000000 --- a/Server/src/main/java/plugin/ai/system/android/CombatDroid.java +++ /dev/null @@ -1,4 +0,0 @@ -package plugin.ai.system.android; - -public class CombatDroid { -} diff --git a/Server/src/main/java/plugin/ai/system/android/GatheringDroid.java b/Server/src/main/java/plugin/ai/system/android/GatheringDroid.java deleted file mode 100644 index 8a6160f27..000000000 --- a/Server/src/main/java/plugin/ai/system/android/GatheringDroid.java +++ /dev/null @@ -1,4 +0,0 @@ -package plugin.ai.system.android; - -public class GatheringDroid { -} diff --git a/Server/src/main/java/plugin/drops/mystery_box/MysteryBoxDropper.java b/Server/src/main/java/plugin/drops/mystery_box/MysteryBoxDropper.java index 74e81db85..68d8bfbd3 100644 --- a/Server/src/main/java/plugin/drops/mystery_box/MysteryBoxDropper.java +++ b/Server/src/main/java/plugin/drops/mystery_box/MysteryBoxDropper.java @@ -4,7 +4,7 @@ import core.game.node.item.Item; import core.plugin.Initializable; import core.plugin.Plugin; import core.plugin.PluginManifest; -import core.tools.Items; +import rs09.tools.Items; import core.tools.RandomFunction; import plugin.drops.DropPlugin; import plugin.drops.DropPlugins; diff --git a/Server/src/main/java/plugin/drops/mystery_box/MysteryBoxPlugin.java b/Server/src/main/java/plugin/drops/mystery_box/MysteryBoxPlugin.java index d93701832..0ed2df68a 100644 --- a/Server/src/main/java/plugin/drops/mystery_box/MysteryBoxPlugin.java +++ b/Server/src/main/java/plugin/drops/mystery_box/MysteryBoxPlugin.java @@ -8,7 +8,7 @@ import core.game.node.item.Item; import core.game.node.item.WeightedChanceItem; import core.plugin.Plugin; import core.plugin.PluginManifest; -import core.tools.Items; +import rs09.tools.Items; import core.tools.RandomFunction; import core.plugin.Initializable; import core.tools.StringUtils; diff --git a/Server/src/main/java/plugin/ai/AIPBuilder.java b/Server/src/main/java/rs09/game/ai/AIPBuilder.java similarity index 99% rename from Server/src/main/java/plugin/ai/AIPBuilder.java rename to Server/src/main/java/rs09/game/ai/AIPBuilder.java index cb7cfe41f..244dc5aa9 100644 --- a/Server/src/main/java/plugin/ai/AIPBuilder.java +++ b/Server/src/main/java/rs09/game/ai/AIPBuilder.java @@ -1,4 +1,4 @@ -package plugin.ai; +package rs09.game.ai; import core.game.node.entity.skill.Skills; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/plugin/ai/AIPControlDialogue.java b/Server/src/main/java/rs09/game/ai/AIPControlDialogue.java similarity index 99% rename from Server/src/main/java/plugin/ai/AIPControlDialogue.java rename to Server/src/main/java/rs09/game/ai/AIPControlDialogue.java index 492470dce..32c69e852 100644 --- a/Server/src/main/java/plugin/ai/AIPControlDialogue.java +++ b/Server/src/main/java/rs09/game/ai/AIPControlDialogue.java @@ -1,4 +1,4 @@ -package plugin.ai; +package rs09.game.ai; import core.game.content.dialogue.DialoguePlugin; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/plugin/ai/AIPlayer.java b/Server/src/main/java/rs09/game/ai/AIPlayer.java similarity index 99% rename from Server/src/main/java/plugin/ai/AIPlayer.java rename to Server/src/main/java/rs09/game/ai/AIPlayer.java index 439b40a20..ffa0c3e06 100644 --- a/Server/src/main/java/plugin/ai/AIPlayer.java +++ b/Server/src/main/java/rs09/game/ai/AIPlayer.java @@ -1,6 +1,6 @@ -package plugin.ai; +package rs09.game.ai; -import core.ServerConstants; +import rs09.ServerConstants; import core.game.container.impl.EquipmentContainer; import core.game.interaction.DestinationFlag; import core.game.interaction.MovementPulse; @@ -13,13 +13,12 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.info.PlayerDetails; import core.game.node.entity.player.link.appearance.Gender; import core.game.node.item.Item; -import core.game.system.SystemLogger; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.path.Pathfinder; import core.game.world.map.zone.impl.WildernessZone; -import core.game.world.repository.Repository; +import rs09.game.world.repository.Repository; import core.net.packet.context.MessageContext; import core.net.packet.in.InteractionPacket; import core.plugin.Plugin; diff --git a/Server/src/main/java/plugin/ai/ArtificialSession.java b/Server/src/main/java/rs09/game/ai/ArtificialSession.java similarity index 97% rename from Server/src/main/java/plugin/ai/ArtificialSession.java rename to Server/src/main/java/rs09/game/ai/ArtificialSession.java index df5d73f62..0a6222de8 100644 --- a/Server/src/main/java/plugin/ai/ArtificialSession.java +++ b/Server/src/main/java/rs09/game/ai/ArtificialSession.java @@ -1,4 +1,4 @@ -package plugin.ai; +package rs09.game.ai; import java.nio.ByteBuffer; diff --git a/Server/src/main/java/plugin/ai/general/scriptrepository/Script.java b/Server/src/main/java/rs09/game/ai/general/scriptrepository/Script.java similarity index 93% rename from Server/src/main/java/plugin/ai/general/scriptrepository/Script.java rename to Server/src/main/java/rs09/game/ai/general/scriptrepository/Script.java index 5fcdba027..842cbb58a 100644 --- a/Server/src/main/java/plugin/ai/general/scriptrepository/Script.java +++ b/Server/src/main/java/rs09/game/ai/general/scriptrepository/Script.java @@ -1,7 +1,7 @@ -package plugin.ai.general.scriptrepository; +package rs09.game.ai.general.scriptrepository; import core.game.node.entity.player.Player; -import plugin.ai.general.ScriptAPI; +import rs09.game.ai.general.ScriptAPI; import core.game.node.item.Item; import java.util.ArrayList; diff --git a/Server/src/main/java/plugin/ai/lumbridge/DeadIdler.java b/Server/src/main/java/rs09/game/ai/lumbridge/DeadIdler.java similarity index 92% rename from Server/src/main/java/plugin/ai/lumbridge/DeadIdler.java rename to Server/src/main/java/rs09/game/ai/lumbridge/DeadIdler.java index bacecadb3..8d80279ee 100644 --- a/Server/src/main/java/plugin/ai/lumbridge/DeadIdler.java +++ b/Server/src/main/java/rs09/game/ai/lumbridge/DeadIdler.java @@ -1,6 +1,6 @@ -package plugin.ai.lumbridge; +package rs09.game.ai.lumbridge; -import plugin.ai.AIPlayer; +import rs09.game.ai.AIPlayer; import core.game.world.map.Location; import core.game.world.map.zone.ZoneBorders; import core.tools.RandomFunction; diff --git a/Server/src/main/java/plugin/ai/lumbridge/LumbridgeBotHandler.java b/Server/src/main/java/rs09/game/ai/lumbridge/LumbridgeBotHandler.java similarity index 93% rename from Server/src/main/java/plugin/ai/lumbridge/LumbridgeBotHandler.java rename to Server/src/main/java/rs09/game/ai/lumbridge/LumbridgeBotHandler.java index 675c6fd4c..f49a543d4 100644 --- a/Server/src/main/java/plugin/ai/lumbridge/LumbridgeBotHandler.java +++ b/Server/src/main/java/rs09/game/ai/lumbridge/LumbridgeBotHandler.java @@ -1,6 +1,6 @@ -package plugin.ai.lumbridge; +package rs09.game.ai.lumbridge; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.tools.RandomFunction; import java.util.concurrent.Executors; diff --git a/Server/src/main/java/plugin/ai/pvmbots/DragonKiller.java b/Server/src/main/java/rs09/game/ai/pvmbots/DragonKiller.java similarity index 95% rename from Server/src/main/java/plugin/ai/pvmbots/DragonKiller.java rename to Server/src/main/java/rs09/game/ai/pvmbots/DragonKiller.java index 25a340e74..ef4ee0478 100644 --- a/Server/src/main/java/plugin/ai/pvmbots/DragonKiller.java +++ b/Server/src/main/java/rs09/game/ai/pvmbots/DragonKiller.java @@ -1,7 +1,7 @@ -package plugin.ai.pvmbots; +package rs09.game.ai.pvmbots; import core.game.node.entity.skill.Skills; -import plugin.ai.AIPlayer; +import rs09.game.ai.AIPlayer; import core.game.node.entity.player.link.prayer.*; import core.game.world.map.Location; import core.game.world.map.zone.impl.WildernessZone; diff --git a/Server/src/main/java/plugin/ai/pvmbots/GiantMoleBot.java b/Server/src/main/java/rs09/game/ai/pvmbots/GiantMoleBot.java similarity index 95% rename from Server/src/main/java/plugin/ai/pvmbots/GiantMoleBot.java rename to Server/src/main/java/rs09/game/ai/pvmbots/GiantMoleBot.java index e469d0a56..16d6865e8 100644 --- a/Server/src/main/java/plugin/ai/pvmbots/GiantMoleBot.java +++ b/Server/src/main/java/rs09/game/ai/pvmbots/GiantMoleBot.java @@ -1,6 +1,6 @@ -package plugin.ai.pvmbots; +package rs09.game.ai.pvmbots; -import plugin.ai.AIPlayer; +import rs09.game.ai.AIPlayer; import core.game.node.entity.player.link.prayer.PrayerType; import core.game.node.item.Item; import core.game.world.map.Location; diff --git a/Server/src/main/java/plugin/ai/pvmbots/LowestBot.java b/Server/src/main/java/rs09/game/ai/pvmbots/LowestBot.java similarity index 91% rename from Server/src/main/java/plugin/ai/pvmbots/LowestBot.java rename to Server/src/main/java/rs09/game/ai/pvmbots/LowestBot.java index 84bafd8fe..3a3f3c342 100644 --- a/Server/src/main/java/plugin/ai/pvmbots/LowestBot.java +++ b/Server/src/main/java/rs09/game/ai/pvmbots/LowestBot.java @@ -1,6 +1,6 @@ -package plugin.ai.pvmbots; +package rs09.game.ai.pvmbots; -import plugin.ai.AIPlayer; +import rs09.game.ai.AIPlayer; import core.game.world.map.Location; public class LowestBot extends PvMBots{ diff --git a/Server/src/main/java/plugin/ai/pvmbots/NoobBot.java b/Server/src/main/java/rs09/game/ai/pvmbots/NoobBot.java similarity index 93% rename from Server/src/main/java/plugin/ai/pvmbots/NoobBot.java rename to Server/src/main/java/rs09/game/ai/pvmbots/NoobBot.java index 696048f69..556e57eff 100644 --- a/Server/src/main/java/plugin/ai/pvmbots/NoobBot.java +++ b/Server/src/main/java/rs09/game/ai/pvmbots/NoobBot.java @@ -1,6 +1,6 @@ -package plugin.ai.pvmbots; +package rs09.game.ai.pvmbots; -import plugin.ai.AIPlayer; +import rs09.game.ai.AIPlayer; import core.game.world.map.Location; public class NoobBot extends PvMBots{ diff --git a/Server/src/main/java/plugin/ai/pvmbots/PvMBots.java b/Server/src/main/java/rs09/game/ai/pvmbots/PvMBots.java similarity index 98% rename from Server/src/main/java/plugin/ai/pvmbots/PvMBots.java rename to Server/src/main/java/rs09/game/ai/pvmbots/PvMBots.java index 1119ee77e..cff8cee53 100644 --- a/Server/src/main/java/plugin/ai/pvmbots/PvMBots.java +++ b/Server/src/main/java/rs09/game/ai/pvmbots/PvMBots.java @@ -1,4 +1,4 @@ -package plugin.ai.pvmbots; +package rs09.game.ai.pvmbots; import java.util.ArrayList; import java.util.List; @@ -11,7 +11,7 @@ import core.game.node.entity.skill.Skills; import core.game.node.entity.Entity; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import plugin.ai.AIPlayer; +import rs09.game.ai.AIPlayer; import core.game.node.entity.player.link.prayer.PrayerType; import core.game.node.item.Item; import core.game.world.map.Location; diff --git a/Server/src/main/java/plugin/ai/pvp/PVPAIPActions.java b/Server/src/main/java/rs09/game/ai/pvp/PVPAIPActions.java similarity index 98% rename from Server/src/main/java/plugin/ai/pvp/PVPAIPActions.java rename to Server/src/main/java/rs09/game/ai/pvp/PVPAIPActions.java index 4a8074046..a2ad48d4f 100644 --- a/Server/src/main/java/plugin/ai/pvp/PVPAIPActions.java +++ b/Server/src/main/java/rs09/game/ai/pvp/PVPAIPActions.java @@ -1,4 +1,4 @@ -package plugin.ai.pvp; +package rs09.game.ai.pvp; import java.util.List; @@ -9,10 +9,10 @@ import core.game.content.consumable.Food; import core.game.content.consumable.effects.HealingEffect; import core.game.node.entity.skill.Skills; import core.game.node.entity.player.Player; -import plugin.ai.AIPlayer; +import rs09.game.ai.AIPlayer; import core.game.node.item.Item; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import core.game.world.map.path.Pathfinder; import core.game.world.update.flag.context.ChatMessage; import core.game.world.update.flag.player.ChatFlag; diff --git a/Server/src/main/java/plugin/ai/pvp/PVPAIPBuilderUtils.java b/Server/src/main/java/rs09/game/ai/pvp/PVPAIPBuilderUtils.java similarity index 99% rename from Server/src/main/java/plugin/ai/pvp/PVPAIPBuilderUtils.java rename to Server/src/main/java/rs09/game/ai/pvp/PVPAIPBuilderUtils.java index c05b09bf8..e7a63b14f 100644 --- a/Server/src/main/java/plugin/ai/pvp/PVPAIPBuilderUtils.java +++ b/Server/src/main/java/rs09/game/ai/pvp/PVPAIPBuilderUtils.java @@ -1,9 +1,9 @@ -package plugin.ai.pvp; +package rs09.game.ai.pvp; import core.game.container.impl.EquipmentContainer; import core.game.node.entity.skill.Skills; import core.game.node.entity.combat.CombatSpell; -import plugin.ai.AIPlayer; +import rs09.game.ai.AIPlayer; import core.game.node.entity.player.link.SpellBookManager; import core.game.node.item.Item; import core.tools.RandomFunction; diff --git a/Server/src/main/java/plugin/ai/resource/ResourceAIPActions.java b/Server/src/main/java/rs09/game/ai/resource/ResourceAIPActions.java similarity index 93% rename from Server/src/main/java/plugin/ai/resource/ResourceAIPActions.java rename to Server/src/main/java/rs09/game/ai/resource/ResourceAIPActions.java index f8565d9be..7999b49e9 100644 --- a/Server/src/main/java/plugin/ai/resource/ResourceAIPActions.java +++ b/Server/src/main/java/rs09/game/ai/resource/ResourceAIPActions.java @@ -1,11 +1,11 @@ -package plugin.ai.resource; +package rs09.game.ai.resource; import core.game.node.entity.skill.gather.SkillingResource; import core.game.node.entity.player.Player; -import plugin.ai.AIPlayer; +import rs09.game.ai.AIPlayer; import core.game.system.task.Pulse; -import core.game.world.GameWorld; -import core.game.world.repository.Repository; +import rs09.game.world.GameWorld; +import rs09.game.world.repository.Repository; import java.util.List; diff --git a/Server/src/main/java/plugin/ai/resource/ResourceAIPManager.java b/Server/src/main/java/rs09/game/ai/resource/ResourceAIPManager.java similarity index 97% rename from Server/src/main/java/plugin/ai/resource/ResourceAIPManager.java rename to Server/src/main/java/rs09/game/ai/resource/ResourceAIPManager.java index c04e5f290..3bc015317 100644 --- a/Server/src/main/java/plugin/ai/resource/ResourceAIPManager.java +++ b/Server/src/main/java/rs09/game/ai/resource/ResourceAIPManager.java @@ -1,10 +1,10 @@ -package plugin.ai.resource; +package rs09.game.ai.resource; import core.game.node.entity.player.Player; -import plugin.ai.resource.task.ResourceTask; -import plugin.ai.resource.task.ResourceTasks; +import rs09.game.ai.resource.task.ResourceTask; +import rs09.game.ai.resource.task.ResourceTasks; import core.game.system.task.Pulse; -import core.game.world.GameWorld; +import rs09.game.world.GameWorld; import java.sql.ResultSet; import java.sql.Statement; diff --git a/Server/src/main/java/plugin/ai/resource/task/ResourceTask.java b/Server/src/main/java/rs09/game/ai/resource/task/ResourceTask.java similarity index 95% rename from Server/src/main/java/plugin/ai/resource/task/ResourceTask.java rename to Server/src/main/java/rs09/game/ai/resource/task/ResourceTask.java index b95917535..7e3e979fa 100644 --- a/Server/src/main/java/plugin/ai/resource/task/ResourceTask.java +++ b/Server/src/main/java/rs09/game/ai/resource/task/ResourceTask.java @@ -1,4 +1,4 @@ -package plugin.ai.resource.task; +package rs09.game.ai.resource.task; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/plugin/ai/resource/task/ResourceTasks.java b/Server/src/main/java/rs09/game/ai/resource/task/ResourceTasks.java similarity index 97% rename from Server/src/main/java/plugin/ai/resource/task/ResourceTasks.java rename to Server/src/main/java/rs09/game/ai/resource/task/ResourceTasks.java index dfefd2147..8e9a1120e 100644 --- a/Server/src/main/java/plugin/ai/resource/task/ResourceTasks.java +++ b/Server/src/main/java/rs09/game/ai/resource/task/ResourceTasks.java @@ -1,4 +1,4 @@ -package plugin.ai.resource.task; +package rs09.game.ai.resource.task; import core.game.node.entity.skill.Skills; import core.game.node.entity.player.Player; diff --git a/Server/src/main/java/plugin/ai/skillingbot/SkillingBot.java b/Server/src/main/java/rs09/game/ai/skillingbot/SkillingBot.java similarity index 97% rename from Server/src/main/java/plugin/ai/skillingbot/SkillingBot.java rename to Server/src/main/java/rs09/game/ai/skillingbot/SkillingBot.java index 554b249a9..44e930e9f 100644 --- a/Server/src/main/java/plugin/ai/skillingbot/SkillingBot.java +++ b/Server/src/main/java/rs09/game/ai/skillingbot/SkillingBot.java @@ -1,4 +1,4 @@ -package plugin.ai.skillingbot; +package rs09.game.ai.skillingbot; import core.game.world.map.Location; @@ -7,7 +7,7 @@ import java.util.ArrayList; import core.game.node.entity.skill.Skills; import core.game.interaction.Option; import core.game.node.Node; -import plugin.ai.AIPlayer; +import rs09.game.ai.AIPlayer; import core.game.node.item.Item; import core.net.packet.in.InteractionPacket; diff --git a/Server/src/main/java/plugin/ai/skillingbot/SkillingBotsBuilder.java b/Server/src/main/java/rs09/game/ai/skillingbot/SkillingBotsBuilder.java similarity index 98% rename from Server/src/main/java/plugin/ai/skillingbot/SkillingBotsBuilder.java rename to Server/src/main/java/rs09/game/ai/skillingbot/SkillingBotsBuilder.java index d89ea0db9..9ce76c2d0 100644 --- a/Server/src/main/java/plugin/ai/skillingbot/SkillingBotsBuilder.java +++ b/Server/src/main/java/rs09/game/ai/skillingbot/SkillingBotsBuilder.java @@ -1,11 +1,11 @@ -package plugin.ai.skillingbot; +package rs09.game.ai.skillingbot; import java.util.ArrayList; import core.game.container.impl.EquipmentContainer; import core.game.content.quest.tutorials.tutorialisland.CharacterDesign; import core.game.node.entity.skill.Skills; -import plugin.ai.AIPlayer; +import rs09.game.ai.AIPlayer; import core.game.node.entity.player.link.appearance.Gender; import core.game.node.item.Item; import core.game.world.map.Location; diff --git a/Server/src/main/java/plugin/ai/system/GlobalAIManager.java b/Server/src/main/java/rs09/game/ai/system/GlobalAIManager.java similarity index 90% rename from Server/src/main/java/plugin/ai/system/GlobalAIManager.java rename to Server/src/main/java/rs09/game/ai/system/GlobalAIManager.java index 01b132dea..7c94487fa 100644 --- a/Server/src/main/java/plugin/ai/system/GlobalAIManager.java +++ b/Server/src/main/java/rs09/game/ai/system/GlobalAIManager.java @@ -1,7 +1,7 @@ -package plugin.ai.system; +package rs09.game.ai.system; -import plugin.ai.AIPlayer; +import rs09.game.ai.AIPlayer; import java.util.HashMap; import java.util.Map; diff --git a/Server/src/main/java/rs09/game/ai/system/android/CombatDroid.java b/Server/src/main/java/rs09/game/ai/system/android/CombatDroid.java new file mode 100644 index 000000000..5b0cd0533 --- /dev/null +++ b/Server/src/main/java/rs09/game/ai/system/android/CombatDroid.java @@ -0,0 +1,4 @@ +package rs09.game.ai.system.android; + +public class CombatDroid { +} diff --git a/Server/src/main/java/rs09/game/ai/system/android/GatheringDroid.java b/Server/src/main/java/rs09/game/ai/system/android/GatheringDroid.java new file mode 100644 index 000000000..10de24031 --- /dev/null +++ b/Server/src/main/java/rs09/game/ai/system/android/GatheringDroid.java @@ -0,0 +1,4 @@ +package rs09.game.ai.system.android; + +public class GatheringDroid { +} diff --git a/Server/src/main/java/plugin/ai/system/predicate/Predicate.java b/Server/src/main/java/rs09/game/ai/system/predicate/Predicate.java similarity index 95% rename from Server/src/main/java/plugin/ai/system/predicate/Predicate.java rename to Server/src/main/java/rs09/game/ai/system/predicate/Predicate.java index 8c922c8b0..5f1377b5c 100644 --- a/Server/src/main/java/plugin/ai/system/predicate/Predicate.java +++ b/Server/src/main/java/rs09/game/ai/system/predicate/Predicate.java @@ -1,8 +1,8 @@ -package plugin.ai.system.predicate; +package rs09.game.ai.system.predicate; import javax.security.auth.Destroyable; -import plugin.ai.system.GlobalAIManager; +import rs09.game.ai.system.GlobalAIManager; /** * An android predicate. diff --git a/Server/src/main/java/plugin/ai/system/predicate/PredicateType.java b/Server/src/main/java/rs09/game/ai/system/predicate/PredicateType.java similarity index 79% rename from Server/src/main/java/plugin/ai/system/predicate/PredicateType.java rename to Server/src/main/java/rs09/game/ai/system/predicate/PredicateType.java index 6c41cae22..18629092c 100644 --- a/Server/src/main/java/plugin/ai/system/predicate/PredicateType.java +++ b/Server/src/main/java/rs09/game/ai/system/predicate/PredicateType.java @@ -1,4 +1,4 @@ -package plugin.ai.system.predicate; +package rs09.game.ai.system.predicate; /** * Types of predicates. diff --git a/Server/src/main/java/plugin/ai/system/predicate/impl/AppearancePredicate.java b/Server/src/main/java/rs09/game/ai/system/predicate/impl/AppearancePredicate.java similarity index 90% rename from Server/src/main/java/plugin/ai/system/predicate/impl/AppearancePredicate.java rename to Server/src/main/java/rs09/game/ai/system/predicate/impl/AppearancePredicate.java index f9b1dd443..fe1ffc58e 100644 --- a/Server/src/main/java/plugin/ai/system/predicate/impl/AppearancePredicate.java +++ b/Server/src/main/java/rs09/game/ai/system/predicate/impl/AppearancePredicate.java @@ -1,8 +1,8 @@ -package plugin.ai.system.predicate.impl; +package rs09.game.ai.system.predicate.impl; -import plugin.ai.system.predicate.Predicate; -import plugin.ai.system.predicate.PredicateType; +import rs09.game.ai.system.predicate.Predicate; +import rs09.game.ai.system.predicate.PredicateType; /** * Generates random appearance for the droid. diff --git a/Server/src/main/java/plugin/ai/wilderness/PvPBotsBuilder.java b/Server/src/main/java/rs09/game/ai/wilderness/PvPBotsBuilder.java similarity index 99% rename from Server/src/main/java/plugin/ai/wilderness/PvPBotsBuilder.java rename to Server/src/main/java/rs09/game/ai/wilderness/PvPBotsBuilder.java index 3812f7eb1..bd51bc9e7 100644 --- a/Server/src/main/java/plugin/ai/wilderness/PvPBotsBuilder.java +++ b/Server/src/main/java/rs09/game/ai/wilderness/PvPBotsBuilder.java @@ -1,14 +1,14 @@ -package plugin.ai.wilderness; +package rs09.game.ai.wilderness; import java.util.ArrayList; import core.game.container.impl.EquipmentContainer; import core.game.node.entity.skill.Skills; import core.game.node.entity.combat.CombatSpell; -import plugin.ai.AIPlayer; -import plugin.ai.pvmbots.DragonKiller; -import plugin.ai.pvmbots.NoobBot; -import plugin.ai.pvmbots.PvMBots; +import rs09.game.ai.AIPlayer; +import rs09.game.ai.pvmbots.DragonKiller; +import rs09.game.ai.pvmbots.NoobBot; +import rs09.game.ai.pvmbots.PvMBots; import core.game.node.entity.player.link.SpellBookManager; import core.game.node.entity.player.link.appearance.Gender; import core.game.node.item.Item; diff --git a/Server/src/main/java/plugin/ai/wilderness/WildernessBot.java b/Server/src/main/java/rs09/game/ai/wilderness/WildernessBot.java similarity index 99% rename from Server/src/main/java/plugin/ai/wilderness/WildernessBot.java rename to Server/src/main/java/rs09/game/ai/wilderness/WildernessBot.java index 66f55b414..e8dd001cd 100644 --- a/Server/src/main/java/plugin/ai/wilderness/WildernessBot.java +++ b/Server/src/main/java/rs09/game/ai/wilderness/WildernessBot.java @@ -1,4 +1,4 @@ -package plugin.ai.wilderness; +package rs09.game.ai.wilderness; import java.util.ArrayList; import java.util.List; @@ -12,7 +12,7 @@ import core.game.node.entity.skill.Skills; import core.game.interaction.Option; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; -import plugin.ai.AIPlayer; +import rs09.game.ai.AIPlayer; import core.game.node.entity.player.link.prayer.PrayerType; import core.game.node.item.Item; import core.game.world.map.Location; diff --git a/Server/src/main/kotlin/core/game/camerautils/CameraUtils.kt b/Server/src/main/kotlin/core/game/camerautils/CameraUtils.kt deleted file mode 100644 index 41e3c2405..000000000 --- a/Server/src/main/kotlin/core/game/camerautils/CameraUtils.kt +++ /dev/null @@ -1,5 +0,0 @@ -package core.game.camerautils - -object CameraUtils { - -} \ No newline at end of file diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/CommonKebbitWest.kt b/Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/CommonKebbitWest.kt deleted file mode 100644 index 2b4386cf9..000000000 --- a/Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/CommonKebbitWest.kt +++ /dev/null @@ -1,4 +0,0 @@ -package core.game.node.entity.skill.hunter.tracking - -class CommonKebbitWest { -} \ No newline at end of file diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/Idler.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/Idler.kt deleted file mode 100644 index 1a42dbfa3..000000000 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/Idler.kt +++ /dev/null @@ -1,17 +0,0 @@ -package plugin.ai.general.scriptrepository - -import core.game.system.command.CommandSystem -import core.game.world.map.Location -import core.game.world.map.RegionManager -import core.game.world.map.path.Pathfinder -import core.tools.RandomFunction -import plugin.ai.AIPlayer - -class Idler : Script(){ - override fun tick() { - } - - override fun newInstance(): Script { - return this - } -} \ No newline at end of file diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/PlayerCompatible.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/PlayerCompatible.kt deleted file mode 100644 index 27f9e30e3..000000000 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/PlayerCompatible.kt +++ /dev/null @@ -1,3 +0,0 @@ -package plugin.ai.general.scriptrepository - -annotation class PlayerCompatible diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/PlayerScripts.kt b/Server/src/main/kotlin/plugin/ai/general/scriptrepository/PlayerScripts.kt deleted file mode 100644 index a9381c5b9..000000000 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/PlayerScripts.kt +++ /dev/null @@ -1,19 +0,0 @@ -package plugin.ai.general.scriptrepository - -import io.github.classgraph.ClassGraph - -object PlayerScripts { - class PlayerScript(val identifier: String, val description: Array, val name: String, val clazz: Class<*>) - val identifierMap = HashMap() - - - fun init(){ - val result = ClassGraph().enableAnnotationInfo().acceptPackages("plugin.ai.general.scriptrepository").scan() - result.getClassesWithAnnotation("plugin.ai.general.scriptrepository.PlayerCompatible").forEach { res -> - val description = res.getAnnotationInfo("plugin.ai.general.scriptrepository.ScriptDescription").parameterValues[0].value as Array - val identifier = res.getAnnotationInfo("plugin.ai.general.scriptrepository.ScriptIdentifier").parameterValues[0].value.toString() - val name = res.getAnnotationInfo("plugin.ai.general.scriptrepository.ScriptName").parameterValues[0].value.toString() - identifierMap[identifier] = PlayerScript(identifier,description,name,res.loadClass()) - } - } -} \ No newline at end of file diff --git a/Server/src/main/kotlin/plugin/barbtraining/fishing/BarbFishingPulse.kt b/Server/src/main/kotlin/plugin/barbtraining/fishing/BarbFishingPulse.kt deleted file mode 100644 index 02b256627..000000000 --- a/Server/src/main/kotlin/plugin/barbtraining/fishing/BarbFishingPulse.kt +++ /dev/null @@ -1,98 +0,0 @@ -package plugin.barbtraining.fishing - -import core.game.node.entity.npc.NPC -import core.game.node.entity.player.Player -import core.game.node.item.Item -import core.game.world.update.flag.context.Animation -import core.tools.Items -import core.tools.RandomFunction -import core.game.node.entity.skill.SkillPulse -import core.game.node.entity.skill.Skills -import core.tools.stringtools.colorize - -/** - * Pulse used for barbarian fishing - * @author Ceikry - */ -class BarbFishingPulse(player: Player) : SkillPulse(player,NPC(1176)) { - override fun checkRequirements(): Boolean { - /*if(player.getAttribute("barbtraining:fishing:completed",false) == false){ - player.sendMessage(colorize("%RYou need to complete barbarian fishing training to fish here.")) - return false - }*/ - if(player.skills.getLevel(Skills.FISHING) < 48){ - player.sendMessage(colorize("%RYou need a fishing level of at least 48 to fish here.")) - return false - } - if(player.skills.getLevel(Skills.AGILITY) < 15 || player.skills.getLevel(Skills.STRENGTH) < 15){ - player.sendMessage(colorize("%RYou need a strength and agility level of at least 15 to fish here.")) - return false - } - if(!player.inventory.containsItem(Item(11323))){ - player.sendMessage(colorize("%RYou need a barbarian fishing rod to fish here.")) - return false - } - if(player.inventory.isFull){ - player.sendMessage("You don't have enough space in your inventory.") - return false - } - if(!(player.inventory.containsItem(Item(Items.FEATHER_314)) || player.inventory.containsItem(Item(Items.FISH_OFFCUTS_11334)))){ - player.sendMessage("You don't have any bait with which to fish.") - return false - } - return true - } - - override fun animate() { - player.animator.animate(Animation(622)) - } - - override fun reward(): Boolean { - val stragiXP = arrayOf(5,6,7) - val fishXP = arrayOf(50,70,80) - val reward = getRandomFish() - val success = rollSuccess(when(reward){ - Item(11328) -> 48 - Item(11330) -> 58 - Item(11332) -> 70 - else -> 99 - }) - val index = (when(reward){ - Item(11328) -> 0 - Item(11330) -> 1 - Item(11332) -> 2 - else -> 0 - }) - if(success){ - if(!player.inventory.remove(Item(Items.FISH_OFFCUTS_11334))) { - player.inventory.remove(Item(Items.FEATHER_314)) - } - player.inventory.add(reward) - player.skills.addExperience(Skills.FISHING,fishXP[index].toDouble()) - player.skills.addExperience(Skills.AGILITY,stragiXP[index].toDouble()) - player.skills.addExperience(Skills.STRENGTH,stragiXP[index].toDouble()) - player.sendMessage("You manage to catch a ${reward.name.toLowerCase()}.") - } - super.setDelay(5) - return player.inventory.freeSlots() == 0 - } - - fun rollSuccess(fish: Int): Boolean{ - val level = 1 + player.skills.getLevel(Skills.FISHING) + player.familiarManager.getBoost(Skills.FISHING) - val hostRatio: Double = Math.random() * fish - val clientRatio: Double = Math.random() * (level * 3.0 - fish) - return hostRatio < clientRatio - } - - fun getRandomFish(): Item{ - val fish = arrayOf(11328,11330,11332) - val fishing = player.skills.getLevel(Skills.FISHING) - val strength = player.skills.getLevel(Skills.STRENGTH) - val agility = player.skills.getLevel(Skills.AGILITY) - var possibleIndex = 0 - if(fishing >= 58 && (strength >= 30 && agility >= 30)) possibleIndex++ - if(fishing >= 70 && (strength >= 45 && agility >= 45)) possibleIndex++ - return Item(fish[RandomFunction.random(possibleIndex + 1)]) - } - -} \ No newline at end of file diff --git a/Server/src/main/kotlin/plugin/barbtraining/fishing/FishCuttingPulse.kt b/Server/src/main/kotlin/plugin/barbtraining/fishing/FishCuttingPulse.kt deleted file mode 100644 index bcca5e94e..000000000 --- a/Server/src/main/kotlin/plugin/barbtraining/fishing/FishCuttingPulse.kt +++ /dev/null @@ -1,45 +0,0 @@ -package plugin.barbtraining.fishing - -import core.game.node.entity.player.Player -import core.game.node.item.Item -import core.game.system.task.Pulse -import core.game.world.update.flag.context.Animation -import core.tools.Items -import core.game.node.entity.skill.Skills - -/** - * Pulse used for cutting fish into fish offcuts - * @param player the player running the pulse - * @param fish the fish being cut - * @author Ceikry - */ -class FishCuttingPulse(val player: Player, val fish: Int) : Pulse(0){ - fun checkRequirements(): Boolean { - if(!(player.inventory.freeSlots() >= 2 || (player.inventory.freeSlots() >= 1 && player.inventory.containsItem(Item(Items.FISH_OFFCUTS_11334))))){ - player.sendMessage("You do not have enough space to do that.") - return false - } - return true - } - - override fun pulse(): Boolean { - player.animator.animate(Animation(1248)) - player.inventory.remove(Item(fish)) - - player.inventory.add(Item(Items.FISH_OFFCUTS_11334)) - - player.inventory.add(Item(when(fish){ - 11328, 11330 -> Items.ROE_11324 - 11332 -> Items.CAVIAR_11326 - else -> 0 - })) - - player.skills.addExperience(Skills.COOKING,when(fish){ - 11328,11330 -> 10.0 - 11332 -> 15.0 - else -> 0.0 - }) - - return true - } -} \ No newline at end of file diff --git a/Server/src/main/kotlin/plugin/barbtraining/fishing/KnifeWithFish.kt b/Server/src/main/kotlin/plugin/barbtraining/fishing/KnifeWithFish.kt deleted file mode 100644 index 917942a35..000000000 --- a/Server/src/main/kotlin/plugin/barbtraining/fishing/KnifeWithFish.kt +++ /dev/null @@ -1,26 +0,0 @@ -package plugin.barbtraining.fishing - -import core.game.interaction.NodeUsageEvent -import core.game.interaction.UseWithHandler -import core.plugin.Initializable -import core.plugin.Plugin -import core.tools.Items - -@Initializable -/** - * Handles using a knife with barbarian fishing fish - * @author Ceikry - */ -class KnifeWithFish : UseWithHandler(11328,11330,11332){ - override fun handle(event: NodeUsageEvent?): Boolean { - event?.player ?: return false - event.player.pulseManager.run(FishCuttingPulse(event.player,event.usedItem.id)) - return true - } - - override fun newInstance(arg: Any?): Plugin { - addHandler(Items.KNIFE_946, ITEM_TYPE,this) - return this - } - -} \ No newline at end of file diff --git a/Server/src/main/kotlin/plugin/barbtraining/fishing/OptionHandlers.kt b/Server/src/main/kotlin/plugin/barbtraining/fishing/OptionHandlers.kt deleted file mode 100644 index d9fde3385..000000000 --- a/Server/src/main/kotlin/plugin/barbtraining/fishing/OptionHandlers.kt +++ /dev/null @@ -1,50 +0,0 @@ -package plugin.barbtraining.fishing - -import core.cache.def.impl.NPCDefinition -import core.cache.def.impl.ObjectDefinition -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.plugin.Initializable -import core.plugin.Plugin - -@Initializable -/** - * Option handlers for barbarian fishing. - * @author Ceikry - */ -class OptionHandlers : OptionHandler(){ - override fun handle(player: Player?, node: Node?, option: String?): Boolean { - when(node?.id){ - 25268 -> handleSearch(player).also { return true } - 1176 -> handleFish(player).also{return true} - } - return false - } - - fun handleFish(player: Player?){ - player?.pulseManager?.run(BarbFishingPulse(player)) - player?.sendMessage("You attempt to catch a fish...") - } - - fun handleSearch(player: Player?){ - if(player?.getAttribute("barbtraining:fishing",false) == true){ - if(!player.inventory.containsItem(Item(11323))){ - player.inventory.add(Item(11323)) - player.sendMessage("Under the bed you find a fishing rod.") - } else { - player.sendMessage("You find nothing under the bed") - } - } else { - player?.sendMessage("Maybe I should speak to Otto before looking under his bed.") - } - } - - override fun newInstance(arg: Any?): Plugin { - ObjectDefinition.forId(25268).handlers.put("option:search",this) - NPCDefinition.forId(1176).handlers.put("option:fish",this) - return this - } - -} \ No newline at end of file diff --git a/Server/src/main/kotlin/plugin/barbtraining/fishing/SpotManager.kt b/Server/src/main/kotlin/plugin/barbtraining/fishing/SpotManager.kt deleted file mode 100644 index 1b68f878d..000000000 --- a/Server/src/main/kotlin/plugin/barbtraining/fishing/SpotManager.kt +++ /dev/null @@ -1,82 +0,0 @@ -package plugin.barbtraining.fishing - -import core.game.node.entity.npc.NPC -import core.game.world.map.Location -import core.plugin.Initializable -import core.plugin.Plugin -import core.tools.RandomFunction -import core.plugin.CorePluginTypes.ManagerPlugin -import core.plugin.CorePluginTypes.Managers -import plugin.barbtraining.fishing.SpotManager.Companion.locations -import plugin.barbtraining.fishing.SpotManager.Companion.usedLocations - -@Initializable -/** - * Manages fishing spot spawning and relocation - * @author Ceikry - */ -class SpotManager : ManagerPlugin() { - var ticks = 0 - val spots = ArrayList() - - companion object{ - val usedLocations = arrayListOf() - val locations = listOf( - Location.create(2506, 3494, 0), - Location.create(2504, 3497, 0), - Location.create(2504, 3497, 0), - Location.create(2500, 3506, 0), - Location.create(2500, 3509, 0), - Location.create(2500, 3512, 0), - Location.create(2504, 3516, 0) - ) - } - - override fun tick() { - if(ticks % 50 == 0){ - usedLocations.clear() - for(spot in spots) usedLocations.add(spot.loc ?: Location(0,0,0)) - } - } - - override fun newInstance(arg: Any?): Plugin { - for(i in 0 until 5){ - spots.add(BarbFishingSpot(getNewLoc(), getNewTTL()).also { it.init() }) - } - Managers.register(this) - return this - } -} - -fun getNewTTL(): Int{ - return RandomFunction.random(400,2000) -} - -fun getNewLoc(): Location { - var loc = locations.random() - while(usedLocations.contains(loc)) loc = locations.random() - usedLocations.add(loc) - return loc -} - -class BarbFishingSpot(var loc: Location? = null, var ttl: Int) : NPC(1176){ - init { - location = loc - } - val locations = listOf( - Location.create(2506, 3494, 0), - Location.create(2504, 3497, 0), - Location.create(2504, 3497, 0), - Location.create(2500, 3506, 0), - Location.create(2500, 3509, 0), - Location.create(2500, 3512, 0), - Location.create(2504, 3516, 0) - ) - override fun handleTickActions() { - if(location != loc) properties.teleportLocation = loc.also { ttl = getNewTTL() } - if(ttl-- <= 0){ - loc = getNewLoc() - } - } -} - diff --git a/Server/src/main/kotlin/plugin/creditshop/CreditShop.kt b/Server/src/main/kotlin/plugin/creditshop/CreditShop.kt deleted file mode 100644 index 351c535db..000000000 --- a/Server/src/main/kotlin/plugin/creditshop/CreditShop.kt +++ /dev/null @@ -1,102 +0,0 @@ -package plugin.creditshop - -import core.cache.def.impl.ItemDefinition -import core.game.content.global.shop.Shop -import core.game.content.global.shop.ShopViewer -import core.game.node.entity.player.Player -import core.game.node.item.Item -import core.tools.Items - - -/** - * Shop that sells various things for credits, which can be obtained by voting or contributing code - * @author Ceikry - */ -class CreditShop : Shop("Credit Shop <3", listOf( - Item(Items.CHRISTMAS_CRACKER_962,100), - Item(Items.RED_PARTYHAT_1038,100), - Item(Items.BLUE_PARTYHAT_1042, 100), - Item(Items.GREEN_PARTYHAT_1044, 100), - Item(Items.YELLOW_PARTYHAT_1040, 100), - Item(Items.PURPLE_PARTYHAT_1046,100), - Item(Items.WHITE_PARTYHAT_1048, 100), - Item(Items.RED_HWEEN_MASK_1057,100), - Item(Items.BLUE_HWEEN_MASK_1055, 100), - Item(Items.GREEN_HWEEN_MASK_1053,100), - Item(Items.SANTA_HAT_1050, 100), - Item(Items.SCYTHE_10735,100), - Item(Items.EASTER_RING_7927,100), - Item(Items.BASKET_OF_EGGS_4565,100) -).toTypedArray(),false){ - val prices = hashMapOf( - Items.SANTA_HAT_1050 to 35, - Items.CHRISTMAS_CRACKER_962 to 40, - Items.RED_PARTYHAT_1038 to 50, - Items.BLUE_PARTYHAT_1042 to 50, - Items.GREEN_PARTYHAT_1044 to 50, - Items.YELLOW_PARTYHAT_1040 to 50, - Items.PURPLE_PARTYHAT_1046 to 50, - Items.WHITE_PARTYHAT_1048 to 50, - Items.RED_HWEEN_MASK_1057 to 60, - Items.BLUE_HWEEN_MASK_1055 to 60, - Items.GREEN_HWEEN_MASK_1053 to 60, - 13887 to 100, - 13893 to 100, - 13899 to 100, - 13858 to 100, - 13861 to 100, - 13864 to 100, - 13867 to 100, - 10735 to 200, - 14643 to 125, - Items.EASTER_RING_7927 to 100, - Items.BASKET_OF_EGGS_4565 to 100 - ) - - init { - isPointShop = true - } - - override fun open(player: Player?) { - player ?: return - super.open(player) - val amt = player.details.credits - player.sendMessage("You have $amt credits to spend.") - } - - - override fun getBuyPrice(item: Item?, player: Player?): Int { - return prices.get(item?.id) ?: Integer.MAX_VALUE.also { player?.sendMessage("This item's price hasn't been defined. Please contact us.") } - } - - override fun getPoints(player: Player?): Int { - player ?: return 0 - return player.details.credits - } - - override fun canSell(player: Player?, item: Item?, def: ItemDefinition?): Boolean { - player ?: return false - player.sendMessage("This shop cannot be sold to.") - return false - } - - override fun getPointsName(): String { - return "credit" - } - - override fun value(player: Player?, viewer: ShopViewer?, item: Item?, sell: Boolean) { - item ?: return - player ?: return - var multiple: Boolean - if(sell){ - player.sendMessage("This shop cannot be sold to.").also { return } - } - player.sendMessage("This item costs " + (prices[item.id] ?: Integer.MAX_VALUE).also { multiple = it > 1 } + " " + pointsName + if(multiple) "s." else ".") - } - - override fun decrementPoints(player: Player?, decrement: Int) { - player ?: return - player.details.credits -= decrement - } - -} \ No newline at end of file diff --git a/Server/src/main/kotlin/core/JSONUtils.kt b/Server/src/main/kotlin/rs09/JSONUtils.kt similarity index 99% rename from Server/src/main/kotlin/core/JSONUtils.kt rename to Server/src/main/kotlin/rs09/JSONUtils.kt index bafec26a5..df375170a 100644 --- a/Server/src/main/kotlin/core/JSONUtils.kt +++ b/Server/src/main/kotlin/rs09/JSONUtils.kt @@ -1,4 +1,4 @@ -package core +package rs09 import core.game.world.map.Location import java.io.File diff --git a/Server/src/main/kotlin/core/Server.kt b/Server/src/main/kotlin/rs09/Server.kt similarity index 93% rename from Server/src/main/kotlin/core/Server.kt rename to Server/src/main/kotlin/rs09/Server.kt index af490d679..14c79a264 100644 --- a/Server/src/main/kotlin/core/Server.kt +++ b/Server/src/main/kotlin/rs09/Server.kt @@ -1,18 +1,20 @@ -package core +package rs09 -import core.game.system.* -import core.game.system.config.ServerConfigParser +import core.game.system.SystemManager +import core.game.system.SystemState import core.game.system.mysql.SQLManager -import core.game.world.GameWorld -import core.game.world.repository.Repository import core.gui.ConsoleFrame import core.net.NioReactor import core.net.amsc.WorldCommunicator import core.tools.TimeStamp import kotlinx.coroutines.GlobalScope -import kotlinx.coroutines.launch -import core.game.ge.GEAutoStock import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import rs09.game.ge.GEAutoStock +import rs09.game.system.SystemLogger +import rs09.game.system.config.ServerConfigParser +import rs09.game.world.GameWorld +import rs09.game.world.repository.Repository import java.io.File import java.net.BindException import java.util.* diff --git a/Server/src/main/kotlin/core/ServerConstants.kt b/Server/src/main/kotlin/rs09/ServerConstants.kt similarity index 86% rename from Server/src/main/kotlin/core/ServerConstants.kt rename to Server/src/main/kotlin/rs09/ServerConstants.kt index 3c4d50610..a2082b60d 100644 --- a/Server/src/main/kotlin/core/ServerConstants.kt +++ b/Server/src/main/kotlin/rs09/ServerConstants.kt @@ -1,11 +1,10 @@ -package core +package rs09 import core.game.system.SystemShutdownHook -import core.game.system.mysql.SQLManager import core.game.world.map.Location import core.tools.mysql.Database -import core.tools.secondsToTicks import org.json.simple.JSONObject +import rs09.tools.secondsToTicks import java.io.File import java.math.BigInteger @@ -183,21 +182,21 @@ class ServerConstants { MAX_PLAYERS = data["max_players"].toString().toInt() MAX_NPCS = data["max_npcs"].toString().toInt() - START_LOCATION = JSONUtils.parseLocation(data["new_player_location"].toString()) - HOME_LOCATION = JSONUtils.parseLocation(data["home_location"].toString()) + START_LOCATION = rs09.JSONUtils.parseLocation(data["new_player_location"].toString()) + HOME_LOCATION = rs09.JSONUtils.parseLocation(data["home_location"].toString()) - DATA_PATH = JSONUtils.parsePath(data["data_path"].toString()) - CACHE_PATH = JSONUtils.parsePath(data["cache_path"].toString()) - STORE_PATH = JSONUtils.parsePath(data["store_path"].toString()) - PLAYER_SAVE_PATH = JSONUtils.parsePath(data["save_path"].toString()) - CONFIG_PATH = JSONUtils.parsePath(data["configs_path"].toString()) + DATA_PATH = rs09.JSONUtils.parsePath(data["data_path"].toString()) + CACHE_PATH = rs09.JSONUtils.parsePath(data["cache_path"].toString()) + STORE_PATH = rs09.JSONUtils.parsePath(data["store_path"].toString()) + PLAYER_SAVE_PATH = rs09.JSONUtils.parsePath(data["save_path"].toString()) + CONFIG_PATH = rs09.JSONUtils.parsePath(data["configs_path"].toString()) PLAYER_ATTRIBUTE_PATH = PLAYER_SAVE_PATH + "attributes" + File.separator - GRAND_EXCHANGE_DATA_PATH = JSONUtils.parsePath(data["grand_exchange_data_path"].toString()) - BOT_DATA_PATH = JSONUtils.parsePath(data["bot_data_path"].toString()) - RDT_DATA_PATH = JSONUtils.parsePath(data["rare_drop_table_path"].toString()) - OBJECT_PARSER_PATH = JSONUtils.parsePath(data["object_parser_path"].toString()) - SCRIPTS_PATH = JSONUtils.parsePath(data["scripts_path"].toString()) - DIALOGUE_SCRIPTS_PATH = JSONUtils.parsePath(data["dialogue_scripts_path"].toString()) + GRAND_EXCHANGE_DATA_PATH = rs09.JSONUtils.parsePath(data["grand_exchange_data_path"].toString()) + BOT_DATA_PATH = rs09.JSONUtils.parsePath(data["bot_data_path"].toString()) + RDT_DATA_PATH = rs09.JSONUtils.parsePath(data["rare_drop_table_path"].toString()) + OBJECT_PARSER_PATH = rs09.JSONUtils.parsePath(data["object_parser_path"].toString()) + SCRIPTS_PATH = rs09.JSONUtils.parsePath(data["scripts_path"].toString()) + DIALOGUE_SCRIPTS_PATH = rs09.JSONUtils.parsePath(data["dialogue_scripts_path"].toString()) if(data.containsKey("logs_path")){ LOGS_PATH = data["logs_path"].toString() } diff --git a/Server/src/main/kotlin/core/game/Varbit.kt b/Server/src/main/kotlin/rs09/game/Varbit.kt similarity index 73% rename from Server/src/main/kotlin/core/game/Varbit.kt rename to Server/src/main/kotlin/rs09/game/Varbit.kt index ea3ae3f8f..438187423 100644 --- a/Server/src/main/kotlin/core/game/Varbit.kt +++ b/Server/src/main/kotlin/rs09/game/Varbit.kt @@ -1,4 +1,4 @@ -package core.game +package rs09.game class Varbit(var value: Int, val offset: Int){ diff --git a/Server/src/main/kotlin/core/game/Varp.kt b/Server/src/main/kotlin/rs09/game/Varp.kt similarity index 96% rename from Server/src/main/kotlin/core/game/Varp.kt rename to Server/src/main/kotlin/rs09/game/Varp.kt index 36114db53..d54ba2719 100644 --- a/Server/src/main/kotlin/core/game/Varp.kt +++ b/Server/src/main/kotlin/rs09/game/Varp.kt @@ -1,7 +1,6 @@ -package core.game +package rs09.game import core.game.node.entity.player.Player -import core.game.system.SystemLogger /** * A class that represents Varps and aids in modifying/calculating them diff --git a/Server/src/main/kotlin/core/game/VarpManager.kt b/Server/src/main/kotlin/rs09/game/VarpManager.kt similarity index 99% rename from Server/src/main/kotlin/core/game/VarpManager.kt rename to Server/src/main/kotlin/rs09/game/VarpManager.kt index f91ef60b5..3bdc7c7e9 100644 --- a/Server/src/main/kotlin/core/game/VarpManager.kt +++ b/Server/src/main/kotlin/rs09/game/VarpManager.kt @@ -1,4 +1,4 @@ -package core.game +package rs09.game import core.cache.def.impl.VarbitDefinition import core.game.node.entity.player.Player diff --git a/Server/src/main/kotlin/plugin/ai/AIRepository.kt b/Server/src/main/kotlin/rs09/game/ai/AIRepository.kt similarity index 91% rename from Server/src/main/kotlin/plugin/ai/AIRepository.kt rename to Server/src/main/kotlin/rs09/game/ai/AIRepository.kt index 458e2d770..8334ff3ee 100644 --- a/Server/src/main/kotlin/plugin/ai/AIRepository.kt +++ b/Server/src/main/kotlin/rs09/game/ai/AIRepository.kt @@ -1,9 +1,9 @@ -package plugin.ai +package rs09.game.ai import core.game.node.entity.player.Player import core.game.node.item.GroundItem -import plugin.ai.general.GeneralBotCreator -import core.game.ge.GrandExchangeOffer +import rs09.game.ai.general.GeneralBotCreator +import rs09.game.ge.GrandExchangeOffer /** * A repository for bots to make use of that can contain any info that might be useful to them. diff --git a/Server/src/main/kotlin/plugin/ai/general/GeneralBotCreator.kt b/Server/src/main/kotlin/rs09/game/ai/general/GeneralBotCreator.kt similarity index 91% rename from Server/src/main/kotlin/plugin/ai/general/GeneralBotCreator.kt rename to Server/src/main/kotlin/rs09/game/ai/general/GeneralBotCreator.kt index e54c6626a..78005f894 100644 --- a/Server/src/main/kotlin/plugin/ai/general/GeneralBotCreator.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/GeneralBotCreator.kt @@ -1,15 +1,15 @@ -package plugin.ai.general +package rs09.game.ai.general import core.game.node.entity.player.Player import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.map.Location import core.tools.RandomFunction -import plugin.ai.AIPBuilder -import plugin.ai.AIPlayer -import plugin.ai.AIRepository -import plugin.ai.general.scriptrepository.Idler -import plugin.ai.general.scriptrepository.Script +import rs09.game.ai.AIPBuilder +import rs09.game.ai.AIPlayer +import rs09.game.ai.AIRepository +import rs09.game.ai.general.scriptrepository.Idler +import rs09.game.ai.general.scriptrepository.Script class GeneralBotCreator { //org/crandor/net/packet/in/InteractionPacket.java <<< This is a very useful class for learning to code bots diff --git a/Server/src/main/kotlin/plugin/ai/general/ScriptAPI.kt b/Server/src/main/kotlin/rs09/game/ai/general/ScriptAPI.kt similarity index 98% rename from Server/src/main/kotlin/plugin/ai/general/ScriptAPI.kt rename to Server/src/main/kotlin/rs09/game/ai/general/ScriptAPI.kt index a7577ad23..664cb2874 100644 --- a/Server/src/main/kotlin/plugin/ai/general/ScriptAPI.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/ScriptAPI.kt @@ -1,7 +1,11 @@ -package plugin.ai.general +package rs09.game.ai.general import core.cache.def.impl.ItemDefinition import core.game.component.Component +import core.game.content.consumable.Consumable +import core.game.content.consumable.Consumables +import core.game.content.consumable.Food +import core.game.content.consumable.effects.HealingEffect import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse import core.game.node.Node @@ -9,29 +13,25 @@ import core.game.node.`object`.GameObject import core.game.node.entity.Entity 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.GroundItem import core.game.node.item.GroundItemManager import core.game.node.item.Item -import core.game.system.SystemLogger import core.game.system.task.Pulse -import core.game.world.GameWorld import core.game.world.map.Location import core.game.world.map.RegionManager import core.game.world.map.path.Pathfinder -import core.game.world.repository.Repository import core.game.world.update.flag.context.Animation import core.game.world.update.flag.context.Graphics -import core.tools.Items import core.tools.RandomFunction -import plugin.ai.AIRepository -import core.game.content.consumable.Consumable -import core.game.content.consumable.Consumables -import core.game.content.consumable.Food -import core.game.content.consumable.effects.HealingEffect -import core.game.ge.GrandExchangeOffer -import core.game.ge.OfferManager -import core.game.node.entity.skill.Skills -import core.tools.stringtools.colorize +import rs09.game.ai.AIRepository +import rs09.game.ge.GrandExchangeOffer +import rs09.game.ge.OfferManager +import rs09.game.system.SystemLogger +import rs09.game.world.GameWorld +import rs09.game.world.repository.Repository +import rs09.tools.Items +import rs09.tools.stringtools.colorize import java.util.* import java.util.concurrent.CountDownLatch import java.util.concurrent.Executors diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/Adventurer.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/Adventurer.kt similarity index 99% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/Adventurer.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/Adventurer.kt index f30953b9d..910f23090 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/Adventurer.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/Adventurer.kt @@ -1,29 +1,26 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse -import core.game.node.Node import core.game.node.`object`.GameObject import core.game.node.entity.combat.CombatStyle -import core.game.node.entity.combat.CombatSwingHandler +import rs09.game.node.entity.combat.CombatSwingHandler import core.game.node.entity.skill.Skills import core.game.node.item.Item import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.map.Location import core.game.world.map.RegionManager import core.game.world.map.zone.ZoneBorders -import core.game.world.repository.Repository.sendNews +import rs09.game.world.repository.Repository.sendNews import core.game.world.update.flag.* import core.game.world.update.flag.context.Animation import core.game.world.update.flag.context.ChatMessage import core.game.world.update.flag.context.Graphics import core.game.world.update.flag.player.ChatFlag import core.tools.RandomFunction -import plugin.ai.AIPlayer -import plugin.ai.AIRepository -import plugin.ai.pvmbots.CombatBotAssembler -import plugin.ai.pvp.PVPAIPActions +import rs09.game.ai.AIRepository +import rs09.game.ai.pvmbots.CombatBotAssembler import java.time.LocalDateTime import java.time.format.DateTimeFormatter import kotlin.random.Random diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/ChickenKiller.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/ChickenKiller.kt similarity index 93% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/ChickenKiller.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/ChickenKiller.kt index 442fec043..ae13b9bba 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/ChickenKiller.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/ChickenKiller.kt @@ -1,9 +1,8 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository -import core.game.system.SystemLogger import core.game.world.map.Location -import core.tools.Items -import plugin.ai.general.ScriptAPI +import rs09.tools.Items +import rs09.game.ai.general.ScriptAPI @PlayerCompatible @ScriptName("Chicken Killer") diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/CoalMiner.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/CoalMiner.kt similarity index 96% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/CoalMiner.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/CoalMiner.kt index 6f0606ec4..0dce2ae55 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/CoalMiner.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/CoalMiner.kt @@ -1,13 +1,13 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse import core.game.node.Node import core.game.node.item.Item import core.game.world.map.zone.ZoneBorders -import core.tools.Items -import plugin.ai.general.ScriptAPI -import plugin.ai.skillingbot.SkillingBotAssembler +import rs09.tools.Items +import rs09.game.ai.general.ScriptAPI +import rs09.game.ai.skillingbot.SkillingBotAssembler import core.game.node.entity.skill.Skills @PlayerCompatible diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/CowKiller.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/CowKiller.kt similarity index 97% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/CowKiller.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/CowKiller.kt index 2a8415c53..9e735369e 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/CowKiller.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/CowKiller.kt @@ -1,13 +1,12 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse -import core.game.system.SystemLogger import core.game.system.task.Pulse import core.game.world.map.Location import core.game.world.map.zone.ZoneBorders -import core.tools.Items -import plugin.ai.pvmbots.CombatBotAssembler +import rs09.tools.Items +import rs09.game.ai.pvmbots.CombatBotAssembler class CowKiller : Script() { var state = State.KILLING diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/DraynorFisher.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/DraynorFisher.kt similarity index 94% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/DraynorFisher.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/DraynorFisher.kt index 474794191..827c5571f 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/DraynorFisher.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/DraynorFisher.kt @@ -1,12 +1,12 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse import core.game.node.item.Item import core.game.world.map.Location import core.game.world.map.zone.ZoneBorders -import core.tools.Items -import plugin.ai.skillingbot.SkillingBotAssembler +import rs09.tools.Items +import rs09.game.ai.skillingbot.SkillingBotAssembler class DraynorFisher : Script() { val fishingZone = ZoneBorders(3085, 3223,3089, 3233) diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/DraynorWillows.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/DraynorWillows.kt similarity index 96% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/DraynorWillows.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/DraynorWillows.kt index 952d75e4b..07f93a2c2 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/DraynorWillows.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/DraynorWillows.kt @@ -1,13 +1,13 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository import core.game.component.Component import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse import core.game.node.item.Item import core.game.world.map.zone.ZoneBorders -import core.tools.Items +import rs09.tools.Items import core.game.node.entity.skill.Skills -import core.tools.stringtools.colorize +import rs09.tools.stringtools.colorize @PlayerCompatible @ScriptName("Draynor Willows") diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/FarmerThiever.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/FarmerThiever.kt similarity index 88% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/FarmerThiever.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/FarmerThiever.kt index 68460146e..0dbdfd9c9 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/FarmerThiever.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/FarmerThiever.kt @@ -1,7 +1,7 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository import core.game.world.map.zone.ZoneBorders -import plugin.ai.skillingbot.SkillingBotAssembler +import rs09.game.ai.skillingbot.SkillingBotAssembler import core.game.node.entity.skill.Skills class FarmerThiever : Script() { diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/FletchingBankstander.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/FletchingBankstander.kt similarity index 90% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/FletchingBankstander.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/FletchingBankstander.kt index ce8216329..2cc118627 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/FletchingBankstander.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/FletchingBankstander.kt @@ -1,8 +1,8 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository import core.game.node.item.Item -import core.tools.Items -import plugin.ai.skillingbot.SkillingBotAssembler +import rs09.tools.Items +import rs09.game.ai.skillingbot.SkillingBotAssembler import core.game.node.entity.skill.Skills import core.game.node.entity.skill.fletching.Fletching import core.game.node.entity.skill.fletching.FletchingPulse diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/GenericSlayerBot.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/GenericSlayerBot.kt similarity index 97% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/GenericSlayerBot.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/GenericSlayerBot.kt index f0a799bbc..9a7dfd3a4 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/GenericSlayerBot.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/GenericSlayerBot.kt @@ -1,16 +1,15 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository -import core.tools.Items import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse +import core.game.node.entity.skill.Skills import core.game.node.item.Item -import core.game.system.SystemLogger import core.game.system.task.Pulse import core.game.world.map.Location import core.game.world.map.zone.ZoneBorders import core.tools.RandomFunction -import plugin.ai.AIRepository -import core.game.node.entity.skill.Skills +import rs09.game.ai.AIRepository +import rs09.tools.Items /** * A bot that does various random slayer tasks throughout the game and sells the loot on the GE. @@ -144,7 +143,7 @@ class GenericSlayerBot : Script() { bot.inventory.clear() for(item in inventory) bot.inventory.add(item) - scriptAPI.withdraw(core.tools.Items.LOBSTER_379,10) + scriptAPI.withdraw(rs09.tools.Items.LOBSTER_379,10) bot.fullRestore() if(assignment.amount <= 0){ diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/GlassBlowingBankstander.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/GlassBlowingBankstander.kt similarity index 90% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/GlassBlowingBankstander.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/GlassBlowingBankstander.kt index 4ec8a4e4a..781f98d46 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/GlassBlowingBankstander.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/GlassBlowingBankstander.kt @@ -1,8 +1,8 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository import core.game.node.item.Item -import core.tools.Items -import plugin.ai.skillingbot.SkillingBotAssembler +import rs09.tools.Items +import rs09.game.ai.skillingbot.SkillingBotAssembler import core.game.interaction.inter.GlassInterface import core.game.node.entity.skill.Skills import core.game.node.entity.skill.crafting.GlassProduct diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/GreenDragonKiller.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/GreenDragonKiller.kt similarity index 96% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/GreenDragonKiller.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/GreenDragonKiller.kt index 7b174254a..4a3eb1f22 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/GreenDragonKiller.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/GreenDragonKiller.kt @@ -1,28 +1,27 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository +import core.game.ge.OfferState import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse import core.game.node.entity.Entity import core.game.node.entity.combat.CombatStyle -import core.game.node.entity.combat.CombatSwingHandler import core.game.node.entity.combat.InteractionType -import core.game.node.entity.combat.handlers.MagicSwingHandler -import core.game.node.entity.combat.handlers.MeleeSwingHandler -import core.game.node.entity.combat.handlers.RangeSwingHandler import core.game.node.entity.player.Player +import core.game.node.entity.skill.Skills import core.game.node.entity.state.EntityState import core.game.node.item.Item -import core.game.system.SystemLogger import core.game.system.task.Pulse import core.game.world.map.Location import core.game.world.map.RegionManager import core.game.world.map.zone.ZoneBorders import core.game.world.map.zone.impl.WildernessZone -import core.tools.Items -import plugin.ai.AIRepository -import plugin.ai.pvmbots.CombatBotAssembler -import core.game.ge.OfferState -import core.game.node.entity.skill.Skills +import rs09.game.ai.AIRepository +import rs09.game.ai.pvmbots.CombatBotAssembler +import rs09.game.node.entity.combat.CombatSwingHandler +import rs09.game.node.entity.combat.handlers.MagicSwingHandler +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler +import rs09.game.node.entity.combat.handlers.RangeSwingHandler +import rs09.tools.Items import kotlin.random.Random /** diff --git a/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/Idler.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/Idler.kt new file mode 100644 index 000000000..d7e08dce5 --- /dev/null +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/Idler.kt @@ -0,0 +1,10 @@ +package rs09.game.ai.general.scriptrepository + +class Idler : Script(){ + override fun tick() { + } + + override fun newInstance(): Script { + return this + } +} \ No newline at end of file diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/LobsterCatcher.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/LobsterCatcher.kt similarity index 97% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/LobsterCatcher.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/LobsterCatcher.kt index 3a7e5a57f..6d22559e8 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/LobsterCatcher.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/LobsterCatcher.kt @@ -1,18 +1,18 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse import core.game.node.item.Item import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.map.Location import core.game.world.map.path.Pathfinder import core.game.world.update.flag.context.Animation import core.game.world.update.flag.context.Graphics -import core.tools.Items +import rs09.tools.Items import core.tools.RandomFunction -import plugin.ai.AIPlayer -import plugin.ai.general.ScriptAPI +import rs09.game.ai.AIPlayer +import rs09.game.ai.general.ScriptAPI import core.game.node.entity.skill.Skills import kotlin.random.Random diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/ManThiever.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/ManThiever.kt similarity index 84% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/ManThiever.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/ManThiever.kt index 39f9469a6..a0372a06b 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/ManThiever.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/ManThiever.kt @@ -1,7 +1,7 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository import core.game.node.item.Item -import plugin.ai.skillingbot.SkillingBotAssembler +import rs09.game.ai.skillingbot.SkillingBotAssembler import java.util.* class ManThiever : Script() { diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/NonBankingMiner.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/NonBankingMiner.kt similarity index 86% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/NonBankingMiner.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/NonBankingMiner.kt index d60faf8a0..1113af62e 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/NonBankingMiner.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/NonBankingMiner.kt @@ -1,8 +1,8 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository import core.game.node.item.Item -import core.tools.Items -import plugin.ai.skillingbot.SkillingBotAssembler +import rs09.tools.Items +import rs09.game.ai.skillingbot.SkillingBotAssembler import core.game.node.entity.skill.Skills class NonBankingMiner : Script() { diff --git a/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/PlayerCompatible.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/PlayerCompatible.kt new file mode 100644 index 000000000..5415ad2d1 --- /dev/null +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/PlayerCompatible.kt @@ -0,0 +1,3 @@ +package rs09.game.ai.general.scriptrepository + +annotation class PlayerCompatible diff --git a/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/PlayerScripts.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/PlayerScripts.kt new file mode 100644 index 000000000..1aaba11e6 --- /dev/null +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/PlayerScripts.kt @@ -0,0 +1,19 @@ +package rs09.game.ai.general.scriptrepository + +import io.github.classgraph.ClassGraph + +object PlayerScripts { + class PlayerScript(val identifier: String, val description: Array, val name: String, val clazz: Class<*>) + val identifierMap = HashMap() + + + fun init(){ + val result = ClassGraph().enableAnnotationInfo().acceptPackages("rs09.game.ai.general.scriptrepository").scan() + result.getClassesWithAnnotation("rs09.game.ai.general.scriptrepository.PlayerCompatible").forEach { res -> + val description = res.getAnnotationInfo("rs09.game.ai.general.scriptrepository.ScriptDescription").parameterValues[0].value as Array + val identifier = res.getAnnotationInfo("rs09.game.ai.general.scriptrepository.ScriptIdentifier").parameterValues[0].value.toString() + val name = res.getAnnotationInfo("rs09.game.ai.general.scriptrepository.ScriptName").parameterValues[0].value.toString() + identifierMap[identifier] = PlayerScript(identifier,description,name,res.loadClass()) + } + } +} \ No newline at end of file diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/ScriptDescription.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/ScriptDescription.kt similarity index 57% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/ScriptDescription.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/ScriptDescription.kt index 1a34c47a5..cef85addb 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/ScriptDescription.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/ScriptDescription.kt @@ -1,3 +1,3 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository annotation class ScriptDescription(vararg val value: String) diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/ScriptIdentifier.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/ScriptIdentifier.kt similarity index 54% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/ScriptIdentifier.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/ScriptIdentifier.kt index 08e957a31..d73102c3f 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/ScriptIdentifier.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/ScriptIdentifier.kt @@ -1,3 +1,3 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository annotation class ScriptIdentifier(val value: String) diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/ScriptName.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/ScriptName.kt similarity index 51% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/ScriptName.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/ScriptName.kt index 630265e05..7501d7c05 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/ScriptName.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/ScriptName.kt @@ -1,3 +1,3 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository annotation class ScriptName(val value: String) diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/SeersFlax.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/SeersFlax.kt similarity index 97% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/SeersFlax.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/SeersFlax.kt index 30c4a0676..25dc31f59 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/SeersFlax.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/SeersFlax.kt @@ -1,13 +1,12 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse import core.game.node.item.Item -import core.game.system.SystemLogger import core.game.world.map.Location import core.game.world.map.path.Pathfinder -import core.tools.Items -import plugin.ai.skillingbot.SkillingBotAssembler +import rs09.tools.Items +import rs09.game.ai.skillingbot.SkillingBotAssembler import core.game.node.entity.skill.Skills import core.game.node.entity.skill.crafting.spinning.SpinningItem import core.game.node.entity.skill.crafting.spinning.SpinningPulse diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/SeersMagicTrees.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/SeersMagicTrees.kt similarity index 95% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/SeersMagicTrees.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/SeersMagicTrees.kt index 687a43386..e6e24e43b 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/SeersMagicTrees.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/SeersMagicTrees.kt @@ -1,14 +1,14 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository -import core.tools.Items +import rs09.tools.Items import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse import core.game.node.item.Item import core.game.world.map.Location import core.game.world.map.zone.ZoneBorders import core.tools.RandomFunction -import plugin.ai.general.ScriptAPI -import plugin.ai.skillingbot.SkillingBotAssembler +import rs09.game.ai.general.ScriptAPI +import rs09.game.ai.skillingbot.SkillingBotAssembler import core.game.node.entity.skill.Skills @PlayerCompatible diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/SharkCatcher.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/SharkCatcher.kt similarity index 97% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/SharkCatcher.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/SharkCatcher.kt index b2233c29c..c9e03b936 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/SharkCatcher.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/SharkCatcher.kt @@ -1,14 +1,14 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse import core.game.node.item.Item import core.game.world.map.Location -import core.tools.Items +import rs09.tools.Items import core.tools.RandomFunction -import plugin.ai.AIPlayer -import plugin.ai.general.ScriptAPI -import core.game.ge.OfferManager +import rs09.game.ai.AIPlayer +import rs09.game.ai.general.ScriptAPI +import rs09.game.ge.OfferManager import core.game.node.entity.skill.Skills import kotlin.random.Random diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/VarrockEssenceMiner.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/VarrockEssenceMiner.kt similarity index 94% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/VarrockEssenceMiner.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/VarrockEssenceMiner.kt index e46fa5c9f..bce92685d 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/VarrockEssenceMiner.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/VarrockEssenceMiner.kt @@ -1,14 +1,11 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse -import core.game.node.item.Item -import core.game.system.SystemLogger import core.game.world.map.Location import core.game.world.map.zone.ZoneBorders -import core.tools.Items -import plugin.ai.skillingbot.SkillingBotAssembler -import core.game.node.entity.skill.Skills +import rs09.tools.Items +import rs09.game.ai.skillingbot.SkillingBotAssembler @PlayerCompatible @ScriptDescription("Start in varrock bank with rune mysteries complete and a pickaxe equipped/in inventory") diff --git a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/VarrockSmither.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/VarrockSmither.kt similarity index 94% rename from Server/src/main/kotlin/plugin/ai/general/scriptrepository/VarrockSmither.kt rename to Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/VarrockSmither.kt index d9c05c952..89e84e55e 100644 --- a/Server/src/main/kotlin/plugin/ai/general/scriptrepository/VarrockSmither.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/VarrockSmither.kt @@ -1,12 +1,12 @@ -package plugin.ai.general.scriptrepository +package rs09.game.ai.general.scriptrepository import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse import core.game.node.item.Item import core.game.world.map.Location -import core.tools.Items +import rs09.tools.Items import core.tools.RandomFunction -import plugin.ai.skillingbot.SkillingBotAssembler +import rs09.game.ai.skillingbot.SkillingBotAssembler import core.game.node.entity.skill.Skills import core.game.node.entity.skill.smithing.Bars import core.game.node.entity.skill.smithing.SmithingPulse diff --git a/Server/src/main/kotlin/plugin/ai/minigamebots/pestcontrol/CombatState.kt b/Server/src/main/kotlin/rs09/game/ai/minigamebots/pestcontrol/CombatState.kt similarity index 94% rename from Server/src/main/kotlin/plugin/ai/minigamebots/pestcontrol/CombatState.kt rename to Server/src/main/kotlin/rs09/game/ai/minigamebots/pestcontrol/CombatState.kt index b6e25ca79..8a1245973 100644 --- a/Server/src/main/kotlin/plugin/ai/minigamebots/pestcontrol/CombatState.kt +++ b/Server/src/main/kotlin/rs09/game/ai/minigamebots/pestcontrol/CombatState.kt @@ -1,15 +1,15 @@ -package plugin.ai.minigamebots.pestcontrol +package rs09.game.ai.minigamebots.pestcontrol import core.game.interaction.MovementPulse import core.game.node.Node import core.game.node.entity.npc.NPC -import core.game.world.GameWorld import core.game.world.map.Location import core.game.world.map.RegionManager import core.game.world.map.path.Pathfinder import core.tools.RandomFunction -import core.game.content.activity.pestcontrol.PestControlHelper.GATE_ENTRIES -import core.game.content.activity.pestcontrol.PestControlHelper.getMyPestControlSession1 +import rs09.game.content.activity.pestcontrol.PestControlHelper.GATE_ENTRIES +import rs09.game.content.activity.pestcontrol.PestControlHelper.getMyPestControlSession1 +import rs09.game.world.GameWorld import java.util.* import java.util.concurrent.Executors diff --git a/Server/src/main/kotlin/plugin/ai/minigamebots/pestcontrol/CombatStateIntermediate.kt b/Server/src/main/kotlin/rs09/game/ai/minigamebots/pestcontrol/CombatStateIntermediate.kt similarity index 94% rename from Server/src/main/kotlin/plugin/ai/minigamebots/pestcontrol/CombatStateIntermediate.kt rename to Server/src/main/kotlin/rs09/game/ai/minigamebots/pestcontrol/CombatStateIntermediate.kt index 5a42b5bb2..471760b59 100644 --- a/Server/src/main/kotlin/plugin/ai/minigamebots/pestcontrol/CombatStateIntermediate.kt +++ b/Server/src/main/kotlin/rs09/game/ai/minigamebots/pestcontrol/CombatStateIntermediate.kt @@ -1,16 +1,16 @@ -package plugin.ai.minigamebots.pestcontrol +package rs09.game.ai.minigamebots.pestcontrol import core.game.interaction.MovementPulse import core.game.node.Node import core.game.node.entity.npc.NPC -import core.game.world.GameWorld import core.game.world.map.Location import core.game.world.map.RegionManager import core.game.world.map.path.Pathfinder import core.tools.RandomFunction -import core.game.content.activity.pestcontrol.PestControlHelper.getMyPestControlSession2 +import rs09.game.content.activity.pestcontrol.PestControlHelper.GATE_ENTRIES +import rs09.game.content.activity.pestcontrol.PestControlHelper.getMyPestControlSession2 +import rs09.game.world.GameWorld import java.util.* -import core.game.content.activity.pestcontrol.PestControlHelper.GATE_ENTRIES import java.util.concurrent.Executors class CombatStateIntermediate(val bot: PestControlTestBot2) { diff --git a/Server/src/main/kotlin/plugin/ai/minigamebots/pestcontrol/PestControlIntermediateBot.kt b/Server/src/main/kotlin/rs09/game/ai/minigamebots/pestcontrol/PestControlIntermediateBot.kt similarity index 95% rename from Server/src/main/kotlin/plugin/ai/minigamebots/pestcontrol/PestControlIntermediateBot.kt rename to Server/src/main/kotlin/rs09/game/ai/minigamebots/pestcontrol/PestControlIntermediateBot.kt index 51e18b5b3..32c401132 100644 --- a/Server/src/main/kotlin/plugin/ai/minigamebots/pestcontrol/PestControlIntermediateBot.kt +++ b/Server/src/main/kotlin/rs09/game/ai/minigamebots/pestcontrol/PestControlIntermediateBot.kt @@ -1,12 +1,11 @@ -package plugin.ai.minigamebots.pestcontrol +package rs09.game.ai.minigamebots.pestcontrol +import core.game.content.activity.pestcontrol.PestControlActivityPlugin import core.game.world.map.Location import core.tools.RandomFunction -import core.game.content.activity.pestcontrol.PestControlActivityPlugin -import core.game.content.activity.pestcontrol.PestControlHelper -import core.game.content.activity.pestcontrol.PestControlHelper.BoatInfo -import plugin.ai.pvmbots.CombatBotAssembler -import plugin.ai.pvmbots.PvMBots +import rs09.game.ai.pvmbots.CombatBotAssembler +import rs09.game.ai.pvmbots.PvMBots +import rs09.game.content.activity.pestcontrol.PestControlHelper import java.util.* class PestControlTestBot2(l: Location) : PvMBots(legitimizeLocation(l)) { @@ -18,7 +17,7 @@ class PestControlTestBot2(l: Location) : PvMBots(legitimizeLocation(l)) { var openedGate = false var myCounter = 0 val num = Random().nextInt(4) - val myBoat = BoatInfo.INTERMEDIATE + val myBoat = PestControlHelper.BoatInfo.INTERMEDIATE val combathandler = CombatStateIntermediate(this) var time = 0 diff --git a/Server/src/main/kotlin/plugin/ai/minigamebots/pestcontrol/PestControlNoviceBot.kt b/Server/src/main/kotlin/rs09/game/ai/minigamebots/pestcontrol/PestControlNoviceBot.kt similarity index 95% rename from Server/src/main/kotlin/plugin/ai/minigamebots/pestcontrol/PestControlNoviceBot.kt rename to Server/src/main/kotlin/rs09/game/ai/minigamebots/pestcontrol/PestControlNoviceBot.kt index 10197611c..2369a302a 100644 --- a/Server/src/main/kotlin/plugin/ai/minigamebots/pestcontrol/PestControlNoviceBot.kt +++ b/Server/src/main/kotlin/rs09/game/ai/minigamebots/pestcontrol/PestControlNoviceBot.kt @@ -1,12 +1,11 @@ -package plugin.ai.minigamebots.pestcontrol +package rs09.game.ai.minigamebots.pestcontrol +import core.game.content.activity.pestcontrol.PestControlActivityPlugin import core.game.world.map.Location import core.tools.RandomFunction -import core.game.content.activity.pestcontrol.PestControlActivityPlugin -import core.game.content.activity.pestcontrol.PestControlHelper -import core.game.content.activity.pestcontrol.PestControlHelper.BoatInfo -import plugin.ai.pvmbots.CombatBotAssembler -import plugin.ai.pvmbots.PvMBots +import rs09.game.ai.pvmbots.CombatBotAssembler +import rs09.game.ai.pvmbots.PvMBots +import rs09.game.content.activity.pestcontrol.PestControlHelper import java.util.* class PestControlTestBot(l: Location) : PvMBots(legitimizeLocation(l)){ @@ -17,7 +16,7 @@ class PestControlTestBot(l: Location) : PvMBots(legitimizeLocation(l)){ var openedGate = false var myCounter = 0 val num = Random().nextInt(4) - val myBoat = BoatInfo.NOVICE + val myBoat = PestControlHelper.BoatInfo.NOVICE val combathandler = CombatState(this) var time = 0 diff --git a/Server/src/main/kotlin/plugin/ai/pvmbots/CombatBot.kt b/Server/src/main/kotlin/rs09/game/ai/pvmbots/CombatBot.kt similarity index 97% rename from Server/src/main/kotlin/plugin/ai/pvmbots/CombatBot.kt rename to Server/src/main/kotlin/rs09/game/ai/pvmbots/CombatBot.kt index 6314ec9ad..7890787ed 100644 --- a/Server/src/main/kotlin/plugin/ai/pvmbots/CombatBot.kt +++ b/Server/src/main/kotlin/rs09/game/ai/pvmbots/CombatBot.kt @@ -1,4 +1,4 @@ -package plugin.ai.pvmbots +package rs09.game.ai.pvmbots import core.game.node.entity.player.link.appearance.Gender import core.game.node.entity.player.link.prayer.PrayerType @@ -6,7 +6,7 @@ import core.game.node.item.Item import core.game.world.map.Direction import core.game.world.map.Location import core.tools.RandomFunction -import plugin.ai.AIPlayer +import rs09.game.ai.AIPlayer import core.game.content.consumable.Consumable import core.game.content.consumable.Consumables import core.game.content.consumable.Food diff --git a/Server/src/main/kotlin/plugin/ai/pvmbots/CombatBotAssembler.kt b/Server/src/main/kotlin/rs09/game/ai/pvmbots/CombatBotAssembler.kt similarity index 99% rename from Server/src/main/kotlin/plugin/ai/pvmbots/CombatBotAssembler.kt rename to Server/src/main/kotlin/rs09/game/ai/pvmbots/CombatBotAssembler.kt index 28192f29f..31f8c52a5 100644 --- a/Server/src/main/kotlin/plugin/ai/pvmbots/CombatBotAssembler.kt +++ b/Server/src/main/kotlin/rs09/game/ai/pvmbots/CombatBotAssembler.kt @@ -1,10 +1,10 @@ -package plugin.ai.pvmbots +package rs09.game.ai.pvmbots import core.game.node.item.Item import core.game.world.map.Location -import core.tools.Items +import rs09.tools.Items import core.tools.RandomFunction -import plugin.ai.AIPlayer +import rs09.game.ai.AIPlayer import core.game.node.entity.skill.Skills import java.util.* import kotlin.collections.ArrayList diff --git a/Server/src/main/kotlin/plugin/ai/pvmbots/PvMBotsBuilder.kt b/Server/src/main/kotlin/rs09/game/ai/pvmbots/PvMBotsBuilder.kt similarity index 99% rename from Server/src/main/kotlin/plugin/ai/pvmbots/PvMBotsBuilder.kt rename to Server/src/main/kotlin/rs09/game/ai/pvmbots/PvMBotsBuilder.kt index 63b5d8a78..7eb8d151a 100644 --- a/Server/src/main/kotlin/plugin/ai/pvmbots/PvMBotsBuilder.kt +++ b/Server/src/main/kotlin/rs09/game/ai/pvmbots/PvMBotsBuilder.kt @@ -1,16 +1,16 @@ -package plugin.ai.pvmbots +package rs09.game.ai.pvmbots import core.game.container.impl.EquipmentContainer import core.game.node.entity.combat.CombatSpell import core.game.node.entity.player.link.SpellBookManager import core.game.node.entity.player.link.appearance.Gender import core.game.node.item.Item -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.map.Location import core.tools.RandomFunction -import plugin.ai.AIPlayer -import plugin.ai.minigamebots.pestcontrol.PestControlTestBot -import plugin.ai.minigamebots.pestcontrol.PestControlTestBot2 +import rs09.game.ai.AIPlayer +import rs09.game.ai.minigamebots.pestcontrol.PestControlTestBot +import rs09.game.ai.minigamebots.pestcontrol.PestControlTestBot2 import core.game.node.entity.skill.Skills import java.util.* import java.util.concurrent.Executors diff --git a/Server/src/main/kotlin/plugin/ai/skillingbot/SkillingBotAssembler.kt b/Server/src/main/kotlin/rs09/game/ai/skillingbot/SkillingBotAssembler.kt similarity index 96% rename from Server/src/main/kotlin/plugin/ai/skillingbot/SkillingBotAssembler.kt rename to Server/src/main/kotlin/rs09/game/ai/skillingbot/SkillingBotAssembler.kt index 60920e9c5..2920d370b 100644 --- a/Server/src/main/kotlin/plugin/ai/skillingbot/SkillingBotAssembler.kt +++ b/Server/src/main/kotlin/rs09/game/ai/skillingbot/SkillingBotAssembler.kt @@ -1,8 +1,8 @@ -package plugin.ai.skillingbot +package rs09.game.ai.skillingbot import core.game.node.item.Item import core.game.world.map.Location -import plugin.ai.AIPlayer +import rs09.game.ai.AIPlayer class SkillingBotAssembler { fun produce(type: Wealth,loc: Location): AIPlayer{ diff --git a/Server/src/main/kotlin/rs09/game/camerautils/CameraUtils.kt b/Server/src/main/kotlin/rs09/game/camerautils/CameraUtils.kt new file mode 100644 index 000000000..e238c240f --- /dev/null +++ b/Server/src/main/kotlin/rs09/game/camerautils/CameraUtils.kt @@ -0,0 +1,5 @@ +package rs09.game.camerautils + +object CameraUtils { + +} \ No newline at end of file diff --git a/Server/src/main/kotlin/core/game/camerautils/PlayerCamera.kt b/Server/src/main/kotlin/rs09/game/camerautils/PlayerCamera.kt similarity index 95% rename from Server/src/main/kotlin/core/game/camerautils/PlayerCamera.kt rename to Server/src/main/kotlin/rs09/game/camerautils/PlayerCamera.kt index 9d8096813..2c8a17fef 100644 --- a/Server/src/main/kotlin/core/game/camerautils/PlayerCamera.kt +++ b/Server/src/main/kotlin/rs09/game/camerautils/PlayerCamera.kt @@ -1,7 +1,7 @@ -package core.game.camerautils +package rs09.game.camerautils import core.game.node.entity.player.Player -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger import core.net.packet.PacketRepository import core.net.packet.context.CameraContext import core.net.packet.out.CameraViewPacket diff --git a/Server/src/main/kotlin/core/game/content/activity/allfiredup/AFUBeacon.kt b/Server/src/main/kotlin/rs09/game/content/activity/allfiredup/AFUBeacon.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/activity/allfiredup/AFUBeacon.kt rename to Server/src/main/kotlin/rs09/game/content/activity/allfiredup/AFUBeacon.kt index bde82b31b..a3193dbe2 100644 --- a/Server/src/main/kotlin/core/game/content/activity/allfiredup/AFUBeacon.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/allfiredup/AFUBeacon.kt @@ -1,7 +1,7 @@ -package core.game.content.activity.allfiredup +package rs09.game.content.activity.allfiredup import core.game.node.entity.player.Player -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger import core.game.world.map.Location /** diff --git a/Server/src/main/kotlin/core/game/content/activity/allfiredup/AFUBeaconHandler.kt b/Server/src/main/kotlin/rs09/game/content/activity/allfiredup/AFUBeaconHandler.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/activity/allfiredup/AFUBeaconHandler.kt rename to Server/src/main/kotlin/rs09/game/content/activity/allfiredup/AFUBeaconHandler.kt index c2ec15b76..7eaad10c2 100644 --- a/Server/src/main/kotlin/core/game/content/activity/allfiredup/AFUBeaconHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/allfiredup/AFUBeaconHandler.kt @@ -1,4 +1,4 @@ -package core.game.content.activity.allfiredup +package rs09.game.content.activity.allfiredup import core.cache.def.impl.ObjectDefinition import core.game.interaction.OptionHandler @@ -7,11 +7,11 @@ import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.item.Item import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items +import rs09.tools.Items import core.game.content.dialogue.FacialExpression import core.game.node.entity.skill.Skills diff --git a/Server/src/main/kotlin/core/game/content/activity/allfiredup/AFURepairClimbHandler.kt b/Server/src/main/kotlin/rs09/game/content/activity/allfiredup/AFURepairClimbHandler.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/activity/allfiredup/AFURepairClimbHandler.kt rename to Server/src/main/kotlin/rs09/game/content/activity/allfiredup/AFURepairClimbHandler.kt index d589ce7bb..bd4ed33bd 100644 --- a/Server/src/main/kotlin/core/game/content/activity/allfiredup/AFURepairClimbHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/allfiredup/AFURepairClimbHandler.kt @@ -1,4 +1,4 @@ -package core.game.content.activity.allfiredup +package rs09.game.content.activity.allfiredup import core.cache.def.impl.ObjectDefinition import core.game.interaction.OptionHandler @@ -11,7 +11,7 @@ import core.game.world.map.Location import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items +import rs09.tools.Items import core.game.node.entity.skill.Skills import core.game.node.entity.skill.construction.NailType import java.util.* diff --git a/Server/src/main/kotlin/core/game/content/activity/allfiredup/AFUSession.kt b/Server/src/main/kotlin/rs09/game/content/activity/allfiredup/AFUSession.kt similarity index 95% rename from Server/src/main/kotlin/core/game/content/activity/allfiredup/AFUSession.kt rename to Server/src/main/kotlin/rs09/game/content/activity/allfiredup/AFUSession.kt index 773ee390a..e00479a65 100644 --- a/Server/src/main/kotlin/core/game/content/activity/allfiredup/AFUSession.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/allfiredup/AFUSession.kt @@ -1,13 +1,13 @@ -package core.game.content.activity.allfiredup +package rs09.game.content.activity.allfiredup import core.game.node.entity.player.Player import core.game.node.item.Item -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.plugin.Plugin -import core.tools.Items -import core.tools.stringtools.colorize +import rs09.tools.Items +import rs09.tools.stringtools.colorize /** * Handles keeping track of lit beacons and their burn time remaining diff --git a/Server/src/main/kotlin/core/game/content/activity/allfiredup/BeaconTenderDialogue.kt b/Server/src/main/kotlin/rs09/game/content/activity/allfiredup/BeaconTenderDialogue.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/activity/allfiredup/BeaconTenderDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/activity/allfiredup/BeaconTenderDialogue.kt index ba8b09a4c..2383e6807 100644 --- a/Server/src/main/kotlin/core/game/content/activity/allfiredup/BeaconTenderDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/allfiredup/BeaconTenderDialogue.kt @@ -1,10 +1,10 @@ -package core.game.content.activity.allfiredup +package rs09.game.content.activity.allfiredup import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.item.Item import core.plugin.Initializable -import core.tools.Items +import rs09.tools.Items import core.game.content.dialogue.DialoguePlugin import core.game.node.entity.skill.Skills diff --git a/Server/src/main/kotlin/core/game/content/activity/allfiredup/KingRoaldAFUMiniDialogue.kt b/Server/src/main/kotlin/rs09/game/content/activity/allfiredup/KingRoaldAFUMiniDialogue.kt similarity index 90% rename from Server/src/main/kotlin/core/game/content/activity/allfiredup/KingRoaldAFUMiniDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/activity/allfiredup/KingRoaldAFUMiniDialogue.kt index 1214d9cda..27912626b 100644 --- a/Server/src/main/kotlin/core/game/content/activity/allfiredup/KingRoaldAFUMiniDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/allfiredup/KingRoaldAFUMiniDialogue.kt @@ -1,10 +1,10 @@ -package core.game.content.activity.allfiredup +package rs09.game.content.activity.allfiredup -import core.game.content.dialogue.DialogueFile import core.game.node.item.Item -import core.tools.END_DIALOGUE -import core.tools.Items -import core.tools.START_DIALOGUE +import rs09.game.content.dialogue.DialogueFile +import rs09.tools.END_DIALOGUE +import rs09.tools.Items +import rs09.tools.START_DIALOGUE class KingRoaldAFUMiniDialogue : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { diff --git a/Server/src/main/kotlin/core/game/content/activity/barrows/RewardChest.kt b/Server/src/main/kotlin/rs09/game/content/activity/barrows/RewardChest.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/activity/barrows/RewardChest.kt rename to Server/src/main/kotlin/rs09/game/content/activity/barrows/RewardChest.kt index 79e181177..deb1df0a0 100644 --- a/Server/src/main/kotlin/core/game/content/activity/barrows/RewardChest.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/barrows/RewardChest.kt @@ -1,4 +1,4 @@ -package core.game.content.activity.barrows +package rs09.game.content.activity.barrows import core.game.component.Component import core.game.container.access.InterfaceContainer @@ -7,8 +7,8 @@ import core.game.node.entity.player.Player import core.game.node.item.GroundItemManager import core.game.node.item.Item import core.game.node.item.WeightedChanceItem -import core.tools.Components -import core.tools.Items +import rs09.tools.Components +import rs09.tools.Items import core.tools.RandomFunction import java.util.* diff --git a/Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerActivity.kt b/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerActivity.kt similarity index 95% rename from Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerActivity.kt rename to Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerActivity.kt index ad22ef41b..c2216e843 100644 --- a/Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerActivity.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerActivity.kt @@ -1,16 +1,16 @@ -package core.game.content.activity.fishingtrawler +package rs09.game.content.activity.fishingtrawler import core.game.node.entity.player.Player import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.map.Location import core.game.world.map.build.DynamicRegion import core.game.world.map.zone.ZoneRestriction import core.plugin.Initializable -import core.tools.ticksToSeconds +import rs09.tools.ticksToSeconds import core.game.content.activity.ActivityManager import core.game.content.activity.ActivityPlugin -import core.tools.stringtools.colorize +import rs09.tools.stringtools.colorize /** diff --git a/Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerOptionHandler.kt b/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerOptionHandler.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerOptionHandler.kt rename to Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerOptionHandler.kt index 6764762f6..15fffa6f1 100644 --- a/Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerOptionHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerOptionHandler.kt @@ -1,12 +1,14 @@ -package core.game.content.activity.fishingtrawler +package rs09.game.content.activity.fishingtrawler import core.cache.def.impl.ItemDefinition import core.cache.def.impl.ObjectDefinition +import core.game.content.activity.ActivityManager +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression import core.game.interaction.OptionHandler import core.game.node.Node import core.game.node.entity.player.Player -import core.game.node.entity.player.info.stats.FISHING_TRAWLER_LEAKS_PATCHED -import core.game.node.entity.player.info.stats.STATS_BASE +import core.game.node.entity.skill.Skills import core.game.node.item.GroundItemManager import core.game.node.item.Item import core.game.system.task.Pulse @@ -14,12 +16,10 @@ import core.game.world.map.Location import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items -import core.game.content.activity.ActivityManager -import core.game.content.dialogue.DialoguePlugin -import core.game.content.dialogue.FacialExpression -import core.game.node.entity.skill.Skills -import core.tools.stringtools.colorize +import rs09.game.node.entity.player.info.stats.FISHING_TRAWLER_LEAKS_PATCHED +import rs09.game.node.entity.player.info.stats.STATS_BASE +import rs09.tools.Items +import rs09.tools.stringtools.colorize import kotlin.math.ceil /** diff --git a/Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerOverlay.kt b/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerOverlay.kt similarity index 95% rename from Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerOverlay.kt rename to Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerOverlay.kt index db67fe7ad..542f5c3b3 100644 --- a/Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerOverlay.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerOverlay.kt @@ -1,4 +1,4 @@ -package core.game.content.activity.fishingtrawler +package rs09.game.content.activity.fishingtrawler import core.game.node.entity.player.Player diff --git a/Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerRewardInterface.kt b/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerRewardInterface.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerRewardInterface.kt rename to Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerRewardInterface.kt index 93db0b404..7991057d5 100644 --- a/Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerRewardInterface.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerRewardInterface.kt @@ -1,4 +1,4 @@ -package core.game.content.activity.fishingtrawler +package rs09.game.content.activity.fishingtrawler import core.game.component.Component import core.game.component.ComponentDefinition diff --git a/Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerSession.kt b/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerSession.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerSession.kt rename to Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerSession.kt index 394d61498..83ef8cb6d 100644 --- a/Server/src/main/kotlin/core/game/content/activity/fishingtrawler/FishingTrawlerSession.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerSession.kt @@ -1,22 +1,26 @@ -package core.game.content.activity.fishingtrawler +package rs09.game.content.activity.fishingtrawler import core.game.component.Component import core.game.node.`object`.GameObject import core.game.node.`object`.ObjectBuilder import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player -import core.game.node.entity.player.info.stats.FISHING_TRAWLER_GAMES_WON -import core.game.node.entity.player.info.stats.FISHING_TRAWLER_SHIPS_SANK -import core.game.node.entity.player.info.stats.STATS_BASE import core.game.node.entity.state.EntityState import core.game.node.item.Item import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.map.Location import core.game.world.map.build.DynamicRegion import core.game.world.update.flag.context.Animation import core.plugin.Plugin import core.tools.* +import rs09.game.node.entity.player.info.stats.FISHING_TRAWLER_GAMES_WON +import rs09.game.node.entity.player.info.stats.FISHING_TRAWLER_SHIPS_SANK +import rs09.game.node.entity.player.info.stats.STATS_BASE +import rs09.tools.Components +import rs09.tools.Items +import rs09.tools.secondsToTicks +import rs09.tools.ticksToSeconds import java.util.concurrent.TimeUnit import kotlin.random.Random diff --git a/Server/src/main/kotlin/core/game/content/activity/fishingtrawler/TrawlerLoot.kt b/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/TrawlerLoot.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/activity/fishingtrawler/TrawlerLoot.kt rename to Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/TrawlerLoot.kt index 0b2b18819..522e47872 100644 --- a/Server/src/main/kotlin/core/game/content/activity/fishingtrawler/TrawlerLoot.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/TrawlerLoot.kt @@ -1,8 +1,8 @@ -package core.game.content.activity.fishingtrawler +package rs09.game.content.activity.fishingtrawler import core.game.node.item.Item import core.game.node.item.WeightedChanceItem -import core.tools.Items +import rs09.tools.Items import core.tools.RandomFunction /** diff --git a/Server/src/main/kotlin/core/game/content/activity/fog/FogInteractionHandler.kt b/Server/src/main/kotlin/rs09/game/content/activity/fog/FogInteractionHandler.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/activity/fog/FogInteractionHandler.kt rename to Server/src/main/kotlin/rs09/game/content/activity/fog/FogInteractionHandler.kt index 9dae427ab..77e009f33 100644 --- a/Server/src/main/kotlin/core/game/content/activity/fog/FogInteractionHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/fog/FogInteractionHandler.kt @@ -1,4 +1,4 @@ -package core.game.content.activity.fog +package rs09.game.content.activity.fog import core.game.content.global.action.ClimbActionHandler import core.game.interaction.DestinationFlag diff --git a/Server/src/main/kotlin/core/game/content/activity/fog/ReggieDialogue.kt b/Server/src/main/kotlin/rs09/game/content/activity/fog/ReggieDialogue.kt similarity index 93% rename from Server/src/main/kotlin/core/game/content/activity/fog/ReggieDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/activity/fog/ReggieDialogue.kt index bad9f4e75..1583c6055 100644 --- a/Server/src/main/kotlin/core/game/content/activity/fog/ReggieDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/fog/ReggieDialogue.kt @@ -1,13 +1,13 @@ -package core.game.content.activity.fog +package rs09.game.content.activity.fog import core.game.component.Component import core.game.node.entity.player.Player import core.game.node.item.Item -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.plugin.Initializable -import core.game.interaction.FOGRewardsInterface import core.game.content.dialogue.DialoguePlugin -import core.tools.Components +import rs09.game.interaction.FOGRewardsInterface +import rs09.tools.Components @Initializable class ReggieDialogue(player: Player? = null) : DialoguePlugin(player){ diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/DeliveryBoxHandler.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/DeliveryBoxHandler.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/DeliveryBoxHandler.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/DeliveryBoxHandler.kt index 97ce7f8ad..54e8536fa 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/DeliveryBoxHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/DeliveryBoxHandler.kt @@ -1,4 +1,4 @@ -package core.game.content.activity.gnomecooking +package rs09.game.content.activity.gnomecooking import core.cache.def.impl.ItemDefinition import core.game.interaction.OptionHandler diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/GCRewardTokenHandler.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/GCRewardTokenHandler.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/GCRewardTokenHandler.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/GCRewardTokenHandler.kt index 9d42249b2..f260afc00 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/GCRewardTokenHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/GCRewardTokenHandler.kt @@ -1,13 +1,13 @@ -package core.game.content.activity.gnomecooking +package rs09.game.content.activity.gnomecooking import core.cache.def.impl.ItemDefinition -import core.tools.Items +import rs09.tools.Items 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.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.plugin.Initializable import core.plugin.Plugin import core.tools.RandomFunction diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/GnomeCookingConstants.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/GnomeCookingConstants.kt similarity index 89% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/GnomeCookingConstants.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/GnomeCookingConstants.kt index 8dea239de..b974b25ae 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/GnomeCookingConstants.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/GnomeCookingConstants.kt @@ -1,4 +1,4 @@ -package core.game.content.activity.gnomecooking +package rs09.game.content.activity.gnomecooking const val GC_BASE_ATTRIBUTE = "gnome_cooking" const val GC_TUT_PROG = "tutorial:stage" diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/GnomeCookingJob.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/GnomeCookingJob.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/GnomeCookingJob.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/GnomeCookingJob.kt index dcc93ecd0..560838c84 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/GnomeCookingJob.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/GnomeCookingJob.kt @@ -1,4 +1,4 @@ -package core.game.content.activity.gnomecooking +package rs09.game.content.activity.gnomecooking enum class GnomeCookingJob(val level: GnomeTipper.LEVEL, val npc_id: Int, val tip: String) { CPT_ERRDO(GnomeTipper.LEVEL.EASY,3811, "at the top level of the Grand Tree."), diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/GnomeTipper.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/GnomeTipper.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/GnomeTipper.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/GnomeTipper.kt index e8826c9da..73af6b350 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/GnomeTipper.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/GnomeTipper.kt @@ -1,6 +1,6 @@ -package core.game.content.activity.gnomecooking +package rs09.game.content.activity.gnomecooking -import core.tools.Items +import rs09.tools.Items import core.game.node.item.Item import core.game.node.item.WeightedChanceItem import core.tools.RandomFunction diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaCooker.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/battas/GnomeBattaCooker.kt similarity index 95% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaCooker.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/battas/GnomeBattaCooker.kt index e8ffc48ff..adda91ab4 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaCooker.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/battas/GnomeBattaCooker.kt @@ -1,12 +1,12 @@ -package core.game.content.activity.gnomecooking.battas +package rs09.game.content.activity.gnomecooking.battas -import core.tools.Items +import rs09.tools.Items 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.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaDishFiller.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/battas/GnomeBattaDishFiller.kt similarity index 92% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaDishFiller.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/battas/GnomeBattaDishFiller.kt index a9266e991..7808c237f 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaDishFiller.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/battas/GnomeBattaDishFiller.kt @@ -1,6 +1,6 @@ -package core.game.content.activity.gnomecooking.battas +package rs09.game.content.activity.gnomecooking.battas -import core.tools.Items +import rs09.tools.Items import core.game.interaction.NodeUsageEvent import core.game.interaction.UseWithHandler import core.game.node.item.Item diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaGarnisher.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/battas/GnomeBattaGarnisher.kt similarity index 95% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaGarnisher.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/battas/GnomeBattaGarnisher.kt index 4f3cb4f0b..9a6c61606 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaGarnisher.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/battas/GnomeBattaGarnisher.kt @@ -1,6 +1,6 @@ -package core.game.content.activity.gnomecooking.battas +package rs09.game.content.activity.gnomecooking.battas -import core.tools.Items +import rs09.tools.Items import core.game.interaction.NodeUsageEvent import core.game.interaction.UseWithHandler import core.game.node.item.Item diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaInterface.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/battas/GnomeBattaInterface.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaInterface.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/battas/GnomeBattaInterface.kt index 930808066..a6f3f2180 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaInterface.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/battas/GnomeBattaInterface.kt @@ -1,9 +1,9 @@ -package core.game.content.activity.gnomecooking.battas +package rs09.game.content.activity.gnomecooking.battas import core.game.component.Component import core.game.component.ComponentDefinition import core.game.component.ComponentPlugin -import core.tools.Items +import rs09.tools.Items import core.game.node.entity.player.Player import core.game.node.item.Item import core.plugin.Initializable diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaPrepareHandler.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/battas/GnomeBattaPrepareHandler.kt similarity index 87% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaPrepareHandler.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/battas/GnomeBattaPrepareHandler.kt index 0826bd9be..cb7ac3a73 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/battas/GnomeBattaPrepareHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/battas/GnomeBattaPrepareHandler.kt @@ -1,14 +1,14 @@ -package core.game.content.activity.gnomecooking.battas +package rs09.game.content.activity.gnomecooking.battas import core.cache.def.impl.ItemDefinition import core.game.component.Component -import core.tools.Items +import rs09.tools.Items import core.game.interaction.OptionHandler import core.game.node.Node import core.game.node.entity.player.Player import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Components +import rs09.tools.Components /** * Handles the prepare option for gnome battas diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomeBowlCooker.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/bowls/GnomeBowlCooker.kt similarity index 95% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomeBowlCooker.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/bowls/GnomeBowlCooker.kt index 8ba79fd29..5ff6d3c79 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomeBowlCooker.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/bowls/GnomeBowlCooker.kt @@ -1,12 +1,12 @@ -package core.game.content.activity.gnomecooking.bowls +package rs09.game.content.activity.gnomecooking.bowls -import core.tools.Items +import rs09.tools.Items 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.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomeBowlGarnisher.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/bowls/GnomeBowlGarnisher.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomeBowlGarnisher.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/bowls/GnomeBowlGarnisher.kt index ca9ae585d..dc1ebb4c8 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomeBowlGarnisher.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/bowls/GnomeBowlGarnisher.kt @@ -1,7 +1,7 @@ -package core.game.content.activity.gnomecooking.bowls +package rs09.game.content.activity.gnomecooking.bowls import core.game.interaction.UseWithHandler -import core.tools.Items +import rs09.tools.Items import core.game.interaction.NodeUsageEvent import core.game.node.item.Item import core.plugin.Initializable diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomeBowlInterface.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/bowls/GnomeBowlInterface.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomeBowlInterface.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/bowls/GnomeBowlInterface.kt index 390bffbf4..177cc74b4 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomeBowlInterface.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/bowls/GnomeBowlInterface.kt @@ -1,9 +1,9 @@ -package core.game.content.activity.gnomecooking.bowls +package rs09.game.content.activity.gnomecooking.bowls import core.game.component.Component import core.game.component.ComponentDefinition import core.game.component.ComponentPlugin -import core.tools.Items +import rs09.tools.Items import core.game.node.entity.player.Player import core.game.node.item.Item import core.plugin.Initializable diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomeBowlPrepareHandler.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/bowls/GnomeBowlPrepareHandler.kt similarity index 86% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomeBowlPrepareHandler.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/bowls/GnomeBowlPrepareHandler.kt index 65529125e..312b2c25a 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomeBowlPrepareHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/bowls/GnomeBowlPrepareHandler.kt @@ -1,14 +1,14 @@ -package core.game.content.activity.gnomecooking.bowls +package rs09.game.content.activity.gnomecooking.bowls import core.cache.def.impl.ItemDefinition import core.game.component.Component -import core.tools.Items +import rs09.tools.Items import core.game.interaction.OptionHandler import core.game.node.Node import core.game.node.entity.player.Player import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Components +import rs09.tools.Components @Initializable class GnomeBowlPrepareHandler : OptionHandler() { diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomebowlMouldFiller.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/bowls/GnomebowlMouldFiller.kt similarity index 91% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomebowlMouldFiller.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/bowls/GnomebowlMouldFiller.kt index c2ee2be5e..439ab64d7 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/bowls/GnomebowlMouldFiller.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/bowls/GnomebowlMouldFiller.kt @@ -1,11 +1,11 @@ -package core.game.content.activity.gnomecooking.bowls +package rs09.game.content.activity.gnomecooking.bowls import core.game.interaction.NodeUsageEvent import core.game.interaction.UseWithHandler import core.game.node.item.Item import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items +import rs09.tools.Items private const val GNOME_BOWL_MOLD = 2166 private const val GIANNE_DOUGH = 2171 diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/CocktailCooker.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/cocktails/CocktailCooker.kt similarity index 95% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/CocktailCooker.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/cocktails/CocktailCooker.kt index 08a1884d2..8c65cfa50 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/CocktailCooker.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/cocktails/CocktailCooker.kt @@ -1,11 +1,11 @@ -package core.game.content.activity.gnomecooking.cocktails +package rs09.game.content.activity.gnomecooking.cocktails 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.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/CocktailFinisher.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/cocktails/CocktailFinisher.kt similarity index 95% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/CocktailFinisher.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/cocktails/CocktailFinisher.kt index 16a7b9838..78292611f 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/CocktailFinisher.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/cocktails/CocktailFinisher.kt @@ -1,7 +1,7 @@ -package core.game.content.activity.gnomecooking.cocktails +package rs09.game.content.activity.gnomecooking.cocktails import core.cache.def.impl.ItemDefinition -import core.tools.Items +import rs09.tools.Items import core.game.interaction.OptionHandler import core.game.node.Node import core.game.node.entity.player.Player diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/CocktailShakerHandler.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/cocktails/CocktailShakerHandler.kt similarity index 90% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/CocktailShakerHandler.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/cocktails/CocktailShakerHandler.kt index e9666b2e4..3ed69716d 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/CocktailShakerHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/cocktails/CocktailShakerHandler.kt @@ -1,4 +1,4 @@ -package core.game.content.activity.gnomecooking.cocktails +package rs09.game.content.activity.gnomecooking.cocktails import core.cache.def.impl.ItemDefinition import core.game.component.Component @@ -7,7 +7,7 @@ import core.game.node.Node import core.game.node.entity.player.Player import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Components +import rs09.tools.Components /** * Handles the mix-cocktail option for the cocktail shaker diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/GnomeCocktailInterface.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/cocktails/GnomeCocktailInterface.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/GnomeCocktailInterface.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/cocktails/GnomeCocktailInterface.kt index caf6e81d5..e0fe88d78 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/GnomeCocktailInterface.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/cocktails/GnomeCocktailInterface.kt @@ -1,4 +1,4 @@ -package core.game.content.activity.gnomecooking.cocktails +package rs09.game.content.activity.gnomecooking.cocktails import core.game.component.Component import core.game.component.ComponentDefinition @@ -7,7 +7,7 @@ import core.game.node.entity.player.Player import core.game.node.item.Item import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items +import rs09.tools.Items import core.game.node.entity.skill.Skills private const val WIZARD_BLIZZARD = 2054 diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/PourMixerPlugin.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/cocktails/PourMixerPlugin.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/PourMixerPlugin.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/cocktails/PourMixerPlugin.kt index 52b046351..1f8b95051 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/cocktails/PourMixerPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/cocktails/PourMixerPlugin.kt @@ -1,7 +1,7 @@ -package core.game.content.activity.gnomecooking.cocktails +package rs09.game.content.activity.gnomecooking.cocktails import core.cache.def.impl.ItemDefinition -import core.tools.Items +import rs09.tools.Items import core.game.interaction.OptionHandler import core.game.node.Node import core.game.node.entity.player.Player diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyCooker.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/crunchies/GnomeCrunchyCooker.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyCooker.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/crunchies/GnomeCrunchyCooker.kt index 80d671754..75d4958e6 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyCooker.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/crunchies/GnomeCrunchyCooker.kt @@ -1,11 +1,11 @@ -package core.game.content.activity.gnomecooking.crunchies +package rs09.game.content.activity.gnomecooking.crunchies 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.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyGarnisher.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/crunchies/GnomeCrunchyGarnisher.kt similarity index 95% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyGarnisher.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/crunchies/GnomeCrunchyGarnisher.kt index 17eb5fab8..7819830d6 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyGarnisher.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/crunchies/GnomeCrunchyGarnisher.kt @@ -1,6 +1,6 @@ -package core.game.content.activity.gnomecooking.crunchies +package rs09.game.content.activity.gnomecooking.crunchies -import core.tools.Items +import rs09.tools.Items import core.game.interaction.NodeUsageEvent import core.game.interaction.UseWithHandler import core.game.node.item.Item diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyInterface.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/crunchies/GnomeCrunchyInterface.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyInterface.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/crunchies/GnomeCrunchyInterface.kt index 45f42ecc3..3fad5bd8f 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyInterface.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/crunchies/GnomeCrunchyInterface.kt @@ -1,4 +1,4 @@ -package core.game.content.activity.gnomecooking.crunchies +package rs09.game.content.activity.gnomecooking.crunchies import core.game.component.Component import core.game.component.ComponentDefinition @@ -7,7 +7,7 @@ import core.game.node.entity.player.Player import core.game.node.item.Item import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items +import rs09.tools.Items import core.game.node.entity.skill.Skills private const val TOAD_CRUNCHIES = 9538 diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyPrepareHandler.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/crunchies/GnomeCrunchyPrepareHandler.kt similarity index 90% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyPrepareHandler.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/crunchies/GnomeCrunchyPrepareHandler.kt index 00bad3105..a42ffff40 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyPrepareHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/crunchies/GnomeCrunchyPrepareHandler.kt @@ -1,4 +1,4 @@ -package core.game.content.activity.gnomecooking.crunchies +package rs09.game.content.activity.gnomecooking.crunchies import core.cache.def.impl.ItemDefinition import core.game.component.Component @@ -7,7 +7,7 @@ import core.game.node.Node import core.game.node.entity.player.Player import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Components +import rs09.tools.Components private const val HALF_BAKED_CRUNCHY = 2201 private const val CRUNCHY_INTERFACE = Components.gnome_crunchies_437 diff --git a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyTrayFiller.kt b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/crunchies/GnomeCrunchyTrayFiller.kt similarity index 93% rename from Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyTrayFiller.kt rename to Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/crunchies/GnomeCrunchyTrayFiller.kt index 1f0a71440..80c4e4864 100644 --- a/Server/src/main/kotlin/core/game/content/activity/gnomecooking/crunchies/GnomeCrunchyTrayFiller.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/gnomecooking/crunchies/GnomeCrunchyTrayFiller.kt @@ -1,4 +1,4 @@ -package core.game.content.activity.gnomecooking.crunchies +package rs09.game.content.activity.gnomecooking.crunchies import core.game.interaction.NodeUsageEvent import core.game.interaction.UseWithHandler diff --git a/Server/src/main/kotlin/core/game/content/activity/mta/EnchantSpell.kt b/Server/src/main/kotlin/rs09/game/content/activity/mta/EnchantSpell.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/activity/mta/EnchantSpell.kt rename to Server/src/main/kotlin/rs09/game/content/activity/mta/EnchantSpell.kt index be4c55a8d..a3565e22a 100644 --- a/Server/src/main/kotlin/core/game/content/activity/mta/EnchantSpell.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/mta/EnchantSpell.kt @@ -1,20 +1,21 @@ -package core.game.content.activity.mta +package rs09.game.content.activity.mta -import core.tools.Items +import core.game.content.activity.mta.MTAType +import core.game.content.activity.mta.impl.EnchantingZone +import core.game.content.activity.mta.impl.EnchantingZone.Shapes import core.game.node.Node import core.game.node.entity.Entity 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.entity.player.link.audio.Audio +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.world.update.flag.context.Animation import core.game.world.update.flag.context.Graphics import core.plugin.Plugin -import core.game.content.activity.mta.impl.EnchantingZone -import core.game.content.activity.mta.impl.EnchantingZone.Shapes -import core.game.node.entity.skill.magic.MagicSpell -import core.game.node.entity.skill.magic.Runes +import rs09.tools.Items /** * Represents the enchant spells. diff --git a/Server/src/main/kotlin/core/game/content/activity/pestcontrol/PestControlHelper.kt b/Server/src/main/kotlin/rs09/game/content/activity/pestcontrol/PestControlHelper.kt similarity index 92% rename from Server/src/main/kotlin/core/game/content/activity/pestcontrol/PestControlHelper.kt rename to Server/src/main/kotlin/rs09/game/content/activity/pestcontrol/PestControlHelper.kt index 09ae781a0..372c52037 100644 --- a/Server/src/main/kotlin/core/game/content/activity/pestcontrol/PestControlHelper.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/pestcontrol/PestControlHelper.kt @@ -1,10 +1,11 @@ -package core.game.content.activity.pestcontrol +package rs09.game.content.activity.pestcontrol +import core.game.content.activity.pestcontrol.PestControlSession import core.game.node.entity.player.Player import core.game.world.map.Location import core.game.world.map.zone.ZoneBorders -import plugin.ai.minigamebots.pestcontrol.PestControlTestBot -import plugin.ai.minigamebots.pestcontrol.PestControlTestBot2 +import rs09.game.ai.minigamebots.pestcontrol.PestControlTestBot +import rs09.game.ai.minigamebots.pestcontrol.PestControlTestBot2 import kotlin.random.Random diff --git a/Server/src/main/kotlin/core/game/content/activity/pyramidplunder/PlunderSession.kt b/Server/src/main/kotlin/rs09/game/content/activity/pyramidplunder/PlunderSession.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/activity/pyramidplunder/PlunderSession.kt rename to Server/src/main/kotlin/rs09/game/content/activity/pyramidplunder/PlunderSession.kt index f4dc79fe7..591ef3b0a 100644 --- a/Server/src/main/kotlin/core/game/content/activity/pyramidplunder/PlunderSession.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/pyramidplunder/PlunderSession.kt @@ -1,11 +1,11 @@ -package core.game.content.activity.pyramidplunder +package rs09.game.content.activity.pyramidplunder import core.game.component.Component import core.game.node.entity.player.Player import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.map.Location -import core.tools.Components +import rs09.tools.Components import core.tools.RandomFunction class PlunderSession(val player: Player) { diff --git a/Server/src/main/kotlin/core/game/content/ame/events/SandwichLadyHandler.kt b/Server/src/main/kotlin/rs09/game/content/ame/events/SandwichLadyHandler.kt similarity index 95% rename from Server/src/main/kotlin/core/game/content/ame/events/SandwichLadyHandler.kt rename to Server/src/main/kotlin/rs09/game/content/ame/events/SandwichLadyHandler.kt index 0e7095626..7520e0a3c 100644 --- a/Server/src/main/kotlin/core/game/content/ame/events/SandwichLadyHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/ame/events/SandwichLadyHandler.kt @@ -1,16 +1,16 @@ -package core.game.content.ame.events +package rs09.game.content.ame.events import core.game.component.Component +import core.game.content.quest.PluginInteraction +import core.game.content.quest.PluginInteractionManager import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse import core.game.interaction.Option import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.plugin.Initializable import core.plugin.Plugin -import core.game.content.quest.PluginInteraction -import core.game.content.quest.PluginInteractionManager @Initializable class SandwichLadyHandler : PluginInteraction(3117){ diff --git a/Server/src/main/kotlin/core/game/content/ame/events/SandwichLadyInterface.kt b/Server/src/main/kotlin/rs09/game/content/ame/events/SandwichLadyInterface.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/ame/events/SandwichLadyInterface.kt rename to Server/src/main/kotlin/rs09/game/content/ame/events/SandwichLadyInterface.kt index 9413feeae..a6e95fc3e 100644 --- a/Server/src/main/kotlin/core/game/content/ame/events/SandwichLadyInterface.kt +++ b/Server/src/main/kotlin/rs09/game/content/ame/events/SandwichLadyInterface.kt @@ -1,4 +1,4 @@ -package core.game.content.ame.events +package rs09.game.content.ame.events import core.game.component.Component import core.game.component.ComponentDefinition @@ -8,7 +8,7 @@ import core.game.node.item.GroundItemManager import core.game.node.item.Item import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items +import rs09.tools.Items @Initializable class SandwichLadyInterface : ComponentPlugin(){ diff --git a/Server/src/main/kotlin/core/game/content/ame/events/SandwichLadyNPC.kt b/Server/src/main/kotlin/rs09/game/content/ame/events/SandwichLadyNPC.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/ame/events/SandwichLadyNPC.kt rename to Server/src/main/kotlin/rs09/game/content/ame/events/SandwichLadyNPC.kt index c20dd1a2b..2a8e27962 100644 --- a/Server/src/main/kotlin/core/game/content/ame/events/SandwichLadyNPC.kt +++ b/Server/src/main/kotlin/rs09/game/content/ame/events/SandwichLadyNPC.kt @@ -1,5 +1,7 @@ -package core.game.content.ame.events +package rs09.game.content.ame.events +import core.game.content.ame.AntiMacroEvent +import core.game.content.ame.AntiMacroHandler import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse import core.game.node.entity.npc.AbstractNPC @@ -7,9 +9,6 @@ import core.game.node.entity.player.Player import core.game.world.map.Location import core.plugin.Initializable import core.tools.RandomFunction -import core.game.content.ame.AntiMacroEvent -import core.game.content.ame.AntiMacroHandler -import java.nio.ByteBuffer @Initializable class SandwichLadyEvent : AntiMacroEvent("Sandwich Lady",false,false, 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23){ diff --git a/Server/src/main/kotlin/core/game/content/consumable/effects/RestoreSummoning.kt b/Server/src/main/kotlin/rs09/game/content/consumable/effects/RestoreSummoning.kt similarity index 93% rename from Server/src/main/kotlin/core/game/content/consumable/effects/RestoreSummoning.kt rename to Server/src/main/kotlin/rs09/game/content/consumable/effects/RestoreSummoning.kt index 506520c26..aa48b16a8 100644 --- a/Server/src/main/kotlin/core/game/content/consumable/effects/RestoreSummoning.kt +++ b/Server/src/main/kotlin/rs09/game/content/consumable/effects/RestoreSummoning.kt @@ -1,4 +1,4 @@ -package core.game.content.consumable.effects +package rs09.game.content.consumable.effects import core.game.node.entity.player.Player import core.game.content.consumable.ConsumableEffect diff --git a/Server/src/main/kotlin/core/game/content/dialogue/AberabDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/AberabDialogue.kt similarity index 85% rename from Server/src/main/kotlin/core/game/content/dialogue/AberabDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/AberabDialogue.kt index 54f9ccfb5..5e6f42c9b 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/AberabDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/AberabDialogue.kt @@ -1,5 +1,7 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.plugin.Initializable diff --git a/Server/src/main/kotlin/core/game/content/dialogue/AchiettiesDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/AchiettiesDialogue.kt similarity index 85% rename from Server/src/main/kotlin/core/game/content/dialogue/AchiettiesDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/AchiettiesDialogue.kt index 48becf63d..63344b3b7 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/AchiettiesDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/AchiettiesDialogue.kt @@ -1,5 +1,7 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.plugin.Initializable diff --git a/Server/src/main/kotlin/core/game/content/dialogue/AfflictedDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/AfflictedDialogue.kt similarity index 89% rename from Server/src/main/kotlin/core/game/content/dialogue/AfflictedDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/AfflictedDialogue.kt index 0411bb398..98f92ef5c 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/AfflictedDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/AfflictedDialogue.kt @@ -1,11 +1,11 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.plugin.Initializable import core.tools.RandomFunction -import java.util.* -import java.util.Arrays /** diff --git a/Server/src/main/kotlin/core/game/content/dialogue/AfrahDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/AfrahDialogue.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/dialogue/AfrahDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/AfrahDialogue.kt index ea3fb9064..94751ca20 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/AfrahDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/AfrahDialogue.kt @@ -1,5 +1,7 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.plugin.Initializable diff --git a/Server/src/main/kotlin/core/game/content/dialogue/AgilityBossDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/AgilityBossDialogue.kt similarity index 93% rename from Server/src/main/kotlin/core/game/content/dialogue/AgilityBossDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/AgilityBossDialogue.kt index db4873faf..0b62b2825 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/AgilityBossDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/AgilityBossDialogue.kt @@ -1,5 +1,7 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.plugin.Initializable diff --git a/Server/src/main/kotlin/core/game/content/dialogue/AgmundiDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/AgmundiDialogue.kt similarity index 95% rename from Server/src/main/kotlin/core/game/content/dialogue/AgmundiDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/AgmundiDialogue.kt index dec486ab8..a3878c4ea 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/AgmundiDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/AgmundiDialogue.kt @@ -1,5 +1,7 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.plugin.Initializable diff --git a/Server/src/main/kotlin/core/game/content/dialogue/AluftGianneJrDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/AluftGianneJrDialogue.kt similarity index 84% rename from Server/src/main/kotlin/core/game/content/dialogue/AluftGianneJrDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/AluftGianneJrDialogue.kt index 24e07c0b2..27eb8a084 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/AluftGianneJrDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/AluftGianneJrDialogue.kt @@ -1,10 +1,12 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue import core.game.component.Component +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression import core.game.node.entity.player.Player import core.plugin.Initializable -import core.game.content.activity.gnomecooking.GC_BASE_ATTRIBUTE -import core.game.content.activity.gnomecooking.GC_TUT_PROG +import rs09.game.content.activity.gnomecooking.GC_BASE_ATTRIBUTE +import rs09.game.content.activity.gnomecooking.GC_TUT_PROG @Initializable class AluftGianneJrDialogue(player: Player? = null) : DialoguePlugin(player) { diff --git a/Server/src/main/kotlin/core/game/content/dialogue/AluftGianneSnrDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/AluftGianneSnrDialogue.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/dialogue/AluftGianneSnrDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/AluftGianneSnrDialogue.kt index 4b2bbc816..c3f7098c0 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/AluftGianneSnrDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/AluftGianneSnrDialogue.kt @@ -1,17 +1,19 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue import core.game.component.Component -import core.tools.Items +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.item.Item import core.game.system.task.Pulse -import core.game.world.GameWorld import core.plugin.Initializable import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch -import core.game.content.activity.gnomecooking.* -import core.tools.stringtools.colorize +import rs09.game.content.activity.gnomecooking.* +import rs09.game.world.GameWorld +import rs09.tools.Items +import rs09.tools.stringtools.colorize import java.util.concurrent.TimeUnit val gnomeItems = arrayOf(Items.FRUIT_BATTA_2277,Items.TOAD_BATTA_2255,Items.CHEESE_PLUSTOM_BATTA_2259,Items.WORM_BATTA_2253,Items.VEGETABLE_BATTA_2281, diff --git a/Server/src/main/kotlin/core/game/content/dialogue/AsyffDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/AsyffDialogue.kt similarity index 94% rename from Server/src/main/kotlin/core/game/content/dialogue/AsyffDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/AsyffDialogue.kt index d408fde01..423735b36 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/AsyffDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/AsyffDialogue.kt @@ -1,10 +1,12 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue import core.game.component.Component +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.plugin.Initializable -import core.tools.Components +import rs09.tools.Components /** * Dialogue for Asyff, the fancy dress shop owner diff --git a/Server/src/main/kotlin/core/game/content/dialogue/BlurberryDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/BlurberryDialogue.kt similarity index 91% rename from Server/src/main/kotlin/core/game/content/dialogue/BlurberryDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/BlurberryDialogue.kt index c9d879d80..6fa8d5461 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/BlurberryDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/BlurberryDialogue.kt @@ -1,12 +1,13 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue +import core.game.content.dialogue.DialoguePlugin import core.game.node.entity.player.Player import core.game.node.item.Item import core.plugin.Initializable -import core.tools.Items -import core.game.content.activity.gnomecooking.GC_BASE_ATTRIBUTE -import core.game.content.activity.gnomecooking.GC_TUT_FIN -import core.game.content.activity.gnomecooking.GC_TUT_PROG +import rs09.game.content.activity.gnomecooking.GC_BASE_ATTRIBUTE +import rs09.game.content.activity.gnomecooking.GC_TUT_FIN +import rs09.game.content.activity.gnomecooking.GC_TUT_PROG +import rs09.tools.Items @Initializable class BlurberryDialogue(player: Player? = null): DialoguePlugin(player) { diff --git a/Server/src/main/kotlin/core/game/content/dialogue/BrotherBordissDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/BrotherBordissDialogue.kt similarity index 95% rename from Server/src/main/kotlin/core/game/content/dialogue/BrotherBordissDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/BrotherBordissDialogue.kt index de58736c9..32b860798 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/BrotherBordissDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/BrotherBordissDialogue.kt @@ -1,10 +1,12 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue import core.game.component.Component +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression import core.game.node.entity.player.Player import core.game.node.item.Item import core.plugin.Initializable -import core.tools.Items +import rs09.tools.Items @Initializable /** diff --git a/Server/src/main/kotlin/core/game/content/dialogue/DialogueFile.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/DialogueFile.kt similarity index 93% rename from Server/src/main/kotlin/core/game/content/dialogue/DialogueFile.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/DialogueFile.kt index 8372b84fa..2489af478 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/DialogueFile.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/DialogueFile.kt @@ -1,10 +1,13 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue import core.game.component.Component +import core.game.content.dialogue.DialogueInterpreter +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression import core.game.node.entity.Entity import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player -import core.tools.START_DIALOGUE +import rs09.tools.START_DIALOGUE abstract class DialogueFile { var player: Player? = null diff --git a/Server/src/main/kotlin/core/game/content/dialogue/DukeHoracioDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/DukeHoracioDialogue.kt similarity index 88% rename from Server/src/main/kotlin/core/game/content/dialogue/DukeHoracioDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/DukeHoracioDialogue.kt index a20de3b8e..859ce605e 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/DukeHoracioDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/DukeHoracioDialogue.kt @@ -1,19 +1,16 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue import core.game.content.dialogue.DialoguePlugin -import core.game.content.quest.free.dragonslayer.DragonSlayer -import core.game.content.quest.free.dragonslayer.DukeHoracioDSDialogue -import core.game.content.quest.members.thelosttribe.DukeHoracioTLTDialogue import core.game.content.dialogue.FacialExpression -import core.game.node.entity.player.link.diary.DiaryType -import core.game.node.entity.player.link.quest.Quest -import core.game.content.quest.free.runemysteries.DukeHoracioRMDialogue -import core.game.content.dialogue.DukeHoracioDialogue +import core.game.content.quest.free.dragonslayer.DragonSlayer import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player -import core.game.node.item.Item -import core.tools.DIALOGUE_INITIAL_OPTIONS_HANDLE -import core.tools.END_DIALOGUE +import core.game.node.entity.player.link.diary.DiaryType +import rs09.game.content.quest.free.dragonslayer.DukeHoracioDSDialogue +import rs09.game.content.quest.free.runemysteries.DukeHoracioRMDialogue +import rs09.game.content.quest.members.thelosttribe.DukeHoracioTLTDialogue +import rs09.tools.DIALOGUE_INITIAL_OPTIONS_HANDLE +import rs09.tools.END_DIALOGUE /** * Core dialogue plugin for Duke Horacio, redirects to more specific DialogueFiles. diff --git a/Server/src/main/kotlin/core/game/content/dialogue/ElsieDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/ElsieDialogue.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/dialogue/ElsieDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/ElsieDialogue.kt index 8d6e7a15f..68e582aa1 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/ElsieDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/ElsieDialogue.kt @@ -1,10 +1,11 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue -import core.tools.Items +import core.game.content.dialogue.DialoguePlugin import core.game.node.entity.player.Player import core.game.node.entity.player.link.diary.DiaryType import core.game.node.item.Item import core.plugin.Initializable +import rs09.tools.Items /** * Elsie diff --git a/Server/src/main/kotlin/core/game/content/dialogue/EmptyPlugin.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/EmptyPlugin.kt similarity index 86% rename from Server/src/main/kotlin/core/game/content/dialogue/EmptyPlugin.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/EmptyPlugin.kt index 2d8a1e146..91a35127c 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/EmptyPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/EmptyPlugin.kt @@ -1,8 +1,9 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue +import core.game.content.dialogue.DialoguePlugin import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player -import core.tools.START_DIALOGUE +import rs09.tools.START_DIALOGUE class EmptyPlugin(player: Player? = null,val file: DialogueFile?) : DialoguePlugin(player) { override fun newInstance(player: Player?): DialoguePlugin { diff --git a/Server/src/main/kotlin/core/game/content/dialogue/GabootyDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/GabootyDialogue.kt similarity index 95% rename from Server/src/main/kotlin/core/game/content/dialogue/GabootyDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/GabootyDialogue.kt index 970dd610c..1f77413a7 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/GabootyDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/GabootyDialogue.kt @@ -1,15 +1,11 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue -import com.sun.org.apache.xpath.internal.operations.Bool -import core.cache.def.impl.NPCDefinition -import core.cache.def.impl.ObjectDefinition -import core.game.content.global.shop.Shop +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player -import core.game.system.config.ShopParser -import core.game.system.config.ShopParser.Companion.SHOPS import core.plugin.Initializable -import core.plugin.Plugin +import rs09.game.system.config.ShopParser /** * Dialogue for Gabooty diff --git a/Server/src/main/kotlin/core/game/content/dialogue/GeoffreyDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/GeoffreyDialogue.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/dialogue/GeoffreyDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/GeoffreyDialogue.kt index 089689824..8b75ac7aa 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/GeoffreyDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/GeoffreyDialogue.kt @@ -1,11 +1,12 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue import core.Util -import core.tools.Items +import core.game.content.dialogue.DialoguePlugin import core.game.node.entity.player.Player import core.game.node.entity.player.link.diary.DiaryType import core.game.node.item.Item import core.plugin.Initializable +import rs09.tools.Items @Initializable class GeoffreyDialogue(player: Player? = null) : DialoguePlugin(player) { diff --git a/Server/src/main/kotlin/core/game/content/dialogue/IffieDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/IffieDialogue.kt similarity index 90% rename from Server/src/main/kotlin/core/game/content/dialogue/IffieDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/IffieDialogue.kt index 1550208f2..8cb3b2f4d 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/IffieDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/IffieDialogue.kt @@ -1,5 +1,6 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue +import core.game.content.dialogue.DialoguePlugin import core.game.node.entity.player.Player import core.plugin.Initializable diff --git a/Server/src/main/kotlin/core/game/content/dialogue/KingRoaldDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/KingRoaldDialogue.kt similarity index 75% rename from Server/src/main/kotlin/core/game/content/dialogue/KingRoaldDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/KingRoaldDialogue.kt index 095b6d70e..f61e625c8 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/KingRoaldDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/KingRoaldDialogue.kt @@ -1,14 +1,16 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue -import core.game.content.quest.members.allfiredup.KingRoaldAFUDialogue -import core.game.content.activity.allfiredup.KingRoaldAFUMiniDialogue -import core.game.content.quest.free.shieldofarrav.KingRoaldArravDialogue -import core.game.content.quest.members.priestinperil.KingRoaldPIPDialogue +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player -import core.tools.DIALOGUE_INITIAL_OPTIONS_HANDLE -import core.tools.END_DIALOGUE -import core.tools.START_DIALOGUE +import rs09.game.content.activity.allfiredup.KingRoaldAFUMiniDialogue +import rs09.game.content.quest.free.shieldofarrav.KingRoaldArravDialogue +import rs09.game.content.quest.members.allfiredup.KingRoaldAFUDialogue +import rs09.game.content.quest.members.priestinperil.KingRoaldPIPDialogue +import rs09.tools.DIALOGUE_INITIAL_OPTIONS_HANDLE +import rs09.tools.END_DIALOGUE +import rs09.tools.START_DIALOGUE /** * Central dialogue plugin for King Roald. Reroutes to the more specific DialogueFiles @@ -32,14 +34,14 @@ class KingRoaldDialogue(player: Player? = null) : DialoguePlugin(player) { if(player.questRepository.isComplete("Priest in Peril")) { if (!player.questRepository.hasStarted("All Fired Up") || player.questRepository.getQuest("All Fired Up").getStage(player) == 90) { - addOption("All Fired Up",KingRoaldAFUDialogue(player.questRepository.getStage("All Fired Up"))) + addOption("All Fired Up", KingRoaldAFUDialogue(player.questRepository.getStage("All Fired Up"))) } } else { - addOption("Priest in Peril",KingRoaldPIPDialogue(player.questRepository.getStage("Priest in Peril"))) + addOption("Priest in Peril", KingRoaldPIPDialogue(player.questRepository.getStage("Priest in Peril"))) } if (player.questRepository.getQuest("Shield of Arrav").isStarted(player) && !player.questRepository.getQuest("Shield of Arrav").isCompleted(player)) { - addOption("Shield of Arrav",KingRoaldArravDialogue()) + addOption("Shield of Arrav", KingRoaldArravDialogue()) } if(!sendChoices()){ diff --git a/Server/src/main/kotlin/core/game/content/dialogue/LegendsGuardDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/LegendsGuardDialogue.kt similarity index 91% rename from Server/src/main/kotlin/core/game/content/dialogue/LegendsGuardDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/LegendsGuardDialogue.kt index 031087455..a529844fb 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/LegendsGuardDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/LegendsGuardDialogue.kt @@ -1,5 +1,7 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.plugin.Initializable diff --git a/Server/src/main/kotlin/core/game/content/dialogue/LensaDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/LensaDialogue.kt similarity index 90% rename from Server/src/main/kotlin/core/game/content/dialogue/LensaDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/LensaDialogue.kt index 318e3433d..82b0c136a 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/LensaDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/LensaDialogue.kt @@ -1,5 +1,7 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.plugin.Initializable diff --git a/Server/src/main/kotlin/core/game/content/dialogue/MistagDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/MistagDialogue.kt similarity index 87% rename from Server/src/main/kotlin/core/game/content/dialogue/MistagDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/MistagDialogue.kt index ca9371b68..c2a3af389 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/MistagDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/MistagDialogue.kt @@ -1,13 +1,15 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue import core.game.component.Component import core.game.node.entity.player.Player import core.plugin.Initializable import core.game.content.activity.ActivityManager -import core.game.content.quest.members.thelosttribe.GoblinFollower -import core.game.content.quest.members.thelosttribe.MistagLTDialogue -import core.tools.END_DIALOGUE -import core.tools.START_DIALOGUE +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression +import rs09.game.content.quest.members.thelosttribe.GoblinFollower +import rs09.game.content.quest.members.thelosttribe.MistagLTDialogue +import rs09.tools.END_DIALOGUE +import rs09.tools.START_DIALOGUE @Initializable class MistagDialogue (player: Player? = null) : DialoguePlugin(player){ diff --git a/Server/src/main/kotlin/core/game/content/dialogue/OttoGodblessedDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/OttoGodblessedDialogue.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/dialogue/OttoGodblessedDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/OttoGodblessedDialogue.kt index 9911b3835..a842fd11e 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/OttoGodblessedDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/OttoGodblessedDialogue.kt @@ -1,5 +1,7 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression 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/core/game/content/dialogue/SkillDialogueHandler.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/SkillDialogueHandler.kt similarity index 99% rename from Server/src/main/kotlin/core/game/content/dialogue/SkillDialogueHandler.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/SkillDialogueHandler.kt index efae58689..eeb3fe60b 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/SkillDialogueHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/SkillDialogueHandler.kt @@ -1,11 +1,11 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue import core.game.node.entity.player.Player import core.game.node.item.Item import core.net.packet.PacketRepository import core.net.packet.context.ChildPositionContext import core.net.packet.out.RepositionChild -import core.tools.Components +import rs09.tools.Components import core.tools.StringUtils /** diff --git a/Server/src/main/kotlin/core/game/content/dialogue/ThormacDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/ThormacDialogue.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/dialogue/ThormacDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/ThormacDialogue.kt index 988715376..72d9f673e 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/ThormacDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/ThormacDialogue.kt @@ -1,12 +1,13 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue import core.game.component.Component -import core.tools.Items +import core.game.content.dialogue.DialoguePlugin import core.game.node.entity.player.Player import core.game.node.entity.player.link.diary.DiaryType import core.game.node.item.Item import core.plugin.Initializable -import core.tools.Components +import rs09.tools.Components +import rs09.tools.Items /** * Thormac diff --git a/Server/src/main/kotlin/core/game/content/dialogue/WysonTheGardenerDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/WysonTheGardenerDialogue.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/dialogue/WysonTheGardenerDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/dialogue/WysonTheGardenerDialogue.kt index 555fcc0be..034f3a4a8 100644 --- a/Server/src/main/kotlin/core/game/content/dialogue/WysonTheGardenerDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/dialogue/WysonTheGardenerDialogue.kt @@ -1,14 +1,15 @@ -package core.game.content.dialogue +package rs09.game.content.dialogue +import core.game.content.dialogue.DialoguePlugin import core.game.content.global.BirdNest import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player -import core.game.node.entity.player.link.diary.DiaryLevel import core.game.node.entity.player.link.diary.DiaryType import core.game.node.item.GroundItemManager import core.game.node.item.Item import core.plugin.Initializable -import core.tools.Items +import rs09.game.node.entity.player.link.diary.DiaryLevel +import rs09.tools.Items /** * Represents the Wyson the gardener dialogue. diff --git a/Server/src/main/kotlin/core/game/content/global/EnchantedJewelleryDialogueFile.kt b/Server/src/main/kotlin/rs09/game/content/global/EnchantedJewelleryDialogueFile.kt similarity index 75% rename from Server/src/main/kotlin/core/game/content/global/EnchantedJewelleryDialogueFile.kt rename to Server/src/main/kotlin/rs09/game/content/global/EnchantedJewelleryDialogueFile.kt index f49517809..90a68c13b 100644 --- a/Server/src/main/kotlin/core/game/content/global/EnchantedJewelleryDialogueFile.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/EnchantedJewelleryDialogueFile.kt @@ -1,8 +1,9 @@ -package core.game.content.global +package rs09.game.content.global -import core.game.content.dialogue.DialogueFile +import core.game.content.global.EnchantedJewellery import core.game.node.item.Item -import core.tools.START_DIALOGUE +import rs09.game.content.dialogue.DialogueFile +import rs09.tools.START_DIALOGUE class EnchantedJewelleryDialogueFile(val jewellery: EnchantedJewellery, val item: Item) : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { diff --git a/Server/src/main/kotlin/core/game/content/global/action/EquipHandler.kt b/Server/src/main/kotlin/rs09/game/content/global/action/EquipHandler.kt similarity index 90% rename from Server/src/main/kotlin/core/game/content/global/action/EquipHandler.kt rename to Server/src/main/kotlin/rs09/game/content/global/action/EquipHandler.kt index f5c55c541..ab8c0a507 100644 --- a/Server/src/main/kotlin/core/game/content/global/action/EquipHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/action/EquipHandler.kt @@ -1,21 +1,16 @@ -package core.game.content.global.action +package rs09.game.content.global.action -import core.game.world.GameWorld.ticks -import core.game.interaction.OptionHandler -import core.plugin.Plugin -import core.game.world.GameWorld -import core.game.world.map.zone.ZoneBorders -import core.game.node.entity.player.link.diary.DiaryType -import core.game.system.config.ItemConfigParser -import core.game.node.entity.combat.equipment.WeaponInterface -import core.game.content.global.action.EquipHandler -import core.game.node.entity.player.link.audio.Audio import core.game.container.impl.EquipmentContainer -import core.game.interaction.OptionListener -import core.game.node.Node +import core.game.node.entity.combat.equipment.WeaponInterface import core.game.node.entity.player.Player -import core.game.node.item.Item -import core.tools.Items +import core.game.node.entity.player.link.audio.Audio +import core.game.node.entity.player.link.diary.DiaryType +import core.game.world.map.zone.ZoneBorders +import core.plugin.Plugin +import rs09.game.interaction.OptionListener +import rs09.game.system.config.ItemConfigParser +import rs09.game.world.GameWorld.ticks +import rs09.tools.Items /** * Represents the equipment equipping handler plugin. @@ -26,7 +21,7 @@ class EquipHandler : OptionListener() { override fun defineListeners() { - on("equip",ITEM){player,node -> + on(ITEM,"equip","wield","wear"){player,node -> val item = node.asItem() if(item == null || player.inventory[item.slot] != item){ diff --git a/Server/src/main/kotlin/core/game/content/global/action/PickupHandler.kt b/Server/src/main/kotlin/rs09/game/content/global/action/PickupHandler.kt similarity index 91% rename from Server/src/main/kotlin/core/game/content/global/action/PickupHandler.kt rename to Server/src/main/kotlin/rs09/game/content/global/action/PickupHandler.kt index f21dccc1e..48d643759 100644 --- a/Server/src/main/kotlin/core/game/content/global/action/PickupHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/action/PickupHandler.kt @@ -1,6 +1,6 @@ -package core.game.content.global.action +package rs09.game.content.global.action -import core.tools.Items +import rs09.tools.Items import core.game.content.global.GodType import core.game.node.entity.player.Player import core.game.node.entity.player.link.audio.Audio @@ -8,14 +8,15 @@ 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.system.config.GroundSpawnLoader.GroundSpawn -import core.game.world.GameWorld +import rs09.game.system.config.GroundSpawnLoader +import rs09.game.world.GameWorld + import core.game.world.map.RegionManager import core.game.world.update.flag.context.Animation -import plugin.ai.AIRepository.Companion.getItems +import rs09.game.ai.AIRepository.Companion.getItems import core.game.content.dialogue.FacialExpression import core.game.node.entity.skill.runecrafting.RunePouch -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger /** * A class used to handle the picking up of ground items. @@ -42,7 +43,7 @@ object PickupHandler { SystemLogger.logAlert("$player tried to do the drop & quick pick-up Ground Item dupe.") return true } - if (item !is GroundSpawn && item.isRemainPrivate && !item.droppedBy(player)) { + if (item !is GroundSpawnLoader.GroundSpawn && item.isRemainPrivate && !item.droppedBy(player)) { player.sendMessage("You can't take that item!") return true } @@ -59,7 +60,7 @@ object PickupHandler { player.animate(Animation.create(535)) } - if (item is GroundSpawn && item.getId() == Items.SEAWEED_401 + if (item is GroundSpawnLoader.GroundSpawn && item.getId() == Items.SEAWEED_401 && player.zoneMonitor.isInZone("karamja") && !player.achievementDiaryManager.hasCompletedTask(DiaryType.KARAMJA, 0, 7)) { var seaweed = player.getAttribute("seaweed", 0) diff --git a/Server/src/main/kotlin/core/game/content/global/travel/EssenceTeleport.kt b/Server/src/main/kotlin/rs09/game/content/global/travel/EssenceTeleport.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/global/travel/EssenceTeleport.kt rename to Server/src/main/kotlin/rs09/game/content/global/travel/EssenceTeleport.kt index d3fe81bda..c0ba603a5 100644 --- a/Server/src/main/kotlin/core/game/content/global/travel/EssenceTeleport.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/travel/EssenceTeleport.kt @@ -1,4 +1,4 @@ -package core.game.content.global.travel +package rs09.game.content.global.travel import core.game.node.entity.impl.Projectile import core.game.node.entity.npc.NPC @@ -6,7 +6,7 @@ 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.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.map.Location import core.game.world.update.flag.context.Animation import core.game.world.update.flag.context.Graphics diff --git a/Server/src/main/kotlin/core/game/content/global/worldevents/WorldEvent.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/WorldEvent.kt similarity index 94% rename from Server/src/main/kotlin/core/game/content/global/worldevents/WorldEvent.kt rename to Server/src/main/kotlin/rs09/game/content/global/worldevents/WorldEvent.kt index fc28d7912..397a14aec 100644 --- a/Server/src/main/kotlin/core/game/content/global/worldevents/WorldEvent.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/WorldEvent.kt @@ -1,8 +1,8 @@ -package core.game.content.global.worldevents +package rs09.game.content.global.worldevents -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger import core.plugin.Plugin -import core.plugin.PluginManager +import rs09.plugin.PluginManager import java.util.* /** diff --git a/Server/src/main/kotlin/core/game/content/global/worldevents/WorldEventInitializer.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/WorldEventInitializer.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/global/worldevents/WorldEventInitializer.kt rename to Server/src/main/kotlin/rs09/game/content/global/worldevents/WorldEventInitializer.kt index f4b9e48fe..764e0aeb5 100644 --- a/Server/src/main/kotlin/core/game/content/global/worldevents/WorldEventInitializer.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/WorldEventInitializer.kt @@ -1,4 +1,4 @@ -package core.game.content.global.worldevents +package rs09.game.content.global.worldevents import core.plugin.Initializable import core.plugin.Plugin diff --git a/Server/src/main/kotlin/core/game/content/global/worldevents/holiday/CandyRewardPlugin.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/CandyRewardPlugin.kt similarity index 84% rename from Server/src/main/kotlin/core/game/content/global/worldevents/holiday/CandyRewardPlugin.kt rename to Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/CandyRewardPlugin.kt index b2d56df9f..94babe3be 100644 --- a/Server/src/main/kotlin/core/game/content/global/worldevents/holiday/CandyRewardPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/CandyRewardPlugin.kt @@ -1,12 +1,12 @@ -package core.game.content.global.worldevents.holiday +package rs09.game.content.global.worldevents.holiday import core.game.node.entity.player.Player import core.game.node.item.GroundItemManager import core.game.node.item.Item import core.tools.RandomFunction -import core.plugin.CorePluginTypes.XPGainPlugin import core.game.node.entity.skill.Skills -import core.tools.stringtools.colorize +import rs09.plugin.CorePluginTypes.XPGainPlugin +import rs09.tools.stringtools.colorize class CandyRewardPlugin : XPGainPlugin(){ override fun run(player: Player, skill: Int, amount: Double) { diff --git a/Server/src/main/kotlin/core/game/content/global/worldevents/holiday/GrimDialogue.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/GrimDialogue.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/global/worldevents/holiday/GrimDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/GrimDialogue.kt index 383f0a795..e31dd36dd 100644 --- a/Server/src/main/kotlin/core/game/content/global/worldevents/holiday/GrimDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/GrimDialogue.kt @@ -1,4 +1,4 @@ -package core.game.content.global.worldevents.holiday +package rs09.game.content.global.worldevents.holiday import core.game.node.entity.combat.ImpactHandler import core.game.node.entity.player.Player diff --git a/Server/src/main/kotlin/core/game/content/global/worldevents/holiday/SimpleHalloweenEvent.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/SimpleHalloweenEvent.kt similarity index 80% rename from Server/src/main/kotlin/core/game/content/global/worldevents/holiday/SimpleHalloweenEvent.kt rename to Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/SimpleHalloweenEvent.kt index 41122ce7c..935b478e3 100644 --- a/Server/src/main/kotlin/core/game/content/global/worldevents/holiday/SimpleHalloweenEvent.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/SimpleHalloweenEvent.kt @@ -1,10 +1,10 @@ -package core.game.content.global.worldevents.holiday +package rs09.game.content.global.worldevents.holiday import core.game.node.entity.npc.NPC -import core.game.world.GameWorld import core.game.world.map.Location -import core.game.content.global.worldevents.PluginSet -import core.game.content.global.worldevents.WorldEvent +import rs09.game.content.global.worldevents.PluginSet +import rs09.game.content.global.worldevents.WorldEvent +import rs09.game.world.GameWorld import java.util.* class SimpleHalloweenEvent : WorldEvent("hween"){ diff --git a/Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/LarryHandler.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/LarryHandler.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/LarryHandler.kt rename to Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/LarryHandler.kt index 6d7a1cbc7..5e08de15e 100644 --- a/Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/LarryHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/LarryHandler.kt @@ -1,12 +1,12 @@ -package core.game.content.global.worldevents.penguinhns +package rs09.game.content.global.worldevents.penguinhns import core.game.component.Component import core.game.node.entity.player.Player import core.game.node.item.Item import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.content.dialogue.DialoguePlugin -import core.tools.Components +import rs09.tools.Components class LarryHandler(player: Player? = null) : DialoguePlugin(player){ override fun open(vararg args: Any?): Boolean { diff --git a/Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/NotebookHandler.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/NotebookHandler.kt similarity index 92% rename from Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/NotebookHandler.kt rename to Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/NotebookHandler.kt index 54f039475..5a7e97b08 100644 --- a/Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/NotebookHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/NotebookHandler.kt @@ -1,4 +1,4 @@ -package core.game.content.global.worldevents.penguinhns +package rs09.game.content.global.worldevents.penguinhns import core.cache.def.impl.ItemDefinition import core.game.interaction.OptionHandler diff --git a/Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/PenguinHNSEvent.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/PenguinHNSEvent.kt similarity index 82% rename from Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/PenguinHNSEvent.kt rename to Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/PenguinHNSEvent.kt index 7fff1a0f7..8af9c1c4c 100644 --- a/Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/PenguinHNSEvent.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/PenguinHNSEvent.kt @@ -1,10 +1,10 @@ -package core.game.content.global.worldevents.penguinhns +package rs09.game.content.global.worldevents.penguinhns import core.game.system.task.Pulse -import core.game.world.GameWorld -import core.game.content.global.worldevents.PluginSet -import core.game.content.global.worldevents.WorldEvent -import core.game.content.global.worldevents.WorldEvents +import rs09.game.content.global.worldevents.PluginSet +import rs09.game.content.global.worldevents.WorldEvent +import rs09.game.content.global.worldevents.WorldEvents +import rs09.game.world.GameWorld class PenguinHNSEvent : WorldEvent("penguin-hns"){ val manager = PenguinManager() diff --git a/Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/PenguinManager.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/PenguinManager.kt similarity index 88% rename from Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/PenguinManager.kt rename to Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/PenguinManager.kt index 1a7b18aa7..d82a6833c 100644 --- a/Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/PenguinManager.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/PenguinManager.kt @@ -1,7 +1,7 @@ -package core.game.content.global.worldevents.penguinhns +package rs09.game.content.global.worldevents.penguinhns import core.game.node.entity.npc.NPC -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger import core.game.world.map.Location import java.util.* diff --git a/Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/PenguinSpawner.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/PenguinSpawner.kt similarity index 95% rename from Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/PenguinSpawner.kt rename to Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/PenguinSpawner.kt index b7ac8ab9d..17f9f9263 100644 --- a/Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/PenguinSpawner.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/PenguinSpawner.kt @@ -1,9 +1,8 @@ -package core.game.content.global.worldevents.penguinhns +package rs09.game.content.global.worldevents.penguinhns import core.game.node.entity.npc.NPC import core.game.world.map.Location -import core.game.content.global.worldevents.WorldEvents -import kotlin.collections.ArrayList +import rs09.game.content.global.worldevents.WorldEvents class PenguinSpawner { val CACTUS = 8107 diff --git a/Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/PenguinSpyingHandler.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/PenguinSpyingHandler.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/PenguinSpyingHandler.kt rename to Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/PenguinSpyingHandler.kt index 0394c3a04..7c078daad 100644 --- a/Server/src/main/kotlin/core/game/content/global/worldevents/penguinhns/PenguinSpyingHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/penguinhns/PenguinSpyingHandler.kt @@ -1,4 +1,4 @@ -package core.game.content.global.worldevents.penguinhns +package rs09.game.content.global.worldevents.penguinhns import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse @@ -6,7 +6,7 @@ import core.game.interaction.Option import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.update.flag.context.Animation import core.plugin.Plugin import core.game.content.quest.PluginInteraction diff --git a/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStar.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStar.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStar.kt rename to Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStar.kt index 0d7d16137..3acb0b19a 100644 --- a/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStar.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStar.kt @@ -1,11 +1,11 @@ -package core.game.content.global.worldevents.shootingstar +package rs09.game.content.global.worldevents.shootingstar import core.game.node.`object`.GameObject import core.game.node.`object`.ObjectBuilder import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.world.map.Location -import core.game.world.repository.Repository +import rs09.game.world.repository.Repository /** * Represents a shooting star object (Only ever initialized once) (ideally) diff --git a/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarCommands.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarCommands.kt similarity index 88% rename from Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarCommands.kt rename to Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarCommands.kt index 922e20375..3f067b91e 100644 --- a/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarCommands.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarCommands.kt @@ -1,10 +1,10 @@ -package core.game.content.global.worldevents.shootingstar +package rs09.game.content.global.worldevents.shootingstar import core.game.node.entity.player.Player -import core.game.system.command.CommandPlugin import core.game.system.command.CommandSet import core.plugin.Plugin -import core.game.content.global.worldevents.WorldEvents +import rs09.game.content.global.worldevents.WorldEvents +import rs09.game.system.command.CommandPlugin import java.util.concurrent.TimeUnit /** diff --git a/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarEvent.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarEvent.kt similarity index 83% rename from Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarEvent.kt rename to Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarEvent.kt index bb9ec99ef..bf74ee482 100644 --- a/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarEvent.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarEvent.kt @@ -1,10 +1,14 @@ -package core.game.content.global.worldevents.shootingstar +package rs09.game.content.global.worldevents.shootingstar +import core.game.content.global.worldevents.shootingstar.ScoreboardHandler +import core.game.content.global.worldevents.shootingstar.ShootingStarScoreboard +import core.game.content.global.worldevents.shootingstar.StarChartPlugin import core.game.system.task.Pulse -import core.game.world.GameWorld -import core.game.content.global.worldevents.PluginSet -import core.game.content.global.worldevents.WorldEvent -import core.game.content.global.worldevents.WorldEvents +import rs09.game.content.global.worldevents.PluginSet +import rs09.game.content.global.worldevents.WorldEvent +import rs09.game.content.global.worldevents.WorldEvents +import rs09.game.world.GameWorld + /** * The world event class for shooting stars. Keeps track of event-related data like the ShootingStar instance. diff --git a/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarLogin.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarLogin.kt similarity index 88% rename from Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarLogin.kt rename to Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarLogin.kt index e5815af9e..9a2feb669 100644 --- a/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarLogin.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarLogin.kt @@ -1,10 +1,10 @@ -package core.game.content.global.worldevents.shootingstar +package rs09.game.content.global.worldevents.shootingstar import core.game.node.entity.player.Player import core.plugin.Plugin import core.plugin.PluginManifest import core.plugin.PluginType -import core.game.content.global.worldevents.WorldEvents +import rs09.game.content.global.worldevents.WorldEvents /** * A plugin that handles the message a player receives on login pertaining to shooting stars. diff --git a/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt similarity index 94% rename from Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt rename to Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt index 5d8c005b6..647b2b58b 100644 --- a/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt @@ -1,13 +1,14 @@ -package core.game.content.global.worldevents.shootingstar +package rs09.game.content.global.worldevents.shootingstar +import core.game.content.global.worldevents.shootingstar.ScoreboardManager import core.game.node.`object`.GameObject import core.game.node.entity.player.Player -import core.game.node.item.Item -import core.game.world.GameWorld -import core.game.world.repository.Repository import core.game.node.entity.skill.SkillPulse import core.game.node.entity.skill.Skills import core.game.node.entity.skill.gather.SkillingTool +import core.game.node.item.Item +import rs09.game.world.GameWorld +import rs09.game.world.repository.Repository /** * The pulse used to handle mining shooting stars. diff --git a/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarOptionHandler.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarOptionHandler.kt similarity index 94% rename from Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarOptionHandler.kt rename to Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarOptionHandler.kt index 22fcd714f..87d50f97b 100644 --- a/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/ShootingStarOptionHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarOptionHandler.kt @@ -1,12 +1,12 @@ -package core.game.content.global.worldevents.shootingstar +package rs09.game.content.global.worldevents.shootingstar import core.cache.def.impl.ObjectDefinition import core.game.interaction.OptionHandler import core.game.node.Node import core.game.node.entity.player.Player -import core.game.world.GameWorld import core.plugin.Plugin -import core.game.content.global.worldevents.WorldEvents +import rs09.game.content.global.worldevents.WorldEvents +import rs09.game.world.GameWorld import java.util.concurrent.TimeUnit /** diff --git a/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/StarSpriteDialogue.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/StarSpriteDialogue.kt similarity index 99% rename from Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/StarSpriteDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/StarSpriteDialogue.kt index 037a9070b..2944989b0 100644 --- a/Server/src/main/kotlin/core/game/content/global/worldevents/shootingstar/StarSpriteDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/StarSpriteDialogue.kt @@ -1,9 +1,9 @@ -package core.game.content.global.worldevents.shootingstar +package rs09.game.content.global.worldevents.shootingstar +import core.game.content.dialogue.DialoguePlugin import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.item.Item -import core.game.content.dialogue.DialoguePlugin import java.util.concurrent.TimeUnit /** diff --git a/Server/src/main/kotlin/core/game/content/jobs/CancelJobDialogueFile.kt b/Server/src/main/kotlin/rs09/game/content/jobs/CancelJobDialogueFile.kt similarity index 92% rename from Server/src/main/kotlin/core/game/content/jobs/CancelJobDialogueFile.kt rename to Server/src/main/kotlin/rs09/game/content/jobs/CancelJobDialogueFile.kt index a82475027..48c4f9373 100644 --- a/Server/src/main/kotlin/core/game/content/jobs/CancelJobDialogueFile.kt +++ b/Server/src/main/kotlin/rs09/game/content/jobs/CancelJobDialogueFile.kt @@ -1,8 +1,8 @@ -package core.game.content.jobs +package rs09.game.content.jobs -import core.game.content.dialogue.DialogueFile import core.game.node.item.Item -import core.tools.END_DIALOGUE +import rs09.game.content.dialogue.DialogueFile +import rs09.tools.END_DIALOGUE class CancelJobDialogueFile : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { diff --git a/Server/src/main/kotlin/core/game/content/jobs/JobManager.kt b/Server/src/main/kotlin/rs09/game/content/jobs/JobManager.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/jobs/JobManager.kt rename to Server/src/main/kotlin/rs09/game/content/jobs/JobManager.kt index 1ab586fa7..a576457da 100644 --- a/Server/src/main/kotlin/core/game/content/jobs/JobManager.kt +++ b/Server/src/main/kotlin/rs09/game/content/jobs/JobManager.kt @@ -1,4 +1,4 @@ -package core.game.content.jobs +package rs09.game.content.jobs import GatheringJobs import SlayingJob @@ -6,7 +6,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.system.SystemLogger +import rs09.game.system.SystemLogger object JobManager { @JvmStatic diff --git a/Server/src/main/kotlin/core/game/content/jobs/WorkForOptionListener.kt b/Server/src/main/kotlin/rs09/game/content/jobs/WorkForOptionListener.kt similarity index 91% rename from Server/src/main/kotlin/core/game/content/jobs/WorkForOptionListener.kt rename to Server/src/main/kotlin/rs09/game/content/jobs/WorkForOptionListener.kt index bb09cf0bd..3bc17c2e0 100644 --- a/Server/src/main/kotlin/core/game/content/jobs/WorkForOptionListener.kt +++ b/Server/src/main/kotlin/rs09/game/content/jobs/WorkForOptionListener.kt @@ -1,20 +1,13 @@ -package core.game.content.jobs +package rs09.game.content.jobs import GatheringJobs import SlayingJob -import core.cache.def.impl.NPCDefinition -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.entity.player.link.diary.DiaryType import core.game.node.item.Item -import core.plugin.Initializable -import core.plugin.Plugin -import core.plugin.PluginManager -import core.tools.Items -import core.game.content.dialogue.DialoguePlugin -import core.game.interaction.OptionListener +import rs09.game.interaction.OptionListener +import rs09.tools.Items /** * Handles the work-for actions for the NPCs diff --git a/Server/src/main/kotlin/core/game/content/jobs/impl/GatheringJob.kt b/Server/src/main/kotlin/rs09/game/content/jobs/impl/GatheringJob.kt similarity index 100% rename from Server/src/main/kotlin/core/game/content/jobs/impl/GatheringJob.kt rename to Server/src/main/kotlin/rs09/game/content/jobs/impl/GatheringJob.kt index 68b7a0852..6610a5265 100644 --- a/Server/src/main/kotlin/core/game/content/jobs/impl/GatheringJob.kt +++ b/Server/src/main/kotlin/rs09/game/content/jobs/impl/GatheringJob.kt @@ -1,5 +1,5 @@ -import core.tools.RandomFunction import core.game.node.entity.skill.Skills +import core.tools.RandomFunction enum class GatheringJobs(val lower: Int, val upper: Int, val lvlReq: Int, val itemId: Int,val skill: Int) { LOG(20, 28, 1, 1511, Skills.WOODCUTTING), diff --git a/Server/src/main/kotlin/core/game/content/jobs/impl/SlayingJob.kt b/Server/src/main/kotlin/rs09/game/content/jobs/impl/SlayingJob.kt similarity index 100% rename from Server/src/main/kotlin/core/game/content/jobs/impl/SlayingJob.kt rename to Server/src/main/kotlin/rs09/game/content/jobs/impl/SlayingJob.kt diff --git a/Server/src/main/kotlin/core/game/content/quest/free/cooksassistant/CooksAssistant.kt b/Server/src/main/kotlin/rs09/game/content/quest/free/cooksassistant/CooksAssistant.kt similarity index 99% rename from Server/src/main/kotlin/core/game/content/quest/free/cooksassistant/CooksAssistant.kt rename to Server/src/main/kotlin/rs09/game/content/quest/free/cooksassistant/CooksAssistant.kt index 390053073..83a2e429e 100644 --- a/Server/src/main/kotlin/core/game/content/quest/free/cooksassistant/CooksAssistant.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/free/cooksassistant/CooksAssistant.kt @@ -1,9 +1,9 @@ -package core.game.content.quest.free.cooksassistant +package rs09.game.content.quest.free.cooksassistant import core.game.node.entity.player.Player import core.game.node.entity.player.link.quest.Quest -import core.plugin.Initializable import core.game.node.entity.skill.Skills +import core.plugin.Initializable /** * The Quest Journal and Configuration for the Cook's Assistant Quest. diff --git a/Server/src/main/kotlin/core/game/content/quest/free/cooksassistant/GillieGroatsDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/free/cooksassistant/GillieGroatsDialogue.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/quest/free/cooksassistant/GillieGroatsDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/free/cooksassistant/GillieGroatsDialogue.kt index c897cac40..a56b755c1 100644 --- a/Server/src/main/kotlin/core/game/content/quest/free/cooksassistant/GillieGroatsDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/free/cooksassistant/GillieGroatsDialogue.kt @@ -1,9 +1,9 @@ -package core.game.content.quest.free.cooksassistant +package rs09.game.content.quest.free.cooksassistant -import core.game.node.entity.player.Player -import core.plugin.Initializable import core.game.content.dialogue.DialoguePlugin import core.game.content.dialogue.FacialExpression +import core.game.node.entity.player.Player +import core.plugin.Initializable /** * Dialogue for Gillie Groats. diff --git a/Server/src/main/kotlin/core/game/content/quest/free/cooksassistant/LumbridgeCookDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/free/cooksassistant/LumbridgeCookDialogue.kt similarity index 99% rename from Server/src/main/kotlin/core/game/content/quest/free/cooksassistant/LumbridgeCookDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/free/cooksassistant/LumbridgeCookDialogue.kt index 73edbbe44..5e99af1c1 100644 --- a/Server/src/main/kotlin/core/game/content/quest/free/cooksassistant/LumbridgeCookDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/free/cooksassistant/LumbridgeCookDialogue.kt @@ -1,11 +1,11 @@ -package core.game.content.quest.free.cooksassistant +package rs09.game.content.quest.free.cooksassistant +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.item.Item import core.plugin.Initializable -import core.game.content.dialogue.DialoguePlugin -import core.game.content.dialogue.FacialExpression /** * Dialogue for the Lumbridge Cook. diff --git a/Server/src/main/kotlin/core/game/content/quest/free/cooksassistant/MillieMillerDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/free/cooksassistant/MillieMillerDialogue.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/quest/free/cooksassistant/MillieMillerDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/free/cooksassistant/MillieMillerDialogue.kt index 7dcb5f5f4..519803df8 100644 --- a/Server/src/main/kotlin/core/game/content/quest/free/cooksassistant/MillieMillerDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/free/cooksassistant/MillieMillerDialogue.kt @@ -1,10 +1,10 @@ - package core.game.content.quest.free.cooksassistant + package rs09.game.content.quest.free.cooksassistant - import core.ServerConstants - import core.game.node.entity.player.Player - import core.plugin.Initializable + import rs09.ServerConstants import core.game.content.dialogue.DialoguePlugin import core.game.content.dialogue.FacialExpression + import core.game.node.entity.player.Player + import core.plugin.Initializable /** * Dialogue for Millie Miller. diff --git a/Server/src/main/kotlin/core/game/content/quest/free/dragonslayer/DukeHoracioDSDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/free/dragonslayer/DukeHoracioDSDialogue.kt similarity index 94% rename from Server/src/main/kotlin/core/game/content/quest/free/dragonslayer/DukeHoracioDSDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/free/dragonslayer/DukeHoracioDSDialogue.kt index f232a89b7..e68fcf4ae 100644 --- a/Server/src/main/kotlin/core/game/content/quest/free/dragonslayer/DukeHoracioDSDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/free/dragonslayer/DukeHoracioDSDialogue.kt @@ -1,11 +1,12 @@ -package core.game.content.quest.free.dragonslayer +package rs09.game.content.quest.free.dragonslayer -import core.game.content.dialogue.DialogueFile +import core.game.content.quest.free.dragonslayer.DragonSlayer import core.game.node.entity.player.Player import core.game.node.entity.player.link.diary.DiaryType import core.game.node.item.GroundItemManager -import core.tools.END_DIALOGUE -import core.tools.START_DIALOGUE +import rs09.game.content.dialogue.DialogueFile +import rs09.tools.END_DIALOGUE +import rs09.tools.START_DIALOGUE class DukeHoracioDSDialogue(val questStage: Int) : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { @@ -93,6 +94,7 @@ class DukeHoracioDSDialogue(val questStage: Int) : DialogueFile() { } fun hasShield(player: Player): Boolean{ - return player.inventory.containsItem(DragonSlayer.SHIELD) || player.bank.containsItem(DragonSlayer.SHIELD) || player.equipment.containsItem(DragonSlayer.SHIELD) + return player.inventory.containsItem(DragonSlayer.SHIELD) || player.bank.containsItem(DragonSlayer.SHIELD) || player.equipment.containsItem( + DragonSlayer.SHIELD) } } \ No newline at end of file diff --git a/Server/src/main/kotlin/core/game/content/quest/free/dragonslayer/NedDSDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/free/dragonslayer/NedDSDialogue.kt similarity index 95% rename from Server/src/main/kotlin/core/game/content/quest/free/dragonslayer/NedDSDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/free/dragonslayer/NedDSDialogue.kt index 5a2ae6fb8..127f96292 100644 --- a/Server/src/main/kotlin/core/game/content/quest/free/dragonslayer/NedDSDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/free/dragonslayer/NedDSDialogue.kt @@ -1,8 +1,9 @@ -package core.game.content.quest.free.dragonslayer +package rs09.game.content.quest.free.dragonslayer -import core.game.content.dialogue.DialogueFile -import core.tools.END_DIALOGUE -import core.tools.START_DIALOGUE +import core.game.content.quest.free.dragonslayer.DragonSlayer +import rs09.game.content.dialogue.DialogueFile +import rs09.tools.END_DIALOGUE +import rs09.tools.START_DIALOGUE private const val SHIP_DIALOGUE = 2000 class NedDSDialogue(val questStage: Int) : DialogueFile() { diff --git a/Server/src/main/kotlin/core/game/content/quest/free/dragonslayer/NedDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/free/dragonslayer/NedDialogue.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/quest/free/dragonslayer/NedDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/free/dragonslayer/NedDialogue.kt index 1ef7a5296..0d621d745 100644 --- a/Server/src/main/kotlin/core/game/content/quest/free/dragonslayer/NedDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/free/dragonslayer/NedDialogue.kt @@ -1,16 +1,17 @@ -package core.game.content.quest.free.dragonslayer +package rs09.game.content.quest.free.dragonslayer -import core.game.world.GameWorld.settings import core.game.content.dialogue.DialoguePlugin -import core.game.node.entity.player.link.diary.AchievementDiary -import core.game.content.quest.free.princealirescue.NedPARDialogue import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player -import core.game.node.item.GroundItemManager +import core.game.node.entity.player.link.diary.AchievementDiary import core.game.node.entity.player.link.diary.DiaryType +import core.game.node.item.GroundItemManager import core.game.node.item.Item -import core.tools.DIALOGUE_INITIAL_OPTIONS_HANDLE -import core.tools.END_DIALOGUE +import rs09.game.content.quest.free.princealirescue.NedPARDialogue +import rs09.game.world.GameWorld.settings +import rs09.tools.DIALOGUE_INITIAL_OPTIONS_HANDLE +import rs09.tools.END_DIALOGUE + /** * Core dialogue plugin for Ned. diff --git a/Server/src/main/kotlin/core/game/content/quest/free/princealirescue/NedPARDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/free/princealirescue/NedPARDialogue.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/quest/free/princealirescue/NedPARDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/free/princealirescue/NedPARDialogue.kt index f0ce9bf67..2455eda3d 100644 --- a/Server/src/main/kotlin/core/game/content/quest/free/princealirescue/NedPARDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/free/princealirescue/NedPARDialogue.kt @@ -1,10 +1,10 @@ -package core.game.content.quest.free.princealirescue +package rs09.game.content.quest.free.princealirescue -import core.game.content.dialogue.DialogueFile import core.game.node.item.GroundItemManager import core.game.node.item.Item -import core.tools.END_DIALOGUE -import core.tools.START_DIALOGUE +import rs09.game.content.dialogue.DialogueFile +import rs09.tools.END_DIALOGUE +import rs09.tools.START_DIALOGUE private const val STAGE_KNIT_SWEATER = 10 private const val STAGE_KNIT_WIG = 20 diff --git a/Server/src/main/kotlin/core/game/content/quest/free/runemysteries/DukeHoracioRMDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/free/runemysteries/DukeHoracioRMDialogue.kt similarity index 94% rename from Server/src/main/kotlin/core/game/content/quest/free/runemysteries/DukeHoracioRMDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/free/runemysteries/DukeHoracioRMDialogue.kt index 7024c6454..7d6fdd976 100644 --- a/Server/src/main/kotlin/core/game/content/quest/free/runemysteries/DukeHoracioRMDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/free/runemysteries/DukeHoracioRMDialogue.kt @@ -1,11 +1,11 @@ -package core.game.content.quest.free.runemysteries +package rs09.game.content.quest.free.runemysteries -import core.game.content.dialogue.DialogueFile import core.game.node.entity.player.link.quest.Quest import core.game.node.item.GroundItemManager import core.game.node.item.Item -import core.tools.END_DIALOGUE -import core.tools.START_DIALOGUE +import rs09.game.content.dialogue.DialogueFile +import rs09.tools.END_DIALOGUE +import rs09.tools.START_DIALOGUE class DukeHoracioRMDialogue(val questStage: Int) : DialogueFile() { diff --git a/Server/src/main/kotlin/core/game/content/quest/free/shieldofarrav/KingRoaldArravDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/free/shieldofarrav/KingRoaldArravDialogue.kt similarity index 93% rename from Server/src/main/kotlin/core/game/content/quest/free/shieldofarrav/KingRoaldArravDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/free/shieldofarrav/KingRoaldArravDialogue.kt index 1b2181b32..ce7f43e4c 100644 --- a/Server/src/main/kotlin/core/game/content/quest/free/shieldofarrav/KingRoaldArravDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/free/shieldofarrav/KingRoaldArravDialogue.kt @@ -1,10 +1,12 @@ -package core.game.content.quest.free.shieldofarrav +package rs09.game.content.quest.free.shieldofarrav -import core.game.content.dialogue.DialogueFile +import core.game.content.quest.free.shieldofarrav.ShieldofArrav import core.game.node.item.GroundItemManager import core.game.node.item.Item -import core.tools.END_DIALOGUE -import core.tools.START_DIALOGUE +import rs09.game.content.dialogue.DialogueFile +import rs09.tools.END_DIALOGUE +import rs09.tools.START_DIALOGUE + private val CERTIFICATE = Item(769) diff --git a/Server/src/main/kotlin/core/game/content/quest/members/allfiredup/AllFiredUp.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/allfiredup/AllFiredUp.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/quest/members/allfiredup/AllFiredUp.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/allfiredup/AllFiredUp.kt index c60d3db80..4ac78b5b2 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/allfiredup/AllFiredUp.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/allfiredup/AllFiredUp.kt @@ -1,12 +1,12 @@ -package core.game.content.quest.members.allfiredup +package rs09.game.content.quest.members.allfiredup import core.game.node.entity.player.Player import core.game.node.entity.player.link.quest.Quest +import core.game.node.entity.skill.Skills import core.game.node.item.Item import core.plugin.Initializable -import core.tools.Items -import core.game.content.activity.allfiredup.AFUBeacon -import core.game.node.entity.skill.Skills +import rs09.game.content.activity.allfiredup.AFUBeacon +import rs09.tools.Items /** * Represents the "All Fired Up" quest. diff --git a/Server/src/main/kotlin/core/game/content/quest/members/allfiredup/BlazeSharpeyeDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/allfiredup/BlazeSharpeyeDialogue.kt similarity index 99% rename from Server/src/main/kotlin/core/game/content/quest/members/allfiredup/BlazeSharpeyeDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/allfiredup/BlazeSharpeyeDialogue.kt index a85cb9519..0e4fb2461 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/allfiredup/BlazeSharpeyeDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/allfiredup/BlazeSharpeyeDialogue.kt @@ -1,10 +1,10 @@ -package core.game.content.quest.members.allfiredup +package rs09.game.content.quest.members.allfiredup +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.plugin.Initializable -import core.game.content.dialogue.DialoguePlugin -import core.game.content.dialogue.FacialExpression @Initializable class BlazeSharpeyeDialogue(player: Player? = null) : DialoguePlugin(player) { diff --git a/Server/src/main/kotlin/core/game/content/quest/members/allfiredup/KingRoaldAFUDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/allfiredup/KingRoaldAFUDialogue.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/quest/members/allfiredup/KingRoaldAFUDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/allfiredup/KingRoaldAFUDialogue.kt index ed0b1cea0..453561734 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/allfiredup/KingRoaldAFUDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/allfiredup/KingRoaldAFUDialogue.kt @@ -1,9 +1,10 @@ -package core.game.content.quest.members.allfiredup +package rs09.game.content.quest.members.allfiredup -import core.game.content.dialogue.DialogueFile import core.game.node.entity.skill.Skills -import core.tools.END_DIALOGUE -import core.tools.START_DIALOGUE +import rs09.game.content.dialogue.DialogueFile +import rs09.tools.END_DIALOGUE +import rs09.tools.START_DIALOGUE + class KingRoaldAFUDialogue(val questStage: Int) : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { diff --git a/Server/src/main/kotlin/core/game/content/quest/members/allfiredup/SquireFyreDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/allfiredup/SquireFyreDialogue.kt similarity index 91% rename from Server/src/main/kotlin/core/game/content/quest/members/allfiredup/SquireFyreDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/allfiredup/SquireFyreDialogue.kt index 4f7815131..e0a572a66 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/allfiredup/SquireFyreDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/allfiredup/SquireFyreDialogue.kt @@ -1,10 +1,10 @@ -package core.game.content.quest.members.allfiredup +package rs09.game.content.quest.members.allfiredup +import core.game.content.dialogue.DialoguePlugin import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.plugin.Initializable -import core.game.content.activity.allfiredup.BeaconState -import core.game.content.dialogue.DialoguePlugin +import rs09.game.content.activity.allfiredup.BeaconState @Initializable class SquireFyreDialogue(player: Player? = null) : DialoguePlugin(player){ @@ -26,7 +26,8 @@ class SquireFyreDialogue(player: Player? = null) : DialoguePlugin(player){ when(stage){ 100 -> npc("Of course I can see it. I haven't spent my entire life","practising my seeing skills for nothing! I'm happy to","report that the fire near Blaze is burning brightly.").also { stage++ } 101 -> player("Terrific! Blaze has asked me to light this fire as well, so","he can see how things look from his vantage point.").also { stage++ } - 102 -> npc("Be my guest!").also { stage++; player.questRepository.getQuest("All Fired Up").setStage(player,50); player.varpManager.get(1283).setVarbit(0,BeaconState.DYING.ordinal).send(player) } + 102 -> npc("Be my guest!").also { stage++; player.questRepository.getQuest("All Fired Up").setStage(player,50); player.varpManager.get(1283).setVarbit(0, + BeaconState.DYING.ordinal).send(player) } 103 -> options("How do I light the beacon?","I suppose you don't have any logs I could have?","Okay, thanks.").also { stage++ } 104 -> when(buttonId){ 1 -> player("How do I light the beacon?").also { stage = 110 } diff --git a/Server/src/main/kotlin/core/game/content/quest/members/asoulsbane/SoulsBaneLaunaDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/asoulsbane/SoulsBaneLaunaDialogue.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/quest/members/asoulsbane/SoulsBaneLaunaDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/asoulsbane/SoulsBaneLaunaDialogue.kt index 406e1c933..78e9f8808 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/asoulsbane/SoulsBaneLaunaDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/asoulsbane/SoulsBaneLaunaDialogue.kt @@ -1,9 +1,10 @@ -package core.game.content.quest.members.asoulsbane +package rs09.game.content.quest.members.asoulsbane -import core.game.node.entity.player.Player -import core.game.node.entity.player.link.quest.Quest import core.game.content.dialogue.DialoguePlugin import core.game.content.dialogue.FacialExpression +import core.game.content.quest.members.asoulsbane.ASoulsBane +import core.game.node.entity.player.Player +import core.game.node.entity.player.link.quest.Quest /** * Launa diff --git a/Server/src/main/kotlin/core/game/content/quest/members/priestinperil/KingRoaldPIPDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/priestinperil/KingRoaldPIPDialogue.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/quest/members/priestinperil/KingRoaldPIPDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/priestinperil/KingRoaldPIPDialogue.kt index ce2ce2655..fc038424c 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/priestinperil/KingRoaldPIPDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/priestinperil/KingRoaldPIPDialogue.kt @@ -1,8 +1,9 @@ -package core.game.content.quest.members.priestinperil +package rs09.game.content.quest.members.priestinperil + +import rs09.game.content.dialogue.DialogueFile +import rs09.tools.END_DIALOGUE +import rs09.tools.START_DIALOGUE -import core.game.content.dialogue.DialogueFile -import core.tools.END_DIALOGUE -import core.tools.START_DIALOGUE class KingRoaldPIPDialogue(val questStage: Int) : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/AskeladdenDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/AskeladdenDialogue.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/AskeladdenDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/AskeladdenDialogue.kt index 7069386c2..0229a2486 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/AskeladdenDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/AskeladdenDialogue.kt @@ -1,4 +1,4 @@ -package core.game.content.quest.members.thefremenniktrials +package rs09.game.content.quest.members.thefremenniktrials import core.game.node.entity.player.Player import core.game.content.dialogue.DialoguePlugin diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/BeerOnCouncilWorker.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/BeerOnCouncilWorker.kt similarity index 94% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/BeerOnCouncilWorker.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/BeerOnCouncilWorker.kt index 21d63c4db..4355bbd9b 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/BeerOnCouncilWorker.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/BeerOnCouncilWorker.kt @@ -1,4 +1,4 @@ -package core.game.content.quest.members.thefremenniktrials +package rs09.game.content.quest.members.thefremenniktrials import core.game.interaction.NodeUsageEvent import core.game.node.entity.npc.NPC diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/BranchFletcher.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/BranchFletcher.kt similarity index 94% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/BranchFletcher.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/BranchFletcher.kt index 837ef9e04..59cd4012b 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/BranchFletcher.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/BranchFletcher.kt @@ -1,10 +1,10 @@ -package core.game.content.quest.members.thefremenniktrials +package rs09.game.content.quest.members.thefremenniktrials import core.game.interaction.NodeUsageEvent import core.game.node.entity.player.Player import core.game.node.item.Item import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/ChieftanBrundtDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/ChieftanBrundtDialogue.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/ChieftanBrundtDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/ChieftanBrundtDialogue.kt index f98bef8f3..2da22cb59 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/ChieftanBrundtDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/ChieftanBrundtDialogue.kt @@ -1,4 +1,4 @@ -package core.game.content.quest.members.thefremenniktrials +package rs09.game.content.quest.members.thefremenniktrials import core.game.node.entity.player.Player import core.game.node.entity.player.info.PlayerDetails diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/CouncilWorkerDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/CouncilWorkerDialogue.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/CouncilWorkerDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/CouncilWorkerDialogue.kt index cb261d055..f559f0755 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/CouncilWorkerDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/CouncilWorkerDialogue.kt @@ -1,4 +1,4 @@ -package core.game.content.quest.members.thefremenniktrials +package rs09.game.content.quest.members.thefremenniktrials import core.game.node.entity.player.Player import core.game.node.entity.player.info.PlayerDetails diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/Draugen.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/Draugen.kt similarity index 93% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/Draugen.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/Draugen.kt index 7e5e50f33..35612e108 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/Draugen.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/Draugen.kt @@ -1,4 +1,4 @@ -package core.game.content.quest.members.thefremenniktrials +package rs09.game.content.quest.members.thefremenniktrials import core.game.node.entity.Entity import core.game.node.entity.npc.NPC diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/FishOnAltar.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/FishOnAltar.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/FishOnAltar.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/FishOnAltar.kt index 22d676bfb..9bdf5f0ff 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/FishOnAltar.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/FishOnAltar.kt @@ -1,5 +1,8 @@ package core.plugin.quest.fremtrials +import core.game.content.dialogue.FacialExpression +import core.game.content.quest.PluginInteraction +import core.game.content.quest.PluginInteractionManager import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse import core.game.interaction.NodeUsageEvent @@ -8,14 +11,10 @@ import core.game.node.`object`.GameObject import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.item.Item -import core.game.system.SystemLogger import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.plugin.Initializable import core.plugin.Plugin -import core.game.content.dialogue.FacialExpression -import core.game.content.quest.PluginInteraction -import core.game.content.quest.PluginInteractionManager @Initializable class FishOnAltar : PluginInteraction(383, 389, 395){ diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/FremennikTrials.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/FremennikTrials.kt similarity index 100% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/FremennikTrials.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/FremennikTrials.kt diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/KegOnKegAction.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/KegOnKegAction.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/KegOnKegAction.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/KegOnKegAction.kt index 00faeb5f9..1d8996b58 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/KegOnKegAction.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/KegOnKegAction.kt @@ -1,4 +1,4 @@ -package core.game.content.quest.members.thefremenniktrials +package rs09.game.content.quest.members.thefremenniktrials import core.game.interaction.NodeUsageEvent import core.game.node.entity.player.Player diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/LalliDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/LalliDialogue.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/LalliDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/LalliDialogue.kt index 92644eb78..0e77e3458 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/LalliDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/LalliDialogue.kt @@ -1,4 +1,4 @@ -package core.game.content.quest.members.thefremenniktrials +package rs09.game.content.quest.members.thefremenniktrials import core.game.node.entity.player.Player import core.plugin.Initializable diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/LyreOptionHandler.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/LyreOptionHandler.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/LyreOptionHandler.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/LyreOptionHandler.kt index acadb6996..0919ff739 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/LyreOptionHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/LyreOptionHandler.kt @@ -7,7 +7,7 @@ import core.game.node.entity.impl.Animator import core.game.node.entity.player.Player import core.game.node.item.Item import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.map.Location import core.game.world.update.flag.context.Animation import core.game.world.update.flag.context.Graphics diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/ManniDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/ManniDialogue.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/ManniDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/ManniDialogue.kt index dcc522f23..c20afe869 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/ManniDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/ManniDialogue.kt @@ -1,4 +1,4 @@ -package core.game.content.quest.members.thefremenniktrials +package rs09.game.content.quest.members.thefremenniktrials import core.game.node.entity.impl.Animator import core.game.node.entity.npc.NPC @@ -6,7 +6,7 @@ import core.game.node.entity.player.Player import core.game.node.entity.player.info.PlayerDetails import core.game.node.item.Item import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.map.Location import core.game.world.update.flag.context.Animation import core.plugin.Initializable diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/OlafTheBard.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/OlafTheBard.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/OlafTheBard.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/OlafTheBard.kt index dfa40f8ad..2fb7d7a21 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/OlafTheBard.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/OlafTheBard.kt @@ -1,9 +1,8 @@ -package core.game.content.quest.members.thefremenniktrials +package rs09.game.content.quest.members.thefremenniktrials -import core.game.node.entity.player.Player -import core.game.node.entity.player.info.PlayerDetails -import core.plugin.Initializable import core.game.content.dialogue.DialoguePlugin +import core.game.node.entity.player.Player +import core.plugin.Initializable @Initializable class OlafTheBard(player: Player? = null) : DialoguePlugin(player){ diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/PipeInserter.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/PipeInserter.kt similarity index 94% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/PipeInserter.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/PipeInserter.kt index 8476d32d5..f32dd8006 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/PipeInserter.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/PipeInserter.kt @@ -1,16 +1,16 @@ -package core.game.content.quest.members.thefremenniktrials +package rs09.game.content.quest.members.thefremenniktrials +import core.game.content.quest.PluginInteraction +import core.game.content.quest.PluginInteractionManager import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse import core.game.node.Node import core.game.node.`object`.GameObject import core.game.node.entity.player.Player import core.game.node.item.Item -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.plugin.Initializable import core.plugin.Plugin -import core.game.content.quest.PluginInteraction -import core.game.content.quest.PluginInteractionManager @Initializable class PipeInserter : PluginInteraction(4162){ diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/PoisonSalesman.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/PoisonSalesman.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/PoisonSalesman.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/PoisonSalesman.kt index 737af3ada..d2166607d 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/PoisonSalesman.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/PoisonSalesman.kt @@ -1,11 +1,11 @@ -package core.game.content.quest.members.thefremenniktrials +package rs09.game.content.quest.members.thefremenniktrials import core.game.content.dialogue.DialoguePlugin import core.game.node.entity.player.Player import core.game.node.item.Item import core.plugin.Initializable -import core.tools.END_DIALOGUE -import core.tools.START_DIALOGUE +import rs09.tools.END_DIALOGUE +import rs09.tools.START_DIALOGUE @Initializable class PoisonSalesman(player: Player? = null) : DialoguePlugin(player) { diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SigliTheHuntsman.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/SigliTheHuntsman.kt similarity index 99% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SigliTheHuntsman.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/SigliTheHuntsman.kt index 0a0eda85c..57bf7d8ef 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SigliTheHuntsman.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/SigliTheHuntsman.kt @@ -1,4 +1,4 @@ -package core.game.content.quest.members.thefremenniktrials +package rs09.game.content.quest.members.thefremenniktrials import core.game.node.entity.player.Player import core.game.node.entity.player.info.PlayerDetails diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SwayingTreeHandler.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/SwayingTreeHandler.kt similarity index 95% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SwayingTreeHandler.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/SwayingTreeHandler.kt index 58c4058c6..340cb6095 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SwayingTreeHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/SwayingTreeHandler.kt @@ -1,4 +1,4 @@ -package core.game.content.quest.members.thefremenniktrials +package rs09.game.content.quest.members.thefremenniktrials import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse @@ -7,7 +7,7 @@ import core.game.node.`object`.GameObject import core.game.node.entity.player.Player import core.game.node.item.Item import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.plugin.Initializable import core.plugin.Plugin import core.game.content.quest.PluginInteraction diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SwensenLadder.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/SwensenLadder.kt similarity index 94% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SwensenLadder.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/SwensenLadder.kt index 444fcdb79..e5521757d 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SwensenLadder.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/SwensenLadder.kt @@ -1,4 +1,4 @@ -package core.game.content.quest.members.thefremenniktrials +package rs09.game.content.quest.members.thefremenniktrials import core.game.node.Node import core.game.node.`object`.GameObject diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SwensenPortals.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/SwensenPortals.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SwensenPortals.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/SwensenPortals.kt index 1de0de41c..7ba7b3aa5 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SwensenPortals.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/SwensenPortals.kt @@ -1,11 +1,11 @@ -package core.game.content.quest.members.thefremenniktrials +package rs09.game.content.quest.members.thefremenniktrials import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse import core.game.node.Node import core.game.node.`object`.GameObject import core.game.node.entity.player.Player -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.map.Location import core.plugin.Initializable import core.plugin.Plugin diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SwensenTheNavigator.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/SwensenTheNavigator.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SwensenTheNavigator.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/SwensenTheNavigator.kt index 9ae4c2c60..8c8c33f94 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/SwensenTheNavigator.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/SwensenTheNavigator.kt @@ -1,4 +1,4 @@ -package core.game.content.quest.members.thefremenniktrials +package rs09.game.content.quest.members.thefremenniktrials import core.game.node.entity.player.Player import core.game.node.entity.player.info.PlayerDetails diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/TalismanHandler.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TalismanHandler.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/TalismanHandler.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TalismanHandler.kt index 0345f83b5..13a1bbe70 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/TalismanHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TalismanHandler.kt @@ -1,4 +1,4 @@ -package core.game.content.quest.members.thefremenniktrials +package rs09.game.content.quest.members.thefremenniktrials import core.cache.def.impl.ItemDefinition import core.game.interaction.OptionHandler @@ -7,7 +7,7 @@ import core.game.node.entity.Entity import core.game.node.entity.player.Player import core.game.node.item.Item import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.map.Location import core.plugin.Initializable import core.plugin.Plugin diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/TinderboxOnBomb.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TinderboxOnBomb.kt similarity index 94% rename from Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/TinderboxOnBomb.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TinderboxOnBomb.kt index 1bcfbda53..9c20f5fcc 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thefremenniktrials/TinderboxOnBomb.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TinderboxOnBomb.kt @@ -1,4 +1,4 @@ -package core.game.content.quest.members.thefremenniktrials +package rs09.game.content.quest.members.thefremenniktrials import core.game.interaction.NodeUsageEvent import core.game.node.entity.player.Player diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/CaveGoblinMinerNPC.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/CaveGoblinMinerNPC.kt similarity index 95% rename from Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/CaveGoblinMinerNPC.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/CaveGoblinMinerNPC.kt index e87b792b2..bb144e6fb 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/CaveGoblinMinerNPC.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/CaveGoblinMinerNPC.kt @@ -1,4 +1,4 @@ -package core.game.content.quest.members.thelosttribe +package rs09.game.content.quest.members.thelosttribe import core.game.node.entity.Entity import core.game.node.entity.npc.AbstractNPC diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/CaveRockHandler.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/CaveRockHandler.kt similarity index 93% rename from Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/CaveRockHandler.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/CaveRockHandler.kt index 337128890..5c9bada64 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/CaveRockHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/CaveRockHandler.kt @@ -1,16 +1,15 @@ -package core.game.content.quest.members.thelosttribe +package rs09.game.content.quest.members.thelosttribe import core.cache.def.impl.ObjectDefinition 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.system.SystemLogger import core.game.world.map.Direction import core.game.world.map.Location import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Components +import rs09.tools.Components @Initializable /** diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/CaveZone.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/CaveZone.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/CaveZone.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/CaveZone.kt index 645046035..79ca033a7 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/CaveZone.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/CaveZone.kt @@ -1,10 +1,10 @@ -package core.game.content.quest.members.thelosttribe +package rs09.game.content.quest.members.thelosttribe import core.game.node.entity.Entity import core.game.node.entity.combat.ImpactHandler import core.game.node.entity.player.Player import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld 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/kotlin/core/game/content/quest/members/thelosttribe/DorgCbowEquipPlugin.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/DorgCbowEquipPlugin.kt similarity index 92% rename from Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/DorgCbowEquipPlugin.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/DorgCbowEquipPlugin.kt index 6e11fb665..40d910066 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/DorgCbowEquipPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/DorgCbowEquipPlugin.kt @@ -1,11 +1,11 @@ -package core.game.content.quest.members.thelosttribe +package rs09.game.content.quest.members.thelosttribe import core.cache.def.impl.ItemDefinition import core.game.node.entity.player.Player import core.game.node.item.Item import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items +import rs09.tools.Items @Initializable /** diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/DukeHoracioTLTDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/DukeHoracioTLTDialogue.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/DukeHoracioTLTDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/DukeHoracioTLTDialogue.kt index 5cae544df..6bd881692 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/DukeHoracioTLTDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/DukeHoracioTLTDialogue.kt @@ -1,13 +1,12 @@ -package core.game.content.quest.members.thelosttribe +package rs09.game.content.quest.members.thelosttribe -import core.game.content.dialogue.DialogueFile -import core.game.content.dialogue.DukeHoracioDialogue import core.game.content.dialogue.FacialExpression import core.game.node.entity.npc.NPC import core.game.node.item.Item -import core.tools.END_DIALOGUE -import core.tools.Items -import core.tools.START_DIALOGUE +import rs09.game.content.dialogue.DialogueFile +import rs09.tools.END_DIALOGUE +import rs09.tools.Items +import rs09.tools.START_DIALOGUE class DukeHoracioTLTDialogue(val questStage: Int) : DialogueFile() { private val Sigmund = NPC(2082) diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/GoblinFollower.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/GoblinFollower.kt similarity index 91% rename from Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/GoblinFollower.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/GoblinFollower.kt index bb4245a21..e3a967f66 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/GoblinFollower.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/GoblinFollower.kt @@ -1,11 +1,11 @@ -package core.game.content.quest.members.thelosttribe +package rs09.game.content.quest.members.thelosttribe import core.game.component.Component import core.game.node.entity.player.Player import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.map.Location -import core.tools.Components +import rs09.tools.Components /** * Small object for the goblin follow options diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/HistoryOfTheGoblinRace.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/HistoryOfTheGoblinRace.kt similarity index 97% rename from Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/HistoryOfTheGoblinRace.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/HistoryOfTheGoblinRace.kt index c4339ecec..d7db3d751 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/HistoryOfTheGoblinRace.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/HistoryOfTheGoblinRace.kt @@ -1,12 +1,12 @@ -package core.game.content.quest.members.thelosttribe +package rs09.game.content.quest.members.thelosttribe import core.game.component.Component import core.game.component.ComponentDefinition import core.game.component.ComponentPlugin +import core.game.content.dialogue.FacialExpression import core.game.node.entity.player.Player import core.plugin.Initializable import core.plugin.Plugin -import core.game.content.dialogue.FacialExpression @Initializable /** diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/KazgarDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/KazgarDialogue.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/KazgarDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/KazgarDialogue.kt index 2daf41786..c206fc67c 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/KazgarDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/KazgarDialogue.kt @@ -1,9 +1,9 @@ -package core.game.content.quest.members.thelosttribe +package rs09.game.content.quest.members.thelosttribe +import core.game.content.dialogue.DialoguePlugin import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.plugin.Initializable -import core.game.content.dialogue.DialoguePlugin @Initializable /** diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/LostTribe.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/LostTribe.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/LostTribe.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/LostTribe.kt index 3f7cb6437..c6588463a 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/LostTribe.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/LostTribe.kt @@ -1,12 +1,12 @@ -package core.game.content.quest.members.thelosttribe +package rs09.game.content.quest.members.thelosttribe import core.game.node.entity.player.Player import core.game.node.entity.player.link.quest.Quest +import core.game.node.entity.skill.Skills import core.game.node.item.GroundItemManager import core.game.node.item.Item import core.plugin.Initializable -import core.tools.Items -import core.game.node.entity.skill.Skills +import rs09.tools.Items @Initializable /** diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/LostTribeCutscene.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/LostTribeCutscene.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/LostTribeCutscene.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/LostTribeCutscene.kt index e17373548..dd2207d5b 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/LostTribeCutscene.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/LostTribeCutscene.kt @@ -1,22 +1,21 @@ -package core.game.content.quest.members.thelosttribe +package rs09.game.content.quest.members.thelosttribe -import core.game.camerautils.PlayerCamera +import core.game.content.activity.ActivityPlugin +import core.game.content.activity.CutscenePlugin +import core.game.content.dialogue.FacialExpression import core.game.content.global.action.DoorActionHandler import core.game.interaction.MovementPulse import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.entity.player.link.emote.Emotes -import core.game.system.SystemLogger import core.game.system.task.Pulse -import core.game.world.GameWorld.Pulser import core.game.world.map.Location import core.game.world.map.RegionManager import core.game.world.map.build.DynamicRegion import core.game.world.update.flag.context.Animation import core.plugin.Initializable -import core.game.content.activity.ActivityPlugin -import core.game.content.activity.CutscenePlugin -import core.game.content.dialogue.FacialExpression +import rs09.game.camerautils.PlayerCamera +import rs09.game.world.GameWorld.Pulser private const val DUKE = 2088 private const val MISTAG = 2089 diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/LostTribeOptionHandler.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/LostTribeOptionHandler.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/LostTribeOptionHandler.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/LostTribeOptionHandler.kt index 6f875aae4..55658b5a2 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/LostTribeOptionHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/LostTribeOptionHandler.kt @@ -1,18 +1,18 @@ -package core.game.content.quest.members.thelosttribe +package rs09.game.content.quest.members.thelosttribe import core.cache.def.impl.ItemDefinition import core.cache.def.impl.NPCDefinition import core.cache.def.impl.ObjectDefinition import core.game.component.Component +import core.game.content.dialogue.FacialExpression 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.plugin.Initializable import core.plugin.Plugin -import core.tools.Items -import core.game.content.dialogue.FacialExpression -import core.tools.Components +import rs09.tools.Components +import rs09.tools.Items private val BOOK = Item(Items.GOBLIN_SYMBOL_BOOK_5009) @Initializable diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/MistagLTDialogue.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/MistagLTDialogue.kt similarity index 95% rename from Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/MistagLTDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/MistagLTDialogue.kt index ffb1e4391..04c24dcc1 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/MistagLTDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/MistagLTDialogue.kt @@ -1,9 +1,10 @@ -package core.game.content.quest.members.thelosttribe +package rs09.game.content.quest.members.thelosttribe import core.game.content.activity.ActivityManager -import core.game.content.dialogue.DialogueFile -import core.tools.END_DIALOGUE -import core.tools.START_DIALOGUE +import rs09.game.content.dialogue.DialogueFile +import rs09.tools.END_DIALOGUE +import rs09.tools.START_DIALOGUE + class MistagLTDialogue(val isGreeting: Boolean, val questStage: Int) : DialogueFile() { override fun handle(componentID: Int, buttonID: Int) { diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/PickaxeOnRubble.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/PickaxeOnRubble.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/PickaxeOnRubble.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/PickaxeOnRubble.kt index 0cbf5405a..c86aa3361 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/PickaxeOnRubble.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/PickaxeOnRubble.kt @@ -1,13 +1,13 @@ -package core.game.content.quest.members.thelosttribe +package rs09.game.content.quest.members.thelosttribe import core.game.interaction.NodeUsageEvent import core.game.interaction.UseWithHandler -import core.game.system.task.Pulse -import core.game.world.GameWorld -import core.plugin.Initializable -import core.plugin.Plugin import core.game.node.entity.skill.Skills import core.game.node.entity.skill.gather.SkillingTool +import core.game.system.task.Pulse +import rs09.game.world.GameWorld +import core.plugin.Initializable +import core.plugin.Plugin @Initializable /** diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/PickpocketSigmund.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/PickpocketSigmund.kt similarity index 94% rename from Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/PickpocketSigmund.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/PickpocketSigmund.kt index 4bb07765e..9f9c1a76c 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/PickpocketSigmund.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/PickpocketSigmund.kt @@ -1,17 +1,17 @@ -package core.game.content.quest.members.thelosttribe +package rs09.game.content.quest.members.thelosttribe import core.cache.def.impl.NPCDefinition +import core.game.content.dialogue.FacialExpression 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.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items -import core.game.content.dialogue.FacialExpression +import rs09.tools.Items @Initializable /** diff --git a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/SigmundChestHandler.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/SigmundChestHandler.kt similarity index 94% rename from Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/SigmundChestHandler.kt rename to Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/SigmundChestHandler.kt index e540e25f1..3dc6e736a 100644 --- a/Server/src/main/kotlin/core/game/content/quest/members/thelosttribe/SigmundChestHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/SigmundChestHandler.kt @@ -1,4 +1,4 @@ -package core.game.content.quest.members.thelosttribe +package rs09.game.content.quest.members.thelosttribe import core.cache.def.impl.ObjectDefinition import core.game.interaction.OptionHandler @@ -8,7 +8,7 @@ import core.game.node.item.GroundItemManager import core.game.node.item.Item import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items +import rs09.tools.Items @Initializable /** diff --git a/Server/src/main/kotlin/core/game/content/zone/keldagrim/CartConductorDialogue.kt b/Server/src/main/kotlin/rs09/game/content/zone/keldagrim/CartConductorDialogue.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/zone/keldagrim/CartConductorDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/zone/keldagrim/CartConductorDialogue.kt index e7b595dc2..3d6e04c2c 100644 --- a/Server/src/main/kotlin/core/game/content/zone/keldagrim/CartConductorDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/zone/keldagrim/CartConductorDialogue.kt @@ -1,13 +1,13 @@ -package core.game.content.zone.keldagrim +package rs09.game.content.zone.keldagrim import core.game.component.Component +import core.game.content.dialogue.DialoguePlugin +import core.game.content.dialogue.FacialExpression import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.item.Item import core.game.world.map.Location import core.plugin.Initializable -import core.game.content.dialogue.DialoguePlugin -import core.game.content.dialogue.FacialExpression private const val ICE_MOUNTAIN_CONDUCTOR = 2180 private const val WHITE_WOLF_CONDUCTOR = 2181 diff --git a/Server/src/main/kotlin/core/game/content/zone/keldagrim/DwarvenBoatmanDialogue.kt b/Server/src/main/kotlin/rs09/game/content/zone/keldagrim/DwarvenBoatmanDialogue.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/zone/keldagrim/DwarvenBoatmanDialogue.kt rename to Server/src/main/kotlin/rs09/game/content/zone/keldagrim/DwarvenBoatmanDialogue.kt index 642575385..188387f0c 100644 --- a/Server/src/main/kotlin/core/game/content/zone/keldagrim/DwarvenBoatmanDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/content/zone/keldagrim/DwarvenBoatmanDialogue.kt @@ -1,14 +1,14 @@ -package core.game.content.zone.keldagrim +package rs09.game.content.zone.keldagrim import core.game.component.Component -import core.game.node.entity.player.Player -import core.game.system.task.Pulse -import core.game.world.GameWorld -import core.game.world.map.Location -import core.plugin.Initializable import core.game.content.dialogue.DialoguePlugin import core.game.content.dialogue.FacialExpression -import core.tools.Components +import core.game.node.entity.player.Player +import core.game.system.task.Pulse +import rs09.game.world.GameWorld +import core.game.world.map.Location +import core.plugin.Initializable +import rs09.tools.Components @Initializable class DwarvenBoatmanDialogue(player: Player? = null) : DialoguePlugin(player) { diff --git a/Server/src/main/kotlin/core/game/content/zone/keldagrim/KeldagrimCartMethods.kt b/Server/src/main/kotlin/rs09/game/content/zone/keldagrim/KeldagrimCartMethods.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/zone/keldagrim/KeldagrimCartMethods.kt rename to Server/src/main/kotlin/rs09/game/content/zone/keldagrim/KeldagrimCartMethods.kt index 39f1faf3b..3be0ed76d 100644 --- a/Server/src/main/kotlin/core/game/content/zone/keldagrim/KeldagrimCartMethods.kt +++ b/Server/src/main/kotlin/rs09/game/content/zone/keldagrim/KeldagrimCartMethods.kt @@ -1,13 +1,13 @@ -package core.game.content.zone.keldagrim +package rs09.game.content.zone.keldagrim import core.game.component.Component import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.map.Direction import core.game.world.map.Location -import core.tools.Components +import rs09.tools.Components object KeldagrimCartMethods { @JvmStatic diff --git a/Server/src/main/kotlin/core/game/content/zone/keldagrim/KeldagrimPlugin.kt b/Server/src/main/kotlin/rs09/game/content/zone/keldagrim/KeldagrimPlugin.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/zone/keldagrim/KeldagrimPlugin.kt rename to Server/src/main/kotlin/rs09/game/content/zone/keldagrim/KeldagrimPlugin.kt index d4f9241d5..34eea1b6f 100644 --- a/Server/src/main/kotlin/core/game/content/zone/keldagrim/KeldagrimPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/content/zone/keldagrim/KeldagrimPlugin.kt @@ -1,13 +1,13 @@ -package core.game.content.zone.keldagrim +package rs09.game.content.zone.keldagrim import core.cache.def.impl.ObjectDefinition +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.world.map.Location import core.plugin.Initializable import core.plugin.Plugin -import core.game.content.dialogue.DialoguePlugin /** * File that contains several plugins relating to Keldagrim, diff --git a/Server/src/main/kotlin/core/game/content/zone/keldagrim/Reinald.kt b/Server/src/main/kotlin/rs09/game/content/zone/keldagrim/Reinald.kt similarity index 96% rename from Server/src/main/kotlin/core/game/content/zone/keldagrim/Reinald.kt rename to Server/src/main/kotlin/rs09/game/content/zone/keldagrim/Reinald.kt index 488d37f00..bb750767a 100644 --- a/Server/src/main/kotlin/core/game/content/zone/keldagrim/Reinald.kt +++ b/Server/src/main/kotlin/rs09/game/content/zone/keldagrim/Reinald.kt @@ -1,14 +1,14 @@ -package core.game.content.zone.keldagrim +package rs09.game.content.zone.keldagrim import core.cache.def.impl.NPCDefinition import core.game.component.Component +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.plugin.Initializable import core.plugin.Plugin -import core.game.content.dialogue.DialoguePlugin -import core.tools.Components +import rs09.tools.Components const val REINALD = 2194 diff --git a/Server/src/main/kotlin/core/game/content/zone/keldagrim/ReinaldSmithingEmporiumInterface.kt b/Server/src/main/kotlin/rs09/game/content/zone/keldagrim/ReinaldSmithingEmporiumInterface.kt similarity index 99% rename from Server/src/main/kotlin/core/game/content/zone/keldagrim/ReinaldSmithingEmporiumInterface.kt rename to Server/src/main/kotlin/rs09/game/content/zone/keldagrim/ReinaldSmithingEmporiumInterface.kt index 717bd64e7..378e813d4 100644 --- a/Server/src/main/kotlin/core/game/content/zone/keldagrim/ReinaldSmithingEmporiumInterface.kt +++ b/Server/src/main/kotlin/rs09/game/content/zone/keldagrim/ReinaldSmithingEmporiumInterface.kt @@ -1,4 +1,4 @@ -package core.game.content.zone.keldagrim +package rs09.game.content.zone.keldagrim import core.game.component.Component import core.game.component.ComponentDefinition diff --git a/Server/src/main/kotlin/core/game/content/zone/phasmatys/bonegrinder/BoneGrinderListener.kt b/Server/src/main/kotlin/rs09/game/content/zone/phasmatys/bonegrinder/BoneGrinderListener.kt similarity index 98% rename from Server/src/main/kotlin/core/game/content/zone/phasmatys/bonegrinder/BoneGrinderListener.kt rename to Server/src/main/kotlin/rs09/game/content/zone/phasmatys/bonegrinder/BoneGrinderListener.kt index 09ac0cbab..6a1076d8b 100644 --- a/Server/src/main/kotlin/core/game/content/zone/phasmatys/bonegrinder/BoneGrinderListener.kt +++ b/Server/src/main/kotlin/rs09/game/content/zone/phasmatys/bonegrinder/BoneGrinderListener.kt @@ -1,14 +1,14 @@ -package core.game.content.zone.phasmatys.bonegrinder +package rs09.game.content.zone.phasmatys.bonegrinder import core.game.content.global.Bones -import core.game.interaction.OptionListener import core.game.node.entity.player.Player import core.game.node.item.Item import core.game.system.task.Pulse -import core.game.world.GameWorld.Pulser import core.game.world.map.Location import core.game.world.update.flag.context.Animation -import core.tools.Items +import rs09.game.interaction.OptionListener +import rs09.game.world.GameWorld.Pulser +import rs09.tools.Items private const val LOADER = 11162 private const val BONE_GRINDER = 11163 diff --git a/Server/src/main/kotlin/core/game/ge/BotPrices.kt b/Server/src/main/kotlin/rs09/game/ge/BotPrices.kt similarity index 97% rename from Server/src/main/kotlin/core/game/ge/BotPrices.kt rename to Server/src/main/kotlin/rs09/game/ge/BotPrices.kt index 294806390..4ae1a1dc5 100644 --- a/Server/src/main/kotlin/core/game/ge/BotPrices.kt +++ b/Server/src/main/kotlin/rs09/game/ge/BotPrices.kt @@ -1,7 +1,7 @@ -package core.game.ge +package rs09.game.ge import core.cache.def.impl.ItemDefinition -import core.tools.Items +import rs09.tools.Items class BotPrices { diff --git a/Server/src/main/kotlin/core/game/ge/GEAutoStock.kt b/Server/src/main/kotlin/rs09/game/ge/GEAutoStock.kt similarity index 95% rename from Server/src/main/kotlin/core/game/ge/GEAutoStock.kt rename to Server/src/main/kotlin/rs09/game/ge/GEAutoStock.kt index 25768799a..113e57fa9 100644 --- a/Server/src/main/kotlin/core/game/ge/GEAutoStock.kt +++ b/Server/src/main/kotlin/rs09/game/ge/GEAutoStock.kt @@ -1,9 +1,9 @@ -package core.game.ge +package rs09.game.ge -import core.ServerConstants import org.json.simple.JSONArray import org.json.simple.JSONObject import org.json.simple.parser.JSONParser +import rs09.ServerConstants import java.io.File import java.io.FileReader diff --git a/Server/src/main/kotlin/core/game/ge/GrandExchangeOffer.kt b/Server/src/main/kotlin/rs09/game/ge/GrandExchangeOffer.kt similarity index 96% rename from Server/src/main/kotlin/core/game/ge/GrandExchangeOffer.kt rename to Server/src/main/kotlin/rs09/game/ge/GrandExchangeOffer.kt index b6b4adf94..6e1038e38 100644 --- a/Server/src/main/kotlin/core/game/ge/GrandExchangeOffer.kt +++ b/Server/src/main/kotlin/rs09/game/ge/GrandExchangeOffer.kt @@ -1,11 +1,9 @@ -package core.game.ge - -import core.game.node.entity.player.Player -import core.game.node.item.Item +package rs09.game.ge import core.cache.def.impl.ItemDefinition - - +import core.game.ge.OfferState +import core.game.node.entity.player.Player +import core.game.node.item.Item /** diff --git a/Server/src/main/kotlin/core/game/ge/OfferManager.kt b/Server/src/main/kotlin/rs09/game/ge/OfferManager.kt similarity index 98% rename from Server/src/main/kotlin/core/game/ge/OfferManager.kt rename to Server/src/main/kotlin/rs09/game/ge/OfferManager.kt index f2672ad18..372b4d04e 100644 --- a/Server/src/main/kotlin/core/game/ge/OfferManager.kt +++ b/Server/src/main/kotlin/rs09/game/ge/OfferManager.kt @@ -1,32 +1,34 @@ -package core.game.ge +package rs09.game.ge -import core.ServerConstants +import rs09.ServerConstants import core.cache.def.impl.ItemDefinition import core.game.content.eco.EcoStatus import core.game.content.eco.EconomyManagement +import core.game.ge.BuyingLimitation +import core.game.ge.GrandExchangeDatabase +import core.game.ge.OfferState import core.game.node.entity.player.Player import core.game.node.entity.player.info.PlayerDetails import core.game.node.entity.player.link.audio.Audio import core.game.node.item.Item -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.callback.CallBack -import core.game.world.repository.Repository +import rs09.game.world.repository.Repository import core.net.packet.PacketRepository import core.net.packet.context.ContainerContext import core.net.packet.out.ContainerPacket import org.json.simple.JSONArray import org.json.simple.JSONObject import org.json.simple.parser.JSONParser -import plugin.ai.AIPlayer +import rs09.game.ai.AIPlayer import java.io.File import java.io.FileReader import java.io.FileWriter import java.io.IOException -import java.lang.Exception import java.lang.Integer.min -import java.util.HashMap +import java.util.* import java.util.concurrent.locks.ReentrantLock import javax.script.ScriptEngineManager diff --git a/Server/src/main/kotlin/core/game/ge/PlayerGrandExchange.kt b/Server/src/main/kotlin/rs09/game/ge/PlayerGrandExchange.kt similarity index 98% rename from Server/src/main/kotlin/core/game/ge/PlayerGrandExchange.kt rename to Server/src/main/kotlin/rs09/game/ge/PlayerGrandExchange.kt index 525d6dedc..65602d13f 100644 --- a/Server/src/main/kotlin/core/game/ge/PlayerGrandExchange.kt +++ b/Server/src/main/kotlin/rs09/game/ge/PlayerGrandExchange.kt @@ -1,12 +1,18 @@ -package core.game.ge +package rs09.game.ge import core.cache.def.impl.ItemDefinition import core.game.component.CloseEvent import core.game.component.Component +import core.game.component.InterfaceType import core.game.container.Container import core.game.container.ContainerEvent import core.game.container.ContainerListener +import core.game.container.access.BitregisterAssembler import core.game.container.access.InterfaceContainer +import core.game.ge.GEItemSet +import core.game.ge.GrandExchangeDatabase +import core.game.ge.GrandExchangeEntry +import core.game.ge.OfferState import core.game.node.entity.player.Player import core.game.node.entity.player.link.audio.Audio import core.game.node.item.Item @@ -20,17 +26,13 @@ import core.net.packet.out.ContainerPacket import core.net.packet.out.GrandExchangePacket import org.json.simple.JSONArray import org.json.simple.JSONObject -import core.game.ge.OfferManager.Companion.dispatch -import core.game.ge.OfferManager.Companion.updateOffer -import java.lang.StringBuilder -import java.nio.ByteBuffer +import rs09.game.ge.OfferManager.Companion.dispatch +import rs09.game.ge.OfferManager.Companion.updateOffer +import rs09.game.system.SystemLogger +import rs09.tools.Components import java.text.DecimalFormat import java.text.NumberFormat import java.util.* -import core.game.component.InterfaceType -import core.game.container.access.BitregisterAssembler -import core.game.system.SystemLogger -import core.tools.Components /** diff --git a/Server/src/main/kotlin/core/game/interaction/CorporealBeastWarningInterface.kt b/Server/src/main/kotlin/rs09/game/interaction/CorporealBeastWarningInterface.kt similarity index 95% rename from Server/src/main/kotlin/core/game/interaction/CorporealBeastWarningInterface.kt rename to Server/src/main/kotlin/rs09/game/interaction/CorporealBeastWarningInterface.kt index 85395b797..92bd475f1 100644 --- a/Server/src/main/kotlin/core/game/interaction/CorporealBeastWarningInterface.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/CorporealBeastWarningInterface.kt @@ -1,12 +1,12 @@ -package core.game.interaction +package rs09.game.interaction import core.game.component.Component import core.game.component.ComponentDefinition import core.game.component.ComponentPlugin import core.game.node.entity.player.Player -import core.game.world.GameWorld import core.plugin.Initializable import core.plugin.Plugin +import rs09.game.world.GameWorld @Initializable /** diff --git a/Server/src/main/kotlin/core/game/interaction/FOGRewardsInterface.kt b/Server/src/main/kotlin/rs09/game/interaction/FOGRewardsInterface.kt similarity index 98% rename from Server/src/main/kotlin/core/game/interaction/FOGRewardsInterface.kt rename to Server/src/main/kotlin/rs09/game/interaction/FOGRewardsInterface.kt index 53b0715f6..e4644f06e 100644 --- a/Server/src/main/kotlin/core/game/interaction/FOGRewardsInterface.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/FOGRewardsInterface.kt @@ -1,4 +1,4 @@ -package core.game.interaction +package rs09.game.interaction import core.cache.def.impl.ItemDefinition import core.game.component.Component @@ -6,9 +6,9 @@ import core.game.component.ComponentDefinition import core.game.component.ComponentPlugin import core.game.node.entity.player.Player import core.game.node.item.Item -import core.game.system.SystemLogger import core.plugin.Initializable import core.plugin.Plugin +import rs09.game.system.SystemLogger @Initializable class FOGRewardsInterface : ComponentPlugin(){ diff --git a/Server/src/main/kotlin/core/game/interaction/ItemOnBankBooth.kt b/Server/src/main/kotlin/rs09/game/interaction/ItemOnBankBooth.kt similarity index 88% rename from Server/src/main/kotlin/core/game/interaction/ItemOnBankBooth.kt rename to Server/src/main/kotlin/rs09/game/interaction/ItemOnBankBooth.kt index 3360355ca..80cbc35cd 100644 --- a/Server/src/main/kotlin/core/game/interaction/ItemOnBankBooth.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/ItemOnBankBooth.kt @@ -1,7 +1,10 @@ -package core.game.interaction +package rs09.game.interaction +import core.game.interaction.DestinationFlag +import core.game.interaction.MovementPulse +import core.game.interaction.NodeUsageEvent +import core.game.interaction.UseWithHandler import core.game.node.item.Item -import core.game.system.SystemLogger import core.plugin.Plugin class ItemOnBankBooth : UseWithHandler(0) { diff --git a/Server/src/main/kotlin/core/game/interaction/Listeners.kt b/Server/src/main/kotlin/rs09/game/interaction/Listeners.kt similarity index 86% rename from Server/src/main/kotlin/core/game/interaction/Listeners.kt rename to Server/src/main/kotlin/rs09/game/interaction/Listeners.kt index 6095a345a..6d78e3b62 100644 --- a/Server/src/main/kotlin/core/game/interaction/Listeners.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/Listeners.kt @@ -1,5 +1,7 @@ -package core.game.interaction +package rs09.game.interaction +import core.game.interaction.DestinationFlag +import core.game.interaction.MovementPulse import core.game.node.Node import core.game.node.entity.player.Player @@ -27,6 +29,13 @@ object Listeners { listeners[key] = method } + @JvmStatic + fun add(options: Array,type: Int,method: (Player, Node) -> Boolean){ + for(opt in options){ + add(opt,type,method) + } + } + @JvmStatic fun get(id: Int, type: Int, option: String): ((Player,Node) -> Boolean)?{ return listeners["$id:$type:${option.toLowerCase()}"] diff --git a/Server/src/main/kotlin/core/game/interaction/OptionListener.kt b/Server/src/main/kotlin/rs09/game/interaction/OptionListener.kt similarity index 79% rename from Server/src/main/kotlin/core/game/interaction/OptionListener.kt rename to Server/src/main/kotlin/rs09/game/interaction/OptionListener.kt index e79cc6f62..514b80fb8 100644 --- a/Server/src/main/kotlin/core/game/interaction/OptionListener.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/OptionListener.kt @@ -1,4 +1,4 @@ -package core.game.interaction +package rs09.game.interaction import core.game.node.Node import core.game.node.entity.player.Player @@ -17,4 +17,7 @@ abstract class OptionListener { fun on(option: String, type: Int, handler: (Player, Node) -> Boolean){ Listeners.add(option,type,handler) } + fun on(type: Int, vararg option: String, handler: (Player, Node) -> Boolean){ + Listeners.add(option,type,handler) + } } \ No newline at end of file diff --git a/Server/src/main/kotlin/core/game/interaction/QCRepository.kt b/Server/src/main/kotlin/rs09/game/interaction/QCRepository.kt similarity index 99% rename from Server/src/main/kotlin/core/game/interaction/QCRepository.kt rename to Server/src/main/kotlin/rs09/game/interaction/QCRepository.kt index a32bf3759..f1a74b884 100644 --- a/Server/src/main/kotlin/core/game/interaction/QCRepository.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/QCRepository.kt @@ -1,18 +1,18 @@ -package core.game.interaction +package rs09.game.interaction import core.cache.Cache import core.cache.def.impl.ItemDefinition import core.cache.def.impl.NPCDefinition import core.cache.misc.buffer.ByteBufferUtils import core.game.node.entity.player.Player +import core.game.node.entity.skill.Skills import core.game.system.task.Pulse -import core.game.world.GameWorld.Pulser import core.game.world.update.flag.context.ChatMessage import core.game.world.update.flag.player.ChatFlag import core.net.amsc.MSPacketRepository import core.net.amsc.WorldCommunicator -import core.net.packet.`in`.QCPacketType -import core.game.node.entity.skill.Skills +import rs09.game.world.GameWorld.Pulser +import rs09.net.packet.`in`.QCPacketType import java.nio.ByteBuffer diff --git a/Server/src/main/kotlin/core/game/interaction/city/IsafdarPlugin.kt b/Server/src/main/kotlin/rs09/game/interaction/city/IsafdarPlugin.kt similarity index 97% rename from Server/src/main/kotlin/core/game/interaction/city/IsafdarPlugin.kt rename to Server/src/main/kotlin/rs09/game/interaction/city/IsafdarPlugin.kt index 214d7311b..492de512b 100644 --- a/Server/src/main/kotlin/core/game/interaction/city/IsafdarPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/city/IsafdarPlugin.kt @@ -1,4 +1,4 @@ -package core.game.interaction.city +package rs09.game.interaction.city import core.cache.def.impl.ObjectDefinition import core.game.interaction.OptionHandler diff --git a/Server/src/main/kotlin/core/game/interaction/city/MorytaniaPlugin.kt b/Server/src/main/kotlin/rs09/game/interaction/city/MorytaniaPlugin.kt similarity index 98% rename from Server/src/main/kotlin/core/game/interaction/city/MorytaniaPlugin.kt rename to Server/src/main/kotlin/rs09/game/interaction/city/MorytaniaPlugin.kt index ce7268d43..6d97172a1 100644 --- a/Server/src/main/kotlin/core/game/interaction/city/MorytaniaPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/city/MorytaniaPlugin.kt @@ -1,4 +1,4 @@ -package core.game.interaction.city +package rs09.game.interaction.city import core.cache.def.impl.ObjectDefinition import core.game.interaction.OptionHandler diff --git a/Server/src/main/kotlin/core/game/interaction/city/falador/MakeoverMageInterface.kt b/Server/src/main/kotlin/rs09/game/interaction/city/falador/MakeoverMageInterface.kt similarity index 100% rename from Server/src/main/kotlin/core/game/interaction/city/falador/MakeoverMageInterface.kt rename to Server/src/main/kotlin/rs09/game/interaction/city/falador/MakeoverMageInterface.kt diff --git a/Server/src/main/kotlin/core/game/interaction/inter/ChocatriceIncubationInterface.kt b/Server/src/main/kotlin/rs09/game/interaction/inter/ChocatriceIncubationInterface.kt similarity index 97% rename from Server/src/main/kotlin/core/game/interaction/inter/ChocatriceIncubationInterface.kt rename to Server/src/main/kotlin/rs09/game/interaction/inter/ChocatriceIncubationInterface.kt index 94065297d..91c763a48 100644 --- a/Server/src/main/kotlin/core/game/interaction/inter/ChocatriceIncubationInterface.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/inter/ChocatriceIncubationInterface.kt @@ -1,4 +1,4 @@ -package core.game.interaction.inter +package rs09.game.interaction.inter import core.game.component.Component import core.game.component.ComponentDefinition diff --git a/Server/src/main/kotlin/core/game/interaction/inter/ExperienceInterface.kt b/Server/src/main/kotlin/rs09/game/interaction/inter/ExperienceInterface.kt similarity index 98% rename from Server/src/main/kotlin/core/game/interaction/inter/ExperienceInterface.kt rename to Server/src/main/kotlin/rs09/game/interaction/inter/ExperienceInterface.kt index 388f213e2..faf2df926 100644 --- a/Server/src/main/kotlin/core/game/interaction/inter/ExperienceInterface.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/inter/ExperienceInterface.kt @@ -1,11 +1,11 @@ -package core.game.interaction.inter +package rs09.game.interaction.inter import core.game.component.Component import core.game.component.ComponentDefinition import core.game.component.ComponentPlugin import core.game.node.entity.player.Player import core.game.node.entity.player.link.audio.Audio -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger import core.plugin.Initializable import core.plugin.Plugin import core.game.node.entity.skill.Skills diff --git a/Server/src/main/kotlin/core/game/interaction/inter/FairyRingInterface.kt b/Server/src/main/kotlin/rs09/game/interaction/inter/FairyRingInterface.kt similarity index 98% rename from Server/src/main/kotlin/core/game/interaction/inter/FairyRingInterface.kt rename to Server/src/main/kotlin/rs09/game/interaction/inter/FairyRingInterface.kt index b3e783303..e39239b83 100644 --- a/Server/src/main/kotlin/core/game/interaction/inter/FairyRingInterface.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/inter/FairyRingInterface.kt @@ -1,18 +1,17 @@ -package core.game.interaction.inter +package rs09.game.interaction.inter import core.game.component.Component import core.game.component.ComponentDefinition import core.game.component.ComponentPlugin import core.game.node.entity.player.Player import core.game.node.entity.player.link.TeleportManager -import core.game.system.SystemLogger import core.game.system.task.Pulse -import core.game.world.GameWorld import core.game.world.map.Location import core.game.world.map.RegionManager import core.plugin.Initializable import core.plugin.Plugin import core.tools.RandomFunction +import rs09.game.world.GameWorld val RING_1 = arrayOf('a','d','c','b') val RING_2 = arrayOf('i','l','k','j') diff --git a/Server/src/main/kotlin/core/game/interaction/inter/FurClothingInterface.kt b/Server/src/main/kotlin/rs09/game/interaction/inter/FurClothingInterface.kt similarity index 99% rename from Server/src/main/kotlin/core/game/interaction/inter/FurClothingInterface.kt rename to Server/src/main/kotlin/rs09/game/interaction/inter/FurClothingInterface.kt index 759ab5b27..31934405e 100644 --- a/Server/src/main/kotlin/core/game/interaction/inter/FurClothingInterface.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/inter/FurClothingInterface.kt @@ -1,4 +1,4 @@ -package core.game.interaction.inter +package rs09.game.interaction.inter import core.game.component.Component import core.game.component.ComponentDefinition @@ -10,7 +10,7 @@ import core.plugin.Initializable import core.plugin.Plugin import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch -import core.tools.stringtools.colorize +import rs09.tools.stringtools.colorize private const val FUR_CLOTHING_COMPONENT_ID = 477 diff --git a/Server/src/main/kotlin/core/game/interaction/inter/HairDresserInterface.kt b/Server/src/main/kotlin/rs09/game/interaction/inter/HairDresserInterface.kt similarity index 99% rename from Server/src/main/kotlin/core/game/interaction/inter/HairDresserInterface.kt rename to Server/src/main/kotlin/rs09/game/interaction/inter/HairDresserInterface.kt index 9a6b15dcc..1452c0abb 100644 --- a/Server/src/main/kotlin/core/game/interaction/inter/HairDresserInterface.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/inter/HairDresserInterface.kt @@ -1,13 +1,13 @@ -package core.game.interaction.inter +package rs09.game.interaction.inter import core.game.component.Component import core.game.component.ComponentDefinition import core.game.component.ComponentPlugin +import core.game.content.dialogue.FacialExpression import core.game.node.entity.player.Player import core.game.node.item.Item import core.plugin.Initializable import core.plugin.Plugin -import core.game.content.dialogue.FacialExpression /** * Handles the reworked hairdresser interface with full functionality diff --git a/Server/src/main/kotlin/core/game/interaction/inter/MakeOverInterface.kt b/Server/src/main/kotlin/rs09/game/interaction/inter/MakeOverInterface.kt similarity index 98% rename from Server/src/main/kotlin/core/game/interaction/inter/MakeOverInterface.kt rename to Server/src/main/kotlin/rs09/game/interaction/inter/MakeOverInterface.kt index 29854dc14..e1b91bcca 100644 --- a/Server/src/main/kotlin/core/game/interaction/inter/MakeOverInterface.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/inter/MakeOverInterface.kt @@ -1,15 +1,15 @@ -package core.game.interaction.inter +package rs09.game.interaction.inter import core.game.component.Component import core.game.component.ComponentDefinition import core.game.component.ComponentPlugin -import core.tools.Items +import core.game.content.dialogue.FacialExpression import core.game.node.entity.player.Player import core.game.node.entity.player.link.appearance.Gender import core.game.node.item.Item import core.plugin.Initializable import core.plugin.Plugin -import core.game.content.dialogue.FacialExpression +import rs09.tools.Items //child IDs for components of interest on the interface private const val MALE_CHILD_ID = 90 diff --git a/Server/src/main/kotlin/core/game/interaction/inter/PuppyInterfacePlugin.kt b/Server/src/main/kotlin/rs09/game/interaction/inter/PuppyInterfacePlugin.kt similarity index 97% rename from Server/src/main/kotlin/core/game/interaction/inter/PuppyInterfacePlugin.kt rename to Server/src/main/kotlin/rs09/game/interaction/inter/PuppyInterfacePlugin.kt index 152efeb1a..80c98cd94 100644 --- a/Server/src/main/kotlin/core/game/interaction/inter/PuppyInterfacePlugin.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/inter/PuppyInterfacePlugin.kt @@ -1,4 +1,4 @@ -package core.game.interaction.inter +package rs09.game.interaction.inter import core.game.component.Component import core.game.component.ComponentDefinition diff --git a/Server/src/main/kotlin/core/game/interaction/inter/ThessaliaInterface.kt b/Server/src/main/kotlin/rs09/game/interaction/inter/ThessaliaInterface.kt similarity index 99% rename from Server/src/main/kotlin/core/game/interaction/inter/ThessaliaInterface.kt rename to Server/src/main/kotlin/rs09/game/interaction/inter/ThessaliaInterface.kt index 6311daf38..7baa2cbe3 100644 --- a/Server/src/main/kotlin/core/game/interaction/inter/ThessaliaInterface.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/inter/ThessaliaInterface.kt @@ -1,11 +1,10 @@ -package core.game.interaction.inter +package rs09.game.interaction.inter import core.game.component.Component import core.game.component.ComponentDefinition import core.game.component.ComponentPlugin import core.game.node.entity.player.Player import core.game.node.item.Item -import core.game.system.SystemLogger import core.plugin.Initializable import core.plugin.Plugin diff --git a/Server/src/main/kotlin/core/game/interaction/item/BraceletOfClayPlugin.kt b/Server/src/main/kotlin/rs09/game/interaction/item/BraceletOfClayPlugin.kt similarity index 95% rename from Server/src/main/kotlin/core/game/interaction/item/BraceletOfClayPlugin.kt rename to Server/src/main/kotlin/rs09/game/interaction/item/BraceletOfClayPlugin.kt index ff36ba8f6..429f90e1a 100644 --- a/Server/src/main/kotlin/core/game/interaction/item/BraceletOfClayPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/item/BraceletOfClayPlugin.kt @@ -1,4 +1,4 @@ -package core.game.interaction.item +package rs09.game.interaction.item import core.cache.def.impl.ItemDefinition import core.game.interaction.OptionHandler diff --git a/Server/src/main/kotlin/core/game/interaction/item/EnchantJewelleryTabOption.kt b/Server/src/main/kotlin/rs09/game/interaction/item/EnchantJewelleryTabOption.kt similarity index 97% rename from Server/src/main/kotlin/core/game/interaction/item/EnchantJewelleryTabOption.kt rename to Server/src/main/kotlin/rs09/game/interaction/item/EnchantJewelleryTabOption.kt index 0b533e0e3..3a9fe3e81 100644 --- a/Server/src/main/kotlin/core/game/interaction/item/EnchantJewelleryTabOption.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/item/EnchantJewelleryTabOption.kt @@ -1,17 +1,17 @@ -package core.game.interaction.item +package rs09.game.interaction.item 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.item.Item -import core.game.system.SystemLogger import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch +import rs09.game.system.SystemLogger +import rs09.tools.Items private val LVL_1_ENCHANT = hashMapOf( Items.SAPPHIRE_RING_1637 to Item(Items.RING_OF_RECOIL_2550), diff --git a/Server/src/main/kotlin/core/game/interaction/item/EnchantedJewelleryListener.kt b/Server/src/main/kotlin/rs09/game/interaction/item/EnchantedJewelleryListener.kt similarity index 89% rename from Server/src/main/kotlin/core/game/interaction/item/EnchantedJewelleryListener.kt rename to Server/src/main/kotlin/rs09/game/interaction/item/EnchantedJewelleryListener.kt index 0338299aa..4341cd694 100644 --- a/Server/src/main/kotlin/core/game/interaction/item/EnchantedJewelleryListener.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/item/EnchantedJewelleryListener.kt @@ -1,9 +1,9 @@ -package core.game.interaction.item +package rs09.game.interaction.item -import core.game.interaction.OptionListener import core.game.content.global.EnchantedJewellery -import core.game.content.global.EnchantedJewelleryDialogueFile -import java.util.ArrayList +import rs09.game.content.global.EnchantedJewelleryDialogueFile +import rs09.game.interaction.OptionListener +import java.util.* /** * Listener for enchanted jewellery options diff --git a/Server/src/main/kotlin/core/game/interaction/item/GrandSeedPodHandler.kt b/Server/src/main/kotlin/rs09/game/interaction/item/GrandSeedPodHandler.kt similarity index 96% rename from Server/src/main/kotlin/core/game/interaction/item/GrandSeedPodHandler.kt rename to Server/src/main/kotlin/rs09/game/interaction/item/GrandSeedPodHandler.kt index 8062c63b7..323380c29 100644 --- a/Server/src/main/kotlin/core/game/interaction/item/GrandSeedPodHandler.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/item/GrandSeedPodHandler.kt @@ -1,21 +1,21 @@ -package core.game.interaction.item +package rs09.game.interaction.item import core.cache.def.impl.ItemDefinition -import core.tools.Items import core.game.content.global.travel.glider.GliderPulse import core.game.content.global.travel.glider.Gliders import core.game.interaction.OptionHandler import core.game.node.Node 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.game.world.GameWorld import core.game.world.map.Location import core.game.world.update.flag.context.Animation import core.game.world.update.flag.context.Graphics import core.plugin.Initializable import core.plugin.Plugin -import core.game.node.entity.skill.Skills +import rs09.game.world.GameWorld +import rs09.tools.Items private const val SQUASH_GRAPHICS_BEGIN = 767 private const val SQUASH_GRAPHICS_END = 769 diff --git a/Server/src/main/kotlin/core/game/interaction/item/withitem/CapeDyer.kt b/Server/src/main/kotlin/rs09/game/interaction/item/withitem/CapeDyer.kt similarity index 95% rename from Server/src/main/kotlin/core/game/interaction/item/withitem/CapeDyer.kt rename to Server/src/main/kotlin/rs09/game/interaction/item/withitem/CapeDyer.kt index dbabc9ad3..6a71ea792 100644 --- a/Server/src/main/kotlin/core/game/interaction/item/withitem/CapeDyer.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/item/withitem/CapeDyer.kt @@ -1,13 +1,12 @@ -package core.game.interaction.item.withitem +package rs09.game.interaction.item.withitem import core.game.content.global.Dyes import core.game.interaction.NodeUsageEvent import core.game.interaction.UseWithHandler import core.game.node.item.Item -import core.game.system.SystemLogger import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items +import rs09.tools.Items private val CAPES = arrayOf(1019,1007,1021,1023,1027,1029,1031,6959) private val DYES = Dyes.values().map { it -> it.item.id }.toIntArray() diff --git a/Server/src/main/kotlin/core/game/interaction/item/withobject/CoalTrucksHandler.kt b/Server/src/main/kotlin/rs09/game/interaction/item/withobject/CoalTrucksHandler.kt similarity index 96% rename from Server/src/main/kotlin/core/game/interaction/item/withobject/CoalTrucksHandler.kt rename to Server/src/main/kotlin/rs09/game/interaction/item/withobject/CoalTrucksHandler.kt index bce45c745..b21b70a0f 100644 --- a/Server/src/main/kotlin/core/game/interaction/item/withobject/CoalTrucksHandler.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/item/withobject/CoalTrucksHandler.kt @@ -1,4 +1,4 @@ -package core.game.interaction.item.withobject +package rs09.game.interaction.item.withobject import core.cache.def.impl.ObjectDefinition import core.game.interaction.NodeUsageEvent @@ -11,8 +11,8 @@ import core.game.node.item.Item import core.game.world.map.zone.ZoneBorders import core.plugin.Initializable import core.plugin.Plugin -import core.plugin.PluginManager.definePlugin -import core.tools.Items +import rs09.plugin.PluginManager.definePlugin +import rs09.tools.Items import java.util.* /** diff --git a/Server/src/main/kotlin/core/game/interaction/npc/BogrogPouchSwapper.kt b/Server/src/main/kotlin/rs09/game/interaction/npc/BogrogPouchSwapper.kt similarity index 97% rename from Server/src/main/kotlin/core/game/interaction/npc/BogrogPouchSwapper.kt rename to Server/src/main/kotlin/rs09/game/interaction/npc/BogrogPouchSwapper.kt index 0dfee3a45..5ffbf7c35 100644 --- a/Server/src/main/kotlin/core/game/interaction/npc/BogrogPouchSwapper.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/npc/BogrogPouchSwapper.kt @@ -1,13 +1,12 @@ -package core.game.interaction.npc +package rs09.game.interaction.npc import core.game.component.Component import core.game.node.entity.player.Player import core.game.node.entity.player.link.RunScript -import core.game.node.item.Item -import core.game.system.SystemLogger -import core.game.world.map.zone.ZoneBorders import core.game.node.entity.skill.summoning.SummoningPouch import core.game.node.entity.skill.summoning.SummoningScroll +import core.game.node.item.Item +import core.game.world.map.zone.ZoneBorders import kotlin.math.ceil /** diff --git a/Server/src/main/kotlin/core/game/interaction/object/DemonTauntHandler.kt b/Server/src/main/kotlin/rs09/game/interaction/object/DemonTauntHandler.kt similarity index 97% rename from Server/src/main/kotlin/core/game/interaction/object/DemonTauntHandler.kt rename to Server/src/main/kotlin/rs09/game/interaction/object/DemonTauntHandler.kt index 0328a44e6..cdddfd04f 100644 --- a/Server/src/main/kotlin/core/game/interaction/object/DemonTauntHandler.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/DemonTauntHandler.kt @@ -1,4 +1,4 @@ -package core.game.interaction.`object` +package rs09.game.interaction.`object` import core.cache.def.impl.ObjectDefinition import core.game.interaction.OptionHandler diff --git a/Server/src/main/kotlin/core/game/interaction/object/FairyRingPlugin.kt b/Server/src/main/kotlin/rs09/game/interaction/object/FairyRingPlugin.kt similarity index 97% rename from Server/src/main/kotlin/core/game/interaction/object/FairyRingPlugin.kt rename to Server/src/main/kotlin/rs09/game/interaction/object/FairyRingPlugin.kt index a6caf3678..e2bd58999 100644 --- a/Server/src/main/kotlin/core/game/interaction/object/FairyRingPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/FairyRingPlugin.kt @@ -1,4 +1,4 @@ -package core.game.interaction.`object` +package rs09.game.interaction.`object` import core.cache.def.impl.ObjectDefinition import core.game.component.Component @@ -9,7 +9,7 @@ import core.game.node.entity.player.link.TeleportManager.TeleportType import core.game.world.map.Location import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Components +import rs09.tools.Components /** * Handles interactions with fairy rings diff --git a/Server/src/main/kotlin/core/game/interaction/object/GutanothChestPlugin.kt b/Server/src/main/kotlin/rs09/game/interaction/object/GutanothChestPlugin.kt similarity index 96% rename from Server/src/main/kotlin/core/game/interaction/object/GutanothChestPlugin.kt rename to Server/src/main/kotlin/rs09/game/interaction/object/GutanothChestPlugin.kt index 98aa4464b..bfcfe36a2 100644 --- a/Server/src/main/kotlin/core/game/interaction/object/GutanothChestPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/GutanothChestPlugin.kt @@ -1,4 +1,4 @@ -package core.game.interaction.`object` +package rs09.game.interaction.`object` import core.cache.def.impl.ObjectDefinition import core.game.interaction.OptionHandler @@ -9,13 +9,12 @@ 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.system.SystemLogger import core.game.system.task.Pulse -import core.game.world.GameWorld import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items +import rs09.game.world.GameWorld +import rs09.tools.Items import java.util.concurrent.TimeUnit @Initializable diff --git a/Server/src/main/kotlin/core/game/interaction/object/JungleBushHandler.kt b/Server/src/main/kotlin/rs09/game/interaction/object/JungleBushHandler.kt similarity index 96% rename from Server/src/main/kotlin/core/game/interaction/object/JungleBushHandler.kt rename to Server/src/main/kotlin/rs09/game/interaction/object/JungleBushHandler.kt index 27cc55e50..875800930 100644 --- a/Server/src/main/kotlin/core/game/interaction/object/JungleBushHandler.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/JungleBushHandler.kt @@ -1,4 +1,4 @@ -package core.game.interaction.`object` +package rs09.game.interaction.`object` import core.cache.def.impl.ObjectDefinition import core.game.interaction.OptionHandler @@ -8,11 +8,11 @@ import core.game.node.`object`.ObjectBuilder import core.game.node.entity.player.Player import core.game.node.item.Item import core.game.system.task.Pulse -import core.game.world.GameWorld import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items +import rs09.game.world.GameWorld +import rs09.tools.Items /** * Handles the chopping down of dense jungle, mainly to grant access to the Kharazi Jungle. diff --git a/Server/src/main/kotlin/core/game/interaction/object/MuddyChestHandler.kt b/Server/src/main/kotlin/rs09/game/interaction/object/MuddyChestHandler.kt similarity index 96% rename from Server/src/main/kotlin/core/game/interaction/object/MuddyChestHandler.kt rename to Server/src/main/kotlin/rs09/game/interaction/object/MuddyChestHandler.kt index 0a3abfcf2..30ed36f07 100644 --- a/Server/src/main/kotlin/core/game/interaction/object/MuddyChestHandler.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/MuddyChestHandler.kt @@ -1,7 +1,6 @@ -package core.game.interaction.`object` +package rs09.game.interaction.`object` import core.cache.def.impl.ObjectDefinition -import core.tools.Items import core.game.interaction.OptionHandler import core.game.node.Node import core.game.node.`object`.GameObject @@ -12,6 +11,7 @@ import core.game.node.item.Item import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin +import rs09.tools.Items @Initializable /** diff --git a/Server/src/main/kotlin/core/game/interaction/object/TarBarrelListener.kt b/Server/src/main/kotlin/rs09/game/interaction/object/TarBarrelListener.kt similarity index 80% rename from Server/src/main/kotlin/core/game/interaction/object/TarBarrelListener.kt rename to Server/src/main/kotlin/rs09/game/interaction/object/TarBarrelListener.kt index 5c8d4b7cf..05d6aaf9b 100644 --- a/Server/src/main/kotlin/core/game/interaction/object/TarBarrelListener.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/TarBarrelListener.kt @@ -1,16 +1,10 @@ -package core.game.interaction.`object` +package rs09.game.interaction.`object` -import core.cache.def.impl.ObjectDefinition -import core.game.interaction.OptionHandler -import core.game.interaction.OptionListener -import core.game.node.Node import core.game.node.`object`.ObjectBuilder -import core.game.node.entity.player.Player import core.game.node.item.Item -import core.plugin.Initializable -import core.plugin.Plugin -import core.tools.Items import core.tools.RandomFunction +import rs09.game.interaction.OptionListener +import rs09.tools.Items /** * @author Woah, with love diff --git a/Server/src/main/kotlin/core/game/interaction/player/PeltOptionPlugin.kt b/Server/src/main/kotlin/rs09/game/interaction/player/PeltOptionPlugin.kt similarity index 95% rename from Server/src/main/kotlin/core/game/interaction/player/PeltOptionPlugin.kt rename to Server/src/main/kotlin/rs09/game/interaction/player/PeltOptionPlugin.kt index a0e87b7fe..834182459 100644 --- a/Server/src/main/kotlin/core/game/interaction/player/PeltOptionPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/player/PeltOptionPlugin.kt @@ -1,4 +1,4 @@ -package core.game.interaction.player +package rs09.game.interaction.player import core.game.interaction.Interaction import core.game.interaction.OptionHandler @@ -7,15 +7,15 @@ import core.game.node.entity.impl.Projectile import core.game.node.entity.player.Player import core.game.node.item.Item import core.game.system.task.Pulse -import core.game.world.GameWorld import core.game.world.map.Location import core.game.world.map.path.Pathfinder import core.game.world.update.flag.context.Animation import core.game.world.update.flag.context.Graphics import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items -import core.tools.stringtools.colorize +import rs09.game.world.GameWorld +import rs09.tools.Items +import rs09.tools.stringtools.colorize val snowball = Item(Items.SNOWBALL_11951) val THROW_ANIMATION = Animation(7530) diff --git a/Server/src/main/kotlin/core/game/node/entity/combat/CombatPulse.kt b/Server/src/main/kotlin/rs09/game/node/entity/combat/CombatPulse.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/combat/CombatPulse.kt rename to Server/src/main/kotlin/rs09/game/node/entity/combat/CombatPulse.kt index 9465b9346..bbcfe6c21 100644 --- a/Server/src/main/kotlin/core/game/node/entity/combat/CombatPulse.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/combat/CombatPulse.kt @@ -1,21 +1,25 @@ -package core.game.node.entity.combat +package rs09.game.node.entity.combat import core.game.container.impl.EquipmentContainer import core.game.interaction.MovementPulse import core.game.node.Node import core.game.node.entity.Entity +import core.game.node.entity.combat.BattleState +import core.game.node.entity.combat.CombatStyle +import core.game.node.entity.combat.DeathTask +import core.game.node.entity.combat.InteractionType import core.game.node.entity.combat.equipment.WeaponInterface import core.game.node.entity.impl.Animator import core.game.node.entity.npc.NPC 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.entity.state.EntityState import core.game.node.item.Item import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.update.flag.context.Animation import core.tools.RandomFunction -import core.game.node.entity.skill.Skills /** * The combat-handling pulse implementation. diff --git a/Server/src/main/kotlin/core/game/node/entity/combat/CombatSwingHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/combat/CombatSwingHandler.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/combat/CombatSwingHandler.kt rename to Server/src/main/kotlin/rs09/game/node/entity/combat/CombatSwingHandler.kt index 7bdbbb397..1b1d5edd9 100644 --- a/Server/src/main/kotlin/core/game/node/entity/combat/CombatSwingHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/combat/CombatSwingHandler.kt @@ -1,24 +1,25 @@ -package core.game.node.entity.combat +package rs09.game.node.entity.combat import core.game.container.Container import core.game.container.impl.EquipmentContainer import core.game.node.Node import core.game.node.entity.Entity +import core.game.node.entity.combat.BattleState +import core.game.node.entity.combat.CombatStyle +import core.game.node.entity.combat.InteractionType import core.game.node.entity.combat.equipment.ArmourSet import core.game.node.entity.combat.equipment.DegradableEquipment import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.entity.player.link.audio.Audio import core.game.node.entity.player.link.prayer.PrayerType -import core.game.node.entity.state.EntityState -import core.game.system.config.ItemConfigParser -import core.game.world.map.path.Pathfinder -import core.game.world.update.flag.context.Animation -import core.game.world.update.flag.context.Graphics -import core.tools.RandomFunction import core.game.node.entity.skill.Skills import core.game.node.entity.skill.summoning.familiar.Familiar -import core.game.system.SystemLogger +import core.game.world.map.path.Pathfinder +import core.game.world.update.flag.context.Animation +import core.tools.RandomFunction +import rs09.game.system.SystemLogger +import rs09.game.system.config.ItemConfigParser import java.util.* import kotlin.math.floor diff --git a/Server/src/main/kotlin/core/game/node/entity/combat/equipment/EquipmentDegrader.kt b/Server/src/main/kotlin/rs09/game/node/entity/combat/equipment/EquipmentDegrader.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/combat/equipment/EquipmentDegrader.kt rename to Server/src/main/kotlin/rs09/game/node/entity/combat/equipment/EquipmentDegrader.kt index 140e15f57..2e109941a 100644 --- a/Server/src/main/kotlin/core/game/node/entity/combat/equipment/EquipmentDegrader.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/combat/equipment/EquipmentDegrader.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.combat.equipment +package rs09.game.node.entity.combat.equipment import core.game.node.entity.player.Player import core.game.node.item.Item diff --git a/Server/src/main/kotlin/core/game/node/entity/combat/handlers/MagicSwingHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/MagicSwingHandler.kt similarity index 99% rename from Server/src/main/kotlin/core/game/node/entity/combat/handlers/MagicSwingHandler.kt rename to Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/MagicSwingHandler.kt index 5c432c1f4..bf743c2e4 100644 --- a/Server/src/main/kotlin/core/game/node/entity/combat/handlers/MagicSwingHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/MagicSwingHandler.kt @@ -1,21 +1,21 @@ -package core.game.node.entity.combat.handlers +package rs09.game.node.entity.combat.handlers import core.game.container.Container import core.game.container.impl.EquipmentContainer +import core.game.content.quest.tutorials.tutorialisland.TutorialSession +import core.game.content.quest.tutorials.tutorialisland.TutorialStage import core.game.node.entity.Entity import core.game.node.entity.combat.BattleState import core.game.node.entity.combat.CombatStyle -import core.game.node.entity.combat.CombatSwingHandler import core.game.node.entity.combat.InteractionType import core.game.node.entity.combat.equipment.ArmourSet import core.game.node.entity.combat.equipment.SpellType import core.game.node.entity.combat.equipment.WeaponInterface import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player -import core.tools.RandomFunction import core.game.node.entity.skill.Skills -import core.game.content.quest.tutorials.tutorialisland.TutorialSession -import core.game.content.quest.tutorials.tutorialisland.TutorialStage +import core.tools.RandomFunction +import rs09.game.node.entity.combat.CombatSwingHandler import kotlin.math.floor /** diff --git a/Server/src/main/kotlin/core/game/node/entity/combat/handlers/MeleeSwingHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/MeleeSwingHandler.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/combat/handlers/MeleeSwingHandler.kt rename to Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/MeleeSwingHandler.kt index 81d8529b9..edbc81127 100644 --- a/Server/src/main/kotlin/core/game/node/entity/combat/handlers/MeleeSwingHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/MeleeSwingHandler.kt @@ -1,24 +1,24 @@ -package core.game.node.entity.combat.handlers +package rs09.game.node.entity.combat.handlers import core.game.container.Container import core.game.container.impl.EquipmentContainer +import core.game.content.quest.tutorials.tutorialisland.TutorialSession +import core.game.content.quest.tutorials.tutorialisland.TutorialStage import core.game.node.entity.Entity import core.game.node.entity.combat.BattleState import core.game.node.entity.combat.CombatStyle -import core.game.node.entity.combat.CombatSwingHandler import core.game.node.entity.combat.InteractionType import core.game.node.entity.combat.equipment.ArmourSet import core.game.node.entity.combat.equipment.Weapon import core.game.node.entity.combat.equipment.WeaponInterface 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.entity.state.EntityState import core.game.world.map.path.Pathfinder import core.tools.RandomFunction -import core.game.node.entity.skill.Skills -import core.game.content.quest.tutorials.tutorialisland.TutorialSession -import core.game.content.quest.tutorials.tutorialisland.TutorialStage -import core.game.node.entity.skill.skillcapeperks.SkillcapePerks +import rs09.game.node.entity.combat.CombatSwingHandler +import rs09.game.node.entity.skill.skillcapeperks.SkillcapePerks import kotlin.math.floor /** diff --git a/Server/src/main/kotlin/core/game/node/entity/combat/handlers/MultiSwingHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/MultiSwingHandler.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/combat/handlers/MultiSwingHandler.kt rename to Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/MultiSwingHandler.kt index aa1e05671..ff7220475 100644 --- a/Server/src/main/kotlin/core/game/node/entity/combat/handlers/MultiSwingHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/MultiSwingHandler.kt @@ -1,9 +1,9 @@ -package core.game.node.entity.combat.handlers +package rs09.game.node.entity.combat.handlers import core.game.node.entity.Entity import core.game.node.entity.combat.BattleState import core.game.node.entity.combat.CombatStyle -import core.game.node.entity.combat.CombatSwingHandler +import rs09.game.node.entity.combat.CombatSwingHandler import core.game.node.entity.combat.InteractionType import core.game.node.entity.combat.equipment.SwitchAttack import core.game.node.entity.npc.NPC diff --git a/Server/src/main/kotlin/core/game/node/entity/combat/handlers/RangeSwingHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/RangeSwingHandler.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/combat/handlers/RangeSwingHandler.kt rename to Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/RangeSwingHandler.kt index 231674eb2..59e85f6fc 100644 --- a/Server/src/main/kotlin/core/game/node/entity/combat/handlers/RangeSwingHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/RangeSwingHandler.kt @@ -1,31 +1,31 @@ -package core.game.node.entity.combat.handlers +package rs09.game.node.entity.combat.handlers import core.game.container.Container import core.game.container.impl.EquipmentContainer +import core.game.content.quest.tutorials.tutorialisland.TutorialSession +import core.game.content.quest.tutorials.tutorialisland.TutorialStage import core.game.node.entity.Entity import core.game.node.entity.combat.BattleState import core.game.node.entity.combat.CombatStyle -import core.game.node.entity.combat.CombatSwingHandler import core.game.node.entity.combat.InteractionType import core.game.node.entity.combat.equipment.* import core.game.node.entity.combat.equipment.Weapon.WeaponType 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.entity.skill.Skills import core.game.node.entity.state.EntityState import core.game.node.item.GroundItem import core.game.node.item.GroundItemManager import core.game.node.item.Item import core.game.system.task.Pulse -import core.game.world.GameWorld import core.game.world.map.Location import core.game.world.map.RegionManager import core.game.world.update.flag.context.Graphics import core.tools.RandomFunction -import core.game.node.entity.skill.Skills -import core.game.content.quest.tutorials.tutorialisland.TutorialSession -import core.game.content.quest.tutorials.tutorialisland.TutorialStage -import core.game.system.SystemLogger +import rs09.game.node.entity.combat.CombatSwingHandler +import rs09.game.system.SystemLogger +import rs09.game.world.GameWorld import java.util.* import kotlin.math.ceil import kotlin.math.floor @@ -252,7 +252,7 @@ open class RangeSwingHandler prayer += entity.prayer.getSkillBonus(Skills.RANGE) } var additional = 1.0 // Slayer helmet/salve/... - if(entity is Player && core.game.node.entity.skill.skillcapeperks.SkillcapePerks.isActive(core.game.node.entity.skill.skillcapeperks.SkillcapePerks.ACCURATE_MARKSMAN,entity.asPlayer())){ + if(entity is Player && rs09.game.node.entity.skill.skillcapeperks.SkillcapePerks.isActive(rs09.game.node.entity.skill.skillcapeperks.SkillcapePerks.ACCURATE_MARKSMAN,entity.asPlayer())){ additional += 0.5 } var styleBonus = 0 diff --git a/Server/src/main/kotlin/core/game/node/entity/combat/handlers/SalamanderSwingHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/SalamanderSwingHandler.kt similarity index 96% rename from Server/src/main/kotlin/core/game/node/entity/combat/handlers/SalamanderSwingHandler.kt rename to Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/SalamanderSwingHandler.kt index 1217a67c5..fd8514c59 100644 --- a/Server/src/main/kotlin/core/game/node/entity/combat/handlers/SalamanderSwingHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/SalamanderSwingHandler.kt @@ -1,13 +1,13 @@ -package core.game.node.entity.combat.handlers +package rs09.game.node.entity.combat.handlers import core.game.node.entity.Entity import core.game.node.entity.combat.BattleState import core.game.node.entity.combat.CombatStyle -import core.game.node.entity.combat.CombatSwingHandler +import rs09.game.node.entity.combat.CombatSwingHandler import core.game.node.entity.combat.InteractionType +import core.game.node.entity.skill.Skills import core.game.world.update.flag.context.Animation import core.game.world.update.flag.context.Graphics -import core.game.node.entity.skill.Skills /** * Handles a combat swing using a salamander. diff --git a/Server/src/main/kotlin/core/game/node/entity/combat/special/LiquefySpecialHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/combat/special/LiquefySpecialHandler.kt similarity index 88% rename from Server/src/main/kotlin/core/game/node/entity/combat/special/LiquefySpecialHandler.kt rename to Server/src/main/kotlin/rs09/game/node/entity/combat/special/LiquefySpecialHandler.kt index b72a5a8e9..d6485eef6 100644 --- a/Server/src/main/kotlin/core/game/node/entity/combat/special/LiquefySpecialHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/combat/special/LiquefySpecialHandler.kt @@ -1,9 +1,9 @@ -package core.game.node.entity.combat.special +package rs09.game.node.entity.combat.special import core.game.node.entity.Entity import core.game.node.entity.combat.BattleState import core.game.node.entity.combat.CombatStyle -import core.game.node.entity.combat.handlers.MeleeSwingHandler +import rs09.game.node.entity.combat.handlers.MeleeSwingHandler import core.plugin.Initializable import core.plugin.Plugin diff --git a/Server/src/main/kotlin/core/game/node/entity/equipment/BarrowsEquipmentRegister.kt b/Server/src/main/kotlin/rs09/game/node/entity/equipment/BarrowsEquipmentRegister.kt similarity index 95% rename from Server/src/main/kotlin/core/game/node/entity/equipment/BarrowsEquipmentRegister.kt rename to Server/src/main/kotlin/rs09/game/node/entity/equipment/BarrowsEquipmentRegister.kt index 41fc7049b..b4f235e76 100644 --- a/Server/src/main/kotlin/core/game/node/entity/equipment/BarrowsEquipmentRegister.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/equipment/BarrowsEquipmentRegister.kt @@ -1,7 +1,6 @@ -package core.game.node.entity.equipment +package rs09.game.node.entity.equipment -import core.game.node.entity.combat.equipment.EquipmentDegrader -import core.game.system.SystemLogger +import rs09.game.node.entity.combat.equipment.EquipmentDegrader import core.plugin.Initializable import core.plugin.Plugin diff --git a/Server/src/main/kotlin/core/game/node/entity/equipment/PVPEquipmentRegister.kt b/Server/src/main/kotlin/rs09/game/node/entity/equipment/PVPEquipmentRegister.kt similarity index 94% rename from Server/src/main/kotlin/core/game/node/entity/equipment/PVPEquipmentRegister.kt rename to Server/src/main/kotlin/rs09/game/node/entity/equipment/PVPEquipmentRegister.kt index d9e403054..12a188f2d 100644 --- a/Server/src/main/kotlin/core/game/node/entity/equipment/PVPEquipmentRegister.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/equipment/PVPEquipmentRegister.kt @@ -1,6 +1,6 @@ -package core.game.node.entity.equipment +package rs09.game.node.entity.equipment -import core.game.node.entity.combat.equipment.EquipmentDegrader +import rs09.game.node.entity.combat.equipment.EquipmentDegrader import core.plugin.Initializable import core.plugin.Plugin diff --git a/Server/src/main/kotlin/core/game/node/entity/equipment/SnowballEquipmentPlugin.kt b/Server/src/main/kotlin/rs09/game/node/entity/equipment/SnowballEquipmentPlugin.kt similarity index 90% rename from Server/src/main/kotlin/core/game/node/entity/equipment/SnowballEquipmentPlugin.kt rename to Server/src/main/kotlin/rs09/game/node/entity/equipment/SnowballEquipmentPlugin.kt index c69412cf0..05020d4a5 100644 --- a/Server/src/main/kotlin/core/game/node/entity/equipment/SnowballEquipmentPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/equipment/SnowballEquipmentPlugin.kt @@ -1,13 +1,13 @@ -package core.game.node.entity.equipment +package rs09.game.node.entity.equipment import core.cache.def.impl.ItemDefinition import core.game.interaction.Interaction import core.game.interaction.Option +import rs09.game.interaction.player.PeltOptionPlugin import core.game.node.entity.player.Player import core.game.node.item.Item import core.plugin.Initializable import core.plugin.Plugin -import core.game.interaction.player.PeltOptionPlugin @Initializable class SnowballEquipmentPlugin : Plugin { diff --git a/Server/src/main/kotlin/core/game/node/entity/npc/city/alkharid/AliTheFarmerDialogue.kt b/Server/src/main/kotlin/rs09/game/node/entity/npc/city/alkharid/AliTheFarmerDialogue.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/npc/city/alkharid/AliTheFarmerDialogue.kt rename to Server/src/main/kotlin/rs09/game/node/entity/npc/city/alkharid/AliTheFarmerDialogue.kt index 9e7477eea..32ed26420 100644 --- a/Server/src/main/kotlin/core/game/node/entity/npc/city/alkharid/AliTheFarmerDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/npc/city/alkharid/AliTheFarmerDialogue.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.npc.city.alkharid +package rs09.game.node.entity.npc.city.alkharid import core.game.content.dialogue.DialoguePlugin import core.game.content.dialogue.FacialExpression diff --git a/Server/src/main/kotlin/core/game/node/entity/npc/city/alkharid/AliTheGuard.kt b/Server/src/main/kotlin/rs09/game/node/entity/npc/city/alkharid/AliTheGuard.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/npc/city/alkharid/AliTheGuard.kt rename to Server/src/main/kotlin/rs09/game/node/entity/npc/city/alkharid/AliTheGuard.kt index f75a8a3b5..844eba919 100644 --- a/Server/src/main/kotlin/core/game/node/entity/npc/city/alkharid/AliTheGuard.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/npc/city/alkharid/AliTheGuard.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.npc.city.alkharid +package rs09.game.node.entity.npc.city.alkharid import core.game.content.dialogue.DialoguePlugin import core.game.content.dialogue.FacialExpression diff --git a/Server/src/main/kotlin/core/game/node/entity/npc/city/alkharid/AliTheSmithDialogue.kt b/Server/src/main/kotlin/rs09/game/node/entity/npc/city/alkharid/AliTheSmithDialogue.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/npc/city/alkharid/AliTheSmithDialogue.kt rename to Server/src/main/kotlin/rs09/game/node/entity/npc/city/alkharid/AliTheSmithDialogue.kt index 7ec1109b7..ee0c5717e 100644 --- a/Server/src/main/kotlin/core/game/node/entity/npc/city/alkharid/AliTheSmithDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/npc/city/alkharid/AliTheSmithDialogue.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.npc.city.alkharid +package rs09.game.node.entity.npc.city.alkharid import core.game.content.dialogue.DialoguePlugin import core.game.content.dialogue.FacialExpression diff --git a/Server/src/main/kotlin/core/game/node/entity/npc/city/pollnivneach/AliTheHagDialogue.kt b/Server/src/main/kotlin/rs09/game/node/entity/npc/city/pollnivneach/AliTheHagDialogue.kt similarity index 97% rename from Server/src/main/kotlin/core/game/node/entity/npc/city/pollnivneach/AliTheHagDialogue.kt rename to Server/src/main/kotlin/rs09/game/node/entity/npc/city/pollnivneach/AliTheHagDialogue.kt index 7f24def14..9076eb97a 100644 --- a/Server/src/main/kotlin/core/game/node/entity/npc/city/pollnivneach/AliTheHagDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/npc/city/pollnivneach/AliTheHagDialogue.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.npc.city.pollnivneach +package rs09.game.node.entity.npc.city.pollnivneach import core.game.content.dialogue.DialoguePlugin import core.game.content.dialogue.FacialExpression diff --git a/Server/src/main/kotlin/core/game/node/entity/npc/city/pollnivneach/AliTheMayorDialogue.kt b/Server/src/main/kotlin/rs09/game/node/entity/npc/city/pollnivneach/AliTheMayorDialogue.kt similarity index 97% rename from Server/src/main/kotlin/core/game/node/entity/npc/city/pollnivneach/AliTheMayorDialogue.kt rename to Server/src/main/kotlin/rs09/game/node/entity/npc/city/pollnivneach/AliTheMayorDialogue.kt index a875fc75e..de24c099f 100644 --- a/Server/src/main/kotlin/core/game/node/entity/npc/city/pollnivneach/AliTheMayorDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/npc/city/pollnivneach/AliTheMayorDialogue.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.npc.city.pollnivneach +package rs09.game.node.entity.npc.city.pollnivneach import core.game.content.dialogue.DialoguePlugin import core.game.content.dialogue.FacialExpression diff --git a/Server/src/main/kotlin/core/game/node/entity/npc/city/pollnivneach/AliTheOperator.kt b/Server/src/main/kotlin/rs09/game/node/entity/npc/city/pollnivneach/AliTheOperator.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/npc/city/pollnivneach/AliTheOperator.kt rename to Server/src/main/kotlin/rs09/game/node/entity/npc/city/pollnivneach/AliTheOperator.kt index 7f509c0be..425778bd5 100644 --- a/Server/src/main/kotlin/core/game/node/entity/npc/city/pollnivneach/AliTheOperator.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/npc/city/pollnivneach/AliTheOperator.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.npc.city.pollnivneach +package rs09.game.node.entity.npc.city.pollnivneach import core.game.content.dialogue.DialoguePlugin import core.game.content.dialogue.FacialExpression diff --git a/Server/src/main/kotlin/core/game/node/entity/npc/other/AlKharidWarriorPlugin.kt b/Server/src/main/kotlin/rs09/game/node/entity/npc/other/AlKharidWarriorPlugin.kt similarity index 97% rename from Server/src/main/kotlin/core/game/node/entity/npc/other/AlKharidWarriorPlugin.kt rename to Server/src/main/kotlin/rs09/game/node/entity/npc/other/AlKharidWarriorPlugin.kt index af0a09fda..c896693a2 100644 --- a/Server/src/main/kotlin/core/game/node/entity/npc/other/AlKharidWarriorPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/npc/other/AlKharidWarriorPlugin.kt @@ -1,16 +1,16 @@ -package core.game.node.entity.npc.other +package rs09.game.node.entity.npc.other import core.cache.def.impl.NPCDefinition -import core.plugin.Initializable -import core.game.node.entity.npc.AbstractNPC -import core.plugin.Plugin import core.game.interaction.OptionHandler import core.game.node.Node import core.game.node.entity.Entity +import core.game.node.entity.npc.AbstractNPC import core.game.node.entity.player.Player import core.game.world.map.Location import core.game.world.map.RegionManager -import core.plugin.PluginManager +import core.plugin.Initializable +import core.plugin.Plugin +import rs09.plugin.PluginManager /** * Handles the Al-Kharid Warrior diff --git a/Server/src/main/kotlin/core/game/node/entity/player/info/login/LoginParser.kt b/Server/src/main/kotlin/rs09/game/node/entity/player/info/login/LoginParser.kt similarity index 94% rename from Server/src/main/kotlin/core/game/node/entity/player/info/login/LoginParser.kt rename to Server/src/main/kotlin/rs09/game/node/entity/player/info/login/LoginParser.kt index e3ef8b65c..1bd578c62 100644 --- a/Server/src/main/kotlin/core/game/node/entity/player/info/login/LoginParser.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/player/info/login/LoginParser.kt @@ -1,16 +1,20 @@ -package core.game.node.entity.player.info.login +package rs09.game.node.entity.player.info.login import core.game.node.entity.player.Player import core.game.node.entity.player.info.PlayerDetails -import core.game.system.SystemLogger +import core.game.node.entity.player.info.login.LoginConfiguration +import core.game.node.entity.player.info.login.LoginType +import core.game.node.entity.player.info.login.PlayerParser +import core.game.node.entity.player.info.login.Response import core.game.system.SystemManager import core.game.system.monitor.PlayerMonitor import core.game.system.task.Pulse -import core.game.world.GameWorld -import core.game.world.repository.Repository import core.net.amsc.MSPacketRepository import core.net.amsc.ManagementServerState import core.net.amsc.WorldCommunicator +import rs09.game.system.SystemLogger +import rs09.game.world.GameWorld +import rs09.game.world.repository.Repository import java.util.concurrent.TimeUnit import java.util.concurrent.locks.Lock import java.util.concurrent.locks.ReentrantLock @@ -28,7 +32,8 @@ class LoginParser( /** * The login type. */ - private val type: LoginType) : Runnable { + private val type: LoginType +) : Runnable { /** * Gets the player details. * @return The player details. diff --git a/Server/src/main/kotlin/core/game/node/entity/player/info/login/PlayerSaveParser.kt b/Server/src/main/kotlin/rs09/game/node/entity/player/info/login/PlayerSaveParser.kt similarity index 97% rename from Server/src/main/kotlin/core/game/node/entity/player/info/login/PlayerSaveParser.kt rename to Server/src/main/kotlin/rs09/game/node/entity/player/info/login/PlayerSaveParser.kt index 39b6e8042..b36e1b0e9 100644 --- a/Server/src/main/kotlin/core/game/node/entity/player/info/login/PlayerSaveParser.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/player/info/login/PlayerSaveParser.kt @@ -1,7 +1,7 @@ -package core.game.node.entity.player.info.login +package rs09.game.node.entity.player.info.login -import core.JSONUtils -import core.ServerConstants +import core.game.content.ame.AntiMacroHandler +import core.game.interaction.item.brawling_gloves.BrawlingGloves import core.game.node.entity.combat.CombatSpell import core.game.node.entity.player.Player import core.game.node.entity.player.link.IronmanMode @@ -9,17 +9,14 @@ import core.game.node.entity.player.link.SpellBookManager import core.game.node.entity.player.link.emote.Emotes import core.game.node.entity.player.link.grave.GraveType import core.game.node.entity.player.link.music.MusicEntry -import core.game.node.entity.state.EntityState -import core.game.system.SystemLogger -import core.game.world.GameWorld import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import org.json.simple.JSONArray import org.json.simple.JSONObject import org.json.simple.parser.JSONParser -import core.game.content.ame.AntiMacroHandler -import core.game.interaction.item.brawling_gloves.BrawlingGloves -import core.game.node.entity.state.newsys.StateRepository +import rs09.ServerConstants +import rs09.game.system.SystemLogger +import rs09.game.world.GameWorld import java.io.FileReader import java.util.* @@ -354,7 +351,7 @@ class PlayerSaveParser(val player: Player) { player.inventory.parse(inventory) player.bank.parse(bank) player.equipment.parse(equipment) - player.location = JSONUtils.parseLocation(location) + player.location = rs09.JSONUtils.parseLocation(location) } fun parseSkills() { diff --git a/Server/src/main/kotlin/core/game/node/entity/player/info/login/PlayerSaver.kt b/Server/src/main/kotlin/rs09/game/node/entity/player/info/login/PlayerSaver.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/player/info/login/PlayerSaver.kt rename to Server/src/main/kotlin/rs09/game/node/entity/player/info/login/PlayerSaver.kt index 299a812c8..ec164d7fe 100644 --- a/Server/src/main/kotlin/core/game/node/entity/player/info/login/PlayerSaver.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/player/info/login/PlayerSaver.kt @@ -1,18 +1,19 @@ -package core.game.node.entity.player.info.login +package rs09.game.node.entity.player.info.login -import core.ServerConstants import core.game.container.Container +import core.game.interaction.item.brawling_gloves.BrawlingGloves import core.game.node.entity.player.Player import core.game.node.entity.player.link.IronmanMode -import core.game.system.SystemLogger +import core.game.node.entity.skill.Skills +import core.game.node.entity.skill.summoning.familiar.BurdenBeast +import core.game.node.entity.skill.summoning.pet.Pet import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import org.json.simple.JSONArray import org.json.simple.JSONObject -import core.game.interaction.item.brawling_gloves.BrawlingGloves -import core.game.node.entity.skill.Skills -import core.game.node.entity.skill.summoning.familiar.BurdenBeast -import core.game.node.entity.skill.summoning.pet.Pet +import rs09.ServerConstants +import rs09.game.system.SystemLogger +import java.io.File import java.io.FileWriter import java.io.IOException import java.lang.Math.ceil @@ -81,6 +82,10 @@ class PlayerSaver (val player: Player){ val prettyPrintedJson = scriptEngine["result"] as String try { + if(!File("${ServerConstants.PLAYER_SAVE_PATH}${player.name}.json").exists()){ + File("${ServerConstants.PLAYER_SAVE_PATH}").mkdirs() + File("${ServerConstants.PLAYER_SAVE_PATH}${player.name}.json").createNewFile() + } FileWriter("${ServerConstants.PLAYER_SAVE_PATH}${player.name}.json").use { file -> file.write(prettyPrintedJson) file.flush() diff --git a/Server/src/main/kotlin/core/game/node/entity/player/info/stats/StatAttributeKeys.kt b/Server/src/main/kotlin/rs09/game/node/entity/player/info/stats/StatAttributeKeys.kt similarity index 90% rename from Server/src/main/kotlin/core/game/node/entity/player/info/stats/StatAttributeKeys.kt rename to Server/src/main/kotlin/rs09/game/node/entity/player/info/stats/StatAttributeKeys.kt index 05c99a308..bc6aa3127 100644 --- a/Server/src/main/kotlin/core/game/node/entity/player/info/stats/StatAttributeKeys.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/player/info/stats/StatAttributeKeys.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.player.info.stats +package rs09.game.node.entity.player.info.stats const val STATS_BASE = "stats_manager" const val STATS_ENEMIES_KILLED = "enemies_killed" diff --git a/Server/src/main/kotlin/core/game/node/entity/player/info/stats/StatsCommandSet.kt b/Server/src/main/kotlin/rs09/game/node/entity/player/info/stats/StatsCommandSet.kt similarity index 95% rename from Server/src/main/kotlin/core/game/node/entity/player/info/stats/StatsCommandSet.kt rename to Server/src/main/kotlin/rs09/game/node/entity/player/info/stats/StatsCommandSet.kt index 3cd93be56..4c82abc5a 100644 --- a/Server/src/main/kotlin/core/game/node/entity/player/info/stats/StatsCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/player/info/stats/StatsCommandSet.kt @@ -1,13 +1,13 @@ -package core.game.node.entity.player.info.stats +package rs09.game.node.entity.player.info.stats import core.game.component.Component import core.game.content.global.BossKillCounter import core.game.node.entity.player.Player -import core.game.world.repository.Repository +import rs09.game.system.command.Command +import rs09.game.system.command.sets.CommandSet +import rs09.game.world.repository.Repository import core.plugin.Initializable -import core.game.system.command.Command -import core.game.system.command.sets.CommandSet -import core.tools.Components +import rs09.tools.Components @Initializable class StatsCommandSet : CommandSet(Command.Privilege.STANDARD) { diff --git a/Server/src/main/kotlin/core/game/node/entity/player/link/diary/DiaryLevel.kt b/Server/src/main/kotlin/rs09/game/node/entity/player/link/diary/DiaryLevel.kt similarity index 59% rename from Server/src/main/kotlin/core/game/node/entity/player/link/diary/DiaryLevel.kt rename to Server/src/main/kotlin/rs09/game/node/entity/player/link/diary/DiaryLevel.kt index 7c4127199..33b2a4255 100644 --- a/Server/src/main/kotlin/core/game/node/entity/player/link/diary/DiaryLevel.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/player/link/diary/DiaryLevel.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.player.link.diary +package rs09.game.node.entity.player.link.diary enum class DiaryLevel { BEGINNER, diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/agility/BarbarianOutpostCourse.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/BarbarianOutpostCourse.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/skill/agility/BarbarianOutpostCourse.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/agility/BarbarianOutpostCourse.kt index 31814f419..4c882a886 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/agility/BarbarianOutpostCourse.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/BarbarianOutpostCourse.kt @@ -1,23 +1,25 @@ -package core.game.node.entity.skill.agility +package rs09.game.node.entity.skill.agility import core.cache.def.impl.ItemDefinition import core.cache.def.impl.NPCDefinition import core.cache.def.impl.ObjectDefinition +import core.game.content.dialogue.DialoguePlugin 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`.GameObject import core.game.node.entity.combat.ImpactHandler.HitsplatType import core.game.node.entity.player.Player -import core.game.content.quest.miniquest.barcrawl.BarcrawlManager +import core.game.node.entity.skill.agility.AgilityCourse +import core.game.node.entity.skill.agility.AgilityHandler import core.game.system.task.Pulse -import core.game.world.GameWorld import core.game.world.map.Location import core.game.world.update.flag.context.Animation import core.game.world.update.flag.context.Graphics import core.plugin.Initializable -import core.plugin.PluginManager -import core.game.content.dialogue.DialoguePlugin +import rs09.game.world.GameWorld +import rs09.plugin.PluginManager /** * Handles the barbarian outpost course. diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/agility/GnomeStrongholdCourse.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/GnomeStrongholdCourse.kt similarity index 97% rename from Server/src/main/kotlin/core/game/node/entity/skill/agility/GnomeStrongholdCourse.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/agility/GnomeStrongholdCourse.kt index f36d8a72f..1a8a90bcd 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/agility/GnomeStrongholdCourse.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/GnomeStrongholdCourse.kt @@ -1,16 +1,18 @@ -package core.game.node.entity.skill.agility +package rs09.game.node.entity.skill.agility import core.cache.def.impl.ObjectDefinition import core.game.node.Node import core.game.node.`object`.GameObject import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player +import core.game.node.entity.skill.agility.AgilityCourse +import core.game.node.entity.skill.agility.AgilityHandler import core.game.system.task.LocationLogoutTask import core.game.system.task.LogoutTask -import core.game.world.GameWorld import core.game.world.map.Location import core.game.world.update.flag.context.Animation import core.plugin.Initializable +import rs09.game.world.GameWorld /** * Handles the gnome stronghold agility course. diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/agility/WildernessCourse.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/WildernessCourse.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/skill/agility/WildernessCourse.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/agility/WildernessCourse.kt index b6b8e961f..6be8ac1dc 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/agility/WildernessCourse.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/WildernessCourse.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.agility +package rs09.game.node.entity.skill.agility import core.cache.def.impl.ObjectDefinition import core.game.content.global.action.DoorActionHandler @@ -6,15 +6,17 @@ import core.game.node.Node import core.game.node.`object`.GameObject import core.game.node.entity.player.Player import core.game.node.entity.player.link.TeleportManager +import core.game.node.entity.skill.Skills +import core.game.node.entity.skill.agility.AgilityCourse +import core.game.node.entity.skill.agility.AgilityHandler import core.game.system.task.LocationLogoutTask import core.game.system.task.LogoutTask import core.game.system.task.Pulse -import core.game.world.GameWorld import core.game.world.map.Location import core.game.world.map.RegionManager import core.game.world.update.flag.context.Animation import core.plugin.Initializable -import core.game.node.entity.skill.Skills +import rs09.game.world.GameWorld /** * Handles the wilderness agility course. diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/agility/shortcuts/BasaltRockShortcut.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/BasaltRockShortcut.kt similarity index 99% rename from Server/src/main/kotlin/core/game/node/entity/skill/agility/shortcuts/BasaltRockShortcut.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/BasaltRockShortcut.kt index b0bcf0ebd..032793a13 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/agility/shortcuts/BasaltRockShortcut.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/BasaltRockShortcut.kt @@ -1,17 +1,17 @@ -package core.game.node.entity.skill.agility.shortcuts +package rs09.game.node.entity.skill.agility.shortcuts import core.game.node.Node import core.game.node.`object`.GameObject import core.game.node.entity.player.Player +import core.game.node.entity.skill.agility.AgilityHandler +import core.game.node.entity.skill.agility.AgilityShortcut import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.map.Location import core.game.world.update.flag.context.Animation import core.game.world.update.flag.player.FaceLocationFlag import core.plugin.Initializable import core.plugin.Plugin -import core.game.node.entity.skill.agility.AgilityHandler -import core.game.node.entity.skill.agility.AgilityShortcut /** * Handles the Basalt Rock shortcut. diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/agility/shortcuts/PipeShortcut.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/PipeShortcut.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/skill/agility/shortcuts/PipeShortcut.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/PipeShortcut.kt index ea8a299e4..7d4d11063 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/agility/shortcuts/PipeShortcut.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/PipeShortcut.kt @@ -1,15 +1,15 @@ -package core.game.node.entity.skill.agility.shortcuts +package rs09.game.node.entity.skill.agility.shortcuts import core.game.node.`object`.GameObject import core.game.node.entity.player.Player import core.game.node.entity.player.link.diary.DiaryType +import core.game.node.entity.skill.agility.AgilityHandler +import core.game.node.entity.skill.agility.AgilityShortcut import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin -import core.game.node.entity.skill.agility.AgilityHandler -import core.game.node.entity.skill.agility.AgilityShortcut /** * Handles a pipe shortcut. diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/agility/shortcuts/RockClimbShortcut.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/RockClimbShortcut.kt similarity index 99% rename from Server/src/main/kotlin/core/game/node/entity/skill/agility/shortcuts/RockClimbShortcut.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/RockClimbShortcut.kt index 6a8a9eb07..20b7a16d5 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/agility/shortcuts/RockClimbShortcut.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/RockClimbShortcut.kt @@ -1,14 +1,14 @@ -package core.game.node.entity.skill.agility.shortcuts +package rs09.game.node.entity.skill.agility.shortcuts import core.game.node.`object`.GameObject import core.game.node.entity.impl.ForceMovement import core.game.node.entity.player.Player +import core.game.node.entity.skill.Skills +import core.game.node.entity.skill.agility.AgilityShortcut import core.game.world.map.Direction import core.game.world.map.Location import core.game.world.update.flag.context.Animation import core.plugin.Initializable -import core.game.node.entity.skill.Skills -import core.game.node.entity.skill.agility.AgilityShortcut /** * Handles the rock climbing shortcut. diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/agility/shortcuts/SteppingStoneShortcut.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/SteppingStoneShortcut.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/skill/agility/shortcuts/SteppingStoneShortcut.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/SteppingStoneShortcut.kt index 78c835e45..7fe7f6bc8 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/agility/shortcuts/SteppingStoneShortcut.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/SteppingStoneShortcut.kt @@ -1,16 +1,16 @@ -package core.game.node.entity.skill.agility.shortcuts +package rs09.game.node.entity.skill.agility.shortcuts import core.cache.def.impl.ObjectDefinition 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.entity.skill.Skills import core.game.system.task.Pulse import core.game.world.map.Location import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin -import core.game.node.entity.skill.Skills /** * Handles the stepping stone shortcut. diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/construction/EstateAgentDialogue.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/EstateAgentDialogue.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/skill/construction/EstateAgentDialogue.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/construction/EstateAgentDialogue.kt index 9bb50b7dd..ebd4553b1 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/construction/EstateAgentDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/EstateAgentDialogue.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.construction +package rs09.game.node.entity.skill.construction import core.game.content.dialogue.DialoguePlugin import core.game.content.dialogue.FacialExpression @@ -7,12 +7,14 @@ 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.entity.skill.Skills +import core.game.node.entity.skill.construction.HouseLocation +import core.game.node.entity.skill.construction.HousingStyle import core.game.node.item.Item -import core.game.world.GameWorld.settings +import rs09.game.world.GameWorld.settings import core.plugin.Initializable -import core.tools.END_DIALOGUE -import core.tools.Items -import core.tools.START_DIALOGUE +import rs09.tools.Items +import rs09.tools.END_DIALOGUE +import rs09.tools.START_DIALOGUE /** * Represents the estate agent dialogue. diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/construction/Hotspot.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/Hotspot.kt similarity index 83% rename from Server/src/main/kotlin/core/game/node/entity/skill/construction/Hotspot.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/construction/Hotspot.kt index 67c338549..e25429a02 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/construction/Hotspot.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/Hotspot.kt @@ -1,10 +1,12 @@ -package core.game.node.entity.skill.construction +package rs09.game.node.entity.skill.construction + +import core.game.node.entity.skill.construction.BuildHotspot /** * Represents a hotspot. * @author Emperor */ -class Hotspot (val hotspot: BuildHotspot,val chunkX: Int,val chunkY: Int,var chunkX2: Int,var chunkY2: Int) { +class Hotspot (val hotspot: BuildHotspot, val chunkX: Int, val chunkY: Int, var chunkX2: Int, var chunkY2: Int) { constructor(hotspot: BuildHotspot, chunkX: Int, chunkY: Int) : this(hotspot,chunkX,chunkY,-1,-1) diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/ConstructionDoorPlugin.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/ConstructionDoorPlugin.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/ConstructionDoorPlugin.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/ConstructionDoorPlugin.kt index 3f3b435da..3ef3bc72d 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/ConstructionDoorPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/ConstructionDoorPlugin.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.construction.decoration +package rs09.game.node.entity.skill.construction.decoration import core.cache.def.impl.ObjectDefinition import core.game.content.global.action.DoorActionHandler @@ -6,10 +6,10 @@ import core.game.interaction.OptionHandler import core.game.node.Node import core.game.node.`object`.GameObject import core.game.node.entity.player.Player -import core.plugin.Initializable -import core.plugin.Plugin import core.game.node.entity.skill.construction.BuildHotspot import core.game.node.entity.skill.construction.HousingStyle +import core.plugin.Initializable +import core.plugin.Plugin /** * Handles Construction related doors. diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/bedroom/ShavingStandHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/bedroom/ShavingStandHandler.kt similarity index 91% rename from Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/bedroom/ShavingStandHandler.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/bedroom/ShavingStandHandler.kt index ee4f99c7a..7ab12ef19 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/bedroom/ShavingStandHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/bedroom/ShavingStandHandler.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.construction.decoration.bedroom +package rs09.game.node.entity.skill.construction.decoration.bedroom import core.cache.def.impl.ObjectDefinition import core.game.component.Component @@ -7,7 +7,7 @@ import core.game.node.Node import core.game.node.entity.player.Player import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Components +import rs09.tools.Components @Initializable class ShavingStandHandler : OptionHandler() { diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/bedroom/WardrobeHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/bedroom/WardrobeHandler.kt similarity index 91% rename from Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/bedroom/WardrobeHandler.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/bedroom/WardrobeHandler.kt index f41e6298c..c246481f1 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/bedroom/WardrobeHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/bedroom/WardrobeHandler.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.construction.decoration.bedroom +package rs09.game.node.entity.skill.construction.decoration.bedroom import core.cache.def.impl.ObjectDefinition import core.game.component.Component @@ -7,7 +7,7 @@ import core.game.node.Node import core.game.node.entity.player.Player import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Components +import rs09.tools.Components @Initializable class WardrobeHandler : OptionHandler() { diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/chapel/ShieldBlessingPlugin.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/chapel/ShieldBlessingPlugin.kt similarity index 94% rename from Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/chapel/ShieldBlessingPlugin.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/chapel/ShieldBlessingPlugin.kt index df069e8bc..e8830e27f 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/chapel/ShieldBlessingPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/chapel/ShieldBlessingPlugin.kt @@ -1,14 +1,14 @@ -package core.game.node.entity.skill.construction.decoration.chapel +package rs09.game.node.entity.skill.construction.decoration.chapel import core.game.interaction.NodeUsageEvent import core.game.interaction.UseWithHandler import core.game.node.entity.player.link.audio.Audio +import core.game.node.entity.skill.Skills import core.game.node.item.Item import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items -import core.game.node.entity.skill.Skills +import rs09.tools.Items const val HOLY_ELIXER = 13754 const val SPIRIT_SHIELD = 13734 diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/costume/ToyBoxPlugin.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/costume/ToyBoxPlugin.kt similarity index 92% rename from Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/costume/ToyBoxPlugin.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/costume/ToyBoxPlugin.kt index 38bbe3589..bd12485c5 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/costume/ToyBoxPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/costume/ToyBoxPlugin.kt @@ -1,12 +1,12 @@ -package core.game.node.entity.skill.construction.decoration.costume +package rs09.game.node.entity.skill.construction.decoration.costume import core.cache.def.impl.ObjectDefinition import core.game.interaction.OptionHandler +import core.game.interaction.item.toys.DiangoReclaimInterface import core.game.node.Node import core.game.node.entity.player.Player import core.plugin.Initializable import core.plugin.Plugin -import core.game.interaction.item.toys.DiangoReclaimInterface /** * Handles the Toy Box POH diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberDialogue.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberDialogue.kt similarity index 90% rename from Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberDialogue.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberDialogue.kt index c42d9e06b..8858897ae 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberDialogue.kt @@ -1,8 +1,9 @@ -package core.game.node.entity.skill.construction.decoration.portalchamber +package rs09.game.node.entity.skill.construction.decoration.portalchamber -import core.game.node.entity.player.Player -import core.plugin.Initializable import core.game.content.dialogue.DialoguePlugin +import core.game.node.entity.player.Player +import core.game.node.entity.skill.construction.decoration.portalchamber.PortalChamberPlugin +import core.plugin.Initializable /** * Portal Chamber Dialogue go brrrrrr diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/study/LecternPlugin.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/study/LecternPlugin.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/study/LecternPlugin.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/study/LecternPlugin.kt index d20bd423b..4616fc03e 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/study/LecternPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/study/LecternPlugin.kt @@ -1,24 +1,24 @@ -package core.game.node.entity.skill.construction.decoration.study +package rs09.game.node.entity.skill.construction.decoration.study import core.cache.def.impl.ObjectDefinition import core.game.component.Component import core.game.component.ComponentDefinition import core.game.component.ComponentPlugin import core.game.interaction.OptionHandler +import core.game.interaction.item.TeleTabsOptionPlugin 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.entity.skill.Skills +import core.game.node.entity.skill.construction.Decoration import core.game.node.item.Item import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin -import core.plugin.PluginManager.definePlugin -import core.game.interaction.item.TeleTabsOptionPlugin -import core.game.node.entity.skill.Skills -import core.game.node.entity.skill.construction.Decoration -import core.tools.Components +import rs09.plugin.PluginManager.definePlugin +import rs09.tools.Components /** * Handles the lectern diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/study/TelescopePlugin.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/study/TelescopePlugin.kt similarity index 89% rename from Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/study/TelescopePlugin.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/study/TelescopePlugin.kt index 196e9e3db..f3bf82b8d 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/study/TelescopePlugin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/study/TelescopePlugin.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.construction.decoration.study +package rs09.game.node.entity.skill.construction.decoration.study import core.cache.def.impl.ObjectDefinition import core.game.component.Component @@ -7,13 +7,13 @@ import core.game.node.Node import core.game.node.`object`.GameObject import core.game.node.entity.player.Player import core.game.system.task.Pulse -import core.game.world.GameWorld.Pulser import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin import core.tools.RandomFunction -import core.game.content.global.worldevents.WorldEvents -import core.game.content.global.worldevents.shootingstar.ShootingStarEvent +import rs09.game.content.global.worldevents.WorldEvents +import rs09.game.content.global.worldevents.shootingstar.ShootingStarEvent +import rs09.game.world.GameWorld.Pulser import java.util.concurrent.TimeUnit @Initializable diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/workshop/ArmourStand.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/workshop/ArmourStand.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/workshop/ArmourStand.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/workshop/ArmourStand.kt index 92fff3d44..9a04823c1 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/construction/decoration/workshop/ArmourStand.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/workshop/ArmourStand.kt @@ -1,16 +1,16 @@ -package core.game.node.entity.skill.construction.decoration.workshop +package rs09.game.node.entity.skill.construction.decoration.workshop +import core.game.content.dialogue.DialoguePlugin import core.game.content.global.RepairItem import core.game.interaction.NodeUsageEvent import core.game.interaction.UseWithHandler +import core.game.interaction.npc.bob.BobDialogue.BarrowsEquipment +import core.game.interaction.npc.bob.BobDialogue.BarrowsEquipment.BarrowsFullEquipment import core.game.node.entity.player.Player +import core.game.node.entity.skill.Skills import core.game.node.item.Item import core.plugin.Initializable import core.plugin.Plugin -import core.game.content.dialogue.DialoguePlugin -import core.game.interaction.npc.bob.BobDialogue.BarrowsEquipment -import core.game.interaction.npc.bob.BobDialogue.BarrowsEquipment.BarrowsFullEquipment -import core.game.node.entity.skill.Skills import kotlin.math.ceil @Initializable diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/cooking/ChocolateBarCutter.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/cooking/ChocolateBarCutter.kt similarity index 94% rename from Server/src/main/kotlin/core/game/node/entity/skill/cooking/ChocolateBarCutter.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/cooking/ChocolateBarCutter.kt index 69dc50e60..21afa7be9 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/cooking/ChocolateBarCutter.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/cooking/ChocolateBarCutter.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.cooking +package rs09.game.node.entity.skill.cooking import core.game.interaction.NodeUsageEvent import core.game.interaction.UseWithHandler @@ -7,7 +7,7 @@ import core.game.system.task.Pulse import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items +import rs09.tools.Items @Initializable class ChocolateBarCutter : UseWithHandler(946){ diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/crafting/lightsources/LanternCrafting.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/crafting/lightsources/LanternCrafting.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/skill/crafting/lightsources/LanternCrafting.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/crafting/lightsources/LanternCrafting.kt index e0587b8fb..ac14a7540 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/crafting/lightsources/LanternCrafting.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/crafting/lightsources/LanternCrafting.kt @@ -1,12 +1,12 @@ -package core.game.node.entity.skill.crafting.lightsources +package rs09.game.node.entity.skill.crafting.lightsources import core.game.interaction.NodeUsageEvent import core.game.interaction.UseWithHandler import core.game.node.entity.player.Player +import core.game.node.entity.skill.Skills import core.game.node.item.Item import core.plugin.Initializable import core.plugin.Plugin -import core.game.node.entity.skill.Skills /** * Handles the combining of items to craft lanterns diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/crafting/lightsources/LightSourceExtinguisher.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/crafting/lightsources/LightSourceExtinguisher.kt similarity index 91% rename from Server/src/main/kotlin/core/game/node/entity/skill/crafting/lightsources/LightSourceExtinguisher.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/crafting/lightsources/LightSourceExtinguisher.kt index e9523bc3b..4f056fef8 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/crafting/lightsources/LightSourceExtinguisher.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/crafting/lightsources/LightSourceExtinguisher.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.crafting.lightsources +package rs09.game.node.entity.skill.crafting.lightsources import core.cache.def.impl.ItemDefinition import core.game.container.Container @@ -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.system.SystemLogger +import rs09.game.system.SystemLogger import core.plugin.Initializable import core.plugin.Plugin diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/crafting/lightsources/LightSourceLighter.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/crafting/lightsources/LightSourceLighter.kt similarity index 97% rename from Server/src/main/kotlin/core/game/node/entity/skill/crafting/lightsources/LightSourceLighter.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/crafting/lightsources/LightSourceLighter.kt index 18c40d73e..3a955a658 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/crafting/lightsources/LightSourceLighter.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/crafting/lightsources/LightSourceLighter.kt @@ -1,13 +1,13 @@ -package core.game.node.entity.skill.crafting.lightsources +package rs09.game.node.entity.skill.crafting.lightsources import core.game.container.Container import core.game.interaction.NodeUsageEvent import core.game.interaction.UseWithHandler import core.game.node.entity.player.Player +import core.game.node.entity.skill.Skills import core.game.node.item.Item import core.plugin.Initializable import core.plugin.Plugin -import core.game.node.entity.skill.Skills /** * Method used to light various light sources diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/crafting/lightsources/LightSources.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/crafting/lightsources/LightSources.kt similarity index 95% rename from Server/src/main/kotlin/core/game/node/entity/skill/crafting/lightsources/LightSources.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/crafting/lightsources/LightSources.kt index 6740be38a..c6a6c3c87 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/crafting/lightsources/LightSources.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/crafting/lightsources/LightSources.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.crafting.lightsources +package rs09.game.node.entity.skill.crafting.lightsources enum class LightSources(val emptyID: Int, val fullID: Int, val litID: Int, val levelRequired: Int, val openFlame: Boolean) { WHITE_CANDLE(0,36,33,0,true), diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/BasketsAndSacks.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/BasketsAndSacks.kt similarity index 95% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/BasketsAndSacks.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/BasketsAndSacks.kt index 37063d573..0b5ebc12c 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/BasketsAndSacks.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/BasketsAndSacks.kt @@ -1,6 +1,6 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming -import core.tools.Items +import rs09.tools.Items /** * I don't want to do it this way but jagex has forced my hand diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/CompostBin.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBin.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/CompostBin.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBin.kt index 66452ff3e..7fd935e86 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/CompostBin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBin.kt @@ -1,8 +1,8 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.game.node.entity.player.Player import core.game.node.item.Item -import core.tools.Items +import rs09.tools.Items import core.tools.RandomFunction import org.json.simple.JSONArray import org.json.simple.JSONObject diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/CompostBinOptionHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBinOptionHandler.kt similarity index 97% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/CompostBinOptionHandler.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBinOptionHandler.kt index 1787f3ef1..340d636cb 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/CompostBinOptionHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBinOptionHandler.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.cache.def.impl.ObjectDefinition import core.game.interaction.OptionHandler diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/CompostBins.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBins.kt similarity index 91% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/CompostBins.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBins.kt index 0a69ccca4..9b6e24601 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/CompostBins.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBins.kt @@ -1,10 +1,10 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.cache.def.impl.ObjectDefinition import core.cache.def.impl.VarbitDefinition import core.game.node.`object`.GameObject import core.game.node.entity.player.Player -import core.game.node.entity.state.newsys.states.FarmingState +import rs09.game.node.entity.state.newsys.states.FarmingState enum class CompostBins(val varpIndex: Int, val varpOffest: Int) { FALADOR_COMPOST(511,0), diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/CompostType.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostType.kt similarity index 57% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/CompostType.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostType.kt index 60b206027..1658735dc 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/CompostType.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostType.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming enum class CompostType { NONE, diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/CropHarvester.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CropHarvester.kt similarity index 97% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/CropHarvester.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CropHarvester.kt index 746a3548a..29ec86f79 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/CropHarvester.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CropHarvester.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.cache.def.impl.ObjectDefinition import core.game.interaction.OptionHandler @@ -10,7 +10,7 @@ import core.game.system.task.Pulse import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items +import rs09.tools.Items @Initializable class CropHarvester : OptionHandler() { diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/DigUpPatchDialogue.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/DigUpPatchDialogue.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/DigUpPatchDialogue.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/DigUpPatchDialogue.kt index 1851a744b..579b20c4a 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/DigUpPatchDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/DigUpPatchDialogue.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.game.content.dialogue.DialoguePlugin import core.game.node.entity.player.Player diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/FarmerPayOptionHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FarmerPayOptionHandler.kt similarity index 99% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/FarmerPayOptionHandler.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FarmerPayOptionHandler.kt index 248dcf424..4fc6149e7 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/FarmerPayOptionHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FarmerPayOptionHandler.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.cache.def.impl.NPCDefinition import core.game.content.dialogue.DialoguePlugin diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/Farmers.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/Farmers.kt similarity index 97% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/Farmers.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/Farmers.kt index cafb86168..e56eef180 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/Farmers.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/Farmers.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming enum class Farmers(val id: Int, val patches: Array) { LYRA(2326, arrayOf(FarmingPatch.PORT_PHAS_ALLOTMENT_NW,FarmingPatch.PORT_PHAS_ALLOTMENT_SE)), diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/FarmingPatch.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FarmingPatch.kt similarity index 96% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/FarmingPatch.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FarmingPatch.kt index 2bd0a1d6a..1ecddf411 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/FarmingPatch.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FarmingPatch.kt @@ -1,10 +1,10 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.cache.def.impl.ObjectDefinition import core.cache.def.impl.VarbitDefinition import core.game.node.`object`.GameObject import core.game.node.entity.player.Player -import core.game.node.entity.state.newsys.states.FarmingState +import rs09.game.node.entity.state.newsys.states.FarmingState enum class FarmingPatch(val varpIndex: Int, val varpOffset: Int, val type: PatchType) { //Allotments diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/FruitAndBerryPicker.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FruitAndBerryPicker.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/FruitAndBerryPicker.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FruitAndBerryPicker.kt index dd0150f14..06b5df210 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/FruitAndBerryPicker.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FruitAndBerryPicker.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.cache.def.impl.ObjectDefinition import core.game.interaction.OptionHandler diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/HealthChecker.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/HealthChecker.kt similarity index 95% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/HealthChecker.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/HealthChecker.kt index 09f5bfbec..f9f838065 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/HealthChecker.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/HealthChecker.kt @@ -1,11 +1,11 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.cache.def.impl.ObjectDefinition import core.game.interaction.OptionHandler import core.game.node.Node import core.game.node.entity.player.Player import core.game.node.entity.skill.Skills -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger import core.plugin.Initializable import core.plugin.Plugin import java.util.concurrent.TimeUnit diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/InspectionHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/InspectionHandler.kt similarity index 97% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/InspectionHandler.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/InspectionHandler.kt index 0c2f19255..046de700b 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/InspectionHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/InspectionHandler.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.cache.def.impl.ObjectDefinition import core.game.interaction.OptionHandler diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/LeprechaunNoter.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/LeprechaunNoter.kt similarity index 95% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/LeprechaunNoter.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/LeprechaunNoter.kt index 6e4a0e985..3fc70abfb 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/LeprechaunNoter.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/LeprechaunNoter.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.game.content.dialogue.FacialExpression import core.game.interaction.NodeUsageEvent @@ -6,7 +6,7 @@ import core.game.interaction.UseWithHandler import core.game.node.item.Item import core.plugin.Initializable import core.plugin.Plugin -import core.tools.NPCs +import rs09.tools.NPCs @Initializable class LeprechaunNoter : UseWithHandler(*Plantable.values().map{ it.harvestItem }.toIntArray()) { diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/Patch.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/Patch.kt similarity index 99% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/Patch.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/Patch.kt index 4b2489999..57c0cb074 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/Patch.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/Patch.kt @@ -1,7 +1,7 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.game.node.entity.player.Player -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger import core.tools.RandomFunction import java.util.concurrent.TimeUnit diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/PatchRaker.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/PatchRaker.kt similarity index 91% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/PatchRaker.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/PatchRaker.kt index c02cfbd38..e27fc449a 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/PatchRaker.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/PatchRaker.kt @@ -1,12 +1,11 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.game.node.entity.player.Player import core.game.node.entity.skill.Skills import core.game.node.item.Item -import core.game.system.SystemLogger import core.game.system.task.Pulse import core.game.world.update.flag.context.Animation -import core.tools.Items +import rs09.tools.Items object PatchRaker { val RAKE_ANIM = Animation(2273) diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/PatchType.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/PatchType.kt similarity index 80% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/PatchType.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/PatchType.kt index 96fabe485..11ce96b62 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/PatchType.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/PatchType.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming enum class PatchType(val stageGrowthTime: Int) { ALLOTMENT(10), diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/Plantable.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/Plantable.kt similarity index 99% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/Plantable.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/Plantable.kt index a64037a3a..7835554aa 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/Plantable.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/Plantable.kt @@ -1,7 +1,7 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.game.node.item.Item -import core.tools.Items +import rs09.tools.Items enum class Plantable(val itemID: Int, val value: Int, val stages: Int, val plantingXP: Double, val harvestXP: Double, val checkHealthXP: Double, val requiredLevel: Int, val applicablePatch: PatchType, val harvestItem: Int, val protectionItem: Item? = null,val protectionFlower: Plantable? = null) { diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/SackBasketOptionHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/SackBasketOptionHandler.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/SackBasketOptionHandler.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/SackBasketOptionHandler.kt index 9f7492234..5d9744bea 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/SackBasketOptionHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/SackBasketOptionHandler.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.cache.def.impl.ItemDefinition import core.game.interaction.OptionHandler @@ -7,7 +7,7 @@ import core.game.node.entity.player.Player import core.game.node.item.Item import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items +import rs09.tools.Items @Initializable class SackBasketOptionHandler : OptionHandler() { diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/SeedOnPlantPot.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/SeedOnPlantPot.kt similarity index 96% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/SeedOnPlantPot.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/SeedOnPlantPot.kt index f8ab960ec..4085ca2fb 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/SeedOnPlantPot.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/SeedOnPlantPot.kt @@ -1,11 +1,11 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.game.interaction.NodeUsageEvent import core.game.interaction.UseWithHandler import core.game.node.item.Item import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items +import rs09.tools.Items @Initializable class SeedOnPlantPot : UseWithHandler(Items.ACORN_5312,Items.WILLOW_SEED_5313,Items.MAPLE_SEED_5314,Items.YEW_SEED_5315,Items.MAGIC_SEED_5316,Items.APPLE_TREE_SEED_5283,Items.BANANA_TREE_SEED_5284,Items.ORANGE_TREE_SEED_5285,Items.CURRY_TREE_SEED_5286,Items.PINEAPPLE_SEED_5287,Items.PAPAYA_TREE_SEED_5288,Items.PALM_TREE_SEED_5289) { diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/Seedling.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/Seedling.kt similarity index 60% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/Seedling.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/Seedling.kt index 947e7984c..ae9c98994 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/Seedling.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/Seedling.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming class Seedling(val id: Int, val TTL: Long, val sapling: Int) { diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/SeedlingWaterer.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/SeedlingWaterer.kt similarity index 93% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/SeedlingWaterer.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/SeedlingWaterer.kt index 43db834f5..660cfeb20 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/SeedlingWaterer.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/SeedlingWaterer.kt @@ -1,12 +1,12 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.game.interaction.NodeUsageEvent import core.game.interaction.UseWithHandler -import core.game.node.entity.state.newsys.states.SeedlingState import core.game.node.item.Item import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items +import rs09.game.node.entity.state.newsys.states.SeedlingState +import rs09.tools.Items private val cans = arrayListOf(Items.WATERING_CAN8_5340,Items.WATERING_CAN7_5339,Items.WATERING_CAN6_5338,Items.WATERING_CAN5_5337,Items.WATERING_CAN4_5336,Items.WATERING_CAN3_5335,Items.WATERING_CAN2_5334,Items.WATERING_CAN1_5333) private val seedlings = arrayListOf(Items.OAK_SEEDLING_5358,Items.WILLOW_SEEDLING_5359,Items.MAPLE_SEEDLING_5360,Items.YEW_SEEDLING_5361,Items.MAGIC_SEEDLING_5362) diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/ToolLeprechaunHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/ToolLeprechaunHandler.kt similarity index 92% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/ToolLeprechaunHandler.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/ToolLeprechaunHandler.kt index 1e9af708d..c4460a6d4 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/ToolLeprechaunHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/ToolLeprechaunHandler.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.cache.def.impl.NPCDefinition import core.game.component.Component @@ -8,8 +8,8 @@ import core.game.node.Node import core.game.node.entity.player.Player import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Components -import core.tools.NPCs +import rs09.tools.Components +import rs09.tools.NPCs val TL_IDS = arrayOf(NPCs.TOOL_LEPRECHAUN_3021,NPCs.GOTH_LEPRECHAUN_8000,NPCs.TOOL_LEPRECHAUN_4965) @Initializable diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/ToolLeprechaunInterface.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/ToolLeprechaunInterface.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/ToolLeprechaunInterface.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/ToolLeprechaunInterface.kt index fcad7b9d6..4944ebe11 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/ToolLeprechaunInterface.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/ToolLeprechaunInterface.kt @@ -1,17 +1,15 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.game.component.Component import core.game.component.ComponentDefinition import core.game.component.ComponentPlugin import core.game.node.entity.player.Player import core.game.node.entity.player.link.RunScript -import core.game.node.entity.skill.crafting.jewellery.JewelleryCrafting import core.game.node.item.Item -import core.game.system.SystemLogger import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Components -import core.tools.Items +import rs09.tools.Components +import rs09.tools.Items private const val varp = 615 @Initializable diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/UseWithBinHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/UseWithBinHandler.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/UseWithBinHandler.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/UseWithBinHandler.kt index 6cf295388..961fc94ac 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/UseWithBinHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/UseWithBinHandler.kt @@ -1,10 +1,10 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.game.interaction.NodeUsageEvent import core.game.node.item.Item import core.game.system.task.Pulse import core.game.world.update.flag.context.Animation -import core.tools.Items +import rs09.tools.Items object UseWithBinHandler { @JvmField diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/farming/UseWithPatchHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/UseWithPatchHandler.kt similarity index 99% rename from Server/src/main/kotlin/core/game/node/entity/skill/farming/UseWithPatchHandler.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/farming/UseWithPatchHandler.kt index 7f417241b..2aa44cd49 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/farming/UseWithPatchHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/UseWithPatchHandler.kt @@ -1,11 +1,11 @@ -package core.game.node.entity.skill.farming +package rs09.game.node.entity.skill.farming import core.game.interaction.NodeUsageEvent import core.game.node.entity.skill.Skills import core.game.node.item.Item import core.game.system.task.Pulse import core.game.world.update.flag.context.Animation -import core.tools.Items +import rs09.tools.Items object UseWithPatchHandler{ val RAKE = Items.RAKE_5341 diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/fletching/items/gem/GemBoltCutPulse.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/fletching/items/gem/GemBoltCutPulse.kt similarity index 95% rename from Server/src/main/kotlin/core/game/node/entity/skill/fletching/items/gem/GemBoltCutPulse.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/fletching/items/gem/GemBoltCutPulse.kt index 69265af8d..cef4fb676 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/fletching/items/gem/GemBoltCutPulse.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/fletching/items/gem/GemBoltCutPulse.kt @@ -1,12 +1,12 @@ -package core.game.node.entity.skill.fletching.items.gem +package rs09.game.node.entity.skill.fletching.items.gem import core.game.node.entity.player.Player -import core.game.node.item.Item -import core.game.world.update.flag.context.Animation -import core.tools.Items -import core.game.node.entity.skill.fletching.Fletching.GemBolts import core.game.node.entity.skill.SkillPulse import core.game.node.entity.skill.Skills +import core.game.node.entity.skill.fletching.Fletching.GemBolts +import core.game.node.item.Item +import core.game.world.update.flag.context.Animation +import rs09.tools.Items /** * Represents the gem cutting pulse(gem to bolt). diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/gather/PickaxeRepairPlugin.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/PickaxeRepairPlugin.kt similarity index 96% rename from Server/src/main/kotlin/core/game/node/entity/skill/gather/PickaxeRepairPlugin.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/gather/PickaxeRepairPlugin.kt index 9f4398944..c2298eea8 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/gather/PickaxeRepairPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/PickaxeRepairPlugin.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.gather +package rs09.game.node.entity.skill.gather import core.game.interaction.NodeUsageEvent import core.game.interaction.UseWithHandler diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/gather/mining/MiningSkillPulse.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/mining/MiningSkillPulse.kt similarity index 97% rename from Server/src/main/kotlin/core/game/node/entity/skill/gather/mining/MiningSkillPulse.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/gather/mining/MiningSkillPulse.kt index 1a6657ba4..d218672e3 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/gather/mining/MiningSkillPulse.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/mining/MiningSkillPulse.kt @@ -1,35 +1,35 @@ -package core.game.node.entity.skill.gather.mining +package rs09.game.node.entity.skill.gather.mining import core.cache.def.impl.ItemDefinition -import core.game.system.task.Pulse -import core.game.world.update.flag.context.Animation +import core.game.container.impl.EquipmentContainer +import core.game.content.dialogue.FacialExpression +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.entity.skill.Skills -import core.game.node.entity.skill.gather.SkillingTool -import core.game.content.dialogue.FacialExpression -import core.tools.RandomFunction -import core.game.content.global.SkillingPets -import core.game.container.impl.EquipmentContainer -import core.tools.Items -import core.game.world.map.path.Pathfinder -import core.game.node.entity.player.link.diary.DiaryType import core.game.node.Node import core.game.node.`object`.GameObject import core.game.node.`object`.ObjectBuilder import core.game.node.entity.impl.Animator -import core.game.world.GameWorld -import core.game.node.item.ChanceItem import core.game.node.entity.npc.drop.DropFrequency import core.game.node.entity.player.Player -import core.game.node.entity.player.info.stats.STATS_BASE -import core.game.node.entity.player.info.stats.STATS_ROCKS +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.entity.skill.gather.mining.MiningNode +import core.game.node.item.ChanceItem import core.game.node.item.GroundItemManager import core.game.node.item.Item +import core.game.system.task.Pulse import core.game.world.map.Location +import core.game.world.map.path.Pathfinder +import core.game.world.update.flag.context.Animation +import core.tools.RandomFunction import core.tools.StringUtils -import core.game.node.entity.skill.skillcapeperks.SkillcapePerks -import core.tools.stringtools.colorize +import rs09.game.node.entity.player.info.stats.STATS_BASE +import rs09.game.node.entity.player.info.stats.STATS_ROCKS +import rs09.game.node.entity.skill.skillcapeperks.SkillcapePerks +import rs09.tools.Items +import rs09.tools.stringtools.colorize /** * Mining skill pulse diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/herblore/GrindItemPlugin.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/herblore/GrindItemPlugin.kt similarity index 93% rename from Server/src/main/kotlin/core/game/node/entity/skill/herblore/GrindItemPlugin.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/herblore/GrindItemPlugin.kt index a88d74173..4d119b1e9 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/herblore/GrindItemPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/herblore/GrindItemPlugin.kt @@ -1,7 +1,9 @@ -package core.game.node.entity.skill.herblore +package rs09.game.node.entity.skill.herblore import core.game.interaction.NodeUsageEvent import core.game.interaction.UseWithHandler +import core.game.node.entity.skill.SkillPulse +import core.game.node.entity.skill.herblore.GrindingItem import core.game.node.item.Item import core.game.world.update.flag.context.Animation import core.net.packet.PacketRepository @@ -9,8 +11,7 @@ import core.net.packet.context.ChildPositionContext import core.net.packet.out.RepositionChild import core.plugin.Initializable import core.plugin.Plugin -import core.game.content.dialogue.SkillDialogueHandler -import core.game.node.entity.skill.SkillPulse +import rs09.game.content.dialogue.SkillDialogueHandler /** * plugin used to handle the grinding of an item. diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/hunter/PolarKebbitHunting.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/PolarKebbitHunting.kt similarity index 100% rename from Server/src/main/kotlin/core/game/node/entity/skill/hunter/PolarKebbitHunting.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/PolarKebbitHunting.kt diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/CommonKebbitEast.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/CommonKebbitEast.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/CommonKebbitEast.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/CommonKebbitEast.kt index 4cd0faf25..2355c145a 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/CommonKebbitEast.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/CommonKebbitEast.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.hunter.tracking +package rs09.game.node.entity.skill.hunter.tracking import core.cache.def.impl.ObjectDefinition import core.game.node.item.Item @@ -6,7 +6,7 @@ import core.game.world.map.Location import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items +import rs09.tools.Items @Initializable class CommonKebbitEast : HunterTracking() { diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/CommonKebbitWest.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/CommonKebbitWest.kt new file mode 100644 index 000000000..5d2de79c3 --- /dev/null +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/CommonKebbitWest.kt @@ -0,0 +1,4 @@ +package rs09.game.node.entity.skill.hunter.tracking + +class CommonKebbitWest { +} \ No newline at end of file diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/HunterTracking.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/HunterTracking.kt similarity index 98% rename from Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/HunterTracking.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/HunterTracking.kt index 18a3a71cd..1dd63ad80 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/HunterTracking.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/HunterTracking.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.hunter.tracking +package rs09.game.node.entity.skill.hunter.tracking import core.game.interaction.OptionHandler import core.game.node.Node @@ -7,13 +7,13 @@ import core.game.node.entity.player.Player import core.game.node.entity.skill.Skills import core.game.node.item.GroundItemManager import core.game.node.item.Item -import core.game.system.SystemLogger import core.game.system.task.Pulse -import core.game.world.GameWorld import core.game.world.map.Location import core.game.world.update.flag.context.Animation -import core.tools.Items import core.tools.RandomFunction +import rs09.game.system.SystemLogger +import rs09.game.world.GameWorld +import rs09.tools.Items import java.util.* /** diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/PolarKebbitHunting.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/PolarKebbitHunting.kt similarity index 97% rename from Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/PolarKebbitHunting.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/PolarKebbitHunting.kt index 54b08ef41..0590d81d8 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/PolarKebbitHunting.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/PolarKebbitHunting.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.hunter.tracking +package rs09.game.node.entity.skill.hunter.tracking import core.cache.def.impl.ObjectDefinition import core.game.node.item.Item @@ -6,7 +6,7 @@ import core.game.world.map.Location import core.game.world.update.flag.context.Animation import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items +import rs09.tools.Items @Initializable class PolarKebbitHunting : HunterTracking() { diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/TrailDefinition.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/TrailDefinition.kt similarity index 89% rename from Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/TrailDefinition.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/TrailDefinition.kt index 9b5df1256..84577e3d2 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/hunter/tracking/TrailDefinition.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/TrailDefinition.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.hunter.tracking +package rs09.game.node.entity.skill.hunter.tracking import core.game.world.map.Location diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/runecrafting/PouchManager.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/runecrafting/PouchManager.kt similarity index 97% rename from Server/src/main/kotlin/core/game/node/entity/skill/runecrafting/PouchManager.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/runecrafting/PouchManager.kt index 972155430..322ef285f 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/runecrafting/PouchManager.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/runecrafting/PouchManager.kt @@ -1,14 +1,13 @@ -package core.game.node.entity.skill.runecrafting +package rs09.game.node.entity.skill.runecrafting import core.game.container.Container import core.game.node.entity.player.Player +import core.game.node.entity.skill.Skills import core.game.node.item.Item -import core.tools.Items import org.json.simple.JSONArray import org.json.simple.JSONObject -import core.game.node.entity.skill.Skills -import core.game.system.SystemLogger -import core.tools.stringtools.colorize +import rs09.tools.Items +import rs09.tools.stringtools.colorize /** * A class for managing rune pouches. diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/runecrafting/RunePouchPlugin.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/runecrafting/RunePouchPlugin.kt similarity index 95% rename from Server/src/main/kotlin/core/game/node/entity/skill/runecrafting/RunePouchPlugin.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/runecrafting/RunePouchPlugin.kt index 679b7a3c5..e19b98861 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/runecrafting/RunePouchPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/runecrafting/RunePouchPlugin.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.runecrafting +package rs09.game.node.entity.skill.runecrafting import core.cache.def.impl.ItemDefinition import core.game.interaction.OptionHandler @@ -6,8 +6,8 @@ import core.game.node.Node import core.game.node.entity.player.Player import core.game.node.item.Item import core.plugin.Plugin -import core.tools.Items -import core.tools.stringtools.colorize +import rs09.tools.Items +import rs09.tools.stringtools.colorize /** * Handles the rune pouches. diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/skillcapeperks/Skillcape.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/skillcapeperks/Skillcape.kt similarity index 97% rename from Server/src/main/kotlin/core/game/node/entity/skill/skillcapeperks/Skillcape.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/skillcapeperks/Skillcape.kt index 9ebfe55b5..ec640e4b8 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/skillcapeperks/Skillcape.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/skillcapeperks/Skillcape.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.skillcapeperks +package rs09.game.node.entity.skill.skillcapeperks enum class Skillcape { ATTACK, diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/skillcapeperks/SkillcapeEquipmentPlugin.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/skillcapeperks/SkillcapeEquipmentPlugin.kt similarity index 95% rename from Server/src/main/kotlin/core/game/node/entity/skill/skillcapeperks/SkillcapeEquipmentPlugin.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/skillcapeperks/SkillcapeEquipmentPlugin.kt index 6e7c23c13..eb6cc6f62 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/skillcapeperks/SkillcapeEquipmentPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/skillcapeperks/SkillcapeEquipmentPlugin.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.skillcapeperks +package rs09.game.node.entity.skill.skillcapeperks import core.cache.def.impl.ItemDefinition import core.game.node.entity.player.Player diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/skillcapeperks/SkillcapeOperatePlugin.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/skillcapeperks/SkillcapeOperatePlugin.kt similarity index 94% rename from Server/src/main/kotlin/core/game/node/entity/skill/skillcapeperks/SkillcapeOperatePlugin.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/skillcapeperks/SkillcapeOperatePlugin.kt index 15f4d6e75..f5d31a657 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/skillcapeperks/SkillcapeOperatePlugin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/skillcapeperks/SkillcapeOperatePlugin.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.skill.skillcapeperks +package rs09.game.node.entity.skill.skillcapeperks import core.cache.def.impl.ItemDefinition import core.game.interaction.OptionHandler diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/skillcapeperks/SkillcapePerks.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/skillcapeperks/SkillcapePerks.kt similarity index 99% rename from Server/src/main/kotlin/core/game/node/entity/skill/skillcapeperks/SkillcapePerks.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/skillcapeperks/SkillcapePerks.kt index 95c380ded..9a5a379e3 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/skillcapeperks/SkillcapePerks.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/skillcapeperks/SkillcapePerks.kt @@ -1,14 +1,14 @@ -package core.game.node.entity.skill.skillcapeperks +package rs09.game.node.entity.skill.skillcapeperks import core.game.component.Component +import core.game.content.dialogue.DialoguePlugin import core.game.node.entity.player.Player import core.game.node.entity.player.link.SpellBookManager import core.game.node.entity.player.link.TeleportManager +import core.game.node.entity.skill.runecrafting.Altar import core.game.world.map.zone.impl.DarkZone import core.plugin.Initializable -import core.game.content.dialogue.DialoguePlugin -import core.game.node.entity.skill.runecrafting.Altar -import core.game.world.GameWorld +import rs09.game.world.GameWorld enum class SkillcapePerks(val attribute: String, val effect: ((Player) -> Unit)? = null) { BAREFISTED_SMITHING("cape_perks:barefisted-smithing"), diff --git a/Server/src/main/kotlin/core/game/node/entity/skill/thieving/Pickpocket.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/thieving/Pickpocket.kt similarity index 99% rename from Server/src/main/kotlin/core/game/node/entity/skill/thieving/Pickpocket.kt rename to Server/src/main/kotlin/rs09/game/node/entity/skill/thieving/Pickpocket.kt index 404f87cad..97a5fba93 100644 --- a/Server/src/main/kotlin/core/game/node/entity/skill/thieving/Pickpocket.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/thieving/Pickpocket.kt @@ -1,13 +1,13 @@ -package core.game.node.entity.skill.thieving +package rs09.game.node.entity.skill.thieving +import core.game.content.ttrail.ClueLevel +import core.game.content.ttrail.ClueScrollPlugin import core.game.node.entity.npc.NPC import core.game.node.entity.npc.drop.DropFrequency import core.game.node.entity.player.Player import core.game.node.item.ChanceItem import core.game.node.item.Item import core.tools.RandomFunction -import core.game.content.ttrail.ClueLevel -import core.game.content.ttrail.ClueScrollPlugin import java.util.* import java.util.stream.IntStream diff --git a/Server/src/main/kotlin/core/game/node/entity/state/newsys/PlayerState.kt b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/PlayerState.kt similarity index 52% rename from Server/src/main/kotlin/core/game/node/entity/state/newsys/PlayerState.kt rename to Server/src/main/kotlin/rs09/game/node/entity/state/newsys/PlayerState.kt index 97cc072bd..1facb3406 100644 --- a/Server/src/main/kotlin/core/game/node/entity/state/newsys/PlayerState.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/PlayerState.kt @@ -1,3 +1,3 @@ -package core.game.node.entity.state.newsys +package rs09.game.node.entity.state.newsys annotation class PlayerState(val key: String) diff --git a/Server/src/main/kotlin/core/game/node/entity/state/newsys/State.kt b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/State.kt similarity index 92% rename from Server/src/main/kotlin/core/game/node/entity/state/newsys/State.kt rename to Server/src/main/kotlin/rs09/game/node/entity/state/newsys/State.kt index cba464571..b42bdfbf6 100644 --- a/Server/src/main/kotlin/core/game/node/entity/state/newsys/State.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/State.kt @@ -1,9 +1,9 @@ -package core.game.node.entity.state.newsys +package rs09.game.node.entity.state.newsys import core.game.node.entity.player.Player import core.game.system.task.Pulse -import core.game.world.GameWorld.Pulser import org.json.simple.JSONObject +import rs09.game.world.GameWorld.Pulser /** * A class representing a state that the player or some associated thing can be in. diff --git a/Server/src/main/kotlin/core/game/node/entity/state/newsys/StateRepository.kt b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/StateRepository.kt similarity index 96% rename from Server/src/main/kotlin/core/game/node/entity/state/newsys/StateRepository.kt rename to Server/src/main/kotlin/rs09/game/node/entity/state/newsys/StateRepository.kt index c7f1cea42..bfa8f6bb0 100644 --- a/Server/src/main/kotlin/core/game/node/entity/state/newsys/StateRepository.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/StateRepository.kt @@ -1,4 +1,4 @@ -package core.game.node.entity.state.newsys +package rs09.game.node.entity.state.newsys import core.game.node.entity.player.Player import io.github.classgraph.ClassGraph diff --git a/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/AvaDeviceState.kt b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/AvaDeviceState.kt similarity index 91% rename from Server/src/main/kotlin/core/game/node/entity/state/newsys/states/AvaDeviceState.kt rename to Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/AvaDeviceState.kt index d460e4701..7b77452a2 100644 --- a/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/AvaDeviceState.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/AvaDeviceState.kt @@ -1,17 +1,15 @@ -package core.game.node.entity.state.newsys.states +package rs09.game.node.entity.state.newsys.states import core.game.container.impl.EquipmentContainer -import core.game.node.entity.npc.drop.NPCDropTables import core.game.node.entity.player.Player -import core.game.node.entity.state.newsys.PlayerState -import core.game.node.entity.state.newsys.State -import core.game.node.item.ChanceItem import core.game.node.item.Item -import core.game.system.config.ItemConfigParser import core.game.system.task.Pulse -import core.tools.Items import core.tools.RandomFunction import org.json.simple.JSONObject +import rs09.game.node.entity.state.newsys.PlayerState +import rs09.game.node.entity.state.newsys.State +import rs09.game.system.config.ItemConfigParser +import rs09.tools.Items import kotlin.math.ceil @PlayerState("avadevice") diff --git a/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/DiseasedState.kt b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/DiseasedState.kt similarity index 89% rename from Server/src/main/kotlin/core/game/node/entity/state/newsys/states/DiseasedState.kt rename to Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/DiseasedState.kt index f2cb8ebf9..5e3eae436 100644 --- a/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/DiseasedState.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/DiseasedState.kt @@ -1,13 +1,13 @@ -package core.game.node.entity.state.newsys.states +package rs09.game.node.entity.state.newsys.states import core.game.node.entity.combat.ImpactHandler import core.game.node.entity.player.Player -import core.game.node.entity.state.newsys.PlayerState -import core.game.node.entity.state.newsys.State import core.game.system.task.Pulse -import core.game.world.GameWorld import core.tools.RandomFunction import org.json.simple.JSONObject +import rs09.game.node.entity.state.newsys.PlayerState +import rs09.game.node.entity.state.newsys.State +import rs09.game.world.GameWorld @PlayerState("disease") class DiseasedState(player: Player? = null) : State(player){ diff --git a/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/FarmingState.kt b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/FarmingState.kt similarity index 96% rename from Server/src/main/kotlin/core/game/node/entity/state/newsys/states/FarmingState.kt rename to Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/FarmingState.kt index 269bda4a9..581f37ae2 100644 --- a/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/FarmingState.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/FarmingState.kt @@ -1,17 +1,16 @@ -package core.game.node.entity.state.newsys.states +package rs09.game.node.entity.state.newsys.states import core.game.node.entity.player.Player -import core.game.node.entity.skill.farming.* -import core.game.node.entity.state.newsys.PlayerState -import core.game.node.entity.state.newsys.State -import core.game.system.SystemLogger +import rs09.game.node.entity.skill.farming.* +import rs09.game.node.entity.state.newsys.PlayerState +import rs09.game.node.entity.state.newsys.State +import rs09.game.system.SystemLogger import core.game.system.task.Pulse import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import org.json.simple.JSONArray import org.json.simple.JSONObject import java.util.concurrent.TimeUnit -import kotlin.math.exp @PlayerState("farming") class FarmingState(player: Player? = null) : State(player) { diff --git a/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/GodspellChargedState.kt b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/GodspellChargedState.kt similarity index 86% rename from Server/src/main/kotlin/core/game/node/entity/state/newsys/states/GodspellChargedState.kt rename to Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/GodspellChargedState.kt index 023c4280d..58d7641ac 100644 --- a/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/GodspellChargedState.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/GodspellChargedState.kt @@ -1,10 +1,10 @@ -package core.game.node.entity.state.newsys.states +package rs09.game.node.entity.state.newsys.states import core.game.node.entity.player.Player -import core.game.node.entity.state.newsys.PlayerState -import core.game.node.entity.state.newsys.State import core.game.system.task.Pulse import org.json.simple.JSONObject +import rs09.game.node.entity.state.newsys.PlayerState +import rs09.game.node.entity.state.newsys.State @PlayerState("godcharge") class GodspellChargedState(player: Player? = null) : State(player) { diff --git a/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/IncubatorState.kt b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/IncubatorState.kt similarity index 91% rename from Server/src/main/kotlin/core/game/node/entity/state/newsys/states/IncubatorState.kt rename to Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/IncubatorState.kt index d417c4e36..e4a43c354 100644 --- a/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/IncubatorState.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/IncubatorState.kt @@ -1,9 +1,9 @@ -package core.game.node.entity.state.newsys.states +package rs09.game.node.entity.state.newsys.states import core.game.node.entity.player.Player import core.game.node.entity.skill.summoning.pet.IncubatorEgg -import core.game.node.entity.state.newsys.PlayerState -import core.game.node.entity.state.newsys.State +import rs09.game.node.entity.state.newsys.PlayerState +import rs09.game.node.entity.state.newsys.State import core.game.system.task.Pulse import org.json.simple.JSONObject diff --git a/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/SeedlingState.kt b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/SeedlingState.kt similarity index 92% rename from Server/src/main/kotlin/core/game/node/entity/state/newsys/states/SeedlingState.kt rename to Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/SeedlingState.kt index 6f00b7928..f7dee360d 100644 --- a/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/SeedlingState.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/SeedlingState.kt @@ -1,12 +1,11 @@ -package core.game.node.entity.state.newsys.states +package rs09.game.node.entity.state.newsys.states import core.game.node.entity.player.Player -import core.game.node.entity.skill.farming.Seedling -import core.game.node.entity.state.newsys.PlayerState -import core.game.node.entity.state.newsys.State +import rs09.game.node.entity.skill.farming.Seedling +import rs09.game.node.entity.state.newsys.PlayerState +import rs09.game.node.entity.state.newsys.State import core.game.node.item.Item import core.game.system.task.Pulse -import core.tools.Items import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import org.json.simple.JSONArray diff --git a/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/ShootingStarState.kt b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/ShootingStarState.kt similarity index 87% rename from Server/src/main/kotlin/core/game/node/entity/state/newsys/states/ShootingStarState.kt rename to Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/ShootingStarState.kt index 8440760a6..eed3442ee 100644 --- a/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/ShootingStarState.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/ShootingStarState.kt @@ -1,10 +1,10 @@ -package core.game.node.entity.state.newsys.states +package rs09.game.node.entity.state.newsys.states import core.game.node.entity.player.Player -import core.game.node.entity.state.newsys.PlayerState -import core.game.node.entity.state.newsys.State +import rs09.game.node.entity.state.newsys.PlayerState +import rs09.game.node.entity.state.newsys.State import core.game.system.task.Pulse -import core.tools.ticksToSeconds +import rs09.tools.ticksToSeconds import org.json.simple.JSONObject @PlayerState("shooting-star") diff --git a/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/SkulledState.kt b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/SkulledState.kt similarity index 91% rename from Server/src/main/kotlin/core/game/node/entity/state/newsys/states/SkulledState.kt rename to Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/SkulledState.kt index 413780873..5c04b6b5c 100644 --- a/Server/src/main/kotlin/core/game/node/entity/state/newsys/states/SkulledState.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/state/newsys/states/SkulledState.kt @@ -1,7 +1,7 @@ -package core.game.node.entity.state.newsys.states +package rs09.game.node.entity.state.newsys.states import core.game.node.entity.player.Player -import core.game.node.entity.state.newsys.State +import rs09.game.node.entity.state.newsys.State import core.game.system.task.Pulse import org.json.simple.JSONObject diff --git a/Server/src/main/kotlin/core/game/system/SystemLogger.kt b/Server/src/main/kotlin/rs09/game/system/SystemLogger.kt similarity index 88% rename from Server/src/main/kotlin/core/game/system/SystemLogger.kt rename to Server/src/main/kotlin/rs09/game/system/SystemLogger.kt index f895dd202..a3b0f27c8 100644 --- a/Server/src/main/kotlin/core/game/system/SystemLogger.kt +++ b/Server/src/main/kotlin/rs09/game/system/SystemLogger.kt @@ -1,16 +1,9 @@ -package core.game.system +package rs09.game.system import com.github.ajalt.mordant.rendering.TextColors import com.github.ajalt.mordant.terminal.Terminal -import core.ServerConstants -import core.game.node.entity.player.Player -import core.game.world.GameWorld +import rs09.ServerConstants import java.io.* -import java.nio.charset.StandardCharsets -import java.nio.file.Files -import java.nio.file.Paths -import java.nio.file.StandardOpenOption -import java.text.DateFormat import java.text.SimpleDateFormat import java.util.* diff --git a/Server/src/main/kotlin/core/game/system/command/Command.kt b/Server/src/main/kotlin/rs09/game/system/command/Command.kt similarity index 93% rename from Server/src/main/kotlin/core/game/system/command/Command.kt rename to Server/src/main/kotlin/rs09/game/system/command/Command.kt index 1902ca4e0..44b11f517 100644 --- a/Server/src/main/kotlin/core/game/system/command/Command.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/Command.kt @@ -1,7 +1,7 @@ -package core.game.system.command +package rs09.game.system.command import core.game.node.entity.player.Player -import core.game.world.GameWorld +import rs09.game.world.GameWorld /** * Base class for Commands in the new system. Can pass a lambda as part of the constructor or after the constructor. diff --git a/Server/src/main/kotlin/core/game/system/command/CommandPlugin.kt b/Server/src/main/kotlin/rs09/game/system/command/CommandPlugin.kt similarity index 95% rename from Server/src/main/kotlin/core/game/system/command/CommandPlugin.kt rename to Server/src/main/kotlin/rs09/game/system/command/CommandPlugin.kt index cf3ad04c2..debb49580 100644 --- a/Server/src/main/kotlin/core/game/system/command/CommandPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/CommandPlugin.kt @@ -1,8 +1,9 @@ -package core.game.system.command +package rs09.game.system.command import core.game.node.entity.player.Player -import core.game.world.repository.Repository +import core.game.system.command.CommandSet import core.plugin.Plugin +import rs09.game.world.repository.Repository /** * Represents a command plugin that can be linked to a command set. diff --git a/Server/src/main/kotlin/core/game/system/command/CommandSystem.kt b/Server/src/main/kotlin/rs09/game/system/command/CommandSystem.kt similarity index 93% rename from Server/src/main/kotlin/core/game/system/command/CommandSystem.kt rename to Server/src/main/kotlin/rs09/game/system/command/CommandSystem.kt index 442719dba..e735ddd2f 100644 --- a/Server/src/main/kotlin/core/game/system/command/CommandSystem.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/CommandSystem.kt @@ -1,6 +1,7 @@ -package core.game.system.command +package rs09.game.system.command import core.game.node.entity.player.Player +import core.game.system.command.CommandSet /** * Represents a managing system used to dispatch incoming commands. diff --git a/Server/src/main/kotlin/core/game/system/command/MapDumpCommand.kt b/Server/src/main/kotlin/rs09/game/system/command/MapDumpCommand.kt similarity index 97% rename from Server/src/main/kotlin/core/game/system/command/MapDumpCommand.kt rename to Server/src/main/kotlin/rs09/game/system/command/MapDumpCommand.kt index 749afd795..5a0be4fcb 100644 --- a/Server/src/main/kotlin/core/game/system/command/MapDumpCommand.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/MapDumpCommand.kt @@ -1,6 +1,7 @@ -package core.game.system.command +package rs09.game.system.command import core.game.node.entity.player.Player +import core.game.system.command.CommandSet import core.game.world.map.Location import core.game.world.map.RegionManager import core.plugin.Initializable diff --git a/Server/src/main/kotlin/core/game/system/command/oldsys/AIPCommandPlugin.kt b/Server/src/main/kotlin/rs09/game/system/command/oldsys/AIPCommandPlugin.kt similarity index 94% rename from Server/src/main/kotlin/core/game/system/command/oldsys/AIPCommandPlugin.kt rename to Server/src/main/kotlin/rs09/game/system/command/oldsys/AIPCommandPlugin.kt index 6375d46ee..71c61da18 100644 --- a/Server/src/main/kotlin/core/game/system/command/oldsys/AIPCommandPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/oldsys/AIPCommandPlugin.kt @@ -1,33 +1,33 @@ -package core.game.system.command.oldsys +package rs09.game.system.command.oldsys +//import rs09.game.ai.general.scriptrepository.ManThiever import core.game.container.impl.EquipmentContainer import core.game.interaction.Interaction import core.game.node.entity.player.Player import core.game.node.entity.player.link.appearance.Gender -import core.game.system.command.CommandPlugin +import core.game.node.entity.skill.Skills +import rs09.game.system.command.CommandPlugin import core.game.system.command.CommandSet import core.game.system.task.Pulse -import core.game.world.GameWorld -import core.game.world.ImmerseWorld +import rs09.game.world.GameWorld +import rs09.game.world.ImmerseWorld import core.game.world.map.Location import core.game.world.map.RegionManager import core.game.world.map.path.Pathfinder -import core.game.world.repository.Repository +import rs09.game.world.repository.Repository import core.plugin.Initializable import core.plugin.Plugin import core.tools.RandomFunction -import plugin.ai.AIPBuilder -import plugin.ai.AIPlayer -import plugin.ai.general.GeneralBotCreator -import plugin.ai.general.scriptrepository.LobsterCatcher -//import plugin.ai.general.scriptrepository.ManThiever -import plugin.ai.pvmbots.PvMBotsBuilder -import plugin.ai.pvp.PVPAIPActions -import plugin.ai.pvp.PVPAIPBuilderUtils -import plugin.ai.resource.ResourceAIPActions -import plugin.ai.skillingbot.SkillingBotsBuilder -import plugin.ai.wilderness.PvPBotsBuilder -import core.game.node.entity.skill.Skills +import rs09.game.ai.AIPBuilder +import rs09.game.ai.AIPlayer +import rs09.game.ai.general.GeneralBotCreator +import rs09.game.ai.general.scriptrepository.LobsterCatcher +import rs09.game.ai.pvmbots.PvMBotsBuilder +import rs09.game.ai.pvp.PVPAIPActions +import rs09.game.ai.pvp.PVPAIPBuilderUtils +import rs09.game.ai.resource.ResourceAIPActions +import rs09.game.ai.skillingbot.SkillingBotsBuilder +import rs09.game.ai.wilderness.PvPBotsBuilder import java.util.* /** diff --git a/Server/src/main/kotlin/core/game/system/command/oldsys/SimpleDumpingCommands.kt b/Server/src/main/kotlin/rs09/game/system/command/oldsys/SimpleDumpingCommands.kt similarity index 97% rename from Server/src/main/kotlin/core/game/system/command/oldsys/SimpleDumpingCommands.kt rename to Server/src/main/kotlin/rs09/game/system/command/oldsys/SimpleDumpingCommands.kt index 566d0ab94..240576992 100644 --- a/Server/src/main/kotlin/core/game/system/command/oldsys/SimpleDumpingCommands.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/oldsys/SimpleDumpingCommands.kt @@ -1,13 +1,13 @@ -package core.game.system.command.oldsys +package rs09.game.system.command.oldsys import core.cache.def.impl.ItemDefinition import core.cache.def.impl.NPCDefinition import core.cache.def.impl.ObjectDefinition import core.game.node.entity.player.Player -import core.game.system.command.CommandPlugin import core.game.system.command.CommandSet import core.plugin.Initializable import core.plugin.Plugin +import rs09.game.system.command.CommandPlugin import java.io.BufferedWriter import java.io.File diff --git a/Server/src/main/kotlin/core/game/system/command/oldsys/VisualCommand.kt b/Server/src/main/kotlin/rs09/game/system/command/oldsys/VisualCommand.kt similarity index 98% rename from Server/src/main/kotlin/core/game/system/command/oldsys/VisualCommand.kt rename to Server/src/main/kotlin/rs09/game/system/command/oldsys/VisualCommand.kt index ba3a3ea03..d0d291d78 100644 --- a/Server/src/main/kotlin/core/game/system/command/oldsys/VisualCommand.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/oldsys/VisualCommand.kt @@ -1,29 +1,26 @@ -package core.game.system.command.oldsys +package rs09.game.system.command.oldsys import core.cache.Cache import core.game.container.access.InterfaceContainer +import core.game.content.quest.tutorials.tutorialisland.CharacterDesign import core.game.node.`object`.GameObject import core.game.node.`object`.ObjectBuilder import core.game.node.entity.combat.ImpactHandler.HitsplatType 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.entity.player.link.IronmanMode import core.game.node.entity.player.link.audio.Audio import core.game.node.item.Item -import core.game.system.command.CommandPlugin import core.game.system.command.CommandSet import core.game.system.task.Pulse -import core.game.world.GameWorld import core.game.world.map.Location import core.game.world.map.RegionManager -import core.game.world.repository.Repository import core.game.world.update.flag.context.Animation import core.game.world.update.flag.context.Graphics import core.plugin.Initializable import core.plugin.Plugin -import core.game.content.activity.ActivityManager -import core.game.content.quest.tutorials.tutorialisland.CharacterDesign +import rs09.game.system.command.CommandPlugin +import rs09.game.world.GameWorld import java.awt.Toolkit import java.awt.datatransfer.StringSelection diff --git a/Server/src/main/kotlin/core/game/system/command/rottenpotato/RPUseWithNPCDialogue.kt b/Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RPUseWithNPCDialogue.kt similarity index 95% rename from Server/src/main/kotlin/core/game/system/command/rottenpotato/RPUseWithNPCDialogue.kt rename to Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RPUseWithNPCDialogue.kt index df3f2b215..deb209cfb 100644 --- a/Server/src/main/kotlin/core/game/system/command/rottenpotato/RPUseWithNPCDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RPUseWithNPCDialogue.kt @@ -1,11 +1,11 @@ -package core.game.system.command.rottenpotato +package rs09.game.system.command.rottenpotato +import core.game.content.dialogue.DialoguePlugin import core.game.node.entity.combat.ImpactHandler import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.plugin.Initializable -import core.game.content.dialogue.DialoguePlugin -import core.tools.stringtools.colorize +import rs09.tools.stringtools.colorize /** * Rotten potato -> npc interaction menu diff --git a/Server/src/main/kotlin/core/game/system/command/rottenpotato/RPUseWithPlayerDialogue.kt b/Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RPUseWithPlayerDialogue.kt similarity index 96% rename from Server/src/main/kotlin/core/game/system/command/rottenpotato/RPUseWithPlayerDialogue.kt rename to Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RPUseWithPlayerDialogue.kt index df3236dfd..6183f2f92 100644 --- a/Server/src/main/kotlin/core/game/system/command/rottenpotato/RPUseWithPlayerDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RPUseWithPlayerDialogue.kt @@ -1,9 +1,9 @@ -package core.game.system.command.rottenpotato +package rs09.game.system.command.rottenpotato +import core.game.content.dialogue.DialoguePlugin import core.game.node.entity.combat.ImpactHandler import core.game.node.entity.player.Player import core.plugin.Initializable -import core.game.content.dialogue.DialoguePlugin @Initializable /** diff --git a/Server/src/main/kotlin/core/game/system/command/rottenpotato/RottenPotatoExtraDialogue.kt b/Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RottenPotatoExtraDialogue.kt similarity index 96% rename from Server/src/main/kotlin/core/game/system/command/rottenpotato/RottenPotatoExtraDialogue.kt rename to Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RottenPotatoExtraDialogue.kt index fef5dee3d..cf1fe10c4 100644 --- a/Server/src/main/kotlin/core/game/system/command/rottenpotato/RottenPotatoExtraDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RottenPotatoExtraDialogue.kt @@ -1,13 +1,13 @@ -package core.game.system.command.rottenpotato +package rs09.game.system.command.rottenpotato +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.RunScript import core.game.world.map.RegionManager -import core.game.world.repository.Repository import core.plugin.Initializable -import core.game.content.dialogue.DialoguePlugin -import core.tools.stringtools.colorize +import rs09.game.world.repository.Repository +import rs09.tools.stringtools.colorize @Initializable /** diff --git a/Server/src/main/kotlin/core/game/system/command/rottenpotato/RottenPotatoOptionHandler.kt b/Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RottenPotatoOptionHandler.kt similarity index 89% rename from Server/src/main/kotlin/core/game/system/command/rottenpotato/RottenPotatoOptionHandler.kt rename to Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RottenPotatoOptionHandler.kt index cc4f2bd89..24bf89dd1 100644 --- a/Server/src/main/kotlin/core/game/system/command/rottenpotato/RottenPotatoOptionHandler.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RottenPotatoOptionHandler.kt @@ -1,14 +1,14 @@ -package core.game.system.command.rottenpotato +package rs09.game.system.command.rottenpotato 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.system.command.CommandSystem +import rs09.game.system.command.CommandSystem import core.plugin.Initializable import core.plugin.Plugin -import core.tools.Items -import core.tools.stringtools.colorize +import rs09.tools.Items +import rs09.tools.stringtools.colorize /** * Handles the Rotten Potato options diff --git a/Server/src/main/kotlin/core/game/system/command/rottenpotato/RottenPotatoRSHDDialogue.kt b/Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RottenPotatoRSHDDialogue.kt similarity index 94% rename from Server/src/main/kotlin/core/game/system/command/rottenpotato/RottenPotatoRSHDDialogue.kt rename to Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RottenPotatoRSHDDialogue.kt index fa2d58eb4..0e5087cd7 100644 --- a/Server/src/main/kotlin/core/game/system/command/rottenpotato/RottenPotatoRSHDDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RottenPotatoRSHDDialogue.kt @@ -1,15 +1,15 @@ -package core.game.system.command.rottenpotato +package rs09.game.system.command.rottenpotato +import core.game.content.dialogue.DialoguePlugin import core.game.node.entity.player.Player import core.game.node.entity.player.info.login.PlayerParser import core.game.node.entity.player.link.RunScript -import core.game.world.ImmerseWorld -import core.game.world.repository.Repository +import rs09.game.world.ImmerseWorld +import rs09.game.world.repository.Repository import core.plugin.Initializable -import plugin.ai.AIPlayer -import plugin.ai.AIRepository -import core.game.content.dialogue.DialoguePlugin -import core.tools.stringtools.colorize +import rs09.tools.stringtools.colorize +import rs09.game.ai.AIPlayer +import rs09.game.ai.AIRepository @Initializable /** diff --git a/Server/src/main/kotlin/core/game/system/command/rottenpotato/RottenPotatoUseWithHandler.kt b/Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RottenPotatoUseWithHandler.kt similarity index 94% rename from Server/src/main/kotlin/core/game/system/command/rottenpotato/RottenPotatoUseWithHandler.kt rename to Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RottenPotatoUseWithHandler.kt index 804275d2a..a665437e9 100644 --- a/Server/src/main/kotlin/core/game/system/command/rottenpotato/RottenPotatoUseWithHandler.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RottenPotatoUseWithHandler.kt @@ -1,4 +1,4 @@ -package core.game.system.command.rottenpotato +package rs09.game.system.command.rottenpotato import core.game.node.Node import core.game.node.`object`.GameObject diff --git a/Server/src/main/kotlin/core/game/system/command/sets/AnimationCommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/AnimationCommandSet.kt similarity index 93% rename from Server/src/main/kotlin/core/game/system/command/sets/AnimationCommandSet.kt rename to Server/src/main/kotlin/rs09/game/system/command/sets/AnimationCommandSet.kt index 1141f19b7..f59299bb2 100644 --- a/Server/src/main/kotlin/core/game/system/command/sets/AnimationCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/AnimationCommandSet.kt @@ -1,12 +1,12 @@ -package core.game.system.command.sets +package rs09.game.system.command.sets import core.game.node.entity.npc.NPC -import core.game.system.command.CommandPlugin.Companion.toInteger import core.game.system.task.Pulse -import core.game.world.GameWorld import core.game.world.update.flag.context.Animation import core.plugin.Initializable -import core.game.system.command.Command +import rs09.game.system.command.Command +import rs09.game.system.command.CommandPlugin.Companion.toInteger +import rs09.game.world.GameWorld import java.util.* @Initializable diff --git a/Server/src/main/kotlin/core/game/system/command/sets/BottingCommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/BottingCommandSet.kt similarity index 90% rename from Server/src/main/kotlin/core/game/system/command/sets/BottingCommandSet.kt rename to Server/src/main/kotlin/rs09/game/system/command/sets/BottingCommandSet.kt index 305fdf54e..cd3bbd95a 100644 --- a/Server/src/main/kotlin/core/game/system/command/sets/BottingCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/BottingCommandSet.kt @@ -1,14 +1,14 @@ -package core.game.system.command.sets +package rs09.game.system.command.sets import core.game.component.Component import core.plugin.Initializable -import plugin.ai.general.GeneralBotCreator -import plugin.ai.general.scriptrepository.PlayerScripts -import plugin.ai.general.scriptrepository.Script -import core.game.system.command.Command -import core.game.world.GameWorld -import core.tools.Components -import core.tools.stringtools.colorize +import rs09.game.ai.general.GeneralBotCreator +import rs09.game.ai.general.scriptrepository.PlayerScripts +import rs09.game.ai.general.scriptrepository.Script +import rs09.game.system.command.Command +import rs09.game.world.GameWorld +import rs09.tools.Components +import rs09.tools.stringtools.colorize @Initializable class BottingCommandSet : CommandSet(Command.Privilege.STANDARD) { diff --git a/Server/src/main/kotlin/core/game/system/command/sets/CommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/CommandSet.kt similarity index 90% rename from Server/src/main/kotlin/core/game/system/command/sets/CommandSet.kt rename to Server/src/main/kotlin/rs09/game/system/command/sets/CommandSet.kt index 081cfbe3e..cdc9e0559 100644 --- a/Server/src/main/kotlin/core/game/system/command/sets/CommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/CommandSet.kt @@ -1,10 +1,10 @@ -package core.game.system.command.sets +package rs09.game.system.command.sets import core.game.node.entity.player.Player +import rs09.game.system.command.Command +import rs09.game.system.command.CommandMapping import core.plugin.Plugin -import core.tools.stringtools.colorize -import core.game.system.command.Command -import core.game.system.command.CommandMapping +import rs09.tools.stringtools.colorize /** * Command sets allow you to organize sets of commands by category/type. It also provides diff --git a/Server/src/main/kotlin/core/game/system/command/sets/ConfigCommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/ConfigCommandSet.kt similarity index 95% rename from Server/src/main/kotlin/core/game/system/command/sets/ConfigCommandSet.kt rename to Server/src/main/kotlin/rs09/game/system/command/sets/ConfigCommandSet.kt index 378f07216..b8c064da5 100644 --- a/Server/src/main/kotlin/core/game/system/command/sets/ConfigCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/ConfigCommandSet.kt @@ -1,7 +1,7 @@ -package core.game.system.command.sets +package rs09.game.system.command.sets import core.plugin.Initializable -import core.game.system.command.Command +import rs09.game.system.command.Command @Initializable class ConfigCommandSet : CommandSet(Command.Privilege.ADMIN){ diff --git a/Server/src/main/kotlin/core/game/system/command/sets/DevelopmentCommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/DevelopmentCommandSet.kt similarity index 85% rename from Server/src/main/kotlin/core/game/system/command/sets/DevelopmentCommandSet.kt rename to Server/src/main/kotlin/rs09/game/system/command/sets/DevelopmentCommandSet.kt index e53140664..429337d18 100644 --- a/Server/src/main/kotlin/core/game/system/command/sets/DevelopmentCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/DevelopmentCommandSet.kt @@ -1,9 +1,9 @@ -package core.game.system.command.sets +package rs09.game.system.command.sets import core.game.node.item.Item +import rs09.game.system.command.Command import core.plugin.Initializable -import core.tools.Items -import core.game.system.command.Command +import rs09.tools.Items @Initializable class DevelopmentCommandSet : CommandSet(Command.Privilege.ADMIN) { diff --git a/Server/src/main/kotlin/core/game/system/command/sets/FunCommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/FunCommandSet.kt similarity index 97% rename from Server/src/main/kotlin/core/game/system/command/sets/FunCommandSet.kt rename to Server/src/main/kotlin/rs09/game/system/command/sets/FunCommandSet.kt index ff958bc85..d06a87fd0 100644 --- a/Server/src/main/kotlin/core/game/system/command/sets/FunCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/FunCommandSet.kt @@ -1,13 +1,13 @@ -package core.game.system.command.sets +package rs09.game.system.command.sets +import core.game.content.quest.tutorials.tutorialisland.CharacterDesign import core.game.node.entity.npc.NPC import core.game.system.task.Pulse -import core.game.world.GameWorld import core.game.world.map.RegionManager import core.game.world.update.flag.context.Animation import core.plugin.Initializable -import core.game.system.command.Command -import core.game.content.quest.tutorials.tutorialisland.CharacterDesign +import rs09.game.system.command.Command +import rs09.game.world.GameWorld import java.util.* @Initializable diff --git a/Server/src/main/kotlin/core/game/system/command/sets/MiscCommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt similarity index 96% rename from Server/src/main/kotlin/core/game/system/command/sets/MiscCommandSet.kt rename to Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt index 5ef218150..d1a3f8105 100644 --- a/Server/src/main/kotlin/core/game/system/command/sets/MiscCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt @@ -1,34 +1,31 @@ -package core.game.system.command.sets +package rs09.game.system.command.sets -import core.ServerConstants import core.cache.def.impl.ItemDefinition import core.cache.def.impl.ObjectDefinition import core.cache.def.impl.VarbitDefinition import core.game.component.Component -import core.game.container.impl.EquipmentContainer +import core.game.ge.OfferState import core.game.node.`object`.GameObject import core.game.node.entity.player.info.Rights import core.game.node.entity.player.link.RunScript +import core.game.node.entity.skill.Skills import core.game.node.item.Item -import core.game.system.SystemLogger import core.game.system.communication.CommunicationInfo -import core.game.world.GameWorld import core.game.world.map.RegionManager import core.game.world.map.build.DynamicRegion -import core.game.world.repository.Repository import core.plugin.Initializable import core.tools.StringUtils -import core.game.content.activity.fishingtrawler.TrawlerLoot -import core.game.system.command.Command -import core.game.system.command.CommandMapping -import plugin.creditshop.CreditShop -import core.game.ge.OfferManager -import core.game.ge.OfferState -import core.game.node.entity.skill.Skills -import core.game.node.entity.state.newsys.states.FarmingState -import core.tools.Components -import core.tools.Items -import core.tools.stringtools.colorize +import rs09.ServerConstants +import rs09.game.content.activity.fishingtrawler.TrawlerLoot +import rs09.game.ge.OfferManager +import rs09.game.node.entity.state.newsys.states.FarmingState +import rs09.game.system.SystemLogger +import rs09.game.system.command.Command +import rs09.game.system.command.CommandMapping +import rs09.game.world.GameWorld +import rs09.game.world.repository.Repository +import rs09.tools.Components +import rs09.tools.stringtools.colorize import java.awt.Toolkit import java.awt.datatransfer.StringSelection import java.util.* @@ -134,9 +131,9 @@ class MiscCommandSet : CommandSet(Command.Privilege.ADMIN){ /** * Opens the credit/voting shop */ - define("shop", Command.Privilege.STANDARD){ player, _ -> + /*define("shop", Command.Privilege.STANDARD){ player, _ -> CreditShop().open(player) - } + }*/ /** * Shows the player a list of currently active GE sell offers diff --git a/Server/src/main/kotlin/core/game/system/command/sets/ModerationCommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/ModerationCommandSet.kt similarity index 93% rename from Server/src/main/kotlin/core/game/system/command/sets/ModerationCommandSet.kt rename to Server/src/main/kotlin/rs09/game/system/command/sets/ModerationCommandSet.kt index 15b83c4f8..93b9e1e5d 100644 --- a/Server/src/main/kotlin/core/game/system/command/sets/ModerationCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/ModerationCommandSet.kt @@ -1,11 +1,11 @@ -package core.game.system.command.sets +package rs09.game.system.command.sets +import rs09.game.system.command.Command import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.map.Location -import core.game.world.repository.Repository +import rs09.game.world.repository.Repository import core.plugin.Initializable -import core.game.system.command.Command import java.util.concurrent.TimeUnit @Initializable diff --git a/Server/src/main/kotlin/core/game/system/command/sets/MusicCommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/MusicCommandSet.kt similarity index 93% rename from Server/src/main/kotlin/core/game/system/command/sets/MusicCommandSet.kt rename to Server/src/main/kotlin/rs09/game/system/command/sets/MusicCommandSet.kt index 19e583388..6f65b8442 100644 --- a/Server/src/main/kotlin/core/game/system/command/sets/MusicCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/MusicCommandSet.kt @@ -1,8 +1,8 @@ -package core.game.system.command.sets +package rs09.game.system.command.sets import core.game.node.entity.player.link.music.MusicEntry import core.plugin.Initializable -import core.game.system.command.Command +import rs09.game.system.command.Command @Initializable class MusicCommandSet : CommandSet(Command.Privilege.STANDARD){ diff --git a/Server/src/main/kotlin/core/game/system/command/sets/QuestCommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/QuestCommandSet.kt similarity index 97% rename from Server/src/main/kotlin/core/game/system/command/sets/QuestCommandSet.kt rename to Server/src/main/kotlin/rs09/game/system/command/sets/QuestCommandSet.kt index 9c3c5d208..abe11a8ad 100644 --- a/Server/src/main/kotlin/core/game/system/command/sets/QuestCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/QuestCommandSet.kt @@ -1,10 +1,10 @@ -package core.game.system.command.sets +package rs09.game.system.command.sets import core.game.component.Component import core.game.node.entity.player.Player import core.game.node.entity.player.link.quest.QuestRepository +import rs09.game.system.command.Command import core.plugin.Initializable -import core.game.system.command.Command @Initializable class QuestCommandSet : CommandSet(Command.Privilege.ADMIN){ diff --git a/Server/src/main/kotlin/core/game/system/command/sets/SlayerCommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/SlayerCommandSet.kt similarity index 93% rename from Server/src/main/kotlin/core/game/system/command/sets/SlayerCommandSet.kt rename to Server/src/main/kotlin/rs09/game/system/command/sets/SlayerCommandSet.kt index 2f462f255..e3cd03bdd 100644 --- a/Server/src/main/kotlin/core/game/system/command/sets/SlayerCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/SlayerCommandSet.kt @@ -1,8 +1,8 @@ -package core.game.system.command.sets +package rs09.game.system.command.sets import core.game.node.entity.npc.NPC import core.plugin.Initializable -import core.game.system.command.Command +import rs09.game.system.command.Command @Initializable class SlayerCommandSet : CommandSet(Command.Privilege.ADMIN){ diff --git a/Server/src/main/kotlin/core/game/system/command/sets/SpawnCommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/SpawnCommandSet.kt similarity index 94% rename from Server/src/main/kotlin/core/game/system/command/sets/SpawnCommandSet.kt rename to Server/src/main/kotlin/rs09/game/system/command/sets/SpawnCommandSet.kt index 9792533be..cc838b2d8 100644 --- a/Server/src/main/kotlin/core/game/system/command/sets/SpawnCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/SpawnCommandSet.kt @@ -1,14 +1,14 @@ -package core.game.system.command.sets +package rs09.game.system.command.sets import core.cache.Cache import core.game.node.`object`.GameObject import core.game.node.`object`.ObjectBuilder import core.game.node.entity.npc.NPC import core.game.node.item.Item -import core.game.system.SystemLogger -import core.game.system.command.CommandPlugin +import rs09.game.system.SystemLogger +import rs09.game.system.command.Command +import rs09.game.system.command.CommandPlugin import core.plugin.Initializable -import core.game.system.command.Command import java.awt.Toolkit import java.awt.datatransfer.StringSelection diff --git a/Server/src/main/kotlin/core/game/system/command/sets/SystemCommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/SystemCommandSet.kt similarity index 95% rename from Server/src/main/kotlin/core/game/system/command/sets/SystemCommandSet.kt rename to Server/src/main/kotlin/rs09/game/system/command/sets/SystemCommandSet.kt index d980ad4b3..820eb4091 100644 --- a/Server/src/main/kotlin/core/game/system/command/sets/SystemCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/SystemCommandSet.kt @@ -1,4 +1,4 @@ -package core.game.system.command.sets +package rs09.game.system.command.sets import core.game.node.entity.player.info.login.Response import core.game.node.entity.player.info.portal.PlayerSQLManager @@ -6,8 +6,8 @@ import core.game.node.item.Item import core.game.system.SystemManager import core.game.system.SystemState import core.plugin.Initializable -import core.tools.Items -import core.game.system.command.Command +import rs09.game.system.command.Command +import rs09.tools.Items @Initializable class SystemCommandSet : CommandSet(Command.Privilege.ADMIN){ diff --git a/Server/src/main/kotlin/core/game/system/command/sets/TeleportCommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/TeleportCommandSet.kt similarity index 96% rename from Server/src/main/kotlin/core/game/system/command/sets/TeleportCommandSet.kt rename to Server/src/main/kotlin/rs09/game/system/command/sets/TeleportCommandSet.kt index 74977edaf..b2042bac7 100644 --- a/Server/src/main/kotlin/core/game/system/command/sets/TeleportCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/TeleportCommandSet.kt @@ -1,11 +1,11 @@ -package core.game.system.command.sets +package rs09.game.system.command.sets -import core.ServerConstants import core.game.node.entity.player.link.TeleportManager import core.game.world.map.Location -import core.game.world.repository.Repository import core.plugin.Initializable -import core.game.system.command.Command +import rs09.ServerConstants +import rs09.game.system.command.Command +import rs09.game.world.repository.Repository @Initializable class TeleportCommandSet : CommandSet(Command.Privilege.ADMIN){ diff --git a/Server/src/main/kotlin/core/game/system/config/ConfigParser.kt b/Server/src/main/kotlin/rs09/game/system/config/ConfigParser.kt similarity index 91% rename from Server/src/main/kotlin/core/game/system/config/ConfigParser.kt rename to Server/src/main/kotlin/rs09/game/system/config/ConfigParser.kt index e9ecba870..68b6b6c20 100644 --- a/Server/src/main/kotlin/core/game/system/config/ConfigParser.kt +++ b/Server/src/main/kotlin/rs09/game/system/config/ConfigParser.kt @@ -1,8 +1,7 @@ -package core.game.system.config +package rs09.game.system.config import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch -import kotlinx.coroutines.runBlocking class ConfigParser { fun prePlugin() = GlobalScope.launch{ diff --git a/Server/src/main/kotlin/core/game/system/config/DoorConfigLoader.kt b/Server/src/main/kotlin/rs09/game/system/config/DoorConfigLoader.kt similarity index 95% rename from Server/src/main/kotlin/core/game/system/config/DoorConfigLoader.kt rename to Server/src/main/kotlin/rs09/game/system/config/DoorConfigLoader.kt index 71a778d1d..b8957ca36 100644 --- a/Server/src/main/kotlin/core/game/system/config/DoorConfigLoader.kt +++ b/Server/src/main/kotlin/rs09/game/system/config/DoorConfigLoader.kt @@ -1,7 +1,7 @@ -package core.game.system.config +package rs09.game.system.config -import core.ServerConstants -import core.game.system.SystemLogger +import rs09.ServerConstants +import rs09.game.system.SystemLogger import org.json.simple.JSONArray import org.json.simple.JSONObject import org.json.simple.parser.JSONParser diff --git a/Server/src/main/kotlin/core/game/system/config/DropTableParser.kt b/Server/src/main/kotlin/rs09/game/system/config/DropTableParser.kt similarity index 95% rename from Server/src/main/kotlin/core/game/system/config/DropTableParser.kt rename to Server/src/main/kotlin/rs09/game/system/config/DropTableParser.kt index 4812111ae..788f5c8ec 100644 --- a/Server/src/main/kotlin/core/game/system/config/DropTableParser.kt +++ b/Server/src/main/kotlin/rs09/game/system/config/DropTableParser.kt @@ -1,9 +1,9 @@ -package core.game.system.config +package rs09.game.system.config -import core.ServerConstants +import rs09.ServerConstants import core.cache.def.impl.NPCDefinition import core.game.node.item.WeightedChanceItem -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger import org.json.simple.JSONArray import org.json.simple.JSONObject import org.json.simple.parser.JSONParser diff --git a/Server/src/main/kotlin/core/game/system/config/GroundSpawnLoader.kt b/Server/src/main/kotlin/rs09/game/system/config/GroundSpawnLoader.kt similarity index 95% rename from Server/src/main/kotlin/core/game/system/config/GroundSpawnLoader.kt rename to Server/src/main/kotlin/rs09/game/system/config/GroundSpawnLoader.kt index 040c50143..eb927d232 100644 --- a/Server/src/main/kotlin/core/game/system/config/GroundSpawnLoader.kt +++ b/Server/src/main/kotlin/rs09/game/system/config/GroundSpawnLoader.kt @@ -1,14 +1,14 @@ -package core.game.system.config +package rs09.game.system.config -import core.ServerConstants +import rs09.ServerConstants import core.game.node.item.GroundItem import core.game.node.item.GroundItemManager import core.game.node.item.Item -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger import core.game.system.task.Pulse -import core.game.world.GameWorld +import rs09.game.world.GameWorld import core.game.world.map.Location -import core.game.world.repository.Repository +import rs09.game.world.repository.Repository import org.json.simple.JSONArray import org.json.simple.JSONObject import org.json.simple.parser.JSONParser diff --git a/Server/src/main/kotlin/core/game/system/config/InterfaceConfigParser.kt b/Server/src/main/kotlin/rs09/game/system/config/InterfaceConfigParser.kt similarity index 91% rename from Server/src/main/kotlin/core/game/system/config/InterfaceConfigParser.kt rename to Server/src/main/kotlin/rs09/game/system/config/InterfaceConfigParser.kt index 6034e016e..f4573ce18 100644 --- a/Server/src/main/kotlin/core/game/system/config/InterfaceConfigParser.kt +++ b/Server/src/main/kotlin/rs09/game/system/config/InterfaceConfigParser.kt @@ -1,8 +1,8 @@ -package core.game.system.config +package rs09.game.system.config -import core.ServerConstants +import rs09.ServerConstants import core.game.component.ComponentDefinition -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger import org.json.simple.JSONArray import org.json.simple.JSONObject import org.json.simple.parser.JSONParser diff --git a/Server/src/main/kotlin/core/game/system/config/ItemConfigParser.kt b/Server/src/main/kotlin/rs09/game/system/config/ItemConfigParser.kt similarity index 98% rename from Server/src/main/kotlin/core/game/system/config/ItemConfigParser.kt rename to Server/src/main/kotlin/rs09/game/system/config/ItemConfigParser.kt index 63c151067..e781e8764 100644 --- a/Server/src/main/kotlin/core/game/system/config/ItemConfigParser.kt +++ b/Server/src/main/kotlin/rs09/game/system/config/ItemConfigParser.kt @@ -1,10 +1,10 @@ -package core.game.system.config +package rs09.game.system.config -import core.ServerConstants +import rs09.ServerConstants import core.cache.def.impl.ItemDefinition import core.game.node.entity.impl.Animator import core.game.node.entity.player.link.audio.Audio -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger import core.game.world.update.flag.context.Animation import org.json.simple.JSONArray import org.json.simple.JSONObject diff --git a/Server/src/main/kotlin/core/game/system/config/MusicConfigLoader.kt b/Server/src/main/kotlin/rs09/game/system/config/MusicConfigLoader.kt similarity index 96% rename from Server/src/main/kotlin/core/game/system/config/MusicConfigLoader.kt rename to Server/src/main/kotlin/rs09/game/system/config/MusicConfigLoader.kt index 24941fbb8..cd9c22f48 100644 --- a/Server/src/main/kotlin/core/game/system/config/MusicConfigLoader.kt +++ b/Server/src/main/kotlin/rs09/game/system/config/MusicConfigLoader.kt @@ -1,9 +1,9 @@ -package core.game.system.config +package rs09.game.system.config -import core.ServerConstants +import rs09.ServerConstants import core.game.node.entity.player.link.music.MusicEntry import core.game.node.entity.player.link.music.MusicZone -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger import core.game.world.map.RegionManager import core.game.world.map.zone.ZoneBorders import org.json.simple.JSONArray diff --git a/Server/src/main/kotlin/core/game/system/config/NPCConfigParser.kt b/Server/src/main/kotlin/rs09/game/system/config/NPCConfigParser.kt similarity index 98% rename from Server/src/main/kotlin/core/game/system/config/NPCConfigParser.kt rename to Server/src/main/kotlin/rs09/game/system/config/NPCConfigParser.kt index afd032ec0..91a5e6176 100644 --- a/Server/src/main/kotlin/core/game/system/config/NPCConfigParser.kt +++ b/Server/src/main/kotlin/rs09/game/system/config/NPCConfigParser.kt @@ -1,15 +1,15 @@ -package core.game.system.config +package rs09.game.system.config -import core.ServerConstants +import rs09.ServerConstants import core.cache.def.impl.NPCDefinition +import core.game.content.ttrail.ClueLevel import core.game.node.entity.combat.CombatStyle import core.game.node.entity.impl.Animator -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger import core.game.world.update.flag.context.Animation import org.json.simple.JSONArray import org.json.simple.JSONObject import org.json.simple.parser.JSONParser -import core.game.content.ttrail.ClueLevel import java.io.FileReader class NPCConfigParser { diff --git a/Server/src/main/kotlin/core/game/system/config/NPCSpawner.kt b/Server/src/main/kotlin/rs09/game/system/config/NPCSpawner.kt similarity index 94% rename from Server/src/main/kotlin/core/game/system/config/NPCSpawner.kt rename to Server/src/main/kotlin/rs09/game/system/config/NPCSpawner.kt index 3a3b03d30..22cf9015d 100644 --- a/Server/src/main/kotlin/core/game/system/config/NPCSpawner.kt +++ b/Server/src/main/kotlin/rs09/game/system/config/NPCSpawner.kt @@ -1,8 +1,8 @@ -package core.game.system.config +package rs09.game.system.config -import core.ServerConstants +import rs09.ServerConstants import core.game.node.entity.npc.NPC -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger import core.game.world.map.Direction import core.game.world.map.Location import org.json.simple.JSONArray diff --git a/Server/src/main/kotlin/core/game/system/config/ObjectConfigParser.kt b/Server/src/main/kotlin/rs09/game/system/config/ObjectConfigParser.kt similarity index 93% rename from Server/src/main/kotlin/core/game/system/config/ObjectConfigParser.kt rename to Server/src/main/kotlin/rs09/game/system/config/ObjectConfigParser.kt index cb2afe6f4..40c5372e9 100644 --- a/Server/src/main/kotlin/core/game/system/config/ObjectConfigParser.kt +++ b/Server/src/main/kotlin/rs09/game/system/config/ObjectConfigParser.kt @@ -1,8 +1,8 @@ -package core.game.system.config +package rs09.game.system.config -import core.ServerConstants +import rs09.ServerConstants import core.cache.def.impl.ObjectDefinition -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger import org.json.simple.JSONArray import org.json.simple.JSONObject import org.json.simple.parser.JSONParser diff --git a/Server/src/main/kotlin/core/game/system/config/RangedConfigLoader.kt b/Server/src/main/kotlin/rs09/game/system/config/RangedConfigLoader.kt similarity index 97% rename from Server/src/main/kotlin/core/game/system/config/RangedConfigLoader.kt rename to Server/src/main/kotlin/rs09/game/system/config/RangedConfigLoader.kt index 37a4516d0..ac8476a2a 100644 --- a/Server/src/main/kotlin/core/game/system/config/RangedConfigLoader.kt +++ b/Server/src/main/kotlin/rs09/game/system/config/RangedConfigLoader.kt @@ -1,13 +1,13 @@ -package core.game.system.config +package rs09.game.system.config -import core.ServerConstants +import rs09.ServerConstants import core.cache.def.impl.ItemDefinition import core.game.node.entity.combat.equipment.Ammunition import core.game.node.entity.combat.equipment.BoltEffect import core.game.node.entity.combat.equipment.RangeWeapon import core.game.node.entity.impl.Projectile import core.game.node.entity.npc.NPC -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger import core.game.world.map.Location import core.game.world.update.flag.context.Animation import core.game.world.update.flag.context.Graphics diff --git a/Server/src/main/kotlin/core/game/system/config/ServerConfigParser.kt b/Server/src/main/kotlin/rs09/game/system/config/ServerConfigParser.kt similarity index 88% rename from Server/src/main/kotlin/core/game/system/config/ServerConfigParser.kt rename to Server/src/main/kotlin/rs09/game/system/config/ServerConfigParser.kt index 28237fffc..1b82346bc 100644 --- a/Server/src/main/kotlin/core/game/system/config/ServerConfigParser.kt +++ b/Server/src/main/kotlin/rs09/game/system/config/ServerConfigParser.kt @@ -1,12 +1,11 @@ -package core.game.system.config +package rs09.game.system.config -import core.JSONUtils -import core.ServerConstants -import core.game.world.GameSettings -import core.game.world.GameWorld -import core.plugin.PluginManager import org.json.simple.JSONObject import org.json.simple.parser.JSONParser +import rs09.ServerConstants +import rs09.game.world.GameSettings +import rs09.game.world.GameWorld +import rs09.plugin.PluginManager import java.io.File import java.io.FileReader import kotlin.system.exitProcess @@ -17,7 +16,7 @@ import kotlin.system.exitProcess * @author Ceikry */ class ServerConfigParser(path: String) { - val pathTo = JSONUtils.parsePath(path) + val pathTo = rs09.JSONUtils.parsePath(path) val confFile = File(pathTo) val parser = JSONParser() var reader: FileReader? = null diff --git a/Server/src/main/kotlin/core/game/system/config/ShopParser.kt b/Server/src/main/kotlin/rs09/game/system/config/ShopParser.kt similarity index 96% rename from Server/src/main/kotlin/core/game/system/config/ShopParser.kt rename to Server/src/main/kotlin/rs09/game/system/config/ShopParser.kt index bd7fd3ed5..c11d4da9c 100644 --- a/Server/src/main/kotlin/core/game/system/config/ShopParser.kt +++ b/Server/src/main/kotlin/rs09/game/system/config/ShopParser.kt @@ -1,10 +1,10 @@ -package core.game.system.config +package rs09.game.system.config -import core.ServerConstants +import rs09.ServerConstants import core.game.content.global.shop.Shop import core.game.node.entity.player.Player import core.game.node.item.Item -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger import org.json.simple.JSONArray import org.json.simple.JSONObject import org.json.simple.parser.JSONParser diff --git a/Server/src/main/kotlin/core/game/system/config/TableDump.kt b/Server/src/main/kotlin/rs09/game/system/config/TableDump.kt similarity index 100% rename from Server/src/main/kotlin/core/game/system/config/TableDump.kt rename to Server/src/main/kotlin/rs09/game/system/config/TableDump.kt diff --git a/Server/src/main/kotlin/core/game/system/config/XteaParser.kt b/Server/src/main/kotlin/rs09/game/system/config/XteaParser.kt similarity index 94% rename from Server/src/main/kotlin/core/game/system/config/XteaParser.kt rename to Server/src/main/kotlin/rs09/game/system/config/XteaParser.kt index 62d540ba8..5ff740263 100644 --- a/Server/src/main/kotlin/core/game/system/config/XteaParser.kt +++ b/Server/src/main/kotlin/rs09/game/system/config/XteaParser.kt @@ -1,7 +1,7 @@ -package core.game.system.config +package rs09.game.system.config -import core.ServerConstants -import core.game.system.SystemLogger +import rs09.ServerConstants +import rs09.game.system.SystemLogger import org.json.simple.JSONArray import org.json.simple.JSONObject import org.json.simple.parser.JSONParser diff --git a/Server/src/main/kotlin/core/game/world/DeadlockDetector.kt b/Server/src/main/kotlin/rs09/game/world/DeadlockDetector.kt similarity index 90% rename from Server/src/main/kotlin/core/game/world/DeadlockDetector.kt rename to Server/src/main/kotlin/rs09/game/world/DeadlockDetector.kt index 5eaf92e85..69aebd430 100644 --- a/Server/src/main/kotlin/core/game/world/DeadlockDetector.kt +++ b/Server/src/main/kotlin/rs09/game/world/DeadlockDetector.kt @@ -1,8 +1,7 @@ -package core.game.world +package rs09.game.world -import core.game.system.SystemLogger +import rs09.game.system.SystemLogger import java.lang.management.ManagementFactory -import java.lang.management.ThreadMXBean class DeadlockDetector : Runnable { override fun run() { diff --git a/Server/src/main/kotlin/core/game/world/GameSettings.kt b/Server/src/main/kotlin/rs09/game/world/GameSettings.kt similarity index 99% rename from Server/src/main/kotlin/core/game/world/GameSettings.kt rename to Server/src/main/kotlin/rs09/game/world/GameSettings.kt index 6a983263b..473818b99 100644 --- a/Server/src/main/kotlin/core/game/world/GameSettings.kt +++ b/Server/src/main/kotlin/rs09/game/world/GameSettings.kt @@ -1,7 +1,7 @@ -package core.game.world +package rs09.game.world -import core.ServerConstants import org.json.simple.JSONObject +import rs09.ServerConstants import java.io.FileInputStream import java.io.IOException import java.util.* diff --git a/Server/src/main/kotlin/core/game/world/GameWorld.kt b/Server/src/main/kotlin/rs09/game/world/GameWorld.kt similarity index 91% rename from Server/src/main/kotlin/core/game/world/GameWorld.kt rename to Server/src/main/kotlin/rs09/game/world/GameWorld.kt index 070068ddc..7bd821755 100644 --- a/Server/src/main/kotlin/core/game/world/GameWorld.kt +++ b/Server/src/main/kotlin/rs09/game/world/GameWorld.kt @@ -1,31 +1,30 @@ -package core.game.world +package rs09.game.world -import core.ServerConstants import core.cache.Cache import core.cache.ServerStore import core.cache.def.impl.ObjectDefinition +import core.game.ge.GrandExchangeDatabase import core.game.node.entity.npc.drop.RareDropTable import core.game.node.entity.player.Player import core.game.system.SystemManager import core.game.system.SystemState -import core.game.system.config.ConfigParser -import core.game.system.script.ScriptManager import core.game.system.task.Pulse import core.game.system.task.TaskExecutor -import core.game.world.callback.CallbackHub import core.game.world.map.Location import core.game.world.map.RegionManager -import core.game.world.repository.Repository -import core.plugin.PluginManager +import core.plugin.CorePluginTypes.StartupPlugin import core.tools.RandomFunction import core.tools.mysql.DatabaseManager -import core.worker.MajorUpdateWorker -import core.plugin.CorePluginTypes.StartupPlugin -import plugin.ai.general.scriptrepository.PlayerScripts -import core.game.ge.GrandExchangeDatabase -import core.game.node.entity.state.newsys.StateRepository -import core.game.system.SystemLogger -import core.game.system.SystemLogger.logInfo +import rs09.game.ai.general.scriptrepository.PlayerScripts +import rs09.ServerConstants +import rs09.game.node.entity.state.newsys.StateRepository +import rs09.game.system.SystemLogger +import rs09.game.system.SystemLogger.logInfo +import rs09.game.system.config.ConfigParser +import rs09.game.world.callback.CallbackHub +import rs09.game.world.repository.Repository +import rs09.plugin.PluginManager +import rs09.worker.MajorUpdateWorker import java.util.* import java.util.function.Consumer diff --git a/Server/src/main/kotlin/core/game/world/ImmerseWorld.kt b/Server/src/main/kotlin/rs09/game/world/ImmerseWorld.kt similarity index 96% rename from Server/src/main/kotlin/core/game/world/ImmerseWorld.kt rename to Server/src/main/kotlin/rs09/game/world/ImmerseWorld.kt index 2eafb71f2..cdfc035bb 100644 --- a/Server/src/main/kotlin/core/game/world/ImmerseWorld.kt +++ b/Server/src/main/kotlin/rs09/game/world/ImmerseWorld.kt @@ -1,12 +1,12 @@ -package core.game.world +package rs09.game.world import core.game.node.entity.combat.CombatStyle import core.game.world.map.Location import core.game.world.map.zone.ZoneBorders -import plugin.ai.general.GeneralBotCreator -import plugin.ai.general.scriptrepository.* -import plugin.ai.pvmbots.CombatBotAssembler -import plugin.ai.skillingbot.SkillingBotAssembler +import rs09.game.ai.general.GeneralBotCreator +import rs09.game.ai.general.scriptrepository.* +import rs09.game.ai.pvmbots.CombatBotAssembler +import rs09.game.ai.skillingbot.SkillingBotAssembler import java.util.concurrent.Executors object ImmerseWorld { diff --git a/Server/src/main/kotlin/core/game/world/PulseRunner.kt b/Server/src/main/kotlin/rs09/game/world/PulseRunner.kt similarity index 95% rename from Server/src/main/kotlin/core/game/world/PulseRunner.kt rename to Server/src/main/kotlin/rs09/game/world/PulseRunner.kt index 589ea087a..143986e89 100644 --- a/Server/src/main/kotlin/core/game/world/PulseRunner.kt +++ b/Server/src/main/kotlin/rs09/game/world/PulseRunner.kt @@ -1,11 +1,7 @@ -package core.game.world +package rs09.game.world import core.game.system.task.Pulse import java.util.* -import java.util.concurrent.Executors -import java.util.concurrent.ThreadPoolExecutor -import java.util.concurrent.TimeUnit -import kotlin.math.floor /** new way of running pulses that multithreads based on core count automatically, should improve performance drastically. * @author ceik diff --git a/Server/src/main/kotlin/core/game/world/callback/CallbackHub.kt b/Server/src/main/kotlin/rs09/game/world/callback/CallbackHub.kt similarity index 75% rename from Server/src/main/kotlin/core/game/world/callback/CallbackHub.kt rename to Server/src/main/kotlin/rs09/game/world/callback/CallbackHub.kt index 13c5b146c..cf26afe74 100644 --- a/Server/src/main/kotlin/core/game/world/callback/CallbackHub.kt +++ b/Server/src/main/kotlin/rs09/game/world/callback/CallbackHub.kt @@ -1,12 +1,11 @@ -package core.game.world.callback +package rs09.game.world.callback -import core.game.world.map.zone.ZoneBuilder import core.game.node.entity.skill.hunter.ImpetuousImpulses -import core.game.world.GameWorld -import core.game.ge.OfferManager -import core.game.node.entity.skill.farming.UseWithPatchHandler -import core.game.system.SystemLogger -import java.util.ArrayList +import core.game.world.callback.CallBack +import core.game.world.map.zone.ZoneBuilder +import rs09.game.ge.OfferManager +import rs09.game.system.SystemLogger +import java.util.* /** * Initializes a few world pulses that need to continuously run diff --git a/Server/src/main/kotlin/core/game/world/map/path/SmartPathfinder.kt b/Server/src/main/kotlin/rs09/game/world/map/path/SmartPathfinder.kt similarity index 99% rename from Server/src/main/kotlin/core/game/world/map/path/SmartPathfinder.kt rename to Server/src/main/kotlin/rs09/game/world/map/path/SmartPathfinder.kt index ece18eef2..24bfebccc 100644 --- a/Server/src/main/kotlin/core/game/world/map/path/SmartPathfinder.kt +++ b/Server/src/main/kotlin/rs09/game/world/map/path/SmartPathfinder.kt @@ -1,7 +1,11 @@ -package core.game.world.map.path +package rs09.game.world.map.path import core.game.world.map.Location import core.game.world.map.Point +import core.game.world.map.path.ClipMaskSupplier +import core.game.world.map.path.Path +import core.game.world.map.path.Pathfinder +import core.game.world.map.path.Pathfinder.* class SmartPathfinder /** diff --git a/Server/src/main/kotlin/core/game/world/repository/DisconnectionQueue.kt b/Server/src/main/kotlin/rs09/game/world/repository/DisconnectionQueue.kt similarity index 98% rename from Server/src/main/kotlin/core/game/world/repository/DisconnectionQueue.kt rename to Server/src/main/kotlin/rs09/game/world/repository/DisconnectionQueue.kt index 06203fa9c..d29538d6d 100644 --- a/Server/src/main/kotlin/core/game/world/repository/DisconnectionQueue.kt +++ b/Server/src/main/kotlin/rs09/game/world/repository/DisconnectionQueue.kt @@ -1,13 +1,13 @@ -package core.game.world.repository +package rs09.game.world.repository import core.game.node.entity.player.Player import core.game.node.entity.player.info.login.PlayerParser -import core.game.system.SystemLogger import core.game.system.mysql.SQLEntryHandler import core.game.system.mysql.impl.HighscoreSQLHandler import core.game.system.mysql.impl.PlayerLogSQLHandler import core.game.system.task.TaskExecutor -import core.game.world.GameWorld +import rs09.game.system.SystemLogger +import rs09.game.world.GameWorld import java.util.* import java.util.concurrent.ConcurrentHashMap diff --git a/Server/src/main/kotlin/core/game/world/repository/Repository.kt b/Server/src/main/kotlin/rs09/game/world/repository/Repository.kt similarity index 96% rename from Server/src/main/kotlin/core/game/world/repository/Repository.kt rename to Server/src/main/kotlin/rs09/game/world/repository/Repository.kt index 126f6465f..ea3a6436e 100644 --- a/Server/src/main/kotlin/core/game/world/repository/Repository.kt +++ b/Server/src/main/kotlin/rs09/game/world/repository/Repository.kt @@ -1,14 +1,13 @@ -package core.game.world.repository +package rs09.game.world.repository -import core.ServerConstants import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player -import java.util.concurrent.CopyOnWriteArrayList -import java.util.HashMap -import kotlin.jvm.JvmOverloads -import core.game.world.map.RegionManager import core.game.world.map.Location -import java.util.ArrayList +import core.game.world.map.RegionManager +import core.game.world.repository.NodeList +import rs09.ServerConstants +import java.util.* +import java.util.concurrent.CopyOnWriteArrayList /** * The repository holding all node lists, etc in the game world. diff --git a/Server/src/main/kotlin/core/game/world/update/MapChunkRenderer.kt b/Server/src/main/kotlin/rs09/game/world/update/MapChunkRenderer.kt similarity index 98% rename from Server/src/main/kotlin/core/game/world/update/MapChunkRenderer.kt rename to Server/src/main/kotlin/rs09/game/world/update/MapChunkRenderer.kt index a24f32141..4ec0b8849 100644 --- a/Server/src/main/kotlin/core/game/world/update/MapChunkRenderer.kt +++ b/Server/src/main/kotlin/rs09/game/world/update/MapChunkRenderer.kt @@ -1,4 +1,4 @@ -package core.game.world.update +package rs09.game.world.update import core.game.node.entity.player.Player import core.game.world.map.RegionChunk diff --git a/Server/src/main/kotlin/core/game/world/update/NPCRenderer.kt b/Server/src/main/kotlin/rs09/game/world/update/NPCRenderer.kt similarity index 98% rename from Server/src/main/kotlin/core/game/world/update/NPCRenderer.kt rename to Server/src/main/kotlin/rs09/game/world/update/NPCRenderer.kt index 99c474909..14afa209c 100644 --- a/Server/src/main/kotlin/core/game/world/update/NPCRenderer.kt +++ b/Server/src/main/kotlin/rs09/game/world/update/NPCRenderer.kt @@ -1,11 +1,11 @@ -package core.game.world.update +package rs09.game.world.update import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player -import core.game.world.GameWorld import core.game.world.map.RegionManager import core.net.packet.IoBuffer import core.net.packet.PacketHeader +import rs09.game.world.GameWorld import java.nio.ByteBuffer import java.util.* diff --git a/Server/src/main/kotlin/core/game/world/update/PlayerRenderer.kt b/Server/src/main/kotlin/rs09/game/world/update/PlayerRenderer.kt similarity index 99% rename from Server/src/main/kotlin/core/game/world/update/PlayerRenderer.kt rename to Server/src/main/kotlin/rs09/game/world/update/PlayerRenderer.kt index 0fb1068bc..15d92b9a6 100644 --- a/Server/src/main/kotlin/core/game/world/update/PlayerRenderer.kt +++ b/Server/src/main/kotlin/rs09/game/world/update/PlayerRenderer.kt @@ -1,4 +1,4 @@ -package core.game.world.update +package rs09.game.world.update import core.game.node.entity.player.Player import core.game.node.entity.player.info.RenderInfo diff --git a/Server/src/main/kotlin/core/game/world/update/UpdateMasks.kt b/Server/src/main/kotlin/rs09/game/world/update/UpdateMasks.kt similarity index 99% rename from Server/src/main/kotlin/core/game/world/update/UpdateMasks.kt rename to Server/src/main/kotlin/rs09/game/world/update/UpdateMasks.kt index feb8eddc5..b86573eab 100644 --- a/Server/src/main/kotlin/core/game/world/update/UpdateMasks.kt +++ b/Server/src/main/kotlin/rs09/game/world/update/UpdateMasks.kt @@ -1,4 +1,4 @@ -package core.game.world.update +package rs09.game.world.update import core.game.node.entity.Entity import core.game.node.entity.combat.ImpactHandler diff --git a/Server/src/main/kotlin/core/game/world/update/UpdateSequence.kt b/Server/src/main/kotlin/rs09/game/world/update/UpdateSequence.kt similarity index 97% rename from Server/src/main/kotlin/core/game/world/update/UpdateSequence.kt rename to Server/src/main/kotlin/rs09/game/world/update/UpdateSequence.kt index ea479e4b0..5d13af290 100644 --- a/Server/src/main/kotlin/core/game/world/update/UpdateSequence.kt +++ b/Server/src/main/kotlin/rs09/game/world/update/UpdateSequence.kt @@ -1,14 +1,14 @@ -package core.game.world.update +package rs09.game.world.update import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.item.GroundItemManager import core.game.world.map.RegionManager import core.game.world.repository.InitializingNodeList -import core.game.world.repository.Repository import core.net.packet.PacketRepository import core.net.packet.context.PlayerContext import core.net.packet.out.ClearMinimapFlag +import rs09.game.world.repository.Repository import java.util.concurrent.CountDownLatch import java.util.concurrent.Executors import java.util.concurrent.TimeUnit diff --git a/Server/src/main/kotlin/core/net/event/LoginReadEvent.kt b/Server/src/main/kotlin/rs09/net/event/LoginReadEvent.kt similarity index 96% rename from Server/src/main/kotlin/core/net/event/LoginReadEvent.kt rename to Server/src/main/kotlin/rs09/net/event/LoginReadEvent.kt index 50d79bfae..d6fae103f 100644 --- a/Server/src/main/kotlin/core/net/event/LoginReadEvent.kt +++ b/Server/src/main/kotlin/rs09/net/event/LoginReadEvent.kt @@ -1,6 +1,5 @@ -package core.net.event +package rs09.net.event -import core.ServerConstants import core.cache.Cache import core.cache.crypto.ISAACCipher import core.cache.crypto.ISAACPair @@ -8,18 +7,19 @@ import core.cache.misc.buffer.ByteBufferUtils import core.game.node.entity.player.info.ClientInfo import core.game.node.entity.player.info.PlayerDetails import core.game.node.entity.player.info.UIDInfo -import core.game.node.entity.player.info.login.LoginParser import core.game.node.entity.player.info.login.LoginType import core.game.node.entity.player.info.login.Response import core.game.node.entity.player.info.portal.PlayerSQLManager -import core.game.system.SystemLogger import core.game.system.task.TaskExecutor -import core.game.world.repository.Repository import core.net.Constants import core.net.IoReadEvent import core.net.IoSession import core.net.amsc.WorldCommunicator import core.tools.StringUtils +import rs09.ServerConstants +import rs09.game.node.entity.player.info.login.LoginParser +import rs09.game.system.SystemLogger +import rs09.game.world.repository.Repository import java.lang.Runnable import java.math.BigInteger import java.nio.ByteBuffer @@ -167,7 +167,7 @@ class LoginReadEvent val encryptedByteArray = ByteArray(numBytes) buffer.get(encryptedByteArray) val encryptedBytes = BigInteger(encryptedByteArray) - return ByteBuffer.wrap(encryptedBytes.modPow(ServerConstants.EXPONENT,ServerConstants.MODULUS).toByteArray()) + return ByteBuffer.wrap(encryptedBytes.modPow(ServerConstants.EXPONENT, ServerConstants.MODULUS).toByteArray()) } } } \ No newline at end of file diff --git a/Server/src/main/kotlin/core/net/packet/in/ItemOnGroundItemPacket.kt b/Server/src/main/kotlin/rs09/net/packet/in/ItemOnGroundItemPacket.kt similarity index 96% rename from Server/src/main/kotlin/core/net/packet/in/ItemOnGroundItemPacket.kt rename to Server/src/main/kotlin/rs09/net/packet/in/ItemOnGroundItemPacket.kt index c02c375a5..9bdd01cae 100644 --- a/Server/src/main/kotlin/core/net/packet/in/ItemOnGroundItemPacket.kt +++ b/Server/src/main/kotlin/rs09/net/packet/in/ItemOnGroundItemPacket.kt @@ -1,14 +1,14 @@ -package core.net.packet.`in` +package rs09.net.packet.`in` import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse import core.game.node.entity.player.Player +import core.game.node.entity.skill.firemaking.FireMakingPulse import core.game.node.item.GroundItemManager import core.game.world.map.Location import core.net.packet.IncomingPacket import core.net.packet.IoBuffer -import core.tools.Items -import core.game.node.entity.skill.firemaking.FireMakingPulse +import rs09.tools.Items /** * Handles the Item -> Ground Item packet @@ -45,7 +45,7 @@ class ItemOnGroundItemPacket : IncomingPacket { override fun pulse(): Boolean { if(used.id == Items.TINDERBOX_590 || used.id == Items.GOLDEN_TINDERBOX_2946){ when(usedWithItemId){ - Items.LOGS_1511,Items.ACHEY_TREE_LOGS_2862,Items.ARCTIC_PINE_LOGS_10810,Items.MAGIC_LOGS_1513,Items.MAHOGANY_LOGS_6332,Items.MAPLE_LOGS_1517,Items.YEW_LOGS_1515,Items.TEAK_LOGS_6333,Items.OAK_LOGS_1521,Items.WILLOW_LOGS_1519 + Items.LOGS_1511,Items.ACHEY_TREE_LOGS_2862,Items.ARCTIC_PINE_LOGS_10810,Items.MAGIC_LOGS_1513,Items.MAHOGANY_LOGS_6332,Items.MAPLE_LOGS_1517,Items.YEW_LOGS_1515,Items.TEAK_LOGS_6333,Items.OAK_LOGS_1521, Items.WILLOW_LOGS_1519 -> { player.pulseManager.run(FireMakingPulse(player,usedWith.asItem(),usedWith)) } diff --git a/Server/src/main/kotlin/core/net/packet/in/QuickChatPacketHandler.kt b/Server/src/main/kotlin/rs09/net/packet/in/QuickChatPacketHandler.kt similarity index 95% rename from Server/src/main/kotlin/core/net/packet/in/QuickChatPacketHandler.kt rename to Server/src/main/kotlin/rs09/net/packet/in/QuickChatPacketHandler.kt index d8be5a921..311c0d57e 100644 --- a/Server/src/main/kotlin/core/net/packet/in/QuickChatPacketHandler.kt +++ b/Server/src/main/kotlin/rs09/net/packet/in/QuickChatPacketHandler.kt @@ -1,11 +1,11 @@ -package core.net.packet.`in` +package rs09.net.packet.`in` -import core.game.interaction.QCRepository import core.game.node.entity.player.Player -import core.game.system.SystemLogger -import core.game.world.GameWorld import core.net.packet.IncomingPacket import core.net.packet.IoBuffer +import rs09.game.interaction.QCRepository +import rs09.game.system.SystemLogger +import rs09.game.world.GameWorld /** * Decodes the quick chat packet diff --git a/Server/src/main/kotlin/core/plugin/CorePluginTypes/XPGainPlugins.kt b/Server/src/main/kotlin/rs09/plugin/CorePluginTypes/XPGainPlugins.kt similarity index 94% rename from Server/src/main/kotlin/core/plugin/CorePluginTypes/XPGainPlugins.kt rename to Server/src/main/kotlin/rs09/plugin/CorePluginTypes/XPGainPlugins.kt index 976ca3ded..5659bf437 100644 --- a/Server/src/main/kotlin/core/plugin/CorePluginTypes/XPGainPlugins.kt +++ b/Server/src/main/kotlin/rs09/plugin/CorePluginTypes/XPGainPlugins.kt @@ -1,4 +1,4 @@ -package core.plugin.CorePluginTypes +package rs09.plugin.CorePluginTypes import core.game.node.entity.player.Player import core.plugin.Plugin diff --git a/Server/src/main/kotlin/core/plugin/PluginManager.kt b/Server/src/main/kotlin/rs09/plugin/PluginManager.kt similarity index 91% rename from Server/src/main/kotlin/core/plugin/PluginManager.kt rename to Server/src/main/kotlin/rs09/plugin/PluginManager.kt index e735aa0d4..842953dc2 100644 --- a/Server/src/main/kotlin/core/plugin/PluginManager.kt +++ b/Server/src/main/kotlin/rs09/plugin/PluginManager.kt @@ -1,17 +1,19 @@ -package core.plugin +package rs09.plugin +import core.game.content.activity.ActivityManager +import core.game.content.activity.ActivityPlugin +import core.game.content.dialogue.DialoguePlugin import core.game.node.entity.player.info.login.LoginConfiguration import core.game.node.entity.player.link.quest.Quest import core.game.node.entity.player.link.quest.QuestRepository -import core.game.system.SystemLogger +import core.plugin.Plugin +import core.plugin.PluginManifest +import core.plugin.PluginType import io.github.classgraph.ClassGraph import io.github.classgraph.ClassInfo -import core.game.content.activity.ActivityManager -import core.game.content.activity.ActivityPlugin -import core.game.system.command.Command -import core.game.content.dialogue.DialoguePlugin -import core.game.interaction.OptionListener -import java.lang.Exception +import rs09.game.interaction.OptionListener +import rs09.game.system.SystemLogger +import rs09.game.system.command.Command import java.util.* import java.util.function.Consumer import kotlin.reflect.jvm.internal.impl.load.kotlin.JvmType @@ -65,12 +67,12 @@ object PluginManager { e.printStackTrace() } }) - result.getSubclasses("core.game.system.command.Command").forEach { + result.getSubclasses("rs09.game.system.command.Command").forEach { try { definePlugin(it.loadClass().newInstance() as Plugin).also { System.out.println("Initializing $it") } } catch (e: Exception) {e.printStackTrace()} } - result.getSubclasses("core.game.interaction.OptionListener").forEach { + result.getSubclasses("rs09.game.interaction.OptionListener").forEach { (it.loadClass().newInstance() as OptionListener).defineListeners() } } diff --git a/Server/src/main/kotlin/core/tools/Components.kt b/Server/src/main/kotlin/rs09/tools/Components.kt similarity index 99% rename from Server/src/main/kotlin/core/tools/Components.kt rename to Server/src/main/kotlin/rs09/tools/Components.kt index 49083e84a..2dbefde55 100644 --- a/Server/src/main/kotlin/core/tools/Components.kt +++ b/Server/src/main/kotlin/rs09/tools/Components.kt @@ -1,4 +1,4 @@ -package core.tools +package rs09.tools object Components { const val guide_eggs_overlay_000 = 0 diff --git a/Server/src/main/kotlin/core/tools/DialogueConst.kt b/Server/src/main/kotlin/rs09/tools/DialogueConst.kt similarity index 93% rename from Server/src/main/kotlin/core/tools/DialogueConst.kt rename to Server/src/main/kotlin/rs09/tools/DialogueConst.kt index 0e5a605ea..bdd2e23f4 100644 --- a/Server/src/main/kotlin/core/tools/DialogueConst.kt +++ b/Server/src/main/kotlin/rs09/tools/DialogueConst.kt @@ -1,4 +1,4 @@ -package core.tools +package rs09.tools const val START_DIALOGUE = 0 const val END_DIALOGUE = 1000000 diff --git a/Server/src/main/kotlin/core/tools/Interfaces.kt b/Server/src/main/kotlin/rs09/tools/Interfaces.kt similarity index 99% rename from Server/src/main/kotlin/core/tools/Interfaces.kt rename to Server/src/main/kotlin/rs09/tools/Interfaces.kt index 98d262630..8867e8262 100644 --- a/Server/src/main/kotlin/core/tools/Interfaces.kt +++ b/Server/src/main/kotlin/rs09/tools/Interfaces.kt @@ -1,4 +1,4 @@ -package core.tools +package rs09.tools object Interfaces { const val GUIDE_EGGS_OVERLAY_0 = 0 diff --git a/Server/src/main/kotlin/core/tools/Items.kt b/Server/src/main/kotlin/rs09/tools/Items.kt similarity index 99% rename from Server/src/main/kotlin/core/tools/Items.kt rename to Server/src/main/kotlin/rs09/tools/Items.kt index eeef8c55f..a562e9fcc 100644 --- a/Server/src/main/kotlin/core/tools/Items.kt +++ b/Server/src/main/kotlin/rs09/tools/Items.kt @@ -1,4 +1,4 @@ -package core.tools +package rs09.tools object Items { const val DWARF_REMAINS_0 = 0 diff --git a/Server/src/main/kotlin/core/tools/NPCs.kt b/Server/src/main/kotlin/rs09/tools/NPCs.kt similarity index 99% rename from Server/src/main/kotlin/core/tools/NPCs.kt rename to Server/src/main/kotlin/rs09/tools/NPCs.kt index a4929fe6e..8cad79230 100644 --- a/Server/src/main/kotlin/core/tools/NPCs.kt +++ b/Server/src/main/kotlin/rs09/tools/NPCs.kt @@ -1,4 +1,4 @@ -package core.tools +package rs09.tools object NPCs{ diff --git a/Server/src/main/kotlin/core/tools/TickUtils.kt b/Server/src/main/kotlin/rs09/tools/TickUtils.kt similarity index 95% rename from Server/src/main/kotlin/core/tools/TickUtils.kt rename to Server/src/main/kotlin/rs09/tools/TickUtils.kt index 3d449d4ab..db78fdea9 100644 --- a/Server/src/main/kotlin/core/tools/TickUtils.kt +++ b/Server/src/main/kotlin/rs09/tools/TickUtils.kt @@ -1,4 +1,4 @@ -package core.tools +package rs09.tools const val tick = 600 //ms const val second = 1000 //ms diff --git a/Server/src/main/kotlin/core/tools/stringtools/StringTools.kt b/Server/src/main/kotlin/rs09/tools/stringtools/StringTools.kt similarity index 96% rename from Server/src/main/kotlin/core/tools/stringtools/StringTools.kt rename to Server/src/main/kotlin/rs09/tools/stringtools/StringTools.kt index 9f990162b..16b460d3d 100644 --- a/Server/src/main/kotlin/core/tools/stringtools/StringTools.kt +++ b/Server/src/main/kotlin/rs09/tools/stringtools/StringTools.kt @@ -1,4 +1,4 @@ -package core.tools.stringtools +package rs09.tools.stringtools const val RED = "" const val ORANGE = "" diff --git a/Server/src/main/kotlin/core/worker/MajorUpdateWorker.kt b/Server/src/main/kotlin/rs09/worker/MajorUpdateWorker.kt similarity index 89% rename from Server/src/main/kotlin/core/worker/MajorUpdateWorker.kt rename to Server/src/main/kotlin/rs09/worker/MajorUpdateWorker.kt index d4d4f1a1a..13929fd2f 100644 --- a/Server/src/main/kotlin/core/worker/MajorUpdateWorker.kt +++ b/Server/src/main/kotlin/rs09/worker/MajorUpdateWorker.kt @@ -1,14 +1,14 @@ -package core.worker +package rs09.worker -import core.Server import core.game.system.task.Pulse -import core.game.world.GameWorld -import core.game.world.repository.Repository -import core.game.world.update.UpdateSequence +import core.plugin.CorePluginTypes.Managers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import core.plugin.CorePluginTypes.Managers +import rs09.Server +import rs09.game.world.GameWorld +import rs09.game.world.repository.Repository +import rs09.game.world.update.UpdateSequence /** * Handles the running of pulses and writing of masks, etc diff --git a/Server/worldprops/default.json b/Server/worldprops/default.json index 370cfee33..8c0da7e38 100644 --- a/Server/worldprops/default.json +++ b/Server/worldprops/default.json @@ -16,6 +16,7 @@ "enable_bots": true, "autostock_ge": true, "allow_token_purchase": true, + "max_adv_bots": "0", "message_of_the_week_identifier": "0", "message_of_the_week_text": "Welcome to 2009Scape!
Nowin Technicolor!" }, diff --git a/build.gradle b/build.gradle index 2bd60c869..86f984174 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ allprojects { apply plugin: 'org.jetbrains.kotlin.jvm' apply plugin: 'com.github.johnrengelman.shadow' - group = 'org.2009scape' + group = 'org.rs09' version = '1.0.0' sourceCompatibility = 1.8 diff --git a/settings.gradle b/settings.gradle index 741d92f87..3d2c55f5d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -rootProject.name = '2009Scape' +rootProject.name = 'RS09' include 'Client' include 'Management-Server' include 'Server' \ No newline at end of file