From 99b62d0fb55f4aeb2c30a988ef1d0024b7294ded Mon Sep 17 00:00:00 2001 From: Ceikry Date: Tue, 22 Jun 2021 13:23:34 -0500 Subject: [PATCH] Refactor GameObject -> Scenery --- .../core/cache/def/impl/ObjectDefinition.java | 4 +- .../barrows/BarrowsActivityPlugin.java | 8 +- .../activity/barrows/BarrowsCrypt.java | 4 +- .../bountyhunter/BHOptionHandler.java | 4 +- .../clanwars/ClanWarsActivityPlugin.java | 16 ++-- .../clanwars/ClanWarsChallengeRoom.java | 6 +- .../gnomecopter/GnomeCopterActivity.java | 12 +-- .../activity/guild/CraftingGuildPlugin.java | 12 +-- .../content/activity/guild/FishingGuild.java | 6 +- .../activity/guild/HeroGuildPlugin.java | 6 +- .../activity/guild/MiningGuildPlugin.java | 8 +- .../activity/guild/RangingGuildPlugin.java | 24 +++--- .../activity/guild/WizardGuildPlugin.java | 8 +- .../activity/gwd/GodwarsEntranceHandler.java | 4 +- .../content/activity/gwd/GodwarsMapzone.java | 14 ++-- .../activity/magearena/MageArenaPlugin.java | 10 +-- .../activity/mta/impl/AlchemistZone.java | 8 +- .../activity/mta/impl/EnchantingZone.java | 4 +- .../activity/mta/impl/GraveyardZone.java | 8 +- .../activity/partyroom/BalloonManager.java | 28 +++---- .../activity/partyroom/PartyRoomPlugin.java | 10 +-- .../activity/pestcontrol/PCLanderZone.java | 6 +- .../activity/pestcontrol/PCObjectHandler.java | 36 ++++----- .../pestcontrol/PestControlSession.java | 6 +- .../pestcontrol/monsters/PCRavagerNPC.java | 18 ++--- .../pestcontrol/monsters/PCSplatterNPC.java | 12 +-- .../activity/puropuro/PuroPuroPlugin.java | 22 +++--- .../pyramidplunder/PlunderObject.java | 6 +- .../activity/pyramidplunder/PlunderZones.java | 6 +- .../pyramidplunder/PyramidOptionHandler.java | 6 +- .../stronghold/StrongHoldSecurityPlugin.java | 18 ++--- .../playersafety/PSOptionHandler.java | 10 +-- .../StrongHoldOfPlayerSafetyPlugin.java | 4 +- .../tzhaar/TzhaarFightCavesPlugin.java | 4 +- .../tzhaar/TzhaarFightPitsPlugin.java | 6 +- .../activity/wguild/WarriorsGuild.java | 6 +- .../wguild/animator/AnimationRoom.java | 6 +- .../activity/wguild/barrel/BarrelRoom.java | 4 +- .../wguild/catapult/CatapultRoom.java | 8 +- .../wguild/cyclopes/CyclopesRoom.java | 6 +- .../activity/wguild/dummy/DummyRoom.java | 22 +++--- .../activity/wguild/shot/ShotPutRoom.java | 4 +- .../content/cutscene/DBRCutscenePlugin.java | 8 +- .../cutscene/JulietCutscenePlugin.java | 8 +- .../game/content/cutscene/OrganCutScene.java | 12 +-- .../content/dialogue/BorderGuardDialogue.java | 8 +- .../content/dialogue/DoorPerilDialogue.java | 8 +- .../dialogue/EnchantTiaraDialogue.java | 4 +- .../dialogue/IgnatiusVulcanDialogue.java | 8 +- .../dialogue/MithrilSeedsDialogue.java | 10 +-- .../content/dialogue/MithrilSeedsPlugin.java | 6 +- .../content/dialogue/TraibornDialogue.java | 10 +-- .../core/game/content/global/GodType.java | 4 +- .../global/action/ClimbActionHandler.java | 35 +++++---- .../global/action/DoorActionHandler.java | 68 ++++++++--------- .../holiday/christmas/ChristmasEvent.java | 28 +++---- .../holiday/halloween/DeathMansionEvent.java | 32 ++++---- .../quest/PluginInteractionManager.java | 4 +- .../game/content/quest/free/ImpCatcher.java | 8 +- .../BKFortressPlugin.java | 18 ++--- .../free/demonslayer/DemonSlayerCutscene.java | 12 +-- .../free/demonslayer/DemonSlayerPlugin.java | 12 +-- .../free/demonslayer/TraibornDialogue.java | 10 +-- .../quest/free/dragonslayer/DragonSlayer.java | 4 +- .../free/dragonslayer/DragonSlayerPlugin.java | 50 ++++++------- .../quest/free/dragonslayer/ElvargNPC.java | 12 +-- .../GoblinDiplomacyPlugin.java | 4 +- .../PiratesTreasurePlugin.java | 4 +- .../PrinceAliRescuePlugin.java | 8 +- .../free/shieldofarrav/ShieldArravPlugin.java | 28 +++---- .../therestlessghost/RestlessGhostPlugin.java | 14 ++-- .../therestlessghost/RestlessGhostSkull.java | 4 +- .../fishingcontest/GarlicPipeInteraction.java | 10 +-- .../fishingcontest/StairInteraction.java | 6 +- .../fishingcontest/VineInteraction.java | 6 +- .../members/junglepotion/JunglePotion.java | 14 ++-- .../junglepotion/JunglePotionPlugin.java | 10 +-- .../members/lostcity/LostCityPlugin.java | 6 +- .../merlinscrystal/CrateCutscenePlugin.java | 12 +-- .../MerlinCrystalOptionPlugin.java | 4 +- .../merlinscrystal/MerlinCrystalPlugin.java | 12 +-- .../sheepherder/IncineratorHandler.java | 7 +- .../thetouristrap/BedabinNomadDialogue.java | 8 +- .../thetouristrap/TouristTrapPlugin.java | 38 +++++----- .../waterfallquest/WaterfallPlugin.java | 52 ++++++------- .../whatliesbelow/WLBelowCutscene.java | 8 +- .../witchshouse/WitchsHousePlugin.java | 16 ++-- .../tutorialisland/TutorialIslandPlugin.java | 12 +-- .../tutorialisland/TutorialStage.java | 6 +- .../game/content/zone/ChaosTunnelZone.java | 10 +-- .../content/zone/YanilleAgilityDungeon.java | 8 +- .../content/zone/phasmatys/PhasmatysZone.java | 30 ++++---- .../content/zone/rellekka/RellekkaZone.java | 6 +- .../zone/wbisland/WaterBirthDungeonZone.java | 6 +- .../game/interaction/DestinationFlag.java | 6 +- .../core/game/interaction/Interaction.java | 6 +- .../java/core/game/interaction/Option.java | 4 +- .../core/game/interaction/UseWithHandler.java | 6 +- .../game/interaction/city/BedabinPlugin.java | 8 +- .../interaction/city/BurthorpePlugin.java | 4 +- .../interaction/city/CamelotNodePlugin.java | 8 +- .../interaction/city/DraynorManorPlugin.java | 52 ++++++------- .../interaction/city/DraynorNodePlugin.java | 12 +-- .../interaction/city/EdgevilleNodePlugin.java | 10 +-- .../interaction/city/FaladorNodePlugin.java | 12 +-- .../city/GnomeStrongholdPlugin.java | 20 ++--- .../interaction/city/HamHideoutPlugin.java | 6 +- .../city/KaramajaOptionPlugin.java | 30 ++++---- .../interaction/city/LumbridgeNodePlugin.java | 18 ++--- .../interaction/city/MonasteryPlugin.java | 4 +- .../interaction/city/PortSarimPlugin.java | 6 +- .../game/interaction/city/SophanemPlugin.java | 4 +- .../city/TaverlyDungeonPlugin.java | 12 +-- .../interaction/city/TrollheimPlugin.java | 12 +-- .../interaction/city/TzhaarCityPlugin.java | 4 +- .../interaction/city/VarrockNodePlugin.java | 18 ++--- .../interaction/city/WildernessPlugin.java | 8 +- .../interaction/city/WizardTowerPlugin.java | 12 +-- .../game/interaction/city/ZanarisPlugin.java | 8 +- .../interaction/city/lumbridge/FredChest.java | 8 +- .../interaction/item/SilverSicklePlugin.java | 10 +-- .../item/withitem/ChestKeyPlugin.java | 6 +- .../item/withitem/ImpJarCreatePlugin.java | 4 +- .../item/withobject/GWDEntranceRopeUsage.java | 4 +- .../withobject/PriestInPerilUsePlugin.java | 4 +- .../item/withobject/SmithingPlugin.java | 4 +- .../item/withobject/WaterSourcePlugin.java | 4 +- .../npc/BurthorpeOptionPlugin.java | 4 +- .../npc/SpiritKyattOptionPlugin.java | 8 +- .../SorceressApprenticePlugin.java | 4 +- .../interaction/object/BankingPlugin.java | 6 +- .../object/BarrowsTunnelShortcut.java | 4 +- .../object/BrassKeyDoorPlugin.java | 6 +- .../object/ChampionsArenaPlugin.java | 4 +- .../object/ChampionsGuildDoor.java | 6 +- .../object/ChefGuildDoorPlugin.java | 6 +- .../interaction/object/CowMilkingPlugin.java | 8 +- .../object/CulinomancerChestPliugin.java | 8 +- .../object/DoorManagingPlugin.java | 12 +-- .../object/DropPartyLeverOptionPlugin.java | 4 +- .../object/ErnestTheChickenPlugin.java | 24 +++--- .../object/FieldPickingPlugin.java | 18 ++--- .../object/GrandExchangeShortcut.java | 6 +- .../interaction/object/HaystackPlugin.java | 4 +- .../interaction/object/JangerBerryPlugin.java | 8 +- .../object/KalphiteEntranceHandler.java | 10 +-- .../object/KhardianInteractionPlugin.java | 6 +- .../object/LadderManagingPlugin.java | 6 +- .../interaction/object/LavaMazePlugin.java | 6 +- .../object/LumbridgeBasementPlugin.java | 8 +- .../object/LumbridgeSwampHolePlugin.java | 6 +- .../interaction/object/MuseumGatePlugin.java | 4 +- .../interaction/object/PortsObjectPlugin.java | 4 +- .../object/PriestInPerilOptionPlugin.java | 12 +-- .../interaction/object/ProspectOrePlugin.java | 4 +- .../interaction/object/PyreSitePlugin.java | 18 ++--- .../object/ReadSignPostPlugin.java | 4 +- .../object/RedberryBushPlugin.java | 8 +- .../interaction/object/RomeoQuestPlugin.java | 8 +- .../object/RuneCraftingGuildObjects.java | 4 +- .../interaction/object/ShantayPassPlugin.java | 10 +-- .../object/SinclairFlourBarrelPlugin.java | 6 +- .../interaction/object/SlashWebPlugin.java | 8 +- .../object/ThievingGuidePlugin.java | 10 +-- .../object/TollGateOptionPlugin.java | 8 +- .../object/VampireSlayerPlugin.java | 4 +- .../object/WildernessLeverPlugin.java | 12 +-- .../object/WildernessObeliskPlugin.java | 14 ++-- .../interaction/object/WydinDoorPlugin.java | 6 +- .../interaction/object/dmc/DMCHandler.java | 32 ++++---- .../object/sorceress/GardenObjectsPlugin.java | 6 +- .../sorceress/SorceressGardenObject.java | 6 +- .../wildyditch/WildernessDitchPlugin.java | 4 +- .../wildyditch/WildernessInterfacePlugin.java | 4 +- Server/src/main/java/core/game/node/Node.java | 10 +-- .../npc/city/sophanem/WallShortcut.java | 4 +- .../node/entity/npc/familiar/BeaverNPC.java | 4 +- .../entity/npc/familiar/CompostMoundNPC.java | 4 +- .../entity/npc/familiar/DesertWyrmNPC.java | 14 ++-- .../entity/npc/familiar/ForgeRegentNPC.java | 8 +- .../node/entity/npc/familiar/PyreLordNPC.java | 8 +- .../node/entity/npc/other/ArmourSuitNPC.java | 6 +- .../entity/player/link/PacketDispatch.java | 6 +- .../entity/skill/agility/AgilityShortcut.java | 10 +-- .../agility/brimhaven/BrimhavenArena.java | 26 +++---- .../agility/brimhaven/BrimhavenCourse.java | 20 ++--- .../agility/pyramid/AgilityPyramidCourse.java | 28 +++---- .../skill/agility/pyramid/RollingBlock.java | 4 +- .../shortcuts/AlKharidPitShortcut.java | 6 +- .../agility/shortcuts/BarSqueezeShortcut.java | 4 +- .../shortcuts/CrumblingWallShortcut.java | 4 +- .../agility/shortcuts/FenceJumpShortcut.java | 4 +- .../agility/shortcuts/KaramjaGrapple.java | 6 +- .../agility/shortcuts/LogBalanceShortcut.java | 4 +- .../agility/shortcuts/MonkeyBarShortcut.java | 4 +- .../skill/agility/shortcuts/RopeSwing.java | 6 +- .../agility/shortcuts/StileShortcut.java | 10 +-- .../shortcuts/StrangeFloorShortcut.java | 4 +- .../agility/shortcuts/TunnelShortcut.java | 6 +- .../agility/shortcuts/WaterOrbGrapple.java | 12 +-- .../shortcuts/ZanarisSqueezeShortcut.java | 4 +- .../skill/construction/BuildOptionPlugin.java | 10 +-- .../skill/construction/BuildRoomDialogue.java | 26 +++---- .../skill/construction/BuildingUtils.java | 58 +++++++-------- .../construction/ConstructionInterface.java | 4 +- .../entity/skill/construction/Decoration.java | 4 +- .../skill/construction/HouseManager.java | 4 +- .../construction/PortalOptionPlugin.java | 4 +- .../node/entity/skill/construction/Room.java | 16 ++-- .../skill/construction/RoomBuilder.java | 34 ++++----- .../skill/construction/RoomProperties.java | 4 +- .../decoration/BeerBarrelPlugin.java | 4 +- .../decoration/ChairBenchPlugin.java | 4 +- .../decoration/FireplacePlugin.java | 8 +- .../decoration/StaircasePlugin.java | 20 ++--- .../decoration/bedroom/ClockPlugin.java | 4 +- .../decoration/chapel/BoneOfferPlugin.java | 14 ++-- .../decoration/kitchen/BeerBarrelPlugin.java | 4 +- .../portalchamber/PortalChamberPlugin.java | 4 +- .../workshop/ClockmakersBenchPlugin.java | 4 +- .../decoration/workshop/ToolsPlugin.java | 4 +- .../entity/skill/cooking/CookingRewrite.kt | 4 +- .../skill/cooking/IntentionalBurnPulse.java | 8 +- .../entity/skill/cooking/PieCookingPulse.java | 6 +- .../skill/cooking/PizzaCookingPulse.java | 6 +- .../skill/cooking/StandardCookingPulse.java | 12 +-- .../skill/crafting/WeaveOptionPlugin.java | 8 +- .../skill/firemaking/FireMakingPulse.java | 10 +-- .../skill/gather/GatheringSkillPulse.java | 12 +-- .../woodcutting/WoodcuttingSkillPulse.java | 12 +-- .../entity/skill/hunter/DeadfallSetting.java | 10 +-- .../entity/skill/hunter/HunterManager.java | 10 +-- .../entity/skill/hunter/HunterPlugin.java | 8 +- .../entity/skill/hunter/NetTrapSetting.java | 22 +++--- .../entity/skill/hunter/TrapCreatePulse.java | 10 +-- .../skill/hunter/TrapDismantlePulse.java | 6 +- .../node/entity/skill/hunter/TrapSetting.java | 20 ++--- .../node/entity/skill/hunter/TrapWrapper.java | 26 +++---- .../game/node/entity/skill/hunter/Traps.java | 6 +- .../entity/skill/magic/ChargeOrbSpells.java | 6 +- .../skill/magic/lunar/FertileSoilSpell.java | 4 +- .../node/entity/skill/runecrafting/Altar.java | 4 +- .../runecrafting/CombinationRunePlugin.java | 4 +- .../runecrafting/EnchantTiaraPlugin.java | 4 +- .../skill/runecrafting/MysteriousRuin.java | 4 +- .../runecrafting/MysteriousRuinPlugin.java | 4 +- .../runecrafting/RunecraftingPlugin.java | 10 +-- .../skill/runecrafting/abyss/AbyssPlugin.java | 26 +++---- .../skill/slayer/FishingExplosivePlugin.java | 6 +- .../skill/slayer/SlayerTowerPlugin.java | 10 +-- .../entity/skill/slayer/SlayerTowerZone.java | 4 +- .../skill/slayer/dungeon/AncientCavern.java | 14 ++-- .../slayer/dungeon/FremennikDungeon.java | 6 +- .../skill/smithing/FurnaceOptionPlugin.java | 4 +- .../skill/summoning/SummoningCreator.java | 4 +- .../summoning/SummoningTrainingRoom.java | 6 +- .../skill/thieving/PickableDoorHandler.java | 16 ++-- .../node/entity/skill/thieving/Stall.java | 4 +- .../skill/thieving/StallThiefPulse.java | 10 +-- .../skill/thieving/ThievableChestPlugin.java | 14 ++-- .../skill/thieving/ThievingOptionPlugin.java | 4 +- .../core/game/node/object/Constructed.java | 10 +-- .../object/{GameObject.java => Scenery.java} | 74 +++++++++---------- ...ObjectBuilder.java => SceneryBuilder.java} | 64 ++++++++-------- .../core/game/world/map/BuildRegionChunk.java | 54 +++++++------- .../java/core/game/world/map/RegionChunk.java | 42 +++++------ .../core/game/world/map/RegionManager.java | 20 ++--- .../java/core/game/world/map/RegionPlane.java | 41 +++++----- .../game/world/map/build/DynamicRegion.java | 14 ++-- .../game/world/map/build/LandscapeParser.java | 36 ++++----- .../core/game/world/map/path/Pathfinder.java | 6 +- .../game/world/objectparser/ObjectParser.java | 6 +- .../update/flag/chunk/ObjectUpdateFlag.java | 14 ++-- .../world/update/flag/context/Animation.java | 8 +- .../update/flag/player/FaceLocationFlag.java | 6 +- .../core/net/packet/PacketRepository.java | 4 +- ...tContext.java => BuildSceneryContext.java} | 18 ++--- .../core/net/packet/in/InteractionPacket.java | 10 +-- .../net/packet/in/InterfaceUseOnPacket.java | 4 +- .../core/net/packet/in/ItemActionPacket.java | 6 +- .../net/packet/out/AnimateObjectPacket.java | 6 +- .../{ClearObject.java => ClearScenery.java} | 14 ++-- ...tructObject.java => ConstructScenery.java} | 14 ++-- Server/src/main/kotlin/api/ContentAPI.kt | 18 ++--- .../kotlin/rs09/game/ai/general/ScriptAPI.kt | 14 ++-- .../ai/general/scriptrepository/Adventurer.kt | 6 +- .../fishingtrawler/FishingTrawlerSession.kt | 10 +-- .../activity/fog/FogInteractionHandler.kt | 8 +- .../worldevents/shootingstar/ShootingStar.kt | 18 ++--- .../shootingstar/ShootingStarMiningPulse.kt | 4 +- .../TFTInteractionListeners.kt | 4 +- .../members/thelostcity/DramenTreeListener.kt | 4 +- .../interaction/object/GutanothChestPlugin.kt | 10 +-- .../interaction/object/JungleBushHandler.kt | 6 +- .../interaction/object/MuddyChestHandler.kt | 6 +- .../interaction/object/TarBarrelListener.kt | 4 +- .../dungeons/brimhaven/BrimhavenUtils.kt | 14 ++-- .../skill/agility/BarbarianOutpostCourse.kt | 18 ++--- .../skill/agility/GnomeStrongholdCourse.kt | 6 +- .../entity/skill/agility/WildernessCourse.kt | 18 ++--- .../agility/shortcuts/BasaltRockShortcut.kt | 6 +- .../skill/agility/shortcuts/PipeShortcut.kt | 6 +- .../agility/shortcuts/RockClimbShortcut.kt | 4 +- .../decoration/ConstructionDoorPlugin.kt | 6 +- .../decoration/chapel/BurnerListener.kt | 8 +- .../decoration/study/TelescopePlugin.kt | 4 +- .../entity/skill/cooking/CookingDialogue.kt | 8 +- .../node/entity/skill/farming/CompostBins.kt | 4 +- .../node/entity/skill/farming/FarmingPatch.kt | 4 +- .../skill/gather/mining/MiningSkillPulse.kt | 9 +-- .../skill/hunter/tracking/HunterTracking.kt | 6 +- .../node/entity/skill/magic/LunarListeners.kt | 4 +- .../system/command/oldsys/VisualCommand.kt | 10 +-- .../RottenPotatoUseWithHandler.kt | 4 +- .../system/command/sets/MiscCommandSet.kt | 4 +- .../system/command/sets/SpawnCommandSet.kt | 8 +- 316 files changed, 1706 insertions(+), 1712 deletions(-) rename Server/src/main/java/core/game/node/object/{GameObject.java => Scenery.java} (80%) rename Server/src/main/java/core/game/node/object/{ObjectBuilder.java => SceneryBuilder.java} (76%) rename Server/src/main/java/core/net/packet/context/{BuildObjectContext.java => BuildSceneryContext.java} (60%) rename Server/src/main/java/core/net/packet/out/{ClearObject.java => ClearScenery.java} (68%) rename Server/src/main/java/core/net/packet/out/{ConstructObject.java => ConstructScenery.java} (68%) 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 022ed5526..9bd1c8bd9 100644 --- a/Server/src/main/java/core/cache/def/impl/ObjectDefinition.java +++ b/Server/src/main/java/core/cache/def/impl/ObjectDefinition.java @@ -5,7 +5,7 @@ import core.cache.def.Definition; import core.cache.misc.buffer.ByteBufferUtils; import core.game.interaction.OptionHandler; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import rs09.game.system.SystemLogger; import rs09.game.world.GameWorld; @@ -17,7 +17,7 @@ import java.util.Map; * Represents an object's definition. * @author Emperor */ -public class ObjectDefinition extends Definition { +public class ObjectDefinition extends Definition { /** * The item definitions mapping. 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 049d52d7b..336b6aee7 100644 --- a/Server/src/main/java/core/game/content/activity/barrows/BarrowsActivityPlugin.java +++ b/Server/src/main/java/core/game/content/activity/barrows/BarrowsActivityPlugin.java @@ -16,7 +16,7 @@ import core.game.node.entity.npc.agg.AggressiveHandler; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.ActivityData; import core.game.node.entity.skill.summoning.familiar.Familiar; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import core.game.world.map.Location; import core.game.world.map.RegionManager; @@ -228,8 +228,8 @@ public final class BarrowsActivityPlugin extends ActivityPlugin { @Override public boolean interact(Entity e, Node target, Option option) { - if (target instanceof GameObject) { - GameObject object = (GameObject) target; + if (target instanceof Scenery) { + Scenery object = (Scenery) target; Player player = (Player) e; if (object.getId() >= 6702 && object.getId() <= 6707) { ClimbActionHandler.climb((Player) e, ClimbActionHandler.CLIMB_UP, BarrowsCrypt.getCrypt(object.getId() - 6702).getExitLocation()); @@ -264,7 +264,7 @@ public final class BarrowsActivityPlugin extends ActivityPlugin { if (index > -1) { BarrowsCrypt.getCrypt(index).spawnBrother(player, RegionManager.getTeleportLocation(target.getLocation(), 1)); } - DoorActionHandler.handleAutowalkDoor(e, (GameObject) target); + DoorActionHandler.handleAutowalkDoor(e, (Scenery) target); return true; case 6821: BarrowsCrypt.getCrypt(BarrowsCrypt.AHRIM).openSarcophagus((Player) e, object); diff --git a/Server/src/main/java/core/game/content/activity/barrows/BarrowsCrypt.java b/Server/src/main/java/core/game/content/activity/barrows/BarrowsCrypt.java index e891dab32..7d30190fb 100644 --- a/Server/src/main/java/core/game/content/activity/barrows/BarrowsCrypt.java +++ b/Server/src/main/java/core/game/content/activity/barrows/BarrowsCrypt.java @@ -4,7 +4,7 @@ import core.game.content.global.action.DigAction; import core.game.content.global.action.DigSpadeHandler; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.RegionManager; @@ -106,7 +106,7 @@ public final class BarrowsCrypt { * Opens the sarcophagus. * @param player The player. */ - public void openSarcophagus(Player player, GameObject object) { + public void openSarcophagus(Player player, Scenery object) { if (index == player.getSavedData().getActivityData().getBarrowTunnelIndex()) { player.getDialogueInterpreter().open("barrow_tunnel", index); return; 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 91f7ed37b..c1da57a6a 100644 --- a/Server/src/main/java/core/game/content/activity/bountyhunter/BHOptionHandler.java +++ b/Server/src/main/java/core/game/content/activity/bountyhunter/BHOptionHandler.java @@ -5,7 +5,7 @@ import core.game.content.activity.ActivityManager; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; @@ -31,7 +31,7 @@ public final class BHOptionHandler extends OptionHandler { @Override public boolean handle(final Player player, Node node, String option) { - GameObject object = (GameObject) node; + Scenery object = (Scenery) node; final BountyHunterActivity activity = player.getExtension(BountyHunterActivity.class); switch (object.getId()) { case 28119: 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 bdad6555a..fa07958d6 100644 --- a/Server/src/main/java/core/game/content/activity/clanwars/ClanWarsActivityPlugin.java +++ b/Server/src/main/java/core/game/content/activity/clanwars/ClanWarsActivityPlugin.java @@ -16,8 +16,8 @@ import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.impl.PulseManager; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.ConfigurationManager.Configuration; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.communication.ClanEntry; import core.game.system.communication.ClanRepository; import core.game.system.task.Pulse; @@ -134,14 +134,14 @@ public final class ClanWarsActivityPlugin extends ActivityPlugin { int offset = 0; for (int x = 5; x < 54; x++) { offset = (offset + 1) % 3; - ObjectBuilder.add(new GameObject(28174 + offset, base.transform(x, 64, 0))); + SceneryBuilder.add(new Scenery(28174 + offset, base.transform(x, 64, 0))); } GameWorld.getPulser().submit(pulse = new Pulse(200) { @Override public boolean pulse() { for (int x = 5; x < 54; x++) { Location l = base.transform(x, 64, 0); - GameObject object = RegionManager.getObject(l); + Scenery object = RegionManager.getObject(l); if (object != null) { Animation anim = Animation.create(7386 + ((object.getId() - 28174) % 3)); anim.setObject(object); @@ -153,9 +153,9 @@ public final class ClanWarsActivityPlugin extends ActivityPlugin { public boolean pulse() { for (int x = 5; x < 54; x++) { Location l = base.transform(x, 64, 0); - GameObject object = RegionManager.getObject(l); + Scenery object = RegionManager.getObject(l); if (object != null) { - ObjectBuilder.remove(object); + SceneryBuilder.remove(object); } } return true; @@ -346,8 +346,8 @@ public final class ClanWarsActivityPlugin extends ActivityPlugin { @Override public boolean interact(Entity e, Node target, Option option) { - if (target instanceof GameObject) { - GameObject object = (GameObject) target; + if (target instanceof Scenery) { + Scenery object = (Scenery) target; if (object.getId() == 28214 || object.getId() == 28140) { e.getProperties().setTeleportLocation(getLeaveLocation()); return true; 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 4a44737fd..bb55cf13c 100644 --- a/Server/src/main/java/core/game/content/activity/clanwars/ClanWarsChallengeRoom.java +++ b/Server/src/main/java/core/game/content/activity/clanwars/ClanWarsChallengeRoom.java @@ -4,7 +4,7 @@ import core.game.interaction.Option; import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneBuilder; @@ -63,8 +63,8 @@ public final class ClanWarsChallengeRoom extends MapZone implements Plugin= 3438 ? Location.create(2659, 3437, 0) : Location.create(2657, 3439, 0)); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node, player.getLocation().getY() >= 3438 ? Location.create(2659, 3437, 0) : Location.create(2657, 3439, 0)); break; } break; @@ -114,18 +114,18 @@ public final class RangingGuildPlugin extends OptionHandler { @Override public Location getDestination(Node node, Node n) { - if (n instanceof GameObject) { - if (((GameObject) n).getDefinition().hasAction("open")) { - if (((GameObject) n).getId() == 2514) { + if (n instanceof Scenery) { + if (((Scenery) n).getDefinition().hasAction("open")) { + if (((Scenery) n).getId() == 2514) { if (node.getLocation().getY() >= 3438) { return Location.create(2657, 3439, 0); } else { return Location.create(2659, 3437, 0); } } - return DoorActionHandler.getDestination((Player) node, (GameObject) n); + return DoorActionHandler.getDestination((Player) node, (Scenery) n); } - if (((GameObject) n).getId() == 2513) + if (((Scenery) n).getId() == 2513) return Location.create(2673, 3420, 0); } return null; @@ -1113,9 +1113,9 @@ public final class RangingGuildPlugin extends OptionHandler { private final Player player; /** - * Represents the game object. + * Represents the scenery. */ - private final GameObject object; + private final Scenery object; /** * Constructs a new {@code ArcheryCompetitionPulse} {@code Object}. @@ -1123,7 +1123,7 @@ public final class RangingGuildPlugin extends OptionHandler { * @param player the player. * @param object the object. */ - public ArcheryCompetitionPulse(final Player player, final GameObject object) { + public ArcheryCompetitionPulse(final Player player, final Scenery object) { super(1, player, object); this.player = player; this.object = object; 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 b7e101a3f..e9580550c 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 @@ -11,7 +11,7 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.skill.Skills; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; @@ -43,7 +43,7 @@ public final class WizardGuildPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - final int id = node instanceof GameObject ? ((GameObject) node).getId() : ((NPC) node).getId(); + final int id = node instanceof Scenery ? ((Scenery) node).getId() : ((NPC) node).getId(); switch (option) { case "climb-up": switch (id) { @@ -51,7 +51,7 @@ public final class WizardGuildPlugin extends OptionHandler { if (node.getLocation().equals(new Location(2590, 3089, 0))) { ClimbActionHandler.climb(player, null, Location.create(2591, 3092, 1)); } else { - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); } break; } @@ -64,7 +64,7 @@ public final class WizardGuildPlugin extends OptionHandler { player.getDialogueInterpreter().sendDialogue("You need a Magic level of at least 66 to enter."); return true; } - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); break; case 2155: case 2154: 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 ac5afa202..44766dd3a 100644 --- a/Server/src/main/java/core/game/content/activity/gwd/GodwarsEntranceHandler.java +++ b/Server/src/main/java/core/game/content/activity/gwd/GodwarsEntranceHandler.java @@ -9,7 +9,7 @@ import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -35,7 +35,7 @@ public final class GodwarsEntranceHandler extends OptionHandler { @Override public boolean handle(final Player player, Node node, String option) { - GameObject object = (GameObject) node; + Scenery object = (Scenery) node; switch (object.getId()) { case 26340: if (!player.getInventory().remove(new Item(954))) { 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 f5e56c9c8..c5e335599 100644 --- a/Server/src/main/java/core/game/content/activity/gwd/GodwarsMapzone.java +++ b/Server/src/main/java/core/game/content/activity/gwd/GodwarsMapzone.java @@ -14,7 +14,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.info.Rights; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; @@ -143,8 +143,8 @@ public final class GodwarsMapzone extends MapZone implements Plugin { @Override public boolean interact(Entity e, Node target, Option option) { - if (target instanceof GameObject) { - GameObject object = (GameObject) target; + if (target instanceof Scenery) { + Scenery object = (Scenery) target; if (object.getId() == 26439) { handleIceBridge((Player) e, object); return true; @@ -277,7 +277,7 @@ public final class GodwarsMapzone extends MapZone implements Plugin { * @param player The player. * @param object The pillar object. */ - private void handlePillarGrapple(final Player player, final GameObject object) { + private void handlePillarGrapple(final Player player, final Scenery object) { if (player.getSkills().getStaticLevel(Skills.RANGE) < 70) { player.getPacketDispatch().sendMessage("You need a Range level of 70 to enter here."); return; @@ -305,7 +305,7 @@ public final class GodwarsMapzone extends MapZone implements Plugin { * @param player The player. * @param object The door object. */ - private void handleBigDoor(final Player player, final GameObject object, boolean checkLocation) { + private void handleBigDoor(final Player player, final Scenery object, boolean checkLocation) { player.lock(4); if (checkLocation && player.getLocation().getX() > object.getLocation().getX()) { GameWorld.getPulser().submit(new MovementPulse(player, object.getLocation()) { @@ -343,7 +343,7 @@ public final class GodwarsMapzone extends MapZone implements Plugin { * @param object The object. * @return {@code True} if the player can't pass. */ - private boolean handleChamberEntrance(Player player, GameObject object) { + private boolean handleChamberEntrance(Player player, Scenery object) { Direction dir = Direction.get((object.getRotation() + 3) % 4); if (dir.getStepX() != 0) { if (player.getLocation().getX() == object.getLocation().transform(dir.getStepX(), 0, 0).getX()) { @@ -375,7 +375,7 @@ public final class GodwarsMapzone extends MapZone implements Plugin { * @param player The player. * @param object The object. */ - private void handleIceBridge(final Player player, final GameObject object) { + private void handleIceBridge(final Player player, final Scenery object) { if (player.getSkills().getStaticLevel(Skills.HITPOINTS) < 70) { player.getPacketDispatch().sendMessage("You need 70 Hitpoints to cross this bridge."); return; 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 14b5e198d..7467f1e89 100644 --- a/Server/src/main/java/core/game/content/activity/magearena/MageArenaPlugin.java +++ b/Server/src/main/java/core/game/content/activity/magearena/MageArenaPlugin.java @@ -11,7 +11,7 @@ import core.game.node.entity.skill.agility.AgilityHandler; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import core.game.world.map.Direction; import core.game.world.map.Location; @@ -72,7 +72,7 @@ public final class MageArenaPlugin extends OptionHandler { player.getDialogueInterpreter().addAction(new DialogueAction() { @Override public void handle(Player player, int buttonId) { - handlePool(player, true, destination, (GameObject) node); + handlePool(player, true, destination, (Scenery) node); } }); return true; @@ -81,7 +81,7 @@ public final class MageArenaPlugin extends OptionHandler { GameWorld.getPulser().submit(new Pulse(1, player) { @Override public boolean pulse() { - handlePool(player, false, destination, (GameObject) node); + handlePool(player, false, destination, (Scenery) node); return true; } }); @@ -89,7 +89,7 @@ public final class MageArenaPlugin extends OptionHandler { case 2873: case 2874: case 2875: - GodType.forObject(node.getId()).pray(player, (GameObject) node); + GodType.forObject(node.getId()).pray(player, (Scenery) node); break; case 2412: case 2413: @@ -163,7 +163,7 @@ public final class MageArenaPlugin extends OptionHandler { * @param enter if entered. * @param dest the destination. */ - public void handlePool(final Player player, boolean enter, final Location dest, final GameObject object) { + public void handlePool(final Player player, boolean enter, final Location dest, final Scenery object) { final Location start = player.getAttribute("mb-loc", player.getLocation()); final Location end = player.getLocation().transform(player.getAttribute("mb-dir", Direction.NORTH), 1); player.removeAttribute("mc-loc"); 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 f2bd556d2..7d4ff503b 100644 --- a/Server/src/main/java/core/game/content/activity/mta/impl/AlchemistZone.java +++ b/Server/src/main/java/core/game/content/activity/mta/impl/AlchemistZone.java @@ -12,8 +12,8 @@ import core.game.node.entity.Entity; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -155,12 +155,12 @@ public class AlchemistZone extends MTAZone { * @param player the player. * @param object the object. */ - private void search(Player player, GameObject object) { + private void search(Player player, Scenery object) { AlchemistSession session = getSession(player); AlchemistItem item = session.getItem(object.getId()); if (object.getId() % 2 != 0) { player.animate(Animation.create(3032)); - ObjectBuilder.replace(object, object.transform(object.getId() + 1), 35); + SceneryBuilder.replace(object, object.transform(object.getId() + 1), 35); } if (item == null) { player.sendMessage("The cupboard is empty."); 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 f89d8e1a1..4706a1eb8 100644 --- a/Server/src/main/java/core/game/content/activity/mta/impl/EnchantingZone.java +++ b/Server/src/main/java/core/game/content/activity/mta/impl/EnchantingZone.java @@ -13,7 +13,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -288,7 +288,7 @@ public class EnchantingZone extends MTAZone { * Takes from the shape object. * @param player the player. */ - public void take(Player player, GameObject object) { + public void take(Player player, Scenery object) { if (!player.getInventory().hasSpaceFor(item)) { player.sendMessage("You have no space left in your inventory."); return; 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 0e9b64921..3fb085f03 100644 --- a/Server/src/main/java/core/game/content/activity/mta/impl/GraveyardZone.java +++ b/Server/src/main/java/core/game/content/activity/mta/impl/GraveyardZone.java @@ -10,8 +10,8 @@ import core.game.node.entity.Entity; import core.game.node.entity.combat.ImpactHandler.HitsplatType; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -229,7 +229,7 @@ public class GraveyardZone extends MTAZone { * @param player the player. * @param object the object. */ - public void grab(Player player, GameObject object) { + public void grab(Player player, Scenery object) { if (player.getInventory().freeSlots() < 1) { player.sendMessage("You have no free space!"); return; @@ -242,7 +242,7 @@ public class GraveyardZone extends MTAZone { if (life < 1) { life = 4; BoneType type = ordinal() + 1 > BoneType.values().length - 1 ? BoneType.FIRST : BoneType.values()[ordinal() + 1]; - ObjectBuilder.replace(object, object.transform(type.getObjectId())); + SceneryBuilder.replace(object, object.transform(type.getObjectId())); } object.getAttributes().setAttribute("life", life); } 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 69d3c2ab8..d69bb259e 100644 --- a/Server/src/main/java/core/game/content/activity/partyroom/BalloonManager.java +++ b/Server/src/main/java/core/game/content/activity/partyroom/BalloonManager.java @@ -12,8 +12,8 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -31,7 +31,7 @@ public final class BalloonManager extends OptionHandler { /** * The list of dropped balloons. */ - private static final List balloons = new ArrayList<>(20); + private static final List balloons = new ArrayList<>(20); /** * The count down time until droping. @@ -112,10 +112,10 @@ public final class BalloonManager extends OptionHandler { public boolean pulse() { if (waves == 0 || waves == 3 || waves == 5 || waves == 8 || waves == 10 || waves == 12 || waves == 15 || waves == 18 || waves == 20) { for (int i = 0; i < 30; i++) { - GameObject balloon = getBalloon(); + Scenery balloon = getBalloon(); if (balloon != null) { balloons.add(balloon); - ObjectBuilder.add(balloon, RandomFunction.random(200, 300)); + SceneryBuilder.add(balloon, RandomFunction.random(200, 300)); } } } @@ -129,12 +129,12 @@ public final class BalloonManager extends OptionHandler { * Gets the balloon drop. * @return the balloon. */ - private GameObject getBalloon() { + private Scenery getBalloon() { final Location location = new Location(3045 + RandomFunction.randomSign(RandomFunction.getRandom(8)), 3378 + RandomFunction.randomSign(RandomFunction.getRandom(6)), 0); if (!RegionManager.isTeleportPermitted(location) || RegionManager.getObject(location) != null) { return null; } - return new GameObject(PartyBalloon.values()[RandomFunction.random(PartyBalloon.values().length)].getBalloonId(), location); + return new Scenery(PartyBalloon.values()[RandomFunction.random(PartyBalloon.values().length)].getBalloonId(), location); } /** @@ -142,7 +142,7 @@ public final class BalloonManager extends OptionHandler { * @return {@code True} if so. */ public boolean isCluttered() { - for (GameObject object : balloons) { + for (Scenery object : balloons) { if (RegionManager.getObject(object.getLocation()) != null) { return true; } @@ -188,7 +188,7 @@ public final class BalloonManager extends OptionHandler { * Gets the balloons. * @return the balloons */ - public static List getBalloons() { + public static List getBalloons() { return balloons; } @@ -232,15 +232,15 @@ public final class BalloonManager extends OptionHandler { * @param player the player. * @param object the object. */ - public void burst(final Player player, final GameObject object) { - final GameObject popped = object.transform(popId); + public void burst(final Player player, final Scenery object) { + final Scenery popped = object.transform(popId); if (!getBalloons().contains(object)) { player.sendMessage("Error! Balloon not registered."); return; } player.lock(2); - ObjectBuilder.remove(object); - ObjectBuilder.add(popped); + SceneryBuilder.remove(object); + SceneryBuilder.add(popped); getBalloons().remove(object); player.animate(Animation.create(10017)); @@ -254,7 +254,7 @@ public final class BalloonManager extends OptionHandler { public boolean pulse() { switch (++counter) { case 1: - ObjectBuilder.remove(popped); + SceneryBuilder.remove(popped); if (!player.getIronmanManager().isIronman() && RandomFunction.random(3) == 1) { GroundItem ground = getGround(object.getLocation(), player); if (ground != null) { 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 51555fa55..6ce6fc1c0 100644 --- a/Server/src/main/java/core/game/content/activity/partyroom/PartyRoomPlugin.java +++ b/Server/src/main/java/core/game/content/activity/partyroom/PartyRoomPlugin.java @@ -18,8 +18,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.RunScript; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -81,7 +81,7 @@ public final class PartyRoomPlugin extends OptionHandler { switch (node.getId()) { case CLOSED_CHEST: player.animate(Animation.create(536)); - ObjectBuilder.replace(node.asObject(), node.asObject().transform(OPEN_CHEST)); + SceneryBuilder.replace(node.asObject(), node.asObject().transform(OPEN_CHEST)); break; case OPEN_CHEST: switch (option) { @@ -90,7 +90,7 @@ public final class PartyRoomPlugin extends OptionHandler { break; case "shut": player.animate(Animation.create(535)); - ObjectBuilder.replace(node.asObject(), node.asObject().transform(CLOSED_CHEST)); + SceneryBuilder.replace(node.asObject(), node.asObject().transform(CLOSED_CHEST)); break; } break; @@ -193,7 +193,7 @@ public final class PartyRoomPlugin extends OptionHandler { * @param player the player. * @param object the object. */ - private void handleLever(Player player, GameObject object) { + private void handleLever(Player player, Scenery object) { player.lock(3); player.faceLocation(object.getLocation()); player.animate(Animation.create(6933), 1); diff --git a/Server/src/main/java/core/game/content/activity/pestcontrol/PCLanderZone.java b/Server/src/main/java/core/game/content/activity/pestcontrol/PCLanderZone.java index 1cf770fc7..0d4e3060e 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/PCLanderZone.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/PCLanderZone.java @@ -4,7 +4,7 @@ import core.game.interaction.Option; import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneRestriction; @@ -31,8 +31,8 @@ public final class PCLanderZone extends MapZone { @Override public boolean interact(Entity e, Node target, Option option) { - if (target instanceof GameObject) { - GameObject o = (GameObject) target; + if (target instanceof Scenery) { + Scenery o = (Scenery) target; switch (o.getId()) { case 14314: // Novice exit ladder if (activities[0].getWaitingPlayers().contains(e)) { 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 193276aac..b6be59c0d 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/PCObjectHandler.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/PCObjectHandler.java @@ -9,8 +9,8 @@ import core.game.node.entity.player.Player; import rs09.game.ai.pvmbots.PvMBotsBuilder; import core.game.node.entity.player.info.Rights; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.RegionManager; @@ -94,7 +94,7 @@ public final class PCObjectHandler extends OptionHandler { public boolean handle(Player player, Node node, String option) { int pestBotsAmount = 0; int pestBots2Amount = 0; - GameObject object = (GameObject) node; + Scenery object = (Scenery) node; if (option.equals("cross")) { if (player.getFamiliarManager().hasFamiliar() && player.getRights() != Rights.ADMINISTRATOR) { player.getPacketDispatch().sendMessage("You can't take a follower on the lander."); @@ -160,7 +160,7 @@ public final class PCObjectHandler extends OptionHandler { * @param session The session. * @param object The object. */ - private void handleTurretTower(Player player, PestControlSession session, GameObject object) { + private void handleTurretTower(Player player, PestControlSession session, Scenery object) { int x = object.getLocation().getLocalX(); int y = object.getLocation().getLocalY(); if (x == 45 && y == 41) { @@ -188,10 +188,10 @@ public final class PCObjectHandler extends OptionHandler { * Repairs an object. * @param player The player. * @param session The pest control session. - * @param object The game object to repair. + * @param object The scenery to repair. * @param newId The repaired object id. */ - private void repair(Player player, PestControlSession session, GameObject object, int newId) { + private void repair(Player player, PestControlSession session, Scenery object, int newId) { if (!player.getInventory().contains(2347, 1)) { player.getPacketDispatch().sendMessage("You'll need a hammer to make any repairs!"); return; @@ -203,9 +203,9 @@ public final class PCObjectHandler extends OptionHandler { session.addZealGained(player, 5); player.animate(Animation.create(898)); if (session.getBarricades().remove(object)) { - GameObject replacement = object.transform(newId, object.getRotation(), getObjectType(newId)); + Scenery replacement = object.transform(newId, object.getRotation(), getObjectType(newId)); session.getBarricades().add(replacement); - ObjectBuilder.replace(object, replacement); + SceneryBuilder.replace(object, replacement); } } @@ -213,11 +213,11 @@ public final class PCObjectHandler extends OptionHandler { * Opens the gates. * @param player The player. * @param session The pest control session. - * @param object The game object. + * @param object The scenery. */ - private static void handleGates(Player player, PestControlSession session, GameObject object) { + private static void handleGates(Player player, PestControlSession session, Scenery object) { boolean open = (object.getId() % 2) != 0; - GameObject second = getSecondDoor(object); + Scenery second = getSecondDoor(object); if (second == null) { return; } @@ -233,13 +233,13 @@ public final class PCObjectHandler extends OptionHandler { session.getBarricades().remove(second); Location l = object.getLocation().transform(direction.getStepX(), direction.getStepY(), 0); - GameObject replacement = new GameObject(object.getId() + (open ? 1 : -1), l, 0, open ? rotation : ((direction.toInteger() + 3) % 4)); - ObjectBuilder.replace(object, replacement); + Scenery replacement = new Scenery(object.getId() + (open ? 1 : -1), l, 0, open ? rotation : ((direction.toInteger() + 3) % 4)); + SceneryBuilder.replace(object, replacement); session.getBarricades().add(replacement); l = second.getLocation().transform(direction.getStepX(), direction.getStepY(), 0); - replacement = new GameObject(second.getId() + (open ? 1 : -1), l, 0, open ? getRotation(second) : ((direction.toInteger() + 3) % 4)); - ObjectBuilder.replace(second, replacement); + replacement = new Scenery(second.getId() + (open ? 1 : -1), l, 0, open ? getRotation(second) : ((direction.toInteger() + 3) % 4)); + SceneryBuilder.replace(second, replacement); session.getBarricades().add(replacement); } } @@ -249,7 +249,7 @@ public final class PCObjectHandler extends OptionHandler { * @param object The object. * @return The rotation. */ - private static final int getRotation(GameObject object) { + private static final int getRotation(Scenery object) { int id = object.getId(); if (id > 14236) { id -= 4; @@ -272,9 +272,9 @@ public final class PCObjectHandler extends OptionHandler { * @param object The first door object. * @return The second door object. */ - public static GameObject getSecondDoor(GameObject object) { + public static Scenery getSecondDoor(Scenery object) { Location l = object.getLocation(); - GameObject o = null; + Scenery o = null; if ((o = RegionManager.getObject(l.transform(-1, 0, 0))) != null && o.getName().equals(object.getName())) { return o; } diff --git a/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlSession.java b/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlSession.java index c63f0156c..e5a8cd8b7 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlSession.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/PestControlSession.java @@ -11,7 +11,7 @@ import core.game.content.dialogue.FacialExpression; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.ConfigurationManager.Configuration; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.game.world.map.Point; import core.game.world.map.RegionPlane; @@ -51,7 +51,7 @@ public final class PestControlSession { /** * The barricade & gate objects. */ - private final List barricades = new ArrayList<>(20); + private final List barricades = new ArrayList<>(20); /** * The amount of ticks. @@ -377,7 +377,7 @@ public final class PestControlSession { * Gets the barricades. * @return The barricades. */ - public List getBarricades() { + public List getBarricades() { return barricades; } 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 bbe072ac4..e68e9d789 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCRavagerNPC.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCRavagerNPC.java @@ -6,8 +6,8 @@ import core.game.node.entity.Entity; import core.game.node.entity.combat.BattleState; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -31,7 +31,7 @@ public class PCRavagerNPC extends AbstractNPC { /** * Current object target to destroy. */ - private GameObject target; + private Scenery target; /** * The portal index. @@ -107,14 +107,14 @@ public class PCRavagerNPC extends AbstractNPC { int newId = target.getId() + (target.getId() < 14233 ? 3 : 4); boolean destroyed = !isTarget(newId); int type = destroyed ? 22 : target.getType(); - final GameObject o = target; - final GameObject newTarget = o.transform(newId, o.getRotation(), type); + final Scenery o = target; + final Scenery newTarget = o.transform(newId, o.getRotation(), type); GameWorld.getPulser().submit(new Pulse(1, this, o) { @Override public boolean pulse() { if (getViewport().getRegion().isActive() && session.getBarricades().remove(o)) { session.getBarricades().add(newTarget); - ObjectBuilder.replace(o, newTarget); + SceneryBuilder.replace(o, newTarget); } return true; } @@ -133,10 +133,10 @@ public class PCRavagerNPC extends AbstractNPC { } /** - * Starts attacking a game object. + * Starts attacking a scenery. * @param o The object. */ - private void attack(GameObject o) { + private void attack(Scenery o) { target = o; if (o == null) { setWalks(true); @@ -191,7 +191,7 @@ public class PCRavagerNPC extends AbstractNPC { * @return {@code True} if a target was found. */ private boolean findTarget() { - for (GameObject o : session.getBarricades()) { + for (Scenery o : session.getBarricades()) { if (o.getLocation().withinDistance(getLocation(), MapDistance.RENDERING.getDistance() / 3) && isTarget(o.getId())) { attack(o); return true; 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 dd2393a5d..92ed3881d 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCSplatterNPC.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/monsters/PCSplatterNPC.java @@ -8,8 +8,8 @@ import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -67,7 +67,7 @@ public final class PCSplatterNPC extends AbstractNPC { if (getProperties().getCombatPulse().isAttacking()) { return; } - for (GameObject o : session.getBarricades()) { + for (Scenery o : session.getBarricades()) { if (o.getLocation().isNextTo(this)) { commenceDeath(this); break; @@ -115,14 +115,14 @@ public final class PCSplatterNPC extends AbstractNPC { int maximum = getProperties().getCurrentCombatLevel() / 3; int minimum = maximum / 2; if (session != null) { - for (GameObject o : new ArrayList<>(session.getBarricades())) { + for (Scenery o : new ArrayList<>(session.getBarricades())) { if (o.getLocation().isNextTo(this)) { int newId = o.getId() + (o.getId() < 14233 ? 3 : 4); boolean destroyed = !isTarget(newId); - final GameObject newTarget = o.transform(newId, o.getRotation(), destroyed ? 22 : o.getType()); + final Scenery newTarget = o.transform(newId, o.getRotation(), destroyed ? 22 : o.getType()); if (session.getBarricades().remove(o)) { session.getBarricades().add(newTarget); - ObjectBuilder.replace(o, newTarget); + SceneryBuilder.replace(o, newTarget); } } } 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 ca6bcf5b9..f973f2b9f 100644 --- a/Server/src/main/java/core/game/content/activity/puropuro/PuroPuroPlugin.java +++ b/Server/src/main/java/core/game/content/activity/puropuro/PuroPuroPlugin.java @@ -17,8 +17,8 @@ import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.TeleportManager.TeleportType; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; @@ -126,7 +126,7 @@ public final class PuroPuroPlugin extends MapZone implements Plugin { case 25018: case 25020: case 25021: - pushThrough(p, (GameObject) target); + pushThrough(p, (Scenery) target); return true; case 25014: p.getTeleporter().send(Location.create(2427, 4446, 0), TeleportType.PURO_PURO); @@ -141,7 +141,7 @@ public final class PuroPuroPlugin extends MapZone implements Plugin { * @param player the player. * @param object the object. */ - private void pushThrough(final Player player, final GameObject object) { + private void pushThrough(final Player player, final Scenery object) { if (player.getSkills().getStaticLevel(Skills.HUNTER) < 17) { player.sendMessage("You need a Hunting level of at least 17 to enter the maze."); return; @@ -376,9 +376,9 @@ public final class PuroPuroPlugin extends MapZone implements Plugin { private final Location[] locations; /** - * The game objects. + * The scenerys. */ - private GameObject[] objects = new GameObject[2]; + private Scenery[] objects = new Scenery[2]; /** * The rotation. @@ -415,8 +415,8 @@ public final class PuroPuroPlugin extends MapZone implements Plugin { public void init() { int index = 0; for (Location location : locations) { - GameObject object = new GameObject(25021, location, 22, rot); - ObjectBuilder.add(object); + Scenery object = new Scenery(25021, location, 22, rot); + SceneryBuilder.add(object); objects[index] = object; index++; } @@ -428,15 +428,15 @@ public final class PuroPuroPlugin extends MapZone implements Plugin { */ public void whilt() { busyTicks = GameWorld.getTicks() + 5; - for (GameObject object : objects) { + for (Scenery object : objects) { if (object == null) { continue; } if (removed) { - ObjectBuilder.add(object); + SceneryBuilder.add(object); continue; } - ObjectBuilder.remove(object); + SceneryBuilder.remove(object); } removed = !removed; setNextWhilt(); diff --git a/Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderObject.java b/Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderObject.java index 3af454e8d..25166b95d 100644 --- a/Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderObject.java +++ b/Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderObject.java @@ -1,20 +1,20 @@ package core.game.content.activity.pyramidplunder; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; /** * Object wrapper for pyramid plunder nodes * @author ceik */ -public class PlunderObject extends GameObject { +public class PlunderObject extends Scenery { private transient Player player; private static int thisId; public static int snakeId, openId; - public PlunderObject(GameObject obj){ + public PlunderObject(Scenery obj){ super(obj.getId(),obj.getLocation(),obj.getRotation(),obj.getDirection()); this.thisId = obj.getId(); switch(thisId){ 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 fa7c874c8..2d7448988 100644 --- a/Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderZones.java +++ b/Server/src/main/java/core/game/content/activity/pyramidplunder/PlunderZones.java @@ -9,7 +9,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.skill.Skills; import core.game.node.item.Item; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.SceneryBuilder; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.world.map.Location; @@ -243,7 +243,7 @@ public class PlunderZones implements Plugin { if (!alreadyOpened && (success || charmed)) { player.getPacketDispatch().sendMessage("You successfully search the urn..."); - ObjectBuilder.replace(target.asObject(), target.asObject().transform(object.openId), 5); + SceneryBuilder.replace(target.asObject(), target.asObject().transform(object.openId), 5); manager.registerOpened(object); reward(player,object.getId()); } else { @@ -255,7 +255,7 @@ public class PlunderZones implements Plugin { player.getPacketDispatch().sendMessage("You already checked for snakes."); } else { player.getPacketDispatch().sendMessage("You check the urn for snakes..."); - ObjectBuilder.replace(target.asObject(), target.asObject().transform(object.snakeId), 5); + SceneryBuilder.replace(target.asObject(), target.asObject().transform(object.snakeId), 5); } } break; 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 2fd846778..b838a1ef9 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 @@ -7,7 +7,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -60,9 +60,9 @@ public final class PyramidOptionHandler extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - if (node instanceof GameObject) { + if (node instanceof Scenery) { Location destination = EMPTY_ROOM; - GameObject object = (GameObject) node; + Scenery object = (Scenery) node; boolean willBePushed = (RandomFunction.random(10) > 3); if (object.getId() == 16458 || object.getId() == 16459) { ClimbActionHandler.climb(player, ClimbActionHandler.CLIMB_UP, Location.create(3288, 2801, 0)); 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 2abc09a1a..201516f32 100644 --- a/Server/src/main/java/core/game/content/activity/stronghold/StrongHoldSecurityPlugin.java +++ b/Server/src/main/java/core/game/content/activity/stronghold/StrongHoldSecurityPlugin.java @@ -15,7 +15,7 @@ import core.game.node.entity.Entity; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -149,7 +149,7 @@ public final class StrongHoldSecurityPlugin extends MapZone implements Plugin { * Sends the jail-plague interface. * @param player The {@code Player} instance. */ - public void read(Player player, GameObject object) { + public void read(Player player, Scenery object) { int x = object.getLocation().getX(); int y = object.getLocation().getY(); int rotationX = x; 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 a2dadc3e6..f0fba5361 100644 --- a/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightCavesPlugin.java +++ b/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightCavesPlugin.java @@ -12,7 +12,7 @@ import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.slayer.Tasks; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import core.game.world.map.Location; import core.game.world.map.build.DynamicRegion; @@ -268,7 +268,7 @@ public final class TzhaarFightCavesPlugin extends ActivityPlugin { @Override public boolean interact(Entity e, Node target, Option option) { - if (target instanceof GameObject && ((GameObject) target).getId() == 9357) { + if (target instanceof Scenery && ((Scenery) target).getId() == 9357) { leave((Player) e, e.getAttribute("fc_wave", 0)); player.removeAttribute("fc_wave"); player.removeAttribute("fc_offset"); 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 8d3918eb5..07f671b52 100644 --- a/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightPitsPlugin.java +++ b/Server/src/main/java/core/game/content/activity/tzhaar/TzhaarFightPitsPlugin.java @@ -22,7 +22,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -245,8 +245,8 @@ public final class TzhaarFightPitsPlugin extends ActivityPlugin { @Override public boolean interact(Entity e, Node target, Option option) { - if (target instanceof GameObject) { - GameObject o = (GameObject) target; + if (target instanceof Scenery) { + Scenery o = (Scenery) target; if (o.getId() == 9369) { ForceMovement.run(e, Location.create(2399, 5175, 0), Location.create(2399, 5177, 0)); return true; 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 65b558646..6f871b667 100644 --- a/Server/src/main/java/core/game/content/activity/wguild/WarriorsGuild.java +++ b/Server/src/main/java/core/game/content/activity/wguild/WarriorsGuild.java @@ -10,7 +10,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Plugin; import core.plugin.Initializable; @@ -45,12 +45,12 @@ public final class WarriorsGuild extends OptionHandler { case 15653: case 1530: if (node.getId() == 1530 && !node.getLocation().equals(new Location(2837, 3549, 0))) { - DoorActionHandler.handleDoor(player, (GameObject) node); + DoorActionHandler.handleDoor(player, (Scenery) node); return true; } if (canEnter(player)) { player.getMusicPlayer().unlock(634); - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); } else { player.getDialogueInterpreter().sendDialogues(4285, null, "You not pass. You too weedy."); } 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 201b68f71..64399996a 100644 --- a/Server/src/main/java/core/game/content/activity/wguild/animator/AnimationRoom.java +++ b/Server/src/main/java/core/game/content/activity/wguild/animator/AnimationRoom.java @@ -7,7 +7,7 @@ import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.ItemLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; @@ -110,7 +110,7 @@ public final class AnimationRoom extends MapZone implements Plugin { * @param object The animator. * @param set The set to animate. */ - private void animateArmour(final Player player, final GameObject object, final ArmourSet set) { + private void animateArmour(final Player player, final Scenery object, final ArmourSet set) { if (!player.getInventory().containItems(set.getPieces())) { player.getDialogueInterpreter().sendDialogue("You need a plate body, playe legs and full helm of the same type to", "activate the armour animator."); return; @@ -181,7 +181,7 @@ public final class AnimationRoom extends MapZone implements Plugin { } } } - animateArmour(event.getPlayer(), (GameObject) event.getUsedWith(), set); + animateArmour(event.getPlayer(), (Scenery) event.getUsedWith(), set); return true; } 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 bdb350fb7..7ec7414ef 100644 --- a/Server/src/main/java/core/game/content/activity/wguild/barrel/BarrelRoom.java +++ b/Server/src/main/java/core/game/content/activity/wguild/barrel/BarrelRoom.java @@ -13,7 +13,7 @@ import core.game.node.entity.combat.ImpactHandler.HitsplatType; import core.game.node.entity.lock.Lock; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.zone.MapZone; @@ -126,7 +126,7 @@ public final class BarrelRoom extends MapZone implements Plugin { player.getAppearance().setStandAnimation(4179); player.getAppearance().sync(); player.setAttribute("barrel_count", barrelId); - ((GameObject) node).setChildIndex(player, 1); + ((Scenery) node).setChildIndex(player, 1); if (!players.contains(player)) { player.getWalkingQueue().setRunDisabled(true); players.add(player); 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 22bfa6110..e8d9945b7 100644 --- a/Server/src/main/java/core/game/content/activity/wguild/catapult/CatapultRoom.java +++ b/Server/src/main/java/core/game/content/activity/wguild/catapult/CatapultRoom.java @@ -19,8 +19,8 @@ import core.game.node.entity.impl.Projectile; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -143,8 +143,8 @@ public final class CatapultRoom extends MapZone implements Plugin { } }); Projectile.create(Location.create(2842, 3554, 1), Location.create(2842, 3545, 1), attack.graphicId, 70, 32, 80, 220, 20, 11).send(); - GameObject object = RegionManager.getObject(Location.create(2840, 3552, 1)); - ObjectBuilder.replace(object, object.transform(attack.objectId), 4); + Scenery object = RegionManager.getObject(Location.create(2840, 3552, 1)); + SceneryBuilder.replace(object, object.transform(attack.objectId), 4); Audio sound = new Audio(1911); for (Player p : players) { p.getAudioManager().send(sound); 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 ff5eee50a..a267a21c0 100644 --- a/Server/src/main/java/core/game/content/activity/wguild/cyclopes/CyclopesRoom.java +++ b/Server/src/main/java/core/game/content/activity/wguild/cyclopes/CyclopesRoom.java @@ -17,7 +17,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -68,7 +68,7 @@ public final class CyclopesRoom extends MapZone implements Plugin { Pathfinder.find(p.getLocation(), Location.create(2847, 3541, 2)).walk(p); p.lock(50); } else { - GameObject object = RegionManager.getObject(2, 2847, 3541); + Scenery object = RegionManager.getObject(2, 2847, 3541); if (object != null && p.getLocation().getX() == 2847 && p.getLocation().getY() == 3541) { DoorActionHandler.handleAutowalkDoor(p, object); leave(p); @@ -161,7 +161,7 @@ public final class CyclopesRoom extends MapZone implements Plugin { leave(player); PLAYERS.remove(player); } - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } 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 a44fe7e78..6588c4a99 100644 --- a/Server/src/main/java/core/game/content/activity/wguild/dummy/DummyRoom.java +++ b/Server/src/main/java/core/game/content/activity/wguild/dummy/DummyRoom.java @@ -8,8 +8,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.combat.equipment.WeaponInterface; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -32,12 +32,12 @@ public final class DummyRoom extends OptionHandler { * @author Emperor */ private static enum Dummy { - STAB(new GameObject(15629, 2857, 3549, 0, 10, 2), -1, WeaponInterface.BONUS_STAB), SLASH(new GameObject(15625, 2858, 3554, 0), -1, WeaponInterface.BONUS_SLASH), CRUSH(new GameObject(15628, 2859, 3549, 0, 10, 2), -1, WeaponInterface.BONUS_CRUSH), CONTROLLED(new GameObject(15627, 2855, 3552, 0, 10, 3), WeaponInterface.STYLE_CONTROLLED, -1), DEFENCE(new GameObject(15630, 2855, 3550, 0, 10, 3), WeaponInterface.STYLE_DEFENSIVE, -1), AGGRESSIVE(new GameObject(15626, 2860, 3553, 0, 10, 1), WeaponInterface.STYLE_AGGRESSIVE, -1), ACCURATE(new GameObject(15624, 2856, 3554, 0), WeaponInterface.STYLE_ACCURATE, -1), ; + STAB(new Scenery(15629, 2857, 3549, 0, 10, 2), -1, WeaponInterface.BONUS_STAB), SLASH(new Scenery(15625, 2858, 3554, 0), -1, WeaponInterface.BONUS_SLASH), CRUSH(new Scenery(15628, 2859, 3549, 0, 10, 2), -1, WeaponInterface.BONUS_CRUSH), CONTROLLED(new Scenery(15627, 2855, 3552, 0, 10, 3), WeaponInterface.STYLE_CONTROLLED, -1), DEFENCE(new Scenery(15630, 2855, 3550, 0, 10, 3), WeaponInterface.STYLE_DEFENSIVE, -1), AGGRESSIVE(new Scenery(15626, 2860, 3553, 0, 10, 1), WeaponInterface.STYLE_AGGRESSIVE, -1), ACCURATE(new Scenery(15624, 2856, 3554, 0), WeaponInterface.STYLE_ACCURATE, -1), ; /** * The object. */ - private final GameObject object; + private final Scenery object; /** * The attack style to be used on this dummy. @@ -54,7 +54,7 @@ public final class DummyRoom extends OptionHandler { * @param object The object. * @param attackStyle The attack style. */ - private Dummy(GameObject object, int attackStyle, int bonusType) { + private Dummy(Scenery object, int attackStyle, int bonusType) { this.object = object; this.attackStyle = attackStyle; this.bonusType = bonusType; @@ -64,7 +64,7 @@ public final class DummyRoom extends OptionHandler { * Gets the object. * @return The object. */ - public GameObject getObject() { + public Scenery getObject() { return object; } @@ -103,7 +103,7 @@ public final class DummyRoom extends OptionHandler { } GameWorld.getPulser().submit(new Pulse(10) { boolean activeDummy; - GameObject controlled; + Scenery controlled; @Override public boolean pulse() { @@ -111,12 +111,12 @@ public final class DummyRoom extends OptionHandler { setDelay(10); timeStamp = GameWorld.getTicks(); dummy = RandomFunction.getRandomElement(Dummy.values()); - ObjectBuilder.replace(RegionManager.getObject(dummy.getObject().getLocation()), dummy.getObject(), 11); + SceneryBuilder.replace(RegionManager.getObject(dummy.getObject().getLocation()), dummy.getObject(), 11); activeDummy = true; if (dummy == Dummy.CONTROLLED && controlled == null) { Location l = Location.create(2860, 3551, 0); - controlled = new GameObject(dummy.getObject().getId(), l, 10, 1); - ObjectBuilder.replace(RegionManager.getObject(l), controlled, 11); + controlled = new Scenery(dummy.getObject().getId(), l, 10, 1); + SceneryBuilder.replace(RegionManager.getObject(l), controlled, 11); } return false; } @@ -139,7 +139,7 @@ public final class DummyRoom extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - GameObject object = (GameObject) node; + Scenery object = (Scenery) node; if (object.getId() == 15656) { player.getInterfaceManager().open(new Component(412)); return true; 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 bd5077697..becbf9610 100644 --- a/Server/src/main/java/core/game/content/activity/wguild/shot/ShotPutRoom.java +++ b/Server/src/main/java/core/game/content/activity/wguild/shot/ShotPutRoom.java @@ -16,7 +16,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -65,7 +65,7 @@ public final class ShotPutRoom extends DialoguePlugin { @Override public Location getDestination(Node n, Node node) { - if (node instanceof GameObject) { + if (node instanceof Scenery) { return node.getLocation().transform(0, -1, 0); } return null; 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 3c9d270a7..2a07b37a6 100644 --- a/Server/src/main/java/core/game/content/cutscene/DBRCutscenePlugin.java +++ b/Server/src/main/java/core/game/content/cutscene/DBRCutscenePlugin.java @@ -19,8 +19,8 @@ import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; import core.game.node.item.ItemPlugin; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; @@ -602,8 +602,8 @@ public final class DBRCutscenePlugin extends CutscenePlugin { castShock(base.transform(16, 46, 0)); break; case 55: - GameObject wall = RegionManager.getObject(base.transform(16, 46, 0)); - ObjectBuilder.replace(wall, wall.transform(9151, 0, 10)); + Scenery wall = RegionManager.getObject(base.transform(16, 46, 0)); + SceneryBuilder.replace(wall, wall.transform(9151, 0, 10)); getWiseOldMan().getWalkingQueue().reset(); getWiseOldMan().getWalkingQueue().addPath(base.getX() + 16, base.getY() + 46); getWiseOldMan().getWalkingQueue().addPath(base.getX() + 17, base.getY() + 46); 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 41a997c8c..b1d6d9968 100644 --- a/Server/src/main/java/core/game/content/cutscene/JulietCutscenePlugin.java +++ b/Server/src/main/java/core/game/content/cutscene/JulietCutscenePlugin.java @@ -4,8 +4,8 @@ import core.game.content.activity.ActivityPlugin; import core.game.content.activity.CutscenePlugin; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.map.build.DynamicRegion; @@ -53,8 +53,8 @@ public final class JulietCutscenePlugin extends CutscenePlugin { npcs.add(juliet); npcs.add(NPC.create(3325, base.transform(29, 38, 1))); npcs.add(NPC.create(3324, base.transform(26, 41, 1))); - final GameObject door = RegionManager.getObject(getBase().transform(29, 41, 1)); - ObjectBuilder.remove(door); + final Scenery door = RegionManager.getObject(getBase().transform(29, 41, 1)); + SceneryBuilder.remove(door); for (NPC npc : npcs) { npc.init(); } 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 24c4018d5..2d3ae3774 100644 --- a/Server/src/main/java/core/game/content/cutscene/OrganCutScene.java +++ b/Server/src/main/java/core/game/content/cutscene/OrganCutScene.java @@ -4,8 +4,8 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.content.activity.ActivityPlugin; import core.game.content.activity.CutscenePlugin; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -43,10 +43,10 @@ public final class OrganCutScene extends CutscenePlugin { @Override public void open() { - final GameObject orgin = RegionManager.getObject(base.transform(43, 14, 0)); - final GameObject newOrgin = new GameObject(36979, base.transform(42, 14, 0)); - ObjectBuilder.remove(orgin); - ObjectBuilder.add(newOrgin); + final Scenery orgin = RegionManager.getObject(base.transform(43, 14, 0)); + final Scenery newOrgin = new Scenery(36979, base.transform(42, 14, 0)); + SceneryBuilder.remove(orgin); + SceneryBuilder.add(newOrgin); PacketRepository.send(CameraViewPacket.class, new CameraContext(player, CameraType.POSITION, player.getLocation().getX() + 2, player.getLocation().getY() - 7, 405, 1, 100)); PacketRepository.send(CameraViewPacket.class, new CameraContext(player, CameraType.ROTATION, player.getLocation().getX() + 1, player.getLocation().getY(), 405, 1, 100)); player.lock(); diff --git a/Server/src/main/java/core/game/content/dialogue/BorderGuardDialogue.java b/Server/src/main/java/core/game/content/dialogue/BorderGuardDialogue.java index 9dca1de15..3445632b1 100644 --- a/Server/src/main/java/core/game/content/dialogue/BorderGuardDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/BorderGuardDialogue.java @@ -4,7 +4,7 @@ import core.game.content.global.action.DoorActionHandler; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.game.world.map.RegionManager; @@ -28,9 +28,9 @@ public final class BorderGuardDialogue extends DialoguePlugin { private static final Item COINS = new Item(995, 10); /** - * Represents the door game object. + * Represents the door scenery. */ - private GameObject door; + private Scenery door; /** * Constructs a new {@code BorderGuardDialogue} {@code Object}. @@ -58,7 +58,7 @@ public final class BorderGuardDialogue extends DialoguePlugin { public boolean open(Object... args) { npc = (NPC) args[0]; if (args.length == 2) { - door = ((GameObject) args[1]); + door = ((Scenery) args[1]); } if (player.getLocation().equals(LOCATIONS[0]) || player.getLocation().equals(LOCATIONS[1]) || player.getLocation().equals(LOCATIONS[2])) { door = RegionManager.getObject(LOCATIONS[3]); diff --git a/Server/src/main/java/core/game/content/dialogue/DoorPerilDialogue.java b/Server/src/main/java/core/game/content/dialogue/DoorPerilDialogue.java index 2f15635ae..9c5d84581 100644 --- a/Server/src/main/java/core/game/content/dialogue/DoorPerilDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/DoorPerilDialogue.java @@ -4,7 +4,7 @@ import core.game.content.global.action.DoorActionHandler; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.plugin.Initializable; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; /** * Represents the door peril dialogue. @@ -15,9 +15,9 @@ import core.game.node.object.GameObject; public final class DoorPerilDialogue extends DialoguePlugin { /** - * Represents the game object door. + * Represents the scenery door. */ - private GameObject door; + private Scenery door; /** * Constructs a new {@code DoorPerilDialogue} {@code Object}. @@ -43,7 +43,7 @@ public final class DoorPerilDialogue extends DialoguePlugin { @Override public boolean open(Object... args) { - door = (GameObject) args[0]; + door = (Scenery) args[0]; Quest quest = player.getQuestRepository().getQuest("Priest in Peril"); if (quest.getStage(player) == 10) { interpreter.sendDialogue("You knock at the door...You hear a voice from inside.", "Who are you, and what do you want?"); diff --git a/Server/src/main/java/core/game/content/dialogue/EnchantTiaraDialogue.java b/Server/src/main/java/core/game/content/dialogue/EnchantTiaraDialogue.java index b7d937654..ebfbdaa44 100644 --- a/Server/src/main/java/core/game/content/dialogue/EnchantTiaraDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/EnchantTiaraDialogue.java @@ -7,7 +7,7 @@ import core.game.node.entity.skill.runecrafting.Talisman; import core.game.interaction.NodeUsageEvent; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.RunScript; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; /** * Represents the enchant tiara dialogue. @@ -52,7 +52,7 @@ public final class EnchantTiaraDialogue extends DialoguePlugin { @Override public boolean open(Object... args) { event = ((NodeUsageEvent) args[0]); - altar = Altar.forObject(((GameObject) event.getUsedWith())); + altar = Altar.forObject(((Scenery) event.getUsedWith())); if (!player.getInventory().containsItem(altar.getTalisman().getTalisman())) { player.getPacketDispatch().sendMessage("You don't have the required talisman."); return true; 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 c39690268..2d56d3da3 100644 --- a/Server/src/main/java/core/game/content/dialogue/IgnatiusVulcanDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/IgnatiusVulcanDialogue.java @@ -6,8 +6,8 @@ import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; @@ -187,8 +187,8 @@ public final class IgnatiusVulcanDialogue extends DialoguePlugin { npc.getWalkingQueue().reset(); npc.getAnimator().forceAnimation(ANIMATION); if (RegionManager.getObject(location) == null) { - final GameObject fire = new GameObject(2732, location); - ObjectBuilder.add(fire, RandomFunction.random(100, 130)); + final Scenery fire = new Scenery(2732, location); + SceneryBuilder.add(fire, RandomFunction.random(100, 130)); npc.faceLocation(fire.getLocation()); } } 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 99cae6a54..313253240 100644 --- a/Server/src/main/java/core/game/content/dialogue/MithrilSeedsDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/MithrilSeedsDialogue.java @@ -2,8 +2,8 @@ package core.game.content.dialogue; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; @@ -26,7 +26,7 @@ public final class MithrilSeedsDialogue extends DialoguePlugin { /** * Represents the flower object. */ - private GameObject flower; + private Scenery flower; /** * Constructs a new {@code MithrilSeedPluginDialogue}. @@ -51,7 +51,7 @@ public final class MithrilSeedsDialogue extends DialoguePlugin { @Override public boolean open(Object... args) { - flower = (GameObject) args[0]; + flower = (Scenery) args[0]; player.getDialogueInterpreter().sendOptions("Select an Option", "Pick the flowers.", "Leave the flowers."); return true; } @@ -73,7 +73,7 @@ public final class MithrilSeedsDialogue extends DialoguePlugin { player.getPacketDispatch().sendMessage("Not enough space in your inventory!"); return true; } - if (ObjectBuilder.remove(flower)) { + if (SceneryBuilder.remove(flower)) { player.getInventory().add(reward); player.getPacketDispatch().sendMessage("You pick the flowers."); } 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 198a5f2b3..53040f544 100644 --- a/Server/src/main/java/core/game/content/dialogue/MithrilSeedsPlugin.java +++ b/Server/src/main/java/core/game/content/dialogue/MithrilSeedsPlugin.java @@ -5,8 +5,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.RegionManager; @@ -61,7 +61,7 @@ public final class MithrilSeedsPlugin extends OptionHandler { } player.animate(ANIMATION); player.getInventory().remove(ITEM); - final GameObject object = ObjectBuilder.add(new GameObject(getFlower(RandomFunction.random(100) == 1 ? RARE : FLOWERS), player.getLocation()), 100); + final Scenery object = SceneryBuilder.add(new Scenery(getFlower(RandomFunction.random(100) == 1 ? RARE : FLOWERS), player.getLocation()), 100); player.moveStep(); player.lock(3); player.getPulseManager().run(new Pulse(1, player) { 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 f9376e348..4a0f7d4dc 100644 --- a/Server/src/main/java/core/game/content/dialogue/TraibornDialogue.java +++ b/Server/src/main/java/core/game/content/dialogue/TraibornDialogue.java @@ -4,8 +4,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -201,8 +201,8 @@ public class TraibornDialogue extends DialoguePlugin { stage = 386; break; case 386: - final GameObject object = new GameObject(17434, Location.create(3113, 3161, 1), 11, 1); - ObjectBuilder.add(object); + final Scenery object = new Scenery(17434, Location.create(3113, 3161, 1), 11, 1); + SceneryBuilder.add(object); npc.faceLocation(object.getLocation()); npc.animate(ANIMATION); if (!player.getInventory().containsItem(BONES)) { @@ -225,7 +225,7 @@ public class TraibornDialogue extends DialoguePlugin { npc.face(player); break; case 7: - ObjectBuilder.remove(object); + SceneryBuilder.remove(object); return true; } return false; 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 15d72570a..3221bbaee 100644 --- a/Server/src/main/java/core/game/content/global/GodType.java +++ b/Server/src/main/java/core/game/content/global/GodType.java @@ -5,7 +5,7 @@ import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -63,7 +63,7 @@ public enum GodType { * @param player the player. * @param statue the statue. */ - public void pray(final Player player, final GameObject statue) { + public void pray(final Player player, final Scenery statue) { if (hasAny(player)) { player.lock(3); player.animate(Animation.create(645)); 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 0f8ecbbe6..4a1309405 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 @@ -3,10 +3,9 @@ package core.game.content.global.action; import core.game.container.impl.EquipmentContainer; import org.rs09.consts.Items; import core.game.node.entity.player.link.diary.DiaryType; -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.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; @@ -42,7 +41,7 @@ public final class ClimbActionHandler { * @param object The rope object. * @param option The option. */ - public static void climbRope(Player player, GameObject object, String option) { + public static void climbRope(Player player, Scenery object, String option) { } @@ -53,7 +52,7 @@ public final class ClimbActionHandler { * @param object The trap door object. * @param option The option. */ - public static void climbTrapdoor(Player player, GameObject object, String option) { + public static void climbTrapdoor(Player player, Scenery object, String option) { } @@ -61,12 +60,12 @@ public final class ClimbActionHandler { * Handles the climbing of a ladder. * * @param player The player. - * @param startLadder The game object. + * @param startLadder The scenery. * @param option The option. * @return True if successfully climbed */ - public static boolean climbLadder(Player player, GameObject startLadder, String option) { - GameObject endLadder = null; + public static boolean climbLadder(Player player, Scenery startLadder, String option) { + Scenery endLadder = null; Animation animation = CLIMB_UP; if (startLadder.getName().startsWith("Stair")) { animation = null; @@ -88,8 +87,8 @@ public final class ClimbActionHandler { endLadder = getLadder(startLadder, true); break; case "climb": - GameObject upperLadder = getLadder(startLadder, false); - GameObject downLadder = getLadder(startLadder, true); + Scenery upperLadder = getLadder(startLadder, false); + Scenery downLadder = getLadder(startLadder, true); if (upperLadder == null && downLadder != null) { return climbLadder(player, startLadder, "climb-down"); } @@ -117,7 +116,7 @@ public final class ClimbActionHandler { * @param object The object to teleport to. * @return The teleport destination. */ - public static Location getDestination(GameObject object) { + public static Location getDestination(Scenery object) { int sizeX = object.getDefinition().sizeX; int sizeY = object.getDefinition().sizeY; if (object.getRotation() % 2 != 0) { @@ -149,7 +148,7 @@ public final class ClimbActionHandler { * @param dir The preferred direction from the object. * @return The teleporting destination. */ - private static Location getDestination(GameObject object, int sizeX, int sizeY, Direction dir, int count) { + private static Location getDestination(Scenery object, int sizeX, int sizeY, Direction dir, int count) { Location loc = object.getLocation(); if (dir.toInteger() % 2 != 0) { int x = dir.getStepX(); @@ -248,9 +247,9 @@ public final class ClimbActionHandler { * @param down If the player is going down a floor. * @return The ladder the current ladder object leads to. */ - private static GameObject getLadder(GameObject object, boolean down) { + private static Scenery getLadder(Scenery object, boolean down) { int mod = down ? -1 : 1; - GameObject ladder = RegionManager.getObject(object.getLocation().transform(0, 0, mod)); + Scenery ladder = RegionManager.getObject(object.getLocation().transform(0, 0, mod)); if (ladder == null || !isLadder(ladder)) { if (ladder != null && ladder.getName().equals(object.getName())) { ladder = RegionManager.getObject(ladder.getLocation().transform(0, 0, mod)); @@ -275,10 +274,10 @@ public final class ClimbActionHandler { * @param l The location. * @return The ladder. */ - private static GameObject findLadder(Location l) { + private static Scenery findLadder(Location l) { for (int x = -5; x < 6; x++) { for (int y = -5; y < 6; y++) { - GameObject object = RegionManager.getObject(l.transform(x, y, 0)); + Scenery object = RegionManager.getObject(l.transform(x, y, 0)); if (object != null && isLadder(object)) { return object; } @@ -293,7 +292,7 @@ public final class ClimbActionHandler { * @param object The object. * @return {@code True} if so. */ - private static boolean isLadder(GameObject object) { + private static boolean isLadder(Scenery object) { for (String option : object.getDefinition().getOptions()) { if (option != null && (option.contains("Climb"))) { return true; @@ -341,11 +340,11 @@ public final class ClimbActionHandler { /** * Represents the object to use. */ - private GameObject object; + private Scenery object; @Override public boolean open(Object... args) { - object = (GameObject) args[0]; + object = (Scenery) args[0]; interpreter.sendOptions("What would you like to do?", "Climb Up.", "Climb Down."); stage = 0; return true; 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 9d18ad8c5..9ee567418 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 @@ -6,8 +6,8 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.object.Constructed; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; @@ -38,14 +38,14 @@ public final class DoorActionHandler { * @param player The player. * @param object The object. */ - public static void handleDoor(final Player player, final GameObject object) { - final GameObject second = (object.getId() == 1530 || object.getId() == 1531) ? null : getSecondDoor(object, player); - GameObject o = null; + public static void handleDoor(final Player player, final Scenery object) { + final Scenery second = (object.getId() == 1530 || object.getId() == 1531) ? null : getSecondDoor(object, player); + Scenery o = null; if (object instanceof Constructed && (o = ((Constructed) object).getReplaced()) != null) { player.getAudioManager().send(new Audio(43)); - ObjectBuilder.replace(object, o); + SceneryBuilder.replace(object, o); if (second instanceof Constructed && (o = ((Constructed) second).getReplaced()) != null) { - ObjectBuilder.replace(second, o); + SceneryBuilder.replace(second, o); return; } return; @@ -63,7 +63,7 @@ public final class DoorActionHandler { int firstDir = (object.getRotation() + 3) % 4; Point p = getCloseRotation(object); Location firstLoc = object.getLocation().transform((int) p.getX(), (int) p.getY(), 0); - ObjectBuilder.replace(object, object.transform(d.getReplaceId(), firstDir, firstLoc)); + SceneryBuilder.replace(object, object.transform(d.getReplaceId(), firstDir, firstLoc)); return; } DoorConfigLoader.Door d = DoorConfigLoader.Companion.forId(object.getId()); @@ -91,11 +91,11 @@ public final class DoorActionHandler { * @param object The door object. * @return */ - public static boolean handleAutowalkDoor(final Entity entity, final GameObject object, final Location endLocation) { + public static boolean handleAutowalkDoor(final Entity entity, final Scenery object, final Location endLocation) { if (object.getCharge() == IN_USE_CHARGE) { return false; } - final GameObject second = (object.getId() == 3) ? null : getSecondDoor(object, entity); + final Scenery second = (object.getId() == 3) ? null : getSecondDoor(object, entity); entity.lock(4); final Location loc = entity.getLocation(); entity.addExtension(LogoutTask.class, new LocationLogoutTask(4, loc)); @@ -150,7 +150,7 @@ public final class DoorActionHandler { * @param entity the entity. * @param object the object. */ - public static boolean handleAutowalkDoor(final Entity entity, final GameObject object) { + public static boolean handleAutowalkDoor(final Entity entity, final Scenery object) { return handleAutowalkDoor(entity, object, getEndLocation(entity, object)); } @@ -161,10 +161,10 @@ public final class DoorActionHandler { * @param object the object. * @return the end location. */ - public static Location getEndLocation(Entity entity, GameObject object){ + public static Location getEndLocation(Entity entity, Scenery object){ return getEndLocation(entity,object,false); } - public static Location getEndLocation(Entity entity, GameObject object, Boolean isAutoWalk) { + public static Location getEndLocation(Entity entity, Scenery object, Boolean isAutoWalk) { Location l = object.getLocation(); Location end = DestinationFlag.OBJECT.getDestination(entity,object); switch (object.getRotation()) { @@ -198,11 +198,11 @@ public final class DoorActionHandler { * @param door The door. * @return The destination location. */ - public static Location getDestination(Entity entity, GameObject door) { + public static Location getDestination(Entity entity, Scenery door) { Location l = door.getLocation(); int rotation = door.getRotation(); if (door instanceof Constructed && door.getDefinition().hasAction("close")) { - GameObject o = ((Constructed) door).getReplaced(); + Scenery o = ((Constructed) door).getReplaced(); if (o != null) { l = o.getLocation(); rotation = o.getRotation(); @@ -272,7 +272,7 @@ public final class DoorActionHandler { * @param restoreTicks The amount of ticks before the door(s) should be * closed again. */ - public static void open(GameObject object, GameObject second, int replaceId, int secondReplaceId, boolean clip, int restoreTicks, boolean fence) { + public static void open(Scenery object, Scenery second, int replaceId, int secondReplaceId, boolean clip, int restoreTicks, boolean fence) { if(GameWorld.getSettings().getIncreased_door_time()){ restoreTicks *= 5; } @@ -287,7 +287,7 @@ public final class DoorActionHandler { firstDir = 3; firstLoc = firstLoc.transform(0, 1, 0); } - ObjectBuilder.replace(object, object.transform(replaceId, firstDir, firstLoc), restoreTicks, clip); + SceneryBuilder.replace(object, object.transform(replaceId, firstDir, firstLoc), restoreTicks, clip); return; } second = second.getWrapper(); @@ -310,8 +310,8 @@ public final class DoorActionHandler { secondDir = (secondDir + 2) % 4; } Location secondLoc = second.getLocation().transform((int) p.getX(), (int) p.getY(), 0); - ObjectBuilder.replace(object, object.transform(replaceId, firstDir, firstLoc), restoreTicks, clip); - ObjectBuilder.replace(second, second.transform(secondReplaceId, secondDir, secondLoc), restoreTicks, clip); + SceneryBuilder.replace(object, object.transform(replaceId, firstDir, firstLoc), restoreTicks, clip); + SceneryBuilder.replace(second, second.transform(secondReplaceId, secondDir, secondLoc), restoreTicks, clip); } /** @@ -325,7 +325,7 @@ public final class DoorActionHandler { * @param restoreTicks The amount of ticks before the door(s) should be * closed again. */ - private static void openFence(GameObject object, GameObject second, int replaceId, int secondReplaceId, boolean clip, int restoreTicks) { + private static void openFence(Scenery object, Scenery second, int replaceId, int secondReplaceId, boolean clip, int restoreTicks) { Direction offset = Direction.getDirection(second.getLocation().getX() - object.getLocation().getX(), second.getLocation().getY() - object.getLocation().getY()); int firstDir = (object.getRotation() + 3) % 4; Point p = getRotationPoint(object.getRotation()); @@ -347,21 +347,21 @@ public final class DoorActionHandler { if ((object.getId() == 36917 || object.getId() == 36919)) { switch (object.getDirection()) { case SOUTH: - ObjectBuilder.replace(object, object.transform(36919, firstDir, firstLoc), restoreTicks, true); - ObjectBuilder.replace(second, second.transform(36917, secondDir, secondLoc), restoreTicks, true); + SceneryBuilder.replace(object, object.transform(36919, firstDir, firstLoc), restoreTicks, true); + SceneryBuilder.replace(second, second.transform(36917, secondDir, secondLoc), restoreTicks, true); break; case EAST: - ObjectBuilder.replace(object, object.transform(36917, firstDir, firstLoc), restoreTicks, true); - ObjectBuilder.replace(second, second.transform(36919, secondDir, secondLoc), restoreTicks, true); + SceneryBuilder.replace(object, object.transform(36917, firstDir, firstLoc), restoreTicks, true); + SceneryBuilder.replace(second, second.transform(36919, secondDir, secondLoc), restoreTicks, true); break; default: - ObjectBuilder.replace(object, object.transform(36919, firstDir, firstLoc), restoreTicks, true); - ObjectBuilder.replace(second, second.transform(36917, secondDir, secondLoc), restoreTicks, true); + SceneryBuilder.replace(object, object.transform(36919, firstDir, firstLoc), restoreTicks, true); + SceneryBuilder.replace(second, second.transform(36917, secondDir, secondLoc), restoreTicks, true); break; } } else { - ObjectBuilder.replace(object, object.transform(replaceId, firstDir, firstLoc), restoreTicks, clip); - ObjectBuilder.replace(second, second.transform(secondReplaceId, secondDir, secondLoc), restoreTicks, clip); + SceneryBuilder.replace(object, object.transform(replaceId, firstDir, firstLoc), restoreTicks, clip); + SceneryBuilder.replace(second, second.transform(secondReplaceId, secondDir, secondLoc), restoreTicks, clip); } } @@ -373,8 +373,8 @@ public final class DoorActionHandler { * @param secondReplaceId The second replace id. * closed again. */ - public static boolean autowalkFence(final Entity entity, final GameObject object, final int replaceId, final int secondReplaceId) { - final GameObject second = getSecondDoor(object, entity); + public static boolean autowalkFence(final Entity entity, final Scenery object, final int replaceId, final int secondReplaceId) { + final Scenery second = getSecondDoor(object, entity); if (object.getCharge() == IN_USE_CHARGE || second == null) { return false; } @@ -412,7 +412,7 @@ public final class DoorActionHandler { * @param object The object. * @return The point. */ - private static Point getCloseRotation(GameObject object) { + private static Point getCloseRotation(Scenery object) { switch (object.getRotation()) { case 0: return new Point(0, 1); @@ -451,10 +451,10 @@ public final class DoorActionHandler { * @param object The door. * @return The second door, if any, {@code null} if no second door existed. */ - public static GameObject getSecondDoor(GameObject object, Entity entity) { + public static Scenery getSecondDoor(Scenery object, Entity entity) { Location l = object.getLocation(); Player player = entity instanceof Player ? (Player) entity : null; - GameObject o = null; + Scenery o = null; if ((o = RegionManager.getObject(l.transform(-1, 0, 0))) != null && o.getName().equals(object.getName())) { return o; } @@ -479,7 +479,7 @@ public final class DoorActionHandler { * @return An int-array, with index 0 being first door rotation and index 1 * being second door rotation. */ - public static int[] getRotation(GameObject object, GameObject second, Point rp) { + public static int[] getRotation(Scenery object, Scenery second, Point rp) { if (second == null) { return new int[]{(object.getRotation() + 1) % 4}; } 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 94a8d6d51..042d302eb 100644 --- a/Server/src/main/java/core/game/content/holiday/christmas/ChristmasEvent.java +++ b/Server/src/main/java/core/game/content/holiday/christmas/ChristmasEvent.java @@ -30,8 +30,8 @@ import core.game.node.entity.player.link.TeleportManager.TeleportType; import core.game.node.entity.player.link.emote.Emotes; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -179,32 +179,32 @@ public class ChristmasEvent extends HolidayEvent { */ private void snow() { Location loc = null; - GameObject obj = null; + Scenery obj = null; for (Location location : HUBS) { for (int x = 2; x < 10; x++) { for (int y = 2; y < 10; y++) { loc = location.transform(x, y, 0); if (RegionManager.getObject(loc) == null && RegionManager.isTeleportPermitted(loc) && RandomFunction.random(3) == 1) { - obj = new GameObject(28296, loc); - ObjectBuilder.add(obj); + obj = new Scenery(28296, loc); + SceneryBuilder.add(obj); RegionManager.removeClippingFlag(0, loc.getX(), loc.getY(), false, 0x100); } loc = location.transform(-x, y, 0); if (RegionManager.getObject(loc) == null && RegionManager.isTeleportPermitted(loc) && RandomFunction.random(3) == 1) { - obj = new GameObject(28296, loc); - ObjectBuilder.add(obj); + obj = new Scenery(28296, loc); + SceneryBuilder.add(obj); RegionManager.removeClippingFlag(0, loc.getX(), loc.getY(), false, 0x100); } loc = location.transform(x, -y, 0); if (RegionManager.getObject(loc) == null && RegionManager.isTeleportPermitted(loc) && RandomFunction.random(3) == 1) { - obj = new GameObject(28296, loc); - ObjectBuilder.add(obj); + obj = new Scenery(28296, loc); + SceneryBuilder.add(obj); RegionManager.removeClippingFlag(0, loc.getX(), loc.getY(), false, 0x100); } loc = location.transform(-x, -y, 0); if (RegionManager.getObject(loc) == null && RegionManager.isTeleportPermitted(loc) && RandomFunction.random(3) == 1) { - obj = new GameObject(28296, loc); - ObjectBuilder.add(obj); + obj = new Scenery(28296, loc); + SceneryBuilder.add(obj); RegionManager.removeClippingFlag(0, loc.getX(), loc.getY(), false, 0x100); } } @@ -272,7 +272,7 @@ public class ChristmasEvent extends HolidayEvent { if (player.getInventory().remove(node.asItem())) { player.sendMessage("You start to build a snowman."); player.animate(Animation.create(7532)); - ObjectBuilder.add(new GameObject(28266, loc)); + SceneryBuilder.add(new Scenery(28266, loc)); } break; case "add-to": @@ -292,7 +292,7 @@ public class ChristmasEvent extends HolidayEvent { player.sendMessage("You add some snow to the snowman."); player.lock(1); player.animate(Animation.create(node.asObject().getId() <= 28278 ? 7532 : 7533)); - ObjectBuilder.replace(node.asObject(), node.asObject().transform(node.asObject().getId() + 1)); + SceneryBuilder.replace(node.asObject(), node.asObject().transform(node.asObject().getId() + 1)); if (node.asObject().getId() + 1 >= 28295) { if (player.getZoneMonitor().isInZone(getName())) { player.sendMessages("The snowman is almsot complete! Talk to a snow imp to get a hat or weapon to", "complete it."); @@ -433,7 +433,7 @@ public class ChristmasEvent extends HolidayEvent { id = 6748; } final int npcId = id; - ObjectBuilder.remove(event.getUsedWith().asObject()); + SceneryBuilder.remove(event.getUsedWith().asObject()); final NPC snowman = NPC.create(npcId, event.getUsedWith().getLocation()); snowman.init(); snowman.faceTemporary(player, 2); 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 4c66e3b41..bf2b446b7 100644 --- a/Server/src/main/java/core/game/content/holiday/halloween/DeathMansionEvent.java +++ b/Server/src/main/java/core/game/content/holiday/halloween/DeathMansionEvent.java @@ -33,7 +33,7 @@ import core.game.node.entity.player.link.emote.Emotes; import core.game.node.entity.player.link.request.RequestType; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; @@ -180,11 +180,11 @@ public class DeathMansionEvent extends HolidayEvent { cleanItems(player, GrimItem.getItems()); cleanItems(player, new Item[] { DIARY, SERVANT_SKULL }); } else { - List objs = player.getAttribute("objs", null); + List objs = player.getAttribute("objs", null); if (objs == null) { - objs = new ArrayList(); + objs = new ArrayList(); } - for (GameObject o : objs) { + for (Scenery o : objs) { if (RegionManager.getLocalEntitys(o.getLocation(), 1).size() != 0) { continue; } @@ -427,13 +427,13 @@ public class DeathMansionEvent extends HolidayEvent { if (entity instanceof Player) { final Player p = entity.asPlayer(); Location loc = p.getLocation(); - List objs = p.getAttribute("objs", null); + List objs = p.getAttribute("objs", null); if (objs == null) { - objs = new ArrayList(); + objs = new ArrayList(); } for (int i = 0; i < 1; i++) { for (Direction direction : Direction.values()) { - GameObject o = RegionManager.getObject(loc.transform(direction, 1)); + Scenery o = RegionManager.getObject(loc.transform(direction, 1)); if (o != null && o.getId() == 27241) { objs.add(o); p.setAttribute("objs", objs); @@ -441,7 +441,7 @@ public class DeathMansionEvent extends HolidayEvent { } } } - for (GameObject o : objs) { + for (Scenery o : objs) { if (RegionManager.getLocalEntitys(o.getLocation(), 1).size() != 0) { continue; } @@ -450,7 +450,7 @@ public class DeathMansionEvent extends HolidayEvent { } } if (loc.getX() >= 1630 && loc.getX() <= 1646 && loc.getY() >= 4844 && loc.getY() <= 4852) { - final GameObject object = RegionManager.getObject(entity.getLocation()); + final Scenery object = RegionManager.getObject(entity.getLocation()); if (object != null && object.getId() == 27240) { p.getWalkingQueue().reset(); p.getLocks().lock(); @@ -503,7 +503,7 @@ public class DeathMansionEvent extends HolidayEvent { * @param player the player. * @param target the target. */ - private void handlePassageWay(final Player player, final GameObject target) { + private void handlePassageWay(final Player player, final Scenery target) { int stage = getStage(player); if (stage < 1 || stage < 4 && target.getLocation().getX() == 1694) { electrocute(player, target); @@ -554,7 +554,7 @@ public class DeathMansionEvent extends HolidayEvent { * @param player the player. * @param object the object. */ - private void passSpiderWeb(Player player, GameObject object) { + private void passSpiderWeb(Player player, Scenery object) { int webIndex = player.getAttribute("webIndex", -1); if (webIndex == -1) { player.setAttribute("/save:webIndex", (webIndex = RandomFunction.random(WEB_PATHS.length))); @@ -593,7 +593,7 @@ public class DeathMansionEvent extends HolidayEvent { * @param player the player. * @param object the object. */ - private void electrocute(final Player player, GameObject object) { + private void electrocute(final Player player, Scenery object) { player.lock(4); player.animate(Animation.create(7299)); player.graphics(Graphics.create(281)); @@ -610,8 +610,8 @@ public class DeathMansionEvent extends HolidayEvent { y = -1; y2 = 1; } - GameObject first = RegionManager.getObject(object.getLocation().transform(x, y, 0)); - GameObject second = RegionManager.getObject(object.getLocation().transform(x2, y2, 0)); + Scenery first = RegionManager.getObject(object.getLocation().transform(x, y, 0)); + Scenery second = RegionManager.getObject(object.getLocation().transform(x2, y2, 0)); if (first != null && second != null) { player.getPacketDispatch().sendObjectAnimation(first, Animation.create(7285)); player.getPacketDispatch().sendObjectAnimation(second, Animation.create(7285)); @@ -807,7 +807,7 @@ public class DeathMansionEvent extends HolidayEvent { * @param player the player. * @param object the object. */ - public void search(Player player, GameObject object) { + public void search(Player player, Scenery object) { if (!player.getInventory().hasSpaceFor(item)) { player.sendMessage("You don't have enough inventory space."); return; @@ -827,7 +827,7 @@ public class DeathMansionEvent extends HolidayEvent { * @param player the player. * @param object the object. */ - public void useWithEvent(Player player, GameObject object) { + public void useWithEvent(Player player, Scenery object) { if (hasGrimItem(player, this)) { player.getDialogueInterpreter().sendDialogue("You have already returned this item to it's proper", "spot in the mansion."); return; diff --git a/Server/src/main/java/core/game/content/quest/PluginInteractionManager.java b/Server/src/main/java/core/game/content/quest/PluginInteractionManager.java index 7ee3c45bd..92c23ab8c 100644 --- a/Server/src/main/java/core/game/content/quest/PluginInteractionManager.java +++ b/Server/src/main/java/core/game/content/quest/PluginInteractionManager.java @@ -5,7 +5,7 @@ import core.game.interaction.Option; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import java.util.HashMap; @@ -40,7 +40,7 @@ public class PluginInteractionManager { } } - public static boolean handle(Player player, GameObject object){ + public static boolean handle(Player player, Scenery object){ PluginInteraction i = objectInteractions.get(object.getId()); if(i == null) { return false; diff --git a/Server/src/main/java/core/game/content/quest/free/ImpCatcher.java b/Server/src/main/java/core/game/content/quest/free/ImpCatcher.java index 1b96745c9..f84846c1f 100644 --- a/Server/src/main/java/core/game/content/quest/free/ImpCatcher.java +++ b/Server/src/main/java/core/game/content/quest/free/ImpCatcher.java @@ -5,8 +5,8 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.plugin.Initializable; import core.game.world.map.RegionManager; @@ -112,9 +112,9 @@ public class ImpCatcher extends Quest { player.getPacketDispatch().sendItemZoomOnInterface(AMULET.getId(), 230, 277, 3 + 2); player.getSkills().addExperience(Skills.MAGIC, 875); // 16170 - GameObject table = RegionManager.getObject(Location.create(3102, 3163, 2)); + Scenery table = RegionManager.getObject(Location.create(3102, 3163, 2)); if (table.getId() != 16170) { - ObjectBuilder.replace(table, table.transform(16170), 80); + SceneryBuilder.replace(table, table.transform(16170), 80); } if (!player.getInventory().add(AMULET)) { GroundItemManager.create(AMULET, player.getLocation(), player); 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 042dafa9b..a07c9fe25 100644 --- a/Server/src/main/java/core/game/content/quest/free/blackknightsfortress/BKFortressPlugin.java +++ b/Server/src/main/java/core/game/content/quest/free/blackknightsfortress/BKFortressPlugin.java @@ -8,7 +8,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -66,8 +66,8 @@ public final class BKFortressPlugin extends OptionHandler { @Override public boolean handle(final Player player, Node node, String option) { - final int id = node instanceof Item ? ((Item) node).getId() : ((GameObject) node).getId(); - GameObject object = node instanceof GameObject ? ((GameObject) node) : null; + final int id = node instanceof Item ? ((Item) node).getId() : ((Scenery) node).getId(); + Scenery object = node instanceof Scenery ? ((Scenery) node) : null; Location dest = null; switch (id) { case 2342:// listen at grill. @@ -88,7 +88,7 @@ public final class BKFortressPlugin extends OptionHandler { if (dest != null) { ClimbActionHandler.climb(player, new Animation(828), dest); } else { - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); } break; case 17149: @@ -106,7 +106,7 @@ public final class BKFortressPlugin extends OptionHandler { if (dest != null) { ClimbActionHandler.climb(player, new Animation(828), dest); } else { - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); } break; case 17148: @@ -120,16 +120,16 @@ public final class BKFortressPlugin extends OptionHandler { if (dest != null) { ClimbActionHandler.climb(player, new Animation(828), dest); } else { - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); } break; case 2341: player.getPacketDispatch().sendMessage("You push against the wall. You find a secret passage."); - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; case 2338: if (player.getLocation().getX() > 3019) { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } player.getDialogueInterpreter().open(4605, Repository.findNPC(4605), true, true); @@ -138,7 +138,7 @@ public final class BKFortressPlugin extends OptionHandler { if (!player.getEquipment().containsAtLeastOneItem(1139) || !player.getEquipment().containsAtLeastOneItem(1101)) { player.getDialogueInterpreter().open(4605, Repository.findNPC(4604), true); } else { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); } break; case 74: 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 f6957b8d9..d088f8640 100644 --- a/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayerCutscene.java +++ b/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayerCutscene.java @@ -13,8 +13,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.SpellBookManager.SpellBook; import core.game.node.entity.player.link.quest.Quest; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -55,7 +55,7 @@ public final class DemonSlayerCutscene extends CutscenePlugin { /** * Represents the stone table. */ - public GameObject stoneTable; + public Scenery stoneTable; /** * Represents the delrith npc. @@ -498,8 +498,8 @@ public final class DemonSlayerCutscene extends CutscenePlugin { break; case 1: player.getProperties().setTeleportLocation(cutscene.getBase().transform(28, 35, 0)); - cutscene.stoneTable = new GameObject(17437, cutscene.getBase().transform(27, 41, 0)); - ObjectBuilder.add(cutscene.stoneTable); + cutscene.stoneTable = new Scenery(17437, cutscene.getBase().transform(27, 41, 0)); + SceneryBuilder.add(cutscene.stoneTable); PacketRepository.send(CameraViewPacket.class, new CameraContext(player, CameraType.POSITION, player.getLocation().getX() - 1, player.getLocation().getY() + 2, 380, 1, 98)); PacketRepository.send(CameraViewPacket.class, new CameraContext(player, CameraType.ROTATION, player.getLocation().getX() + 19, player.getLocation().getY() - 55, 380, 1, 98)); interpreter.sendPlainMessage(true, "The wizards cast an evil spell..."); @@ -519,7 +519,7 @@ public final class DemonSlayerCutscene extends CutscenePlugin { PacketRepository.send(CameraViewPacket.class, new CameraContext(player, CameraType.POSITION, player.getLocation().getX() - 1, player.getLocation().getY() - 3, 390, 1, 100)); PacketRepository.send(CameraViewPacket.class, new CameraContext(player, CameraType.ROTATION, player.getLocation().getX() + 30, player.getLocation().getY() - 55, 390, 1, 100)); player.getConfigManager().set(222, 14194946, true); - ObjectBuilder.replace(cutscene.stoneTable, cutscene.stoneTable.transform(17438)); + SceneryBuilder.replace(cutscene.stoneTable, cutscene.stoneTable.transform(17438)); npc("Ha ha ha! At last you are free, my demonic brother!", "Rest now, and then have your revenge on this pitiful", "city!"); stage = 2; return true; diff --git a/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayerPlugin.java b/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayerPlugin.java index d23e7a767..2ed331ab5 100644 --- a/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayerPlugin.java +++ b/Server/src/main/java/core/game/content/quest/free/demonslayer/DemonSlayerPlugin.java @@ -9,8 +9,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; @@ -47,7 +47,7 @@ public final class DemonSlayerPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { final Quest quest = player.getQuestRepository().getQuest("Demon Slayer"); - final int id = node instanceof GameObject ? ((GameObject) node).getId() : node instanceof Item ? ((Item) node).getId() : ((NPC) node).getId(); + final int id = node instanceof Scenery ? ((Scenery) node).getId() : node instanceof Item ? ((Item) node).getId() : ((NPC) node).getId(); switch (id) { case 880: player.getDialogueInterpreter().open(8427322); @@ -70,7 +70,7 @@ public final class DemonSlayerPlugin extends OptionHandler { } return true; case 881: - ObjectBuilder.replace(((GameObject) node), ((GameObject) node).transform(882)); + SceneryBuilder.replace(((Scenery) node), ((Scenery) node).transform(882)); break; case 882: switch (option) { @@ -78,11 +78,11 @@ public final class DemonSlayerPlugin extends OptionHandler { if (node.getLocation().equals(new Location(3237, 3458, 0))) { ClimbActionHandler.climb(player, new Animation(828), SEWER_LOCATION); } else { - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); } break; case "close": - ObjectBuilder.replace(((GameObject) node), ((GameObject) node).transform(881)); + SceneryBuilder.replace(((Scenery) node), ((Scenery) node).transform(881)); break; } break; 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 74c41ef90..f742ca12e 100644 --- a/Server/src/main/java/core/game/content/quest/free/demonslayer/TraibornDialogue.java +++ b/Server/src/main/java/core/game/content/quest/free/demonslayer/TraibornDialogue.java @@ -6,8 +6,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -195,8 +195,8 @@ public class TraibornDialogue extends DialoguePlugin { stage = 386; break; case 386: - final GameObject object = new GameObject(17434, Location.create(3113, 3161, 1), 11, 1); - ObjectBuilder.add(object); + final Scenery object = new Scenery(17434, Location.create(3113, 3161, 1), 11, 1); + SceneryBuilder.add(object); npc.faceLocation(object.getLocation()); npc.animate(ANIMATION); if (!player.getInventory().containsItem(BONES[0]) && !player.getInventory().containsItem(BONES[1])) { @@ -219,7 +219,7 @@ public class TraibornDialogue extends DialoguePlugin { npc.face(player); break; case 7: - ObjectBuilder.remove(object); + SceneryBuilder.remove(object); return true; } return false; 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 e10ed83be..d8f8d89fa 100644 --- a/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayer.java +++ b/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayer.java @@ -6,7 +6,7 @@ import core.game.node.entity.player.link.quest.Quest; import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.agility.AgilityHandler; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import core.game.world.map.Location; import core.game.world.map.RegionManager; @@ -324,7 +324,7 @@ public final class DragonSlayer extends Quest { return true; } player.getPacketDispatch().sendMessage("The door opens..."); - final GameObject object = RegionManager.getObject(new Location(3050, 9839, 0)); + final Scenery object = RegionManager.getObject(new Location(3050, 9839, 0)); player.faceLocation(object.getLocation()); player.getPacketDispatch().sendObjectAnimation(object, new Animation(6636)); GameWorld.getPulser().submit(new Pulse(1, player) { 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 a261d237c..a04b1685f 100644 --- a/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayerPlugin.java +++ b/Server/src/main/java/core/game/content/quest/free/dragonslayer/DragonSlayerPlugin.java @@ -15,8 +15,8 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; @@ -115,7 +115,7 @@ public final class DragonSlayerPlugin extends OptionHandler { @Override public boolean handle(final Player player, Node node, String option) { final Quest quest = player.getQuestRepository().getQuest("Dragon Slayer"); - final int id = node instanceof Item ? ((Item) node).getId() : node instanceof GameObject ? ((GameObject) node).getId() : ((NPC) node).getId(); + final int id = node instanceof Item ? ((Item) node).getId() : node instanceof Scenery ? ((Scenery) node).getId() : ((NPC) node).getId(); switch (id) { case 10560: ClimbActionHandler.climb(player, new Animation(828), Location.create(3191, 3355, 0)); @@ -127,7 +127,7 @@ public final class DragonSlayerPlugin extends OptionHandler { if (player.getLocation().withinDistance(Location.create(2939, 9656, 0))) { ClimbActionHandler.climb(player, new Animation(828), Location.create(2939, 3256, 0)); } else { - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); return true; } break; @@ -135,7 +135,7 @@ public final class DragonSlayerPlugin extends OptionHandler { if (player.getLocation().getDistance(Location.create(3188, 3358, 0)) < 3) { ClimbActionHandler.climb(player, new Animation(828), Location.create(3188, 3354, 1)); } else { - ClimbActionHandler.climbLadder(player, (GameObject) node, "climb-up"); + ClimbActionHandler.climbLadder(player, (Scenery) node, "climb-up"); } break; case 1127: @@ -206,7 +206,7 @@ public final class DragonSlayerPlugin extends OptionHandler { } player.getAchievementDiaryManager().finishTask(player, DiaryType.KARAMJA, 1, 1); player.getSavedData().getQuestData().setDragonSlayerAttribute("memorized", true); - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); } break; case 25154: @@ -310,7 +310,7 @@ public final class DragonSlayerPlugin extends OptionHandler { switch (id) { case 2603: player.getPacketDispatch().sendMessage("You open the chest."); - ObjectBuilder.replace(((GameObject) node), ((GameObject) node).transform(2604)); + SceneryBuilder.replace(((Scenery) node), ((Scenery) node).transform(2604)); break; case 2605: ClimbActionHandler.climb(player, new Animation(827), Location.create(2933, 9640, 0)); @@ -329,7 +329,7 @@ public final class DragonSlayerPlugin extends OptionHandler { break; case "close": player.getPacketDispatch().sendMessage("You shut the chest."); - ObjectBuilder.replace(((GameObject) node), ((GameObject) node).transform(2603)); + SceneryBuilder.replace(((Scenery) node), ((Scenery) node).transform(2603)); break; } break; @@ -339,7 +339,7 @@ public final class DragonSlayerPlugin extends OptionHandler { } else { player.getInventory().remove(DragonSlayer.GREEN_KEY); player.getPacketDispatch().sendMessage("The key disintegrates as it unlocks the door."); - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } break; @@ -349,7 +349,7 @@ public final class DragonSlayerPlugin extends OptionHandler { } else { player.getInventory().remove(DragonSlayer.PURPLE_KEY); player.getPacketDispatch().sendMessage("The key disintegrates as it unlocks the door."); - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } break; @@ -359,7 +359,7 @@ public final class DragonSlayerPlugin extends OptionHandler { } else { player.getInventory().remove(DragonSlayer.BLUE_KEY); player.getPacketDispatch().sendMessage("The key disintegrates as it unlocks the door."); - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } break; @@ -369,7 +369,7 @@ public final class DragonSlayerPlugin extends OptionHandler { } else { player.getInventory().remove(DragonSlayer.YELLOW_KEY); player.getPacketDispatch().sendMessage("The key disintegrates as it unlocks the door."); - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } break; @@ -378,20 +378,20 @@ public final class DragonSlayerPlugin extends OptionHandler { ClimbActionHandler.climb(player, new Animation(828), Location.create(2924, 3258, 0)); return true; } - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); return true; case 1747:// ladder with wrong spawn. if (player.getLocation().getDistance(new Location(2940, 3256, 1)) < 3) { ClimbActionHandler.climb(player, new Animation(828), Location.create(2940, 3256, 2)); return true; } - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); return true; case 25214:// trapdoor. player.getPacketDispatch().sendMessage("The trapdoor can only be opened from below."); break; case 25038:// melzar's maze trapdoor ladder - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); return true; case 1752: player.getPacketDispatch().sendMessage("The ladder is broken, I can't climb it."); @@ -405,7 +405,7 @@ public final class DragonSlayerPlugin extends OptionHandler { ClimbActionHandler.climb(player, new Animation(828), Location.create(2932, 3245, 1)); return true; } - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); return true; case 2596:// red door. if (!player.getInventory().containsItem(DragonSlayer.RED_KEY)) { @@ -413,7 +413,7 @@ public final class DragonSlayerPlugin extends OptionHandler { } else { player.getInventory().remove(DragonSlayer.RED_KEY); player.getPacketDispatch().sendMessage("The key disintegrates as it unlocks the door."); - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } break; @@ -423,33 +423,33 @@ public final class DragonSlayerPlugin extends OptionHandler { } else { player.getInventory().remove(DragonSlayer.ORANGE_KEY); player.getPacketDispatch().sendMessage("The key disintegrates as it unlocks the door."); - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } case 32968: case 2602: if (player.getLocation().equals(new Location(2931, 9640, 0))) { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } if (player.getLocation().equals(new Location(2927, 9649, 0))) { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } if (player.getLocation().equals(Location.create(2924, 9654, 0)) || player.getLocation().equals(Location.create(2938, 3252, 0))) { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } player.getPacketDispatch().sendMessage("The door is locked."); break; case 2595: if (player.getLocation().equals(Location.create(2940, 3248, 0))) { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } if (player.getInventory().containsItem(DragonSlayer.MAZE_KEY)) { player.getPacketDispatch().sendMessage("You use the key and the door opens."); - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } else { player.getPacketDispatch().sendMessage("This door is securely locked."); @@ -461,8 +461,8 @@ public final class DragonSlayerPlugin extends OptionHandler { @Override public Location getDestination(Node node, Node n) { - if (n instanceof GameObject) { - GameObject obj = (GameObject) n; + if (n instanceof Scenery) { + Scenery obj = (Scenery) n; if (obj.getId() == 25115) { if (node.getLocation().getX() <= 3049) { return Location.create(3049, 9840, 0); 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 7634903a0..631cc6f60 100644 --- a/Server/src/main/java/core/game/content/quest/free/dragonslayer/ElvargNPC.java +++ b/Server/src/main/java/core/game/content/quest/free/dragonslayer/ElvargNPC.java @@ -12,8 +12,8 @@ import core.game.node.entity.impl.Animator.Priority; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; @@ -82,8 +82,8 @@ public final class ElvargNPC extends AbstractNPC { @Override public void finalizeDeath(final Entity killer) { super.finalizeDeath(killer); - final GameObject object = new GameObject(25202, getLocation(), getRotation()); - ObjectBuilder.add(object); + final Scenery object = new Scenery(25202, getLocation(), getRotation()); + SceneryBuilder.add(object); killer.faceLocation(object.getCenterLocation()); killer.lock(); GameWorld.getPulser().submit(new Pulse(1) { @@ -96,14 +96,14 @@ public final class ElvargNPC extends AbstractNPC { killer.animate(ANIMATIONS[0]); } else if (counter == 4) { final Player player = ((Player) killer); - ObjectBuilder.replace(object, object.transform(25203)); + SceneryBuilder.replace(object, object.transform(25203)); if (!player.getInventory().add(DragonSlayer.ELVARG_HEAD)) { GroundItemManager.create(DragonSlayer.ELVARG_HEAD, player); } killer.animate(ANIMATIONS[1]); killer.unlock(); } else if (counter == 12) { - ObjectBuilder.remove(RegionManager.getObject(object.getLocation())); + SceneryBuilder.remove(RegionManager.getObject(object.getLocation())); return true; } return false; 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 eadb65ae0..0cff85767 100644 --- a/Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GoblinDiplomacyPlugin.java +++ b/Server/src/main/java/core/game/content/quest/free/goblindiplomacy/GoblinDiplomacyPlugin.java @@ -9,7 +9,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import rs09.game.world.GameWorld; import core.plugin.Plugin; import rs09.plugin.PluginManager; @@ -48,7 +48,7 @@ public final class GoblinDiplomacyPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - int id = node instanceof Item ? ((Item) node).getId() : ((GameObject) node).getId(); + int id = node instanceof Item ? ((Item) node).getId() : ((Scenery) node).getId(); switch (option) { case "wear": player.getPacketDispatch().sendMessage("That armour is to small for a human."); diff --git a/Server/src/main/java/core/game/content/quest/free/piratestreasure/PiratesTreasurePlugin.java b/Server/src/main/java/core/game/content/quest/free/piratestreasure/PiratesTreasurePlugin.java index 9c64e3d10..16b7addfd 100644 --- a/Server/src/main/java/core/game/content/quest/free/piratestreasure/PiratesTreasurePlugin.java +++ b/Server/src/main/java/core/game/content/quest/free/piratestreasure/PiratesTreasurePlugin.java @@ -12,7 +12,7 @@ import core.game.node.entity.player.link.HintIconManager; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Plugin; @@ -46,7 +46,7 @@ public final class PiratesTreasurePlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - int id = node instanceof GameObject ? ((GameObject) node).getId() : ((Item) node).getId(); + int id = node instanceof Scenery ? ((Scenery) node).getId() : ((Item) node).getId(); switch (id) { case 2079: switch (option) { 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 6af80172d..a1f17d99e 100644 --- a/Server/src/main/java/core/game/content/quest/free/princealirescue/PrinceAliRescuePlugin.java +++ b/Server/src/main/java/core/game/content/quest/free/princealirescue/PrinceAliRescuePlugin.java @@ -8,7 +8,7 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.plugin.Initializable; @@ -36,7 +36,7 @@ public class PrinceAliRescuePlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { final Quest quest = player.getQuestRepository().getQuest("Prince Ali Rescue"); - final int id = node instanceof GameObject ? ((GameObject) node).getId() : node instanceof NPC ? ((NPC) node).getId() : 0; + final int id = node instanceof Scenery ? ((Scenery) node).getId() : node instanceof NPC ? ((NPC) node).getId() : 0; switch (id) { case 925: player.getDialogueInterpreter().open(925, node); @@ -44,13 +44,13 @@ public class PrinceAliRescuePlugin extends OptionHandler { case 2881: switch (quest.getStage(player)) { case 60: - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); break; case 50: if (player.getAttribute("keli-gone", 0) > GameWorld.getTicks()) { if (player.getInventory().contains(2418, 1)) { player.getPacketDispatch().sendMessage("You unlock the door."); - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); } else { player.getPacketDispatch().sendMessage("The door is locked."); } 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 75ecbaabf..b9007794f 100644 --- a/Server/src/main/java/core/game/content/quest/free/shieldofarrav/ShieldArravPlugin.java +++ b/Server/src/main/java/core/game/content/quest/free/shieldofarrav/ShieldArravPlugin.java @@ -13,8 +13,8 @@ import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; @@ -60,7 +60,7 @@ public final class ShieldArravPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { final Quest quest = player.getQuestRepository().getQuest("Shield of Arrav"); - final int id = node instanceof GameObject ? ((GameObject) node).getId() : node instanceof Item ? ((Item) node).getId() : ((NPC) node).getId(); + final int id = node instanceof Scenery ? ((Scenery) node).getId() : node instanceof Item ? ((Item) node).getId() : ((NPC) node).getId(); switch (id) { case 769: player.getInterfaceManager().open(new Component(526)); @@ -75,7 +75,7 @@ public final class ShieldArravPlugin extends OptionHandler { player.getPacketDispatch().sendString("Attach this certificate to another.", 529, 2); break; case 2400: - ObjectBuilder.replace(((GameObject) node), ((GameObject) node).transform(2401)); + SceneryBuilder.replace(((Scenery) node), ((Scenery) node).transform(2401)); break; case 2401: switch (option) { @@ -92,7 +92,7 @@ public final class ShieldArravPlugin extends OptionHandler { } break; case "shut": - ObjectBuilder.replace(((GameObject) node), ((GameObject) node).transform(2400)); + SceneryBuilder.replace(((Scenery) node), ((Scenery) node).transform(2400)); break; } break; @@ -100,7 +100,7 @@ public final class ShieldArravPlugin extends OptionHandler { if (node.getLocation().getX() == 3188) { ClimbActionHandler.climb(player, new Animation(828), Location.create(3188, 3392, 1)); } else { - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); return true; } break; @@ -123,12 +123,12 @@ public final class ShieldArravPlugin extends OptionHandler { } break; case 2403: - ObjectBuilder.replace(((GameObject) node), ((GameObject) node).transform(2404)); + SceneryBuilder.replace(((Scenery) node), ((Scenery) node).transform(2404)); break; case 2404: switch (option) { case "close": - ObjectBuilder.replace(((GameObject) node), ((GameObject) node).transform(2403)); + SceneryBuilder.replace(((Scenery) node), ((Scenery) node).transform(2403)); break; case "search": if (quest.getStage(player) == 70 && ShieldofArrav.isPhoenix(player)) { @@ -161,7 +161,7 @@ public final class ShieldArravPlugin extends OptionHandler { player.getDialogueInterpreter().sendDialogue("This is the door to the weapon stash you were looking for. Maybe if", "you can find another adventurer who happens to be a member of the", "Phoenix Gang, they could help you."); return true; } else if (quest.getStage(player) == 60 && player.getInventory().containsItem(ShieldofArrav.KEY)) { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } if (quest.getStage(player) == 70 && player.getInventory().containsItem(ShieldofArrav.KEY)) { @@ -169,7 +169,7 @@ public final class ShieldArravPlugin extends OptionHandler { player.getPacketDispatch().sendMessage("You should get a replacement key from Straven to enter here."); return true; } else { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } } @@ -179,13 +179,13 @@ public final class ShieldArravPlugin extends OptionHandler { if (!ShieldofArrav.isBlackArm(player)) { player.getPacketDispatch().sendMessage("This door seems to be locked from the inside."); } else { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); } break; case 2397: if (ShieldofArrav.isPhoenix(player)) { player.getPacketDispatch().sendMessage("The door automatically opens for you."); - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } player.getPacketDispatch().sendMessage("The door is securely locked."); @@ -220,9 +220,9 @@ public final class ShieldArravPlugin extends OptionHandler { @Override public Location getDestination(Node n, Node node) { - if (node instanceof GameObject) { + if (node instanceof Scenery) { if (node.getName().toLowerCase().contains("door")) { - return DoorActionHandler.getDestination((Player) n, (GameObject) node); + return DoorActionHandler.getDestination((Player) n, (Scenery) node); } } return null; 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 6a327697c..e0e01904a 100644 --- a/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostPlugin.java +++ b/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostPlugin.java @@ -10,8 +10,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -75,8 +75,8 @@ public final class RestlessGhostPlugin extends OptionHandler { GHOST.init(); GHOST.setInvisible(true); } - final int id = ((GameObject) node).getId(); - final GameObject object = (GameObject) node; + final int id = ((Scenery) node).getId(); + final Scenery object = (Scenery) node; switch (option) { case "open": switch (id) { @@ -123,11 +123,11 @@ public final class RestlessGhostPlugin extends OptionHandler { * @param player the player. * @param object the object. */ - private void toggleCoffin(final Player player, final GameObject object) { + private void toggleCoffin(final Player player, final Scenery object) { final boolean open = object.getId() == 2145; player.lock(2); player.animate(open ? OPEN_ANIM : CLOSE_ANIM); - ObjectBuilder.replace(object, object.transform(open ? 15061 : 2145)); + SceneryBuilder.replace(object, object.transform(open ? 15061 : 2145)); player.getPacketDispatch().sendMessage("You " + (open ? "open" : "close") + " the coffin."); if (open && !player.getQuestRepository().isComplete(RestlessGhost.NAME)) { sendGhost(); @@ -156,7 +156,7 @@ public final class RestlessGhostPlugin extends OptionHandler { * @param player the player. * @param object the object. */ - private void searchAltar(final Player player, final GameObject object) { + private void searchAltar(final Player player, final Scenery object) { final boolean hasSkull = object.getId() == 15051; if (player.getQuestRepository().getQuest(RestlessGhost.NAME).getStage(player) != 30) { player.getPacketDispatch().sendMessage("You search the altar and find nothing."); diff --git a/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostSkull.java b/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostSkull.java index 581dc86e2..e5174002e 100644 --- a/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostSkull.java +++ b/Server/src/main/java/core/game/content/quest/free/therestlessghost/RestlessGhostSkull.java @@ -3,7 +3,7 @@ package core.game.content.quest.free.therestlessghost; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; @@ -31,7 +31,7 @@ public final class RestlessGhostSkull extends UseWithHandler { @Override public boolean handle(NodeUsageEvent event) { - final GameObject object = (GameObject) event.getUsedWith(); + final Scenery object = (Scenery) event.getUsedWith(); if (object.getId() == 2145) { event.getPlayer().getDialogueInterpreter().sendDialogue("Maybe I should open it first."); return true; 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 1e0a1c1d4..488be78dc 100644 --- a/Server/src/main/java/core/game/content/quest/members/fishingcontest/GarlicPipeInteraction.java +++ b/Server/src/main/java/core/game/content/quest/members/fishingcontest/GarlicPipeInteraction.java @@ -5,7 +5,7 @@ import core.game.interaction.NodeUsageEvent; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; @@ -26,8 +26,8 @@ public class GarlicPipeInteraction extends PluginInteraction { @Override public boolean handle(Player player, NodeUsageEvent event) { System.out.println("Trying to handle it"); - if(event.getUsed() instanceof Item && event.getUsedWith() instanceof GameObject){ - GameObject usedWith = event.getUsedWith().asObject(); + if(event.getUsed() instanceof Item && event.getUsedWith() instanceof Scenery){ + Scenery usedWith = event.getUsedWith().asObject(); Item used = event.getUsedItem(); if(used.getId() == Items.GARLIC_1550 && usedWith.getId() == 41 && usedWith.getLocation().equals(Location.create(2638, 3446, 0)) && player.getQuestRepository().getStage("Fishing Contest") > 0){ @@ -48,8 +48,8 @@ public class GarlicPipeInteraction extends PluginInteraction { @Override public boolean handle(Player player, Node node) { - if(node instanceof GameObject){ - GameObject object = node.asObject(); + if(node instanceof Scenery){ + Scenery object = node.asObject(); if(object.getId() == 41 && object.getLocation().equals(Location.create(2638, 3446, 0)) && player.getAttribute("fishing_contest:garlic",false)){ player.getPulseManager().run(new MovementPulse(player, object.getLocation().transform(0, -1, 0)) { @Override diff --git a/Server/src/main/java/core/game/content/quest/members/fishingcontest/StairInteraction.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/StairInteraction.java index 1f5e00b31..65435727e 100644 --- a/Server/src/main/java/core/game/content/quest/members/fishingcontest/StairInteraction.java +++ b/Server/src/main/java/core/game/content/quest/members/fishingcontest/StairInteraction.java @@ -4,7 +4,7 @@ import core.game.interaction.MovementPulse; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; import core.game.content.quest.PluginInteraction; @@ -15,7 +15,7 @@ public class StairInteraction extends PluginInteraction { @Override public boolean handle(Player player, Node node) { if(!player.getQuestRepository().isComplete("Fishing Contest")) { - GameObject object = node.asObject(); + Scenery object = node.asObject(); switch (object.getId()) { case 57: handleStairs(player,232,object); @@ -28,7 +28,7 @@ public class StairInteraction extends PluginInteraction { return false; } - private void handleStairs(Player player,int npc_id,GameObject object){ + private void handleStairs(Player player, int npc_id, Scenery object){ player.getPulseManager().run(new MovementPulse(player,object.getLocation().transform(0,2,0)) { @Override public boolean pulse() { diff --git a/Server/src/main/java/core/game/content/quest/members/fishingcontest/VineInteraction.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/VineInteraction.java index f096dd572..6ad525a61 100644 --- a/Server/src/main/java/core/game/content/quest/members/fishingcontest/VineInteraction.java +++ b/Server/src/main/java/core/game/content/quest/members/fishingcontest/VineInteraction.java @@ -3,7 +3,7 @@ package core.game.content.quest.members.fishingcontest; import core.game.interaction.MovementPulse; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.plugin.Plugin; @@ -22,8 +22,8 @@ public class VineInteraction extends PluginInteraction { @Override public boolean handle(Player player, Node node) { - if(node instanceof GameObject){ - GameObject obj = node.asObject(); + if(node instanceof Scenery){ + Scenery obj = node.asObject(); if(player.getQuestRepository().getStage("Fishing Contest") > 0 && player.getQuestRepository().getStage("Fishing Contest") < 100){ player.getPulseManager().run(new MovementPulse(player, node.asObject().getLocation().transform(0, 0, 0)) { @Override 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 2d49293d1..c0793b74e 100644 --- a/Server/src/main/java/core/game/content/quest/members/junglepotion/JunglePotion.java +++ b/Server/src/main/java/core/game/content/quest/members/junglepotion/JunglePotion.java @@ -5,8 +5,8 @@ import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.herblore.Herbs; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import core.game.world.update.flag.context.Animation; import rs09.plugin.PluginManager; @@ -98,7 +98,7 @@ public final class JunglePotion extends Quest { public static enum JungleObjective { JUNGLE_VINE(2575, Herbs.SNAKE_WEED, 10, "It grows near vines in an area to the south west where", "the ground turns soft and the water kisses your feet.") { @Override - public void search(final Player player, final GameObject object) { + public void search(final Player player, final Scenery object) { final Animation animation = Animation.create(2094); player.animate(animation); player.getPulseManager().run(new Pulse(animation.getDefinition().getDurationTicks(), player, object) { @@ -118,7 +118,7 @@ public final class JunglePotion extends Quest { }, PALM_TREE(2577, Herbs.ARDRIGAL, 20, "You are looking for Ardrigal. It is related to the palm", "and grows in its brothers shady profusion."), SITO_FOIL(2579, Herbs.SITO_FOIL, 30, "You are looking for Sito Foil, and it grows best where", "the ground has been blackened by the living flame."), VOLENCIA_MOSS(2581, Herbs.VOLENCIA_MOSS, 40, "You are looking for Volencia Moss. It clings to rocks", "for its existence. It is difficult to see, so you must", "search for it well."), ROGUES_PURSE(32106, Herbs.ROGUES_PUSE, 50, "It inhabits the darkness of the underground, and grows", "in the caverns to the north. A secret entrance to the", "caverns is set into the northern cliffs, be careful Bwana.") { @Override - public void search(final Player player, final GameObject object) { + public void search(final Player player, final Scenery object) { final Animation animation = Animation.create(2097); player.animate(animation); player.getPulseManager().run(new Pulse(animation.getDefinition().getDurationTicks(), player, object) { @@ -175,7 +175,7 @@ public final class JunglePotion extends Quest { * @param player the player. * @param object the object. */ - public void search(final Player player, final GameObject object) { + public void search(final Player player, final Scenery object) { findHerb(player); switchObject(object); } @@ -184,9 +184,9 @@ public final class JunglePotion extends Quest { * Switches the object's id. * @param object the object. */ - public void switchObject(GameObject object) { + public void switchObject(Scenery object) { if (object.isActive()) { - ObjectBuilder.replace(object, object.transform(object.getId() + 1), 80); + SceneryBuilder.replace(object, object.transform(object.getId() + 1), 80); } } diff --git a/Server/src/main/java/core/game/content/quest/members/junglepotion/JunglePotionPlugin.java b/Server/src/main/java/core/game/content/quest/members/junglepotion/JunglePotionPlugin.java index 7169447f8..f452ff66b 100644 --- a/Server/src/main/java/core/game/content/quest/members/junglepotion/JunglePotionPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/junglepotion/JunglePotionPlugin.java @@ -7,8 +7,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.plugin.Plugin; @@ -27,7 +27,7 @@ public final class JunglePotionPlugin extends OptionHandler { for (JungleObjective s : JungleObjective.values()) { ObjectDefinition.forId(s.getObjectId()).getHandlers().put("option:search", this); } - ObjectBuilder.add(new GameObject(2585, Location.create(2828, 9522, 0), 8, 0)); + SceneryBuilder.add(new Scenery(2585, Location.create(2828, 9522, 0), 8, 0)); return this; } @@ -44,7 +44,7 @@ public final class JunglePotionPlugin extends OptionHandler { } switch (option) { case "search": - search(player, quest, (GameObject) node, JungleObjective.forId(node.getId())); + search(player, quest, (Scenery) node, JungleObjective.forId(node.getId())); break; } return true; @@ -57,7 +57,7 @@ public final class JunglePotionPlugin extends OptionHandler { * @param object the object. * @param objective the searchable. */ - private void search(final Player player, Quest quest, final GameObject object, final JungleObjective objective) { + private void search(final Player player, Quest quest, final Scenery object, final JungleObjective objective) { if (quest.getStage(player) < objective.getStage()) { player.sendMessage("Unfortunately, you find nothing of interest."); return; 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 1798856a9..c4213a1a0 100644 --- a/Server/src/main/java/core/game/content/quest/members/lostcity/LostCityPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/lostcity/LostCityPlugin.java @@ -13,7 +13,7 @@ import core.game.node.entity.player.link.quest.Quest; import core.game.node.entity.skill.gather.GatheringSkillPulse; import core.game.node.entity.skill.gather.SkillingTool; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import core.game.world.map.Location; import core.plugin.Plugin; @@ -76,11 +76,11 @@ public final class LostCityPlugin extends OptionHandler { spirit.sendChat("You must defeat me before touching the tree!"); return true; } - player.getPulseManager().run(new GatheringSkillPulse(player, (GameObject) node)); + player.getPulseManager().run(new GatheringSkillPulse(player, (Scenery) node)); break; case 2406: final boolean dramenTeleport = player.getEquipment().containsItem(DRAMEN_STAFF) && quest.getStage(player) > 20 && player.getLocation().getX() <= 3201; - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); if (dramenTeleport) { player.getPacketDispatch().sendMessage("The world starts to shimmer..."); player.getTeleporter().send(Location.create(2452, 4473, 0), TeleportType.FAIRY_RING); diff --git a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/CrateCutscenePlugin.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/CrateCutscenePlugin.java index 6e8e9ea40..b44270cce 100644 --- a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/CrateCutscenePlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/CrateCutscenePlugin.java @@ -5,8 +5,8 @@ import core.game.content.activity.CutscenePlugin; import core.game.content.dialogue.DialoguePlugin; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.build.DynamicRegion; @@ -83,10 +83,10 @@ public class CrateCutscenePlugin extends CutscenePlugin { region = DynamicRegion.create(12609); setRegionBase(); registerRegion(region.getId()); - ObjectBuilder.add(new GameObject(65, base.transform(18, 25, 0), 0, 0)); - ObjectBuilder.add(new GameObject(65, base.transform(19, 25, 0), 0, 4)); - ObjectBuilder.add(new GameObject(65, base.transform(18, 24, 0), 0, 1)); - ObjectBuilder.add(new GameObject(65, base.transform(18, 26, 0), 0, 3)); + SceneryBuilder.add(new Scenery(65, base.transform(18, 25, 0), 0, 0)); + SceneryBuilder.add(new Scenery(65, base.transform(19, 25, 0), 0, 4)); + SceneryBuilder.add(new Scenery(65, base.transform(18, 24, 0), 0, 1)); + SceneryBuilder.add(new Scenery(65, base.transform(18, 26, 0), 0, 3)); } /** diff --git a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystalOptionPlugin.java b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystalOptionPlugin.java index 1ab4d927f..ae19b6753 100644 --- a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystalOptionPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystalOptionPlugin.java @@ -6,7 +6,7 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.plugin.Plugin; /** @@ -24,7 +24,7 @@ public class MerlinCrystalOptionPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { final Quest quest = player.getQuestRepository().getQuest("Merlin's Crystal"); - int id = node instanceof GameObject ? ((GameObject) node).getId() : ((NPC) node).getId(); + int id = node instanceof Scenery ? ((Scenery) node).getId() : ((NPC) node).getId(); switch (id) { case 247: if (quest.getStage(player) < 40) { 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 cbfcf9fc0..3c189463c 100644 --- a/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystalPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/merlinscrystal/MerlinCrystalPlugin.java @@ -20,8 +20,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; @@ -75,14 +75,14 @@ public final class MerlinCrystalPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { final Quest quest = player.getQuestRepository().getQuest("Merlin's Crystal"); - final int id = node instanceof Item ? ((Item) node).getId() : node instanceof GameObject ? ((GameObject) node).getId() : ((NPC) node).getId(); + final int id = node instanceof Item ? ((Item) node).getId() : node instanceof Scenery ? ((Scenery) node).getId() : ((NPC) node).getId(); switch (id) { case 62: if (quest.getStage(player) == 90 && player.getEquipment().contains(35, 1)) { player.sendMessages("You attempt to smash the crystal...", "... and it shatters under the force of Excalibur!"); player.animate(Animation.create(390)); player.lock(); - ObjectBuilder.remove(node.asObject(), 60); + SceneryBuilder.remove(node.asObject(), 60); quest.setStage(player, 99); final NPC merlin = NPC.create(249, Location.create(2767, 3493, 2)); merlin.init(); @@ -154,7 +154,7 @@ public final class MerlinCrystalPlugin extends OptionHandler { npc.setAttribute("beggar_owner", player.getUsername()); ClimbActionHandler.climb(player, new Animation(828), Location.create(3013, 3245, 1)); } else { - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); return true; } return true; @@ -589,7 +589,7 @@ public final class MerlinCrystalPlugin extends OptionHandler { public boolean handle(NodeUsageEvent event) { Player player = event.getPlayer(); Item useditem = event.getUsedItem(); - final GameObject object = (GameObject) event.getUsedWith(); + final Scenery object = (Scenery) event.getUsedWith(); if (player.getAttribute("cleared-beehives", false) && useditem.getId() == REPELLENT.getId() && object.getId() == 68) { player.getDialogueInterpreter().sendDialogue("You have already cleared the hive of its bees.", "You can now safely collect wax from the hive."); 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 d2f8002cc..04b139cd9 100644 --- a/Server/src/main/java/core/game/content/quest/members/sheepherder/IncineratorHandler.java +++ b/Server/src/main/java/core/game/content/quest/members/sheepherder/IncineratorHandler.java @@ -5,8 +5,7 @@ import core.game.interaction.MovementPulse; import core.game.interaction.NodeUsageEvent; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import rs09.game.system.SystemLogger; +import core.game.node.object.Scenery; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.plugin.Plugin; @@ -27,8 +26,8 @@ public class IncineratorHandler extends PluginInteraction { @Override public boolean handle(Player player, NodeUsageEvent event) { Node n = event.getUsedWith(); - if(n instanceof GameObject){ - GameObject obj = (GameObject) n; + if(n instanceof Scenery){ + Scenery obj = (Scenery) n; if (n.getId() == 165) { player.getPulseManager().run(new MovementPulse(player, DestinationFlag.OBJECT.getDestination(player,obj)) { @Override diff --git a/Server/src/main/java/core/game/content/quest/members/thetouristrap/BedabinNomadDialogue.java b/Server/src/main/java/core/game/content/quest/members/thetouristrap/BedabinNomadDialogue.java index c8ef45759..486496a83 100644 --- a/Server/src/main/java/core/game/content/quest/members/thetouristrap/BedabinNomadDialogue.java +++ b/Server/src/main/java/core/game/content/quest/members/thetouristrap/BedabinNomadDialogue.java @@ -4,8 +4,8 @@ import core.game.content.dialogue.DialoguePlugin; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; @@ -93,8 +93,8 @@ public final class BedabinNomadDialogue extends DialoguePlugin { break; case 2: end(); - final GameObject door = RegionManager.getObject(new Location(3169, 3046, 0)); - ObjectBuilder.replace(door, door.transform(2701), 2); + final Scenery door = RegionManager.getObject(new Location(3169, 3046, 0)); + SceneryBuilder.replace(door, door.transform(2701), 2); player.getWalkingQueue().reset(); player.getWalkingQueue().addPath(3169, 3046); player.getPacketDispatch().sendMessage("You walk into the tent."); 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 74179745f..53480de83 100644 --- a/Server/src/main/java/core/game/content/quest/members/thetouristrap/TouristTrapPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/thetouristrap/TouristTrapPlugin.java @@ -23,8 +23,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -180,7 +180,7 @@ public final class TouristTrapPlugin extends OptionHandler { player.getPacketDispatch().sendMessage("This gate looks like it needs a key to open it."); break; } - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); break; case 2686: case 2685: @@ -262,27 +262,27 @@ public final class TouristTrapPlugin extends OptionHandler { player.getPacketDispatch().sendMessage("The gate needs a key in order to be opened."); return true; } - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); player.getPacketDispatch().sendMessage("The guards search you thoroughly as you go through the gates."); return true; } - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); break; case 2689: if (!player.getInventory().containsItem(TouristTrap.CELL_DOOR_KEY)) { player.getPacketDispatch().sendMessage("The door seems to be pretty locked."); break; } - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); break; case 1528: - ObjectBuilder.replace((GameObject) node, ((GameObject) node).transform(1529)); + SceneryBuilder.replace((Scenery) node, ((Scenery) node).transform(1529)); break; } break; case "close": if (id == 1529) { - ObjectBuilder.replace((GameObject) node, ((GameObject) node).transform(1528)); + SceneryBuilder.replace((Scenery) node, ((Scenery) node).transform(1528)); } break; case "look-in": @@ -768,7 +768,7 @@ public final class TouristTrapPlugin extends OptionHandler { player.animate(Animation.create(5052)); break; case 3: - ObjectBuilder.remove(RegionManager.getObject(base.transform(54, 22, 0))); + SceneryBuilder.remove(RegionManager.getObject(base.transform(54, 22, 0))); cart = NPC.create(4980, base.transform(54, 22, 0)); cart.init(); break; @@ -940,7 +940,7 @@ public final class TouristTrapPlugin extends OptionHandler { /** * The cart. */ - private GameObject cart; + private Scenery cart; /** * Constructs a new {@code MineCartDialogue} {@code Object}. @@ -973,7 +973,7 @@ public final class TouristTrapPlugin extends OptionHandler { @Override public boolean open(Object... args) { - cart = (GameObject) args[0]; + cart = (Scenery) args[0]; if (player.getInventory().containsItem(TouristTrap.ANNA_BARREL)) { player("There's not enough room for both of us."); stage = -1; @@ -1078,8 +1078,8 @@ public final class TouristTrapPlugin extends OptionHandler { @Override public void open() { - ObjectBuilder.remove(RegionManager.getObject(base.getLocation().transform(getPath()[0].getLocalX(), getPath()[0].getLocalY(), 0))); - ObjectBuilder.remove(RegionManager.getObject(base.getLocation().transform(getPath()[getPath().length - 1].getLocalX(), getPath()[getPath().length - 1].getLocalY(), 0))); + SceneryBuilder.remove(RegionManager.getObject(base.getLocation().transform(getPath()[0].getLocalX(), getPath()[0].getLocalY(), 0))); + SceneryBuilder.remove(RegionManager.getObject(base.getLocation().transform(getPath()[getPath().length - 1].getLocalX(), getPath()[getPath().length - 1].getLocalY(), 0))); player.getAppearance().setAnimations(Animation.create(211)); player.getAppearance().setRidingMinecart(true); player.getAppearance().sync(); @@ -1260,9 +1260,9 @@ public final class TouristTrapPlugin extends OptionHandler { public static final class BarrelDialogue extends DialoguePlugin { /** - * The game object barrel. + * The scenery barrel. */ - private GameObject barrel; + private Scenery barrel; /** * The quest. @@ -1294,7 +1294,7 @@ public final class TouristTrapPlugin extends OptionHandler { @Override public boolean open(Object... args) { - barrel = (GameObject) args[0]; + barrel = (Scenery) args[0]; quest = player.getQuestRepository().getQuest(TouristTrap.NAME); if ((quest.getStage(player) == 70 || quest.getStage(player) == 72) && !player.hasItem(TouristTrap.ANNA_BARREL)) { interpreter.sendDialogue("You search the barrels and find Ana."); @@ -1347,11 +1347,11 @@ public final class TouristTrapPlugin extends OptionHandler { case 3: end(); player.getInventory().add(TouristTrap.BARREL, player); - ObjectBuilder.remove(barrel); + SceneryBuilder.remove(barrel); GameWorld.getPulser().submit(new Pulse(40) { @Override public boolean pulse() { - ObjectBuilder.add(barrel); + SceneryBuilder.add(barrel); return true; } }); @@ -1618,7 +1618,7 @@ public final class TouristTrapPlugin extends OptionHandler { * @author 'Vexia * @version 1.0 */ - public static final class ProtoTypePulse extends SkillPulse { + public static final class ProtoTypePulse extends SkillPulse { /** * The hammer item. 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 12078a20b..8ad69fd2b 100644 --- a/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterfallPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/waterfallquest/WaterfallPlugin.java @@ -19,8 +19,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; @@ -97,7 +97,7 @@ public final class WaterfallPlugin extends OptionHandler { /** * The ropes. */ - private static final List ROPES = new ArrayList<>(20); + private static final List ROPES = new ArrayList<>(20); @Override public Plugin newInstance(Object arg) throws Throwable { @@ -192,7 +192,7 @@ public final class WaterfallPlugin extends OptionHandler { if (quest.getStage(player) >= 100 && node.getLocation().equals(new Location(2566, 9901)) && player.getLocation().equals(new Location(2566, 9901))) { player.teleport(new Location(2604, 9901)); } else { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); } } if (node.getLocation().equals(new Location(2604, 9900))) { @@ -201,13 +201,13 @@ public final class WaterfallPlugin extends OptionHandler { } break; case 33046: - ObjectBuilder.add(new GameObject(33047, Location.create(2530, 9844, 0), 10, 1)); + SceneryBuilder.add(new Scenery(33047, Location.create(2530, 9844, 0), 10, 1)); break; case 42319: if (node.getLocation().equals(new Location(2556, 9844))) { ClimbActionHandler.climb(player, new Animation(828), Location.create(2557, 3444, 0)); } else { - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); } break; case 33047: @@ -224,7 +224,7 @@ public final class WaterfallPlugin extends OptionHandler { } break; case "close": - ObjectBuilder.add(new GameObject(33046, Location.create(2530, 9844, 0), 10, 1)); + SceneryBuilder.add(new Scenery(33046, Location.create(2530, 9844, 0), 10, 1)); break; } break; @@ -257,7 +257,7 @@ public final class WaterfallPlugin extends OptionHandler { break; case 1991: if (player.getLocation().getY() >= 9576) { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); player.getPacketDispatch().sendMessage("You open the gate and walk through."); } else if (player.getInventory().contains(293, 1) && player.getLocation().getY() < 9576) { player.getPacketDispatch().sendMessage("The gate is locked. You need to use the key on the door to enter."); @@ -326,8 +326,8 @@ public final class WaterfallPlugin extends OptionHandler { return Location.create(2512, 3481, 0); } } - if (n instanceof GameObject) { - GameObject obj = ((GameObject) n); + if (n instanceof Scenery) { + Scenery obj = ((Scenery) n); if (obj.getId() == 1996 || obj.getId() == 1997) { return Location.create(2512, 3476, 0); } @@ -348,23 +348,23 @@ public final class WaterfallPlugin extends OptionHandler { public void handleObjects(boolean add, final Player player) {// very ugly // code if (add) { - ROPES.add(new GameObject(1997, Location.create(2512, 3468, 0), 10, 0)); - ROPES.add(new GameObject(1998, Location.create(2512, 3469, 0), 10, 0)); - ROPES.add(new GameObject(1998, Location.create(2512, 3470, 0), 10, 0)); - ROPES.add(new GameObject(1998, Location.create(2512, 3471, 0), 10, 0)); - ROPES.add(new GameObject(1998, Location.create(2512, 3472, 0), 10, 0)); - ROPES.add(new GameObject(1998, Location.create(2512, 3473, 0), 10, 0)); - ROPES.add(new GameObject(1998, Location.create(2512, 3474, 0), 10, 0)); - ROPES.add(new GameObject(1998, Location.create(2512, 3475, 0), 10, 0)); - for (GameObject rope : ROPES) { - ObjectBuilder.add(rope); + ROPES.add(new Scenery(1997, Location.create(2512, 3468, 0), 10, 0)); + ROPES.add(new Scenery(1998, Location.create(2512, 3469, 0), 10, 0)); + ROPES.add(new Scenery(1998, Location.create(2512, 3470, 0), 10, 0)); + ROPES.add(new Scenery(1998, Location.create(2512, 3471, 0), 10, 0)); + ROPES.add(new Scenery(1998, Location.create(2512, 3472, 0), 10, 0)); + ROPES.add(new Scenery(1998, Location.create(2512, 3473, 0), 10, 0)); + ROPES.add(new Scenery(1998, Location.create(2512, 3474, 0), 10, 0)); + ROPES.add(new Scenery(1998, Location.create(2512, 3475, 0), 10, 0)); + for (Scenery rope : ROPES) { + SceneryBuilder.add(rope); } } else { - for (GameObject rope : ROPES) { - ObjectBuilder.remove(rope); + for (Scenery rope : ROPES) { + SceneryBuilder.remove(rope); } ROPES.clear(); - ObjectBuilder.add(new GameObject(1996, Location.create(2512, 3468, 0), 10, 0)); + SceneryBuilder.add(new Scenery(1996, Location.create(2512, 3468, 0), 10, 0)); } } @@ -408,8 +408,8 @@ public final class WaterfallPlugin extends OptionHandler { @Override public Location getDestination(Player playa, Node n) { - if (n instanceof GameObject) { - GameObject obj = (GameObject) n; + if (n instanceof Scenery) { + Scenery obj = (Scenery) n; if (obj.getId() == 1996 || obj.getId() == 1997) { return Location.create(2512, 3476, 0); } @@ -422,7 +422,7 @@ public final class WaterfallPlugin extends OptionHandler { final Player player = event.getPlayer(); Item useditem = event.getUsedItem(); final Quest quest = player.getQuestRepository().getQuest(WaterFall.NAME); - final GameObject object = (GameObject) event.getUsedWith(); + final Scenery object = (Scenery) event.getUsedWith(); if (useditem.getId() == ROPE.getId() && object.getId() == 1996 || object.getId() == 1997) { player.lock(8); 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 cd3f0b1de..96108526a 100644 --- a/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowCutscene.java +++ b/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowCutscene.java @@ -9,8 +9,8 @@ import core.game.node.entity.Entity; import core.game.node.entity.impl.Projectile; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -65,9 +65,9 @@ public class WLBelowCutscene extends CutscenePlugin { public boolean start(final Player player, boolean login, Object... args) { player.lock(); player.setAttribute("cutscene", this); - GameObject table = RegionManager.getObject(base.transform(9, 37, 0)); + Scenery table = RegionManager.getObject(base.transform(9, 37, 0)); if (table != null) { - ObjectBuilder.remove(table); + SceneryBuilder.remove(table); } surok = NPC.create(5835, base.transform(8, 39, 0)); surok.init(); 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 917ae78b5..7f4439031 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 @@ -14,7 +14,7 @@ import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; @@ -43,7 +43,7 @@ public class WitchsHousePlugin extends OptionHandler { public boolean handle(Player player, Node node, String option) { final Quest quest = player.getQuestRepository().getQuest("Witch's House"); final GroundItem ball = GroundItemManager.get(2407, new Location(2935, 3460, 0), null); - final int id = node instanceof Item ? ((Item) node).getId() : node instanceof GameObject ? ((GameObject) node).getId() : node instanceof NPC ? ((NPC) node).getId() : node.getId(); + final int id = node instanceof Item ? ((Item) node).getId() : node instanceof Scenery ? ((Scenery) node).getId() : node instanceof NPC ? ((NPC) node).getId() : node.getId(); // boolean killedExperiment = player.getAttribute("witchs_house:experiment_killed",false); // boolean experimentAlive = !player.getAttribute("witchs_house:experiment_killed", false); boolean readBook = player.getAttribute("readWitchsBook", false); @@ -109,14 +109,14 @@ public class WitchsHousePlugin extends OptionHandler { break; } if (player.getInventory().containsItem(DOOR_KEY) || player.getLocation().getX() >= 2901) { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); } else { player.sendMessage("The door is locked."); } break; case 2862: if (magnetAttached || player.getLocation().getY() < 3466) { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); player.removeAttribute("attached_magnet"); } else { player.getDialogueInterpreter().sendDialogue("Strange... I can't see any kind of lock or handle to open this door."); @@ -125,7 +125,7 @@ public class WitchsHousePlugin extends OptionHandler { case 2865: case 2866: if (player.getEquipment().containsItem(LEATHER_GLOVES)) { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); } else { player.getImpactHandler().manualHit(player, RandomFunction.random(2, 3), ImpactHandler.HitsplatType.NORMAL); player.getDialogueInterpreter().sendDialogue("As your bare hands touch the gate you feel a shock."); @@ -136,11 +136,11 @@ public class WitchsHousePlugin extends OptionHandler { break; case 2863: if (player.getLocation().getX() >= 2934) { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } if (player.getInventory().containsItem(KEY)) { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); } else { player.sendMessage("The door is locked."); } @@ -238,7 +238,7 @@ public class WitchsHousePlugin extends OptionHandler { public boolean handle(NodeUsageEvent event) { Player player = event.getPlayer(); Item useditem = event.getUsedItem(); - final GameObject object = (GameObject) event.getUsedWith(); + final Scenery object = (Scenery) event.getUsedWith(); assert useditem != null; assert object != null; if (player.getAttribute("mouse_out") != null && useditem.getId() == CHEESE.getId() && object.getId() == 15518) { diff --git a/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialIslandPlugin.java b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialIslandPlugin.java index ae4550c23..e925dd054 100644 --- a/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialIslandPlugin.java +++ b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialIslandPlugin.java @@ -9,7 +9,7 @@ import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; @@ -54,17 +54,17 @@ public class TutorialIslandPlugin extends OptionHandler { player.getDialogueInterpreter().open(((NPC) node).getId(), ((NPC) node)); return true; } - } else if (node instanceof GameObject) { + } else if (node instanceof Scenery) { if (TutorialSession.getExtension(player).getStage() == 16) { int first = node.getId(); int second = first == 3015 ? 3016 : 3015; - if (DoorActionHandler.autowalkFence(player, (GameObject) node, first, second)) { + if (DoorActionHandler.autowalkFence(player, (Scenery) node, first, second)) { TutorialStage.load(player, 17, false); } return true; } final int tut_stage = TutorialSession.getExtension(player).getStage(); - final GameObject object = (GameObject) node; + final Scenery object = (Scenery) node; if (object.getId() == 3028) { return true; } @@ -163,8 +163,8 @@ public class TutorialIslandPlugin extends OptionHandler { @Override public Location getDestination(Node node, Node n) { - if (n instanceof GameObject) { - GameObject object = (GameObject) n; + if (n instanceof Scenery) { + Scenery object = (Scenery) n; if (object.getDefinition().hasAction("open")) { return DoorActionHandler.getDestination((Entity) node, object); } 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 6aa70678d..0f1a71c17 100644 --- a/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialStage.java +++ b/Server/src/main/java/core/game/content/quest/tutorials/tutorialisland/TutorialStage.java @@ -4,7 +4,7 @@ import core.game.component.Component; import core.game.node.entity.combat.equipment.WeaponInterface; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.HintIconManager; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import rs09.game.system.SystemLogger; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; @@ -568,7 +568,7 @@ public enum TutorialStage { } else { removeHintIcon(player); } - GameObject object = RegionManager.getObject(Location.create(3094, 9502, 0)); + Scenery object = RegionManager.getObject(Location.create(3094, 9502, 0)); if (object != null) { player.setAttribute("tut-island:hi_slot", HintIconManager.registerHintIcon(player, object)); } else { @@ -777,7 +777,7 @@ public enum TutorialStage { } else { removeHintIcon(player); } - GameObject object = RegionManager.getObject(Location.create(3130, 3124, 0)); + Scenery object = RegionManager.getObject(Location.create(3130, 3124, 0)); if (object != null) { player.setAttribute("tut-island:hi_slot", HintIconManager.registerHintIcon(player, object)); } else { 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 d0749983e..b2d19a9cc 100644 --- a/Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java +++ b/Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java @@ -12,7 +12,7 @@ import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.zone.MapZone; @@ -227,7 +227,7 @@ public final class ChaosTunnelZone extends MapZone implements Plugin { * @param object the object. * @param player the player. */ - private void teleport(Player player, GameObject object) { + private void teleport(Player player, Scenery object) { if (object.getLocation().getX() == 3142 || object.getLocation().getY() == 5545) { commenceBorkBattle(player); return; @@ -284,7 +284,7 @@ public final class ChaosTunnelZone extends MapZone implements Plugin { * @param object the object. * @return {@code True} if so. */ - private boolean isStained(GameObject object) { + private boolean isStained(Scenery object) { return getStainedTime(object) > GameWorld.getTicks(); } @@ -292,7 +292,7 @@ public final class ChaosTunnelZone extends MapZone implements Plugin { * Sets stained time. * @param object the object. */ - private void setStainedTime(GameObject object) { + private void setStainedTime(Scenery object) { object.getAttributes().setAttribute("stained", (int) GameWorld.getTicks() + RandomFunction.random(50, 150)); } @@ -301,7 +301,7 @@ public final class ChaosTunnelZone extends MapZone implements Plugin { * @param object the object. * @return the time. */ - private int getStainedTime(GameObject object) { + private int getStainedTime(Scenery object) { return object.getAttributes().getAttribute("stained", 0); } 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 2c53b3fe9..18c0de8d0 100644 --- a/Server/src/main/java/core/game/content/zone/YanilleAgilityDungeon.java +++ b/Server/src/main/java/core/game/content/zone/YanilleAgilityDungeon.java @@ -13,8 +13,8 @@ import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.player.Player; import core.game.node.entity.state.EntityState; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; @@ -99,7 +99,7 @@ public class YanilleAgilityDungeon extends MapZone implements Plugin { for (Item item : HERBS) { player.getInventory().add(item, player); } - ObjectBuilder.replace(target.asObject(), target.asObject().transform(target.getId() + 1), 5); + SceneryBuilder.replace(target.asObject(), target.asObject().transform(target.getId() + 1), 5); } return true; case 378: @@ -121,7 +121,7 @@ public class YanilleAgilityDungeon extends MapZone implements Plugin { * @param player the player. * @param object the object. */ - private void handleBalancingLedge(final Player player, GameObject object) { + private void handleBalancingLedge(final Player player, Scenery object) { if (player.getSkills().getLevel(Skills.AGILITY) < 40) { player.getDialogueInterpreter().sendDialogue("You need an Agility level of at least 40 in order to do this."); return; 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 094519b67..126c833be 100644 --- a/Server/src/main/java/core/game/content/zone/phasmatys/PhasmatysZone.java +++ b/Server/src/main/java/core/game/content/zone/phasmatys/PhasmatysZone.java @@ -10,8 +10,8 @@ import core.game.node.entity.player.Player; import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.agility.AgilityHandler; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import core.game.world.map.Direction; import core.game.world.map.Location; @@ -71,18 +71,18 @@ public final class PhasmatysZone extends MapZone implements Plugin { } switch (target.getId()) { case 5259: - handleEnergyBarrier(player, (GameObject) target); + handleEnergyBarrier(player, (Scenery) target); return true; case 5267: player.animate(Animation.create(536)); player.getPacketDispatch().sendMessage("The trapdoor opens..."); - ObjectBuilder.replace((GameObject) target, ((GameObject) target).transform(5268)); + SceneryBuilder.replace((Scenery) target, ((Scenery) target).transform(5268)); return true; case 5268: if (option.getName().equals("Close")) { player.animate(Animation.create(535)); player.getPacketDispatch().sendMessage("You close the trapdoor."); - ObjectBuilder.replace((GameObject) target, ((GameObject) target).transform(5267)); + SceneryBuilder.replace((Scenery) target, ((Scenery) target).transform(5267)); } else { player.getPacketDispatch().sendMessage("You climb down through the trapdoor..."); player.getProperties().setTeleportLocation(Location.create(3669, 9888, 3)); @@ -90,12 +90,12 @@ public final class PhasmatysZone extends MapZone implements Plugin { return true; case 7434: // Trapdoors in bar if (option.getName().equalsIgnoreCase("open")) { - ObjectBuilder.replace(target.asObject(), target.asObject().transform(7435)); + SceneryBuilder.replace(target.asObject(), target.asObject().transform(7435)); } break; case 7435: // open trapdoor in bar if (option.getName().equalsIgnoreCase("close")) { - ObjectBuilder.replace(target.asObject(), target.asObject().transform(7434)); + SceneryBuilder.replace(target.asObject(), target.asObject().transform(7434)); } break; case 9308: @@ -121,7 +121,7 @@ public final class PhasmatysZone extends MapZone implements Plugin { case 11162: case 11163: case 11164: - GameObject obj = (GameObject) target; + Scenery obj = (Scenery) target; switch (option.getName().toLowerCase()) { case "fill": player.getPulseManager().run(fillPulse); @@ -146,7 +146,7 @@ public final class PhasmatysZone extends MapZone implements Plugin { public Pulse emptyPulse = new Pulse(5) { //the bin - GameObject emptyobj = new GameObject(11164, 3658, 3525, 1); + Scenery emptyobj = new Scenery(11164, 3658, 3525, 1); @Override public boolean pulse() { @@ -162,7 +162,7 @@ public final class PhasmatysZone extends MapZone implements Plugin { }; public Pulse windPulse = new Pulse(5) { //the crank - GameObject windobj = new GameObject(11163, 3659, 3525, 1); + Scenery windobj = new Scenery(11163, 3659, 3525, 1); @Override public boolean pulse() { @@ -218,7 +218,7 @@ public final class PhasmatysZone extends MapZone implements Plugin { * @param player the player. * @param object the object. */ - private void checkStatus(Player player, GameObject object) { + private void checkStatus(Player player, Scenery object) { String status = "The grinder is empty."; if (hasBones(player, object, true)) { status = "There are some bones in the hopper."; @@ -234,7 +234,7 @@ public final class PhasmatysZone extends MapZone implements Plugin { * @param player the player. * @param object the object. */ - private void empty(Player player, GameObject object) { + private void empty(Player player, Scenery object) { if (hasBones(player, object, true)) { player.sendMessage("You need to wind the handle to grind the bones."); return; @@ -261,7 +261,7 @@ public final class PhasmatysZone extends MapZone implements Plugin { * @param player the player. * @param object the object. */ - private void wind(Player player, GameObject object) { + private void wind(Player player, Scenery object) { final Bones bone = Bones.forConfigValue(player.getConfigManager().get(408), true); player.getLocks().lockInteractions(3); player.animate(Animation.create(1648)); @@ -280,7 +280,7 @@ public final class PhasmatysZone extends MapZone implements Plugin { * @param object the object. * @return {@code True} if so. */ - public static boolean hasBones(Player player, GameObject object, boolean inHopper) { + public static boolean hasBones(Player player, Scenery object, boolean inHopper) { int value = player.getConfigManager().get(408); for (Bones bone : Bones.values()) { if (bone.getConfigValue(inHopper) == value) { @@ -359,7 +359,7 @@ public final class PhasmatysZone extends MapZone implements Plugin { * @param player the player. * @param object the object. */ - private void handleEnergyBarrier(Player player, GameObject object) { + private void handleEnergyBarrier(Player player, Scenery object) { boolean force = object.getLocation().equals(3659, 3508, 0) && player.getLocation().getY() < 3508 || object.getLocation().equals(3652, 3485, 0) && player.getLocation().getX() > 3652; if (!force && !player.getInventory().contains(4278, 2)) { player.getDialogueInterpreter().open(1706); 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 eb74f5965..49a965738 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 @@ -12,7 +12,7 @@ import core.game.node.entity.Entity; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; @@ -178,7 +178,7 @@ public final class RellekkaZone extends MapZone implements Plugin { switch (node.getId()) { case 4616: case 4615: - crossRellekaBridge(player, (GameObject) node); + crossRellekaBridge(player, (Scenery) node); break; } break; @@ -205,7 +205,7 @@ public final class RellekkaZone extends MapZone implements Plugin { * @param player the player. * @param node the node. */ - private void crossRellekaBridge(Player player, GameObject node) { + private void crossRellekaBridge(Player player, Scenery node) { boolean east = node.getId() == 4616; player.lock(2); if (player.getLocation().equals(node.getLocation())) { 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 a6b092e14..089a27285 100644 --- a/Server/src/main/java/core/game/content/zone/wbisland/WaterBirthDungeonZone.java +++ b/Server/src/main/java/core/game/content/zone/wbisland/WaterBirthDungeonZone.java @@ -17,7 +17,7 @@ import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -228,7 +228,7 @@ public final class WaterBirthDungeonZone extends MapZone implements Plugin { } } else if (n instanceof NPC) { handler = HANDLERS.get(((NPC) n).getId() | NPC_TYPE << 16); - } else if (n instanceof GameObject) { - handler = HANDLERS.get(((GameObject) n).getId() | OBJECT_TYPE << 16); + } else if (n instanceof Scenery) { + handler = HANDLERS.get(((Scenery) n).getId() | OBJECT_TYPE << 16); } else if (n instanceof Player) { handler = HANDLERS.get(((Item) event.getUsed()).getId() | PLAYER_TYPE << 16); } else { diff --git a/Server/src/main/java/core/game/interaction/city/BedabinPlugin.java b/Server/src/main/java/core/game/interaction/city/BedabinPlugin.java index d735824ea..9bde101c9 100644 --- a/Server/src/main/java/core/game/interaction/city/BedabinPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/BedabinPlugin.java @@ -6,8 +6,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.plugin.Initializable; @@ -40,8 +40,8 @@ public final class BedabinPlugin extends OptionHandler { switch (id) { case 2700: if (player.getLocation().getY() >= 3046) { - final GameObject door = RegionManager.getObject(new Location(3169, 3046, 0)); - ObjectBuilder.replace(door, door.transform(2701), 2); + final Scenery door = RegionManager.getObject(new Location(3169, 3046, 0)); + SceneryBuilder.replace(door, door.transform(2701), 2); player.getWalkingQueue().reset(); player.getWalkingQueue().addPath(3169, 3045); player.getPacketDispatch().sendMessage("You walk back out the tent."); diff --git a/Server/src/main/java/core/game/interaction/city/BurthorpePlugin.java b/Server/src/main/java/core/game/interaction/city/BurthorpePlugin.java index 78947c7ac..f791a1c55 100644 --- a/Server/src/main/java/core/game/interaction/city/BurthorpePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/BurthorpePlugin.java @@ -5,7 +5,7 @@ import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; @@ -25,7 +25,7 @@ public final class BurthorpePlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - GameObject object = (GameObject) node; + Scenery object = (Scenery) node; switch (object.getId()) { case 4627: ClimbActionHandler.climb(player, null, Location.create(2899, 3565, 0)); diff --git a/Server/src/main/java/core/game/interaction/city/CamelotNodePlugin.java b/Server/src/main/java/core/game/interaction/city/CamelotNodePlugin.java index 35604b0f2..5054b8f5e 100644 --- a/Server/src/main/java/core/game/interaction/city/CamelotNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/CamelotNodePlugin.java @@ -4,7 +4,7 @@ import core.cache.def.impl.ObjectDefinition; 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.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; @@ -25,7 +25,7 @@ public final class CamelotNodePlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - final int id = ((GameObject) node).getId(); + final int id = ((Scenery) node).getId(); switch (id) { case 26017: player.getPacketDispatch().sendMessage("Court is not in session."); @@ -36,8 +36,8 @@ public final class CamelotNodePlugin extends OptionHandler { @Override public Location getDestination(Node node, Node n) { - if (n instanceof GameObject) { - int id = ((GameObject) n).getId(); + if (n instanceof Scenery) { + int id = ((Scenery) n).getId(); switch (id) { case 993: if (node.getLocation().getX() <= 2638) { 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 be8d31963..16e90d608 100644 --- a/Server/src/main/java/core/game/interaction/city/DraynorManorPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/DraynorManorPlugin.java @@ -10,8 +10,8 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -77,7 +77,7 @@ public final class DraynorManorPlugin extends OptionHandler { @Override public boolean handle(final Player player, Node node, String option) { - int id = ((GameObject) node).getId(); + int id = ((Scenery) node).getId(); switch (id) { case 11498: ClimbActionHandler.climb(player, new Animation(828), Location.create(3108, 3366, 1)); @@ -85,7 +85,7 @@ public final class DraynorManorPlugin extends OptionHandler { case 160: case 156: case 155: - handleBookCase(player, ((GameObject) node)); + handleBookCase(player, ((Scenery) node)); break; case 133: ClimbActionHandler.climb(player, new Animation(827), BASEMENT); @@ -97,13 +97,13 @@ public final class DraynorManorPlugin extends OptionHandler { return true; } player.getPacketDispatch().sendMessage("The doors slam shut behind you."); - DoorActionHandler.handleDoor(player, (GameObject) node); + DoorActionHandler.handleDoor(player, (Scenery) node); return true; case 131: if (!player.getInventory().containsItem(KEY)) { player.getPacketDispatch().sendMessage("The door is locked."); } else { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); } break; case 152: @@ -139,7 +139,7 @@ public final class DraynorManorPlugin extends OptionHandler { * Method used to handle the secret book case opening. * @param player the player. */ - private final void handleBookCase(final Player player, final GameObject object) { + private final void handleBookCase(final Player player, final Scenery object) { Location dest = null; if (RegionManager.getObject(Location.create(3097, 3359, 0)) == null || RegionManager.getObject(Location.create(3097, 3358, 0)) == null) { return; @@ -173,7 +173,7 @@ public final class DraynorManorPlugin extends OptionHandler { player.animate(LEVER_ANIMATION); break; case 2: - ObjectBuilder.replace(object, object.transform(161), 6); + SceneryBuilder.replace(object, object.transform(161), 6); break; case 3: Pathfinder.find(player, Location.create(3096, 3358, 0)).walk(player); @@ -182,19 +182,19 @@ public final class DraynorManorPlugin extends OptionHandler { player.faceLocation(destination); break; case 5: - ObjectBuilder.remove(RegionManager.getObject(Location.create(3097, 3359, 0))); - ObjectBuilder.remove(RegionManager.getObject(Location.create(3097, 3358, 0))); - ObjectBuilder.add(new GameObject(156, new Location(3097, 3357, 0))); - ObjectBuilder.add(new GameObject(157, new Location(3097, 3360, 0))); + SceneryBuilder.remove(RegionManager.getObject(Location.create(3097, 3359, 0))); + SceneryBuilder.remove(RegionManager.getObject(Location.create(3097, 3358, 0))); + SceneryBuilder.add(new Scenery(156, new Location(3097, 3357, 0))); + SceneryBuilder.add(new Scenery(157, new Location(3097, 3360, 0))); break; case 6: AgilityHandler.walk(player, -1, player.getLocation(), destination, null, 0.0, null); break; case 8: - ObjectBuilder.remove(RegionManager.getObject(new Location(3097, 3360, 0))); - ObjectBuilder.remove(RegionManager.getObject(new Location(3097, 3357, 0))); - ObjectBuilder.add(new GameObject(155, new Location(3097, 3359, 0))); - ObjectBuilder.add(new GameObject(156, new Location(3097, 3358, 0))); + SceneryBuilder.remove(RegionManager.getObject(new Location(3097, 3360, 0))); + SceneryBuilder.remove(RegionManager.getObject(new Location(3097, 3357, 0))); + SceneryBuilder.add(new Scenery(155, new Location(3097, 3359, 0))); + SceneryBuilder.add(new Scenery(156, new Location(3097, 3358, 0))); break; } return false; @@ -210,19 +210,19 @@ public final class DraynorManorPlugin extends OptionHandler { switch (count) { case 0: player.getPacketDispatch().sendMessage("You've found a secret door!"); - ObjectBuilder.remove(RegionManager.getObject(Location.create(3097, 3359, 0))); - ObjectBuilder.remove(RegionManager.getObject(Location.create(3097, 3358, 0))); - ObjectBuilder.add(new GameObject(156, new Location(3097, 3357, 0))); - ObjectBuilder.add(new GameObject(157, new Location(3097, 3360, 0))); + SceneryBuilder.remove(RegionManager.getObject(Location.create(3097, 3359, 0))); + SceneryBuilder.remove(RegionManager.getObject(Location.create(3097, 3358, 0))); + SceneryBuilder.add(new Scenery(156, new Location(3097, 3357, 0))); + SceneryBuilder.add(new Scenery(157, new Location(3097, 3360, 0))); break; case 1: AgilityHandler.walk(player, -1, player.getLocation(), destination, null, 0.0, null); break; case 3: - ObjectBuilder.remove(RegionManager.getObject(new Location(3097, 3360, 0))); - ObjectBuilder.remove(RegionManager.getObject(new Location(3097, 3357, 0))); - ObjectBuilder.add(new GameObject(155, new Location(3097, 3359, 0))); - ObjectBuilder.add(new GameObject(156, new Location(3097, 3358, 0))); + SceneryBuilder.remove(RegionManager.getObject(new Location(3097, 3360, 0))); + SceneryBuilder.remove(RegionManager.getObject(new Location(3097, 3357, 0))); + SceneryBuilder.add(new Scenery(155, new Location(3097, 3359, 0))); + SceneryBuilder.add(new Scenery(156, new Location(3097, 3358, 0))); break; } count++; @@ -234,8 +234,8 @@ public final class DraynorManorPlugin extends OptionHandler { @Override public Location getDestination(Node node, Node n) { - if (n instanceof GameObject) { - final int id = ((GameObject) n).getId(); + if (n instanceof Scenery) { + final int id = ((Scenery) n).getId(); switch (id) { case 155: return Location.create(3098, 3359, 0); 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 b44feda67..58ccffa94 100644 --- a/Server/src/main/java/core/game/interaction/city/DraynorNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/DraynorNodePlugin.java @@ -4,7 +4,7 @@ import core.cache.def.impl.NPCDefinition; import core.cache.def.impl.ObjectDefinition; import core.game.component.Component; import core.game.node.entity.player.link.diary.DiaryType; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.SceneryBuilder; import core.game.content.activity.ActivityManager; import core.game.content.activity.ActivityPlugin; import core.game.content.activity.CutscenePlugin; @@ -14,7 +14,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; @@ -45,7 +45,7 @@ public final class DraynorNodePlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - final int id = node instanceof NPC ? ((NPC) node).getId() : ((GameObject) node).getId(); + final int id = node instanceof NPC ? ((NPC) node).getId() : ((Scenery) node).getId(); switch (id) { case 922: player.getDialogueInterpreter().open(((NPC) node).getId(), ((NPC) node), true); @@ -55,7 +55,7 @@ public final class DraynorNodePlugin extends OptionHandler { break; case 6434: // Trapdoors above NW and SE corners of Draynor sewer if (option.equalsIgnoreCase("open")) { - ObjectBuilder.replace(node.asObject(), node.asObject().transform(6435), 500); + SceneryBuilder.replace(node.asObject(), node.asObject().transform(6435), 500); } break; } @@ -64,8 +64,8 @@ public final class DraynorNodePlugin extends OptionHandler { @Override public Location getDestination(Node node, Node n) { - if (n instanceof GameObject) { - final GameObject object = (GameObject) n; + if (n instanceof Scenery) { + final Scenery object = (Scenery) n; if (object.getId() == 7092) { return n.getLocation().transform(0, 1, 0); } diff --git a/Server/src/main/java/core/game/interaction/city/EdgevilleNodePlugin.java b/Server/src/main/java/core/game/interaction/city/EdgevilleNodePlugin.java index f35836ccd..f138ffea2 100644 --- a/Server/src/main/java/core/game/interaction/city/EdgevilleNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/EdgevilleNodePlugin.java @@ -5,8 +5,8 @@ import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; @@ -36,7 +36,7 @@ public final class EdgevilleNodePlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - int id = ((GameObject) node).getId(); + int id = ((Scenery) node).getId(); switch (id) { case 9262: case 9261: @@ -55,12 +55,12 @@ public final class EdgevilleNodePlugin extends OptionHandler { break; case 26933: // Trapdoors at edgeville dungeon entrance if (option.equalsIgnoreCase("open")) { - ObjectBuilder.replace(node.asObject(), node.asObject().transform(26934), 500); + SceneryBuilder.replace(node.asObject(), node.asObject().transform(26934), 500); } break; case 26934: // Trapdoors at edgeville dungeon entrance if (option.equalsIgnoreCase("close")) { - ObjectBuilder.replace(node.asObject(), node.asObject().transform(26933)); + SceneryBuilder.replace(node.asObject(), node.asObject().transform(26933)); } } return true; 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 2d8ec96a3..65d455dbe 100644 --- a/Server/src/main/java/core/game/interaction/city/FaladorNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/FaladorNodePlugin.java @@ -13,8 +13,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -73,7 +73,7 @@ public final class FaladorNodePlugin extends OptionHandler { final int id = node.getId(); switch (id) { case 11708:// estate door. - DoorActionHandler.handleDoor(player, (GameObject) node); + DoorActionHandler.handleDoor(player, (Scenery) node); break; case 2290: player.getDialogueInterpreter().open(id, node); @@ -105,13 +105,13 @@ public final class FaladorNodePlugin extends OptionHandler { }); break; case 2271: - ObjectBuilder.replace((GameObject) node, ((GameObject) node).transform(2272)); + SceneryBuilder.replace((Scenery) node, ((Scenery) node).transform(2272)); player.animate(OPEN_ANIMATION); break; case 2272: switch (option) { case "shut": - ObjectBuilder.replace((GameObject) node, ((GameObject) node).transform(2271)); + SceneryBuilder.replace((Scenery) node, ((Scenery) node).transform(2271)); player.animate(CLOSE_ANIMATION); break; case "search": @@ -139,7 +139,7 @@ public final class FaladorNodePlugin extends OptionHandler { if (npc.getId() == 2290) { return Location.create(2997, 3374, 0); } - } else if (n instanceof GameObject) { + } else if (n instanceof Scenery) { if (n.getId() == 11708 && node.getLocation().equals(new Location(2981, 3370, 0))) { return node.getLocation(); } 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 479802915..f01c7b5d6 100644 --- a/Server/src/main/java/core/game/interaction/city/GnomeStrongholdPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/GnomeStrongholdPlugin.java @@ -7,8 +7,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; @@ -36,7 +36,7 @@ public final class GnomeStrongholdPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - GameObject object = (GameObject) node; + Scenery object = (Scenery) node; switch (object.getId()) { case 9316: case 9317: @@ -68,12 +68,12 @@ public final class GnomeStrongholdPlugin extends OptionHandler { * @param player the player. * @param object the object. */ - private void openTreeDoor(final Player player, final GameObject object) { + private void openTreeDoor(final Player player, final Scenery object) { if (object.getCharge() == 88) { return; } object.setCharge(88); - ObjectBuilder.replace(object, object.transform(object.getId() == 1967 ? 1969 : 1970), 4); + SceneryBuilder.replace(object, object.transform(object.getId() == 1967 ? 1969 : 1970), 4); AgilityHandler.walk(player, -1, player.getLocation(), player.getLocation().transform(0, player.getLocation().getY() <= 3491 ? 2 : -2, 0), new Animation(1426), 0, null); GameWorld.getPulser().submit(new Pulse(4) { @Override @@ -89,13 +89,13 @@ public final class GnomeStrongholdPlugin extends OptionHandler { * @param player The player. * @param object The door. */ - private void openGates(Player player, final GameObject object) { + private void openGates(Player player, final Scenery object) { if (object.getCharge() == 88) { return; } object.setCharge(88); - ObjectBuilder.replace(object, object.transform(191), 4); - ObjectBuilder.add(new GameObject(192, Location.create(2462, 3383, 0)), 4); + SceneryBuilder.replace(object, object.transform(191), 4); + SceneryBuilder.add(new Scenery(192, Location.create(2462, 3383, 0)), 4); Location start = Location.create(2461, 3382, 0); Location end = Location.create(2461, 3385, 0); if (player.getLocation().getY() > object.getLocation().getY()) { @@ -115,8 +115,8 @@ public final class GnomeStrongholdPlugin extends OptionHandler { @Override public Location getDestination(Node node, Node n) { - if (n instanceof GameObject) { - switch (((GameObject) n).getId()) { + if (n instanceof Scenery) { + switch (((Scenery) n).getId()) { case 190: if (node.getLocation().getY() < n.getLocation().getY()) { return Location.create(2461, 3382, 0); 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 b2256c89a..0c9081e95 100644 --- a/Server/src/main/java/core/game/interaction/city/HamHideoutPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/HamHideoutPlugin.java @@ -5,7 +5,7 @@ import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -39,14 +39,14 @@ public final class HamHideoutPlugin extends OptionHandler { @Override public boolean handle(final Player player, Node node, String option) { - final int id = ((GameObject) node).getId(); + final int id = ((Scenery) node).getId(); switch (id) { case 5493: if (player.getLocation().withinDistance(Location.create(3149, 9652, 0))) { ClimbActionHandler.climb(player, new Animation(828), new Location(3165, 3251, 0)); return true; } - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); return true; case 5490: case 5491: 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 5c46ba972..62b105c09 100644 --- a/Server/src/main/java/core/game/interaction/city/KaramajaOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/KaramajaOptionPlugin.java @@ -16,8 +16,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import rs09.game.world.repository.Repository; import core.plugin.Plugin; @@ -104,19 +104,19 @@ public final class KaramajaOptionPlugin extends OptionHandler { player.getPacketDispatch().sendMessage("Not enough inventory space."); return true; } - final GameObject pineApple = ((GameObject) node); + final Scenery pineApple = ((Scenery) node); if (pineApple.getId() == 1413) { player.getPacketDispatch().sendMessage("There are no pineapples left on this plant."); return true; } boolean last = pineApple.getId() == 14012; if (player.getInventory().add(PINEAPPLE)) { - ObjectBuilder.replace(pineApple, pineApple.transform(pineApple.getId() + 1), last ? 270 : 40); + SceneryBuilder.replace(pineApple, pineApple.transform(pineApple.getId() + 1), last ? 270 : 40); player.getPacketDispatch().sendMessage("You pick a pineapple."); } break; case "enter": - switch (((GameObject) node).getId()) { + switch (((Scenery) node).getId()) { case 5083: if (player.getAttribute("saniboch:paid", false) || player.getAchievementDiaryManager().getDiary(DiaryType.KARAMJA).isComplete()) { ClimbActionHandler.climb(player, ClimbActionHandler.CLIMB_UP, Location.create(2713, 9564, 0)); @@ -152,21 +152,21 @@ public final class KaramajaOptionPlugin extends OptionHandler { } break; case "pay-fare": - switch (((GameObject) node).getId()) { + switch (((Scenery) node).getId()) { case 2230: player.getPacketDispatch().sendMessage("This cart appears to have been out of reward for some time."); break; } break; case "climb-up": - switch (((GameObject) node).getId()) { + switch (((Scenery) node).getId()) { case 3618: player.getProperties().setTeleportLocation(AGILITY_MAIN); break; } break; case "climb-down": - switch (((GameObject) node).getId()) { + switch (((Scenery) node).getId()) { case 492: player.getPacketDispatch().sendMessage("You climb down through the pot hole."); player.getProperties().setTeleportLocation(MUSA_POINT_DUNGEON); @@ -182,7 +182,7 @@ public final class KaramajaOptionPlugin extends OptionHandler { } break; case "climb": - switch (((GameObject) node).getId()) { + switch (((Scenery) node).getId()) { case 1764: player.getProperties().setTeleportLocation(VOLCANO_RIM); player.getPacketDispatch().sendMessage("You climb up the hanging rope..."); @@ -191,7 +191,7 @@ public final class KaramajaOptionPlugin extends OptionHandler { } break; case "open": - switch (((GameObject) node).getId()) { + switch (((Scenery) node).getId()) { case 2626: player.getDialogueInterpreter().open(789, Repository.findNPC(789)); break; @@ -211,7 +211,7 @@ public final class KaramajaOptionPlugin extends OptionHandler { } break; case "search": - switch (((GameObject) node).getId()) { + switch (((Scenery) node).getId()) { case 2078: player.getPacketDispatch().sendMessage("There are no bananas left on the tree."); break; @@ -245,7 +245,7 @@ public final class KaramajaOptionPlugin extends OptionHandler { case "shake": if (player.getInventory().hasSpaceFor(new Item(Items.PALM_LEAF_2339))) { player.getPacketDispatch().sendMessage("You shake the tree..."); - ObjectBuilder.replace(node.asObject(), node.asObject().transform(2976), 60); // 35 second cool-down + SceneryBuilder.replace(node.asObject(), node.asObject().transform(2976), 60); // 35 second cool-down player.lock(); final Pulse palmPulse = new Pulse(2) { @Override @@ -275,9 +275,9 @@ public final class KaramajaOptionPlugin extends OptionHandler { @Override public Location getDestination(Node node, Node n) { - if (n instanceof GameObject) { - if (((GameObject) n).getDefinition().hasAction("open")) { - return DoorActionHandler.getDestination((Player) node, (GameObject) n); + if (n instanceof Scenery) { + if (((Scenery) n).getDefinition().hasAction("open")) { + return DoorActionHandler.getDestination((Player) node, (Scenery) n); } } return null; 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 ea41d72ae..0c6a3f2de 100644 --- a/Server/src/main/java/core/game/interaction/city/LumbridgeNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/LumbridgeNodePlugin.java @@ -14,7 +14,7 @@ import core.game.node.entity.combat.equipment.WeaponInterface; import core.game.node.entity.impl.Projectile; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -50,7 +50,7 @@ public final class LumbridgeNodePlugin extends OptionHandler { @Override public boolean handle(final Player player, Node node, String option) { - int id = ((GameObject) node).getId(); + int id = ((Scenery) node).getId(); switch (id) { case 29355: if (node.getLocation().getX() == 3209) { @@ -64,7 +64,7 @@ public final class LumbridgeNodePlugin extends OptionHandler { player.getPacketDispatch().sendMessage("You need a training bow and arrow to practice here."); return true; } - player.getPulseManager().run(new ArcheryTargetPulse(player, (GameObject) node)); + player.getPulseManager().run(new ArcheryTargetPulse(player, (Scenery) node)); return true; case 36978: player.lock(); @@ -82,7 +82,7 @@ public final class LumbridgeNodePlugin extends OptionHandler { case 0: player.lock(); player.sendMessage("You start cranking the lever."); - player.getPacketDispatch().sendObjectAnimation(((GameObject) node), new Animation(9979)); + player.getPacketDispatch().sendObjectAnimation(((Scenery) node), new Animation(9979)); player.animate(new Animation(9977)); break; case 8: @@ -122,8 +122,8 @@ public final class LumbridgeNodePlugin extends OptionHandler { @Override public Location getDestination(Node node, Node n) { - if (n instanceof GameObject) { - final GameObject object = (GameObject) n; + if (n instanceof Scenery) { + final Scenery object = (Scenery) n; if (object.getId() == 36976) { return Location.create(3243, 3205, 2); } else if (object.getId() == 37095) { @@ -147,9 +147,9 @@ public final class LumbridgeNodePlugin extends OptionHandler { private final Player player; /** - * Represents the game object. + * Represents the scenery. */ - private final GameObject object; + private final Scenery object; /** * Constructs a new {@code ArcheryCompetitionPulse} {@code Object}. @@ -157,7 +157,7 @@ public final class LumbridgeNodePlugin extends OptionHandler { * @param player the player. * @param object the object. */ - public ArcheryTargetPulse(final Player player, final GameObject object) { + public ArcheryTargetPulse(final Player player, final Scenery object) { super(1, player, object); this.player = player; this.object = object; diff --git a/Server/src/main/java/core/game/interaction/city/MonasteryPlugin.java b/Server/src/main/java/core/game/interaction/city/MonasteryPlugin.java index 604b4b4f6..a3ab89f3f 100644 --- a/Server/src/main/java/core/game/interaction/city/MonasteryPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/MonasteryPlugin.java @@ -5,7 +5,7 @@ import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; @@ -31,7 +31,7 @@ public final class MonasteryPlugin extends OptionHandler { if (!player.getSavedData().getGlobalData().isJoinedMonastery()) { player.getDialogueInterpreter().open(abbot ? 801 : 7727, true); } else { - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); } break; } 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 08db1cc59..ea35b1c09 100644 --- a/Server/src/main/java/core/game/interaction/city/PortSarimPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/PortSarimPlugin.java @@ -7,7 +7,7 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -83,7 +83,7 @@ public final class PortSarimPlugin extends OptionHandler { player.getDialogueInterpreter().open(((NPC) node).getId(), ((NPC) node)); break; case "open": - switch (((GameObject) node).getId()) { + switch (((Scenery) node).getId()) { case 9565: case 9563: player.getPacketDispatch().sendMessage("The door is securely locked."); @@ -91,7 +91,7 @@ public final class PortSarimPlugin extends OptionHandler { } break; case "pick-lock": - switch (((GameObject) node).getId()) { + switch (((Scenery) node).getId()) { case 9565: if (player.getLocation().getY() <= 3187) { player.getPacketDispatch().sendMessage("You simply cannot find a way to pick the lock from this side."); diff --git a/Server/src/main/java/core/game/interaction/city/SophanemPlugin.java b/Server/src/main/java/core/game/interaction/city/SophanemPlugin.java index 1783b7a47..23b784b7f 100644 --- a/Server/src/main/java/core/game/interaction/city/SophanemPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/SophanemPlugin.java @@ -6,7 +6,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; @@ -29,7 +29,7 @@ public class SophanemPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - final int id = node instanceof GameObject ? ((GameObject) node).getId() : ((Item) node).getId(); + final int id = node instanceof Scenery ? ((Scenery) node).getId() : ((Item) node).getId(); switch (id) { case 20275: ClimbActionHandler.climb(player, new Animation(827), Location.create(2799, 5160, 0)); diff --git a/Server/src/main/java/core/game/interaction/city/TaverlyDungeonPlugin.java b/Server/src/main/java/core/game/interaction/city/TaverlyDungeonPlugin.java index 887a71241..5618bb6f2 100644 --- a/Server/src/main/java/core/game/interaction/city/TaverlyDungeonPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/TaverlyDungeonPlugin.java @@ -6,8 +6,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.plugin.Initializable; @@ -35,7 +35,7 @@ public final class TaverlyDungeonPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - final int id = ((GameObject) node).getId(); + final int id = ((Scenery) node).getId(); switch (id) { case 2143: case 2144: @@ -48,9 +48,9 @@ public final class TaverlyDungeonPlugin extends OptionHandler { ARMOUR_SUITS[i] = npc = NPC.create(453, location); npc.init(); npc.getProperties().getCombatPulse().attack(player); - GameObject object = RegionManager.getObject(location); + Scenery object = RegionManager.getObject(location); if (object != null) { - ObjectBuilder.remove(object); + SceneryBuilder.remove(object); } alive = false; } @@ -62,7 +62,7 @@ public final class TaverlyDungeonPlugin extends OptionHandler { } } player.removeAttribute("spawned_suits"); - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } return false; 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 4daa657ca..bab206236 100644 --- a/Server/src/main/java/core/game/interaction/city/TrollheimPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/TrollheimPlugin.java @@ -18,7 +18,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.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; @@ -168,7 +168,7 @@ public final class TrollheimPlugin extends OptionHandler { @Override public boolean handle(final Player player, Node node, String option) { - final int id = node instanceof GameObject ? ((GameObject) node).getId() : ((NPC) node).getId(); + final int id = node instanceof Scenery ? ((Scenery) node).getId() : ((NPC) node).getId(); final Location loc = node.getLocation(); int xOffset = 0, yOffset = 0; Direction direction = Direction.SOUTH; @@ -235,7 +235,7 @@ public final class TrollheimPlugin extends OptionHandler { case 3786:// exit case 3782:// entrance case 3783:// entrance. - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; case 3672: player.getPacketDispatch().sendMessage("You don't know how to open the secret door."); @@ -261,7 +261,7 @@ public final class TrollheimPlugin extends OptionHandler { player.getPacketDispatch().sendMessage("You need Climbing boots to negotiate these rocks."); return true; } - final GameObject object = ((GameObject) node); + final Scenery object = ((Scenery) node); switch (id) { case 3723: bandaid(player, player.getLocation(), object.getLocation().transform(0, 2, 0), CLIMB_UP); @@ -399,8 +399,8 @@ public final class TrollheimPlugin extends OptionHandler { @Override public Location getDestination(Node node, Node n) { - if (n instanceof GameObject) { - final GameObject object = ((GameObject) n); + if (n instanceof Scenery) { + final Scenery object = ((Scenery) n); if (object.getId() == 3782) { if (node.getLocation().getX() >= 2897) { return Location.create(2897, 3618, 0); diff --git a/Server/src/main/java/core/game/interaction/city/TzhaarCityPlugin.java b/Server/src/main/java/core/game/interaction/city/TzhaarCityPlugin.java index 18fc15f71..0e91d1c98 100644 --- a/Server/src/main/java/core/game/interaction/city/TzhaarCityPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/TzhaarCityPlugin.java @@ -7,7 +7,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; @@ -39,7 +39,7 @@ public final class TzhaarCityPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - int id = ((GameObject) node).getId(); + int id = ((Scenery) node).getId(); switch (option) { case "enter": switch (id) { 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 64f47c498..d87bede8e 100644 --- a/Server/src/main/java/core/game/interaction/city/VarrockNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/VarrockNodePlugin.java @@ -9,8 +9,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -52,14 +52,14 @@ public final class VarrockNodePlugin extends OptionHandler { ObjectDefinition.forId(29534).getHandlers().put("option:enter", this); ObjectDefinition.forId(17985).getHandlers().put("option:climb-down", this); ObjectDefinition.forId(24366).getHandlers().put("option:climb-up", this); - ObjectBuilder.add(new GameObject(17974, new Location(3204, 9911), 10, 0)); + SceneryBuilder.add(new Scenery(17974, new Location(3204, 9911), 10, 0)); new KnockatDoorDialogue().init(); return this; } @Override public boolean handle(final Player player, Node node, String option) { - final int id = node instanceof GameObject ? ((GameObject) node).getId() : ((Item) node).getId(); + final int id = node instanceof Scenery ? ((Scenery) node).getId() : ((Item) node).getId(); switch (id) { case 24366: ClimbActionHandler.climb(player, ClimbActionHandler.CLIMB_UP, new Location(3237, 3459)); @@ -90,7 +90,7 @@ public final class VarrockNodePlugin extends OptionHandler { ClimbActionHandler.climb(player, new Animation(827), Location.create(3096, 3432, 0)); return true; } - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); return true; case 5581: case 36974: @@ -98,18 +98,18 @@ public final class VarrockNodePlugin extends OptionHandler { player.getPacketDispatch().sendMessage("You don't have enough inventory space."); return true; } - ObjectBuilder.replace(((GameObject) node), ((GameObject) node).transform(5582), 5000); + SceneryBuilder.replace(((Scenery) node), ((Scenery) node).transform(5582), 5000); break; case 24357: if (player.getLocation().getDistance(Location.create(3188, 3358, 0)) < 3) { ClimbActionHandler.climb(player, new Animation(828), Location.create(3188, 3354, 1)); return true; } - if (((GameObject) node).getLocation().equals(new Location(3156, 3435, 0))) { + if (((Scenery) node).getLocation().equals(new Location(3156, 3435, 0))) { ClimbActionHandler.climb(player, new Animation(828), Location.create(3155, 3435, 1)); return true; } - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); return true; case 24427: //varrock museum stairs that lead upstairs @@ -131,7 +131,7 @@ public final class VarrockNodePlugin extends OptionHandler { return true; } player.getInventory().add(SPADE); - ObjectBuilder.replace((GameObject) node, ((GameObject) node).transform(0), 250); + SceneryBuilder.replace((Scenery) node, ((Scenery) node).transform(0), 250); return true; } return true; diff --git a/Server/src/main/java/core/game/interaction/city/WildernessPlugin.java b/Server/src/main/java/core/game/interaction/city/WildernessPlugin.java index ae1085388..f559f6426 100644 --- a/Server/src/main/java/core/game/interaction/city/WildernessPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/WildernessPlugin.java @@ -7,7 +7,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.TeleportManager.TeleportType; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; @@ -86,7 +86,7 @@ public final class WildernessPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - int id = ((GameObject) node).getId(); + int id = ((Scenery) node).getId(); switch (option) { case "climb-down": switch (id) { @@ -94,7 +94,7 @@ public final class WildernessPlugin extends OptionHandler { if (node.getLocation().equals(LOCATIONS[0])) { ClimbActionHandler.climb(player, new Animation(827), LOCATIONS[1]); } else { - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); return true; } break; @@ -106,7 +106,7 @@ public final class WildernessPlugin extends OptionHandler { if (node.getLocation().equals(LOCATIONS[6])) { ClimbActionHandler.climb(player, new Animation(828), LOCATIONS[3]); } else { - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); return true; } break; 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 a082d95be..529cb0a07 100644 --- a/Server/src/main/java/core/game/interaction/city/WizardTowerPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/WizardTowerPlugin.java @@ -23,7 +23,7 @@ import core.game.node.entity.skill.Skills; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; @@ -102,7 +102,7 @@ public final class WizardTowerPlugin extends OptionHandler { ClimbActionHandler.climb(player, new Animation(828), new Location(3092, 3361, 0)); return true; } - if (!Location.create(3103, 9576, 0).equals(((GameObject) node).getLocation())) { + if (!Location.create(3103, 9576, 0).equals(((Scenery) node).getLocation())) { return ObjectDefinition.getOptionHandler(2147, "climb-up").handle(player, node, option); } player.getProperties().setTeleportLocation(GROUND_FLOOR); @@ -112,9 +112,9 @@ public final class WizardTowerPlugin extends OptionHandler { break; case "open": if (node.getLocation().equals(new Location(3107, 3162, 0))) { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node, player.getLocation().getX() >= 3107 ? Location.create(3106, 3161, 0) : Location.create(3108, 3163, 0)); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node, player.getLocation().getX() >= 3107 ? Location.create(3106, 3161, 0) : Location.create(3108, 3163, 0)); } else { - DoorActionHandler.handleDoor(player, (GameObject) node); + DoorActionHandler.handleDoor(player, (Scenery) node); } break; } @@ -123,8 +123,8 @@ public final class WizardTowerPlugin extends OptionHandler { @Override public Location getDestination(Node node, Node n) { - if (n instanceof GameObject) { - final GameObject object = (GameObject) n; + if (n instanceof Scenery) { + final Scenery object = (Scenery) n; if (object.getId() == 11993 && object.getLocation().equals(new Location(3107, 3162, 0))) { return node.getLocation().getX() >= 3107 ? Location.create(3108, 3163, 0) : Location.create(3106, 3161, 0); } 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 0bcb3e619..f38df04f3 100644 --- a/Server/src/main/java/core/game/interaction/city/ZanarisPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/ZanarisPlugin.java @@ -10,7 +10,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.TeleportManager.TeleportType; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Plugin; import rs09.plugin.PluginManager; @@ -42,7 +42,7 @@ public final class ZanarisPlugin extends OptionHandler { case 12045: case 12047: if ((node.getId() == 12045 && node.getLocation().equals(new Location(2469, 4438, 0)) && player.getLocation().getX() >= 2470) || player.getLocation().getY() < 4434 && (node.getId() == 12045 || node.getId() == 12047 && node.getLocation().equals(new Location(2465, 4434, 0))) || node.getId() == 12047 && player.getLocation().getX() >= 2470) { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } player.getDialogueInterpreter().open(MagicDoorDialogue.NAME, node); @@ -65,7 +65,7 @@ public final class ZanarisPlugin extends OptionHandler { /** * The object. */ - private GameObject door; + private Scenery door; /** * Constructs a new {@code MagicDoorDialogue} {@code Object}. @@ -91,7 +91,7 @@ public final class ZanarisPlugin extends OptionHandler { @Override public boolean open(Object... args) { - door = (GameObject) args[0]; + door = (Scenery) args[0]; npc("You may not pass through this door without paying the", "trading tax."); return true; } diff --git a/Server/src/main/java/core/game/interaction/city/lumbridge/FredChest.java b/Server/src/main/java/core/game/interaction/city/lumbridge/FredChest.java index 26ca21b65..97e69eb2f 100644 --- a/Server/src/main/java/core/game/interaction/city/lumbridge/FredChest.java +++ b/Server/src/main/java/core/game/interaction/city/lumbridge/FredChest.java @@ -4,8 +4,8 @@ import core.cache.def.impl.ObjectDefinition; 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.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.plugin.Initializable; import core.plugin.Plugin; @@ -27,9 +27,9 @@ public class FredChest extends OptionHandler { @Override public boolean handle(Player player, Node node, String option){ if(option.equals("open")){ - ObjectBuilder.replace(node.asObject(),new GameObject(37010,node.asObject().getLocation(),node.asObject().getRotation())); + SceneryBuilder.replace(node.asObject(),new Scenery(37010,node.asObject().getLocation(),node.asObject().getRotation())); } else if (option.equals("shut")){ - ObjectBuilder.replace(node.asObject(),new GameObject(37009,node.asObject().getLocation(),node.asObject().getRotation())); + SceneryBuilder.replace(node.asObject(),new Scenery(37009,node.asObject().getLocation(),node.asObject().getRotation())); } else if (option.equals("search")){ player.getPacketDispatch().sendMessage("You search the chest but find nothing."); } diff --git a/Server/src/main/java/core/game/interaction/item/SilverSicklePlugin.java b/Server/src/main/java/core/game/interaction/item/SilverSicklePlugin.java index 6e52b72e3..646687452 100644 --- a/Server/src/main/java/core/game/interaction/item/SilverSicklePlugin.java +++ b/Server/src/main/java/core/game/interaction/item/SilverSicklePlugin.java @@ -4,8 +4,8 @@ import core.cache.def.impl.ItemDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.Region; import core.game.world.map.RegionManager; @@ -36,13 +36,13 @@ public final class SilverSicklePlugin extends OptionHandler { if (player.getSkills().getPrayerPoints() < 1) { player.getPacketDispatch().sendMessage("You don't have enough prayer points to do this."); } - for (GameObject[] o : region.getPlanes()[0].getObjects()) { - for (GameObject obj : o) { + for (Scenery[] o : region.getPlanes()[0].getObjects()) { + for (Scenery obj : o) { if (obj != null) { if (obj.getName().equalsIgnoreCase("Rotting log") && player.getSkills().getPrayerPoints() >= 1) { if (player.getLocation().withinDistance(obj.getLocation(), 2)) { handleVisuals(player, node); - ObjectBuilder.add(new GameObject(3509, obj.getLocation(), obj.getRotation())); + SceneryBuilder.add(new Scenery(3509, obj.getLocation(), obj.getRotation())); } } } diff --git a/Server/src/main/java/core/game/interaction/item/withitem/ChestKeyPlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/ChestKeyPlugin.java index 239cd1322..1f83be6c2 100644 --- a/Server/src/main/java/core/game/interaction/item/withitem/ChestKeyPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withitem/ChestKeyPlugin.java @@ -4,8 +4,8 @@ import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.plugin.Initializable; import core.plugin.Plugin; @@ -44,7 +44,7 @@ public final class ChestKeyPlugin extends UseWithHandler { public boolean handle(NodeUsageEvent event) { final Player player = event.getPlayer(); if (player.getInventory().remove(CHEST_KEY)) { - ObjectBuilder.replace((GameObject) event.getUsedWith(), ((GameObject) event.getUsedWith()).transform(2080), 3); + SceneryBuilder.replace((Scenery) event.getUsedWith(), ((Scenery) event.getUsedWith()).transform(2080), 3); player.getInventory().add(PIRATE_MESSAGE); player.getPacketDispatch().sendMessage("You unlock the chest."); player.getPacketDispatch().sendMessage("All that's in the chest is a message..."); diff --git a/Server/src/main/java/core/game/interaction/item/withitem/ImpJarCreatePlugin.java b/Server/src/main/java/core/game/interaction/item/withitem/ImpJarCreatePlugin.java index 408772099..9d2829285 100644 --- a/Server/src/main/java/core/game/interaction/item/withitem/ImpJarCreatePlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withitem/ImpJarCreatePlugin.java @@ -4,7 +4,7 @@ import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; @@ -43,7 +43,7 @@ public final class ImpJarCreatePlugin extends UseWithHandler { @Override public boolean handle(NodeUsageEvent event) { Player player = event.getPlayer(); - if (event.getUsedWith() instanceof GameObject) { + if (event.getUsedWith() instanceof Scenery) { if ((event.getUsedItem().getId() >= 4525 && event.getUsedItem().getId() <= 4700) || event.getUsedItem().getId() == 1939 || event.getUsedItem().getId() == 11262 || event.getUsedItem().getId() == 10012) { fillOilStill(player, event.getUsedItem()); } diff --git a/Server/src/main/java/core/game/interaction/item/withobject/GWDEntranceRopeUsage.java b/Server/src/main/java/core/game/interaction/item/withobject/GWDEntranceRopeUsage.java index 8efae18f5..620f456c0 100644 --- a/Server/src/main/java/core/game/interaction/item/withobject/GWDEntranceRopeUsage.java +++ b/Server/src/main/java/core/game/interaction/item/withobject/GWDEntranceRopeUsage.java @@ -2,7 +2,7 @@ package core.game.interaction.item.withobject; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; @@ -28,7 +28,7 @@ public final class GWDEntranceRopeUsage extends UseWithHandler { @Override public boolean handle(NodeUsageEvent event) { - GameObject object = (GameObject) event.getUsedWith(); + Scenery object = (Scenery) event.getUsedWith(); return object.getInteraction().get(0).getHandler().handle(event.getPlayer(), object, "tie-rope"); } diff --git a/Server/src/main/java/core/game/interaction/item/withobject/PriestInPerilUsePlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/PriestInPerilUsePlugin.java index 091082269..902e07fcf 100644 --- a/Server/src/main/java/core/game/interaction/item/withobject/PriestInPerilUsePlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withobject/PriestInPerilUsePlugin.java @@ -7,7 +7,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; @@ -46,7 +46,7 @@ public class PriestInPerilUsePlugin extends UseWithHandler { @Override public boolean handle(NodeUsageEvent event) { Player player = event.getPlayer(); - int objUse = ((GameObject) event.getUsedWith()).getId(); + int objUse = ((Scenery) event.getUsedWith()).getId(); int itemUse = ((Item) event.getUsedItem()).getId(); switch(objUse) { case 3499: 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 d945ea3b8..d37763a7a 100644 --- a/Server/src/main/java/core/game/interaction/item/withobject/SmithingPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withobject/SmithingPlugin.java @@ -10,7 +10,7 @@ import core.game.interaction.UseWithHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.plugin.Plugin; import core.plugin.Initializable; import rs09.plugin.PluginManager; @@ -66,7 +66,7 @@ public final class SmithingPlugin extends UseWithHandler { @Override public boolean handle(NodeUsageEvent event) { final Player player = event.getPlayer(); - if (((GameObject) event.getUsedWith()).getId() == 2782 && !player.getQuestRepository().isComplete("Doric's Quest")) { + if (((Scenery) event.getUsedWith()).getId() == 2782 && !player.getQuestRepository().isComplete("Doric's Quest")) { player.getDialogueInterpreter().sendDialogue("Property of Doric the Dwarf."); return true; } 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 d4eb8d68d..04590e094 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 @@ -7,7 +7,7 @@ import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; @@ -116,7 +116,7 @@ public final class WaterSourcePlugin extends UseWithHandler { * Method used to handle the interaction. * @param player the player. */ - public final void handle(final GameObject object, final Player player) { + public final void handle(final Scenery object, final Player player) { if (object.getId() == 11661 && required.getId() == Items.BUCKET_1925 && !player.getAchievementDiaryManager().getDiary(DiaryType.FALADOR).isComplete(0,7)) { diff --git a/Server/src/main/java/core/game/interaction/npc/BurthorpeOptionPlugin.java b/Server/src/main/java/core/game/interaction/npc/BurthorpeOptionPlugin.java index d90c1a2a6..63cc74d76 100644 --- a/Server/src/main/java/core/game/interaction/npc/BurthorpeOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/npc/BurthorpeOptionPlugin.java @@ -7,7 +7,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; @@ -63,7 +63,7 @@ public final class BurthorpeOptionPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - final int id = node instanceof NPC ? ((NPC) node).getId() : ((GameObject) node).getId(); + final int id = node instanceof NPC ? ((NPC) node).getId() : ((Scenery) node).getId(); switch (option) { case "climb-down": switch (id) { diff --git a/Server/src/main/java/core/game/interaction/npc/SpiritKyattOptionPlugin.java b/Server/src/main/java/core/game/interaction/npc/SpiritKyattOptionPlugin.java index 6bbae4248..7e73ec5c1 100644 --- a/Server/src/main/java/core/game/interaction/npc/SpiritKyattOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/npc/SpiritKyattOptionPlugin.java @@ -6,8 +6,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; @@ -53,14 +53,14 @@ public final class SpiritKyattOptionPlugin extends OptionHandler { player.getPacketDispatch().sendMessage("You don't have enough inventory space."); return true; } - ObjectBuilder.replace(((GameObject) node), ((GameObject) node).transform(14908), 500); + SceneryBuilder.replace(((Scenery) node), ((Scenery) node).transform(14908), 500); break; case 14910: if (!player.getInventory().add(BRONZE_PICKAXE)) { player.getPacketDispatch().sendMessage("You don't have enough inventory space."); return true; } - ObjectBuilder.replace(((GameObject) node), ((GameObject) node).transform(14908), 500); + SceneryBuilder.replace(((Scenery) node), ((Scenery) node).transform(14908), 500); break; } return true; 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 f4dd52c87..034977cdf 100644 --- a/Server/src/main/java/core/game/interaction/npc/sorceress_app/SorceressApprenticePlugin.java +++ b/Server/src/main/java/core/game/interaction/npc/sorceress_app/SorceressApprenticePlugin.java @@ -7,7 +7,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; @@ -38,7 +38,7 @@ public class SorceressApprenticePlugin extends OptionHandler { if (node.getLocation().getX() == 3322) { ClimbActionHandler.climb(player, new Animation(828), TOP); } else { - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); return true; } break; 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 2b8a43a67..8dcace440 100644 --- a/Server/src/main/java/core/game/interaction/object/BankingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/BankingPlugin.java @@ -21,7 +21,7 @@ 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.node.object.Scenery; import core.game.system.task.Pulse; import core.game.world.map.Direction; import core.game.world.map.Location; @@ -60,7 +60,7 @@ public final class BankingPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - final GameObject object = (GameObject) node; + final Scenery object = (Scenery) node; if (player.getIronmanManager().checkRestriction(IronmanMode.ULTIMATE)) { return true; } @@ -626,7 +626,7 @@ public final class BankingPlugin extends OptionHandler { for (int i = 0; i < 4; i++) { Direction dir = Direction.get(i); Location loc = getLocation().transform(dir.getStepX(), dir.getStepY(), 0); - GameObject bank = RegionManager.getObject(loc); + Scenery bank = RegionManager.getObject(loc); if (bank != null && bank.getName().equals("Bank booth")) { setDirection(dir); setAttribute("facing_booth", true); diff --git a/Server/src/main/java/core/game/interaction/object/BarrowsTunnelShortcut.java b/Server/src/main/java/core/game/interaction/object/BarrowsTunnelShortcut.java index 2f69a67d0..344ff50ef 100644 --- a/Server/src/main/java/core/game/interaction/object/BarrowsTunnelShortcut.java +++ b/Server/src/main/java/core/game/interaction/object/BarrowsTunnelShortcut.java @@ -6,7 +6,7 @@ import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; @@ -43,7 +43,7 @@ public class BarrowsTunnelShortcut extends OptionHandler { break; case 5052: player.getPacketDispatch().sendMessage("You search the wall and find a lever."); - DoorActionHandler.handleAutowalkDoor(player, ((GameObject) node)); + DoorActionHandler.handleAutowalkDoor(player, ((Scenery) node)); break; case 30261: case 30262: diff --git a/Server/src/main/java/core/game/interaction/object/BrassKeyDoorPlugin.java b/Server/src/main/java/core/game/interaction/object/BrassKeyDoorPlugin.java index b5f72c231..090e2a7cb 100644 --- a/Server/src/main/java/core/game/interaction/object/BrassKeyDoorPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/BrassKeyDoorPlugin.java @@ -5,7 +5,7 @@ import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; @@ -21,7 +21,7 @@ public final class BrassKeyDoorPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { if (player.getInventory().contains(983, 1)) { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); } else { player.getPacketDispatch().sendMessage("This door is locked."); return true; @@ -37,7 +37,7 @@ public final class BrassKeyDoorPlugin extends OptionHandler { @Override public Location getDestination(Node node, Node n) { - return DoorActionHandler.getDestination(((Player) node), ((GameObject) n)); + return DoorActionHandler.getDestination(((Player) node), ((Scenery) n)); } } diff --git a/Server/src/main/java/core/game/interaction/object/ChampionsArenaPlugin.java b/Server/src/main/java/core/game/interaction/object/ChampionsArenaPlugin.java index 72692f441..d2b86c982 100644 --- a/Server/src/main/java/core/game/interaction/object/ChampionsArenaPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ChampionsArenaPlugin.java @@ -5,7 +5,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; @@ -25,7 +25,7 @@ public final class ChampionsArenaPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - int id = node instanceof GameObject ? ((GameObject) node).getId() : ((NPC) node).getId(); + int id = node instanceof Scenery ? ((Scenery) node).getId() : ((NPC) node).getId(); switch (id) { case 10556: player.getDialogueInterpreter().open(3050, true, true); diff --git a/Server/src/main/java/core/game/interaction/object/ChampionsGuildDoor.java b/Server/src/main/java/core/game/interaction/object/ChampionsGuildDoor.java index 930b16382..487cdc538 100644 --- a/Server/src/main/java/core/game/interaction/object/ChampionsGuildDoor.java +++ b/Server/src/main/java/core/game/interaction/object/ChampionsGuildDoor.java @@ -6,7 +6,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; @@ -30,7 +30,7 @@ public final class ChampionsGuildDoor extends OptionHandler { player.getDialogueInterpreter().sendDialogues(198, null, "Greetings bold adventurer. Welcome to the guild of", "Champions."); } player.getAchievementDiaryManager().finishTask(player, DiaryType.VARROCK, 1, 1); - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } return true; @@ -44,6 +44,6 @@ public final class ChampionsGuildDoor extends OptionHandler { @Override public Location getDestination(Node node, Node n) { - return DoorActionHandler.getDestination(((Player) node), ((GameObject) n)); + return DoorActionHandler.getDestination(((Player) node), ((Scenery) n)); } } 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 b82372be9..4e753f64c 100644 --- a/Server/src/main/java/core/game/interaction/object/ChefGuildDoorPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ChefGuildDoorPlugin.java @@ -8,7 +8,7 @@ import core.game.node.entity.skill.Skills; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; @@ -30,7 +30,7 @@ public final class ChefGuildDoorPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - final GameObject object = (GameObject) node; + final Scenery object = (Scenery) node; switch (object.getId()) { case 2712: // cooking guild front door if (player.getSkills().getLevel(Skills.COOKING) < 32) { @@ -72,6 +72,6 @@ public final class ChefGuildDoorPlugin extends OptionHandler { @Override public Location getDestination(Node node, Node n) { - return DoorActionHandler.getDestination(((Player) node), ((GameObject) n)); + return DoorActionHandler.getDestination(((Player) node), ((Scenery) n)); } } 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 611fed2da..557f40616 100644 --- a/Server/src/main/java/core/game/interaction/object/CowMilkingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/CowMilkingPlugin.java @@ -7,7 +7,7 @@ import core.game.interaction.UseWithHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; @@ -38,7 +38,7 @@ public final class CowMilkingPlugin extends OptionHandler { player.getDialogueInterpreter().open(70099, "You need to have started the Cold War quest to attempt this."); return true; } - milk(player, (GameObject) node); + milk(player, (Scenery) node); return true; } @@ -48,7 +48,7 @@ public final class CowMilkingPlugin extends OptionHandler { * @param object the object. * @return {@code True} if milked. */ - public boolean milk(final Player player, final GameObject object) { + public boolean milk(final Player player, final Scenery object) { if (!player.getInventory().contains(1925, 1) && !player.getInventory().contains(3727, 1)) { player.getDialogueInterpreter().open(3807, true, true); return true; @@ -109,7 +109,7 @@ public final class CowMilkingPlugin extends OptionHandler { @Override public boolean handle(NodeUsageEvent event) { - milk(event.getPlayer(), (GameObject) event.getUsedWith()); + milk(event.getPlayer(), (Scenery) event.getUsedWith()); return true; } 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 b76aeedfc..2a9b84e28 100644 --- a/Server/src/main/java/core/game/interaction/object/CulinomancerChestPliugin.java +++ b/Server/src/main/java/core/game/interaction/object/CulinomancerChestPliugin.java @@ -4,8 +4,8 @@ import core.cache.def.impl.ObjectDefinition; 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.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.plugin.Initializable; @@ -24,8 +24,8 @@ public final class CulinomancerChestPliugin extends OptionHandler { ObjectDefinition.forId(12309).getHandlers().put("option:bank", this); ObjectDefinition.forId(12309).getHandlers().put("option:buy-items", this); ObjectDefinition.forId(12309).getHandlers().put("option:buy-food", this); - GameObject object = RegionManager.getObject(new Location(3219, 9623, 0)); - ObjectBuilder.replace(object, object.transform(object.getId(), 3)); + Scenery object = RegionManager.getObject(new Location(3219, 9623, 0)); + SceneryBuilder.replace(object, object.transform(object.getId(), 3)); return this; } diff --git a/Server/src/main/java/core/game/interaction/object/DoorManagingPlugin.java b/Server/src/main/java/core/game/interaction/object/DoorManagingPlugin.java index b7740c0cd..c71017a64 100644 --- a/Server/src/main/java/core/game/interaction/object/DoorManagingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/DoorManagingPlugin.java @@ -5,8 +5,8 @@ import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.plugin.Initializable; @@ -30,7 +30,7 @@ public final class DoorManagingPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - GameObject object = (GameObject) node; + Scenery object = (Scenery) node; if (object.getType() != 9 && !player.getLocation().equals(node.getLocation()) && !player.getLocation().isNextTo(object) && object.getName().contains("cupboard")) { return true; } @@ -39,12 +39,12 @@ public final class DoorManagingPlugin extends OptionHandler { switch(option) { case "open": if (object.isActive()) { - ObjectBuilder.replace(object, object.transform(object.getId() + 1), 80); + SceneryBuilder.replace(object, object.transform(object.getId() + 1), 80); } return true; case "close": case "shut": - ObjectBuilder.replace(object, object.transform(object.getId() - 1)); + SceneryBuilder.replace(object, object.transform(object.getId() - 1)); return true; } return true; @@ -70,7 +70,7 @@ public final class DoorManagingPlugin extends OptionHandler { @Override public Location getDestination(Node n, Node node) { - GameObject o = (GameObject) node; + Scenery o = (Scenery) node; if (o.getType() < 4 || o.getType() == 9) { return DoorActionHandler.getDestination((Player) n, o); } 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 eb6486111..0db153ddf 100644 --- a/Server/src/main/java/core/game/interaction/object/DropPartyLeverOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/DropPartyLeverOptionPlugin.java @@ -4,7 +4,7 @@ import core.cache.def.impl.ObjectDefinition; 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.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; @@ -30,7 +30,7 @@ public final class DropPartyLeverOptionPlugin extends OptionHandler { @Override public boolean handle(final Player player, Node node, String option) { - final GameObject object = (GameObject) node; + final Scenery object = (Scenery) node; if (player.getAttribute("delay:lever", -1) > GameWorld.getTicks()) return true; player.setAttribute("delay:picking", GameWorld.getTicks() + 3); 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 063948dd6..5963741d6 100644 --- a/Server/src/main/java/core/game/interaction/object/ErnestTheChickenPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ErnestTheChickenPlugin.java @@ -10,8 +10,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -55,7 +55,7 @@ public final class ErnestTheChickenPlugin extends OptionHandler { @Override public boolean handle(final Player player, Node node, String option) { - final GameObject object = ((GameObject) node); + final Scenery object = ((Scenery) node); final LeverCacheExtension extension = LeverCacheExtension.extend(player); Lever lever = Lever.forObject(object.getId()); switch (option) { @@ -127,7 +127,7 @@ public final class ErnestTheChickenPlugin extends OptionHandler { * @param lever the lever. * @param object the object. */ - public final void pull(final Lever lever, final GameObject object) { + public final void pull(final Lever lever, final Scenery object) { final boolean up = isUp(lever); levers[lever.ordinal()] = !up; player.animate(!up ? UP_ANIMATION : DOWN_ANIMATION); @@ -154,7 +154,7 @@ public final class ErnestTheChickenPlugin extends OptionHandler { * Method used to walk through a door. * @param object the object. */ - public final void walk(final GameObject object) { + public final void walk(final Scenery object) { player.lock(4); GameWorld.getPulser().submit(new Pulse(1, player, object) { @Override @@ -162,16 +162,16 @@ public final class ErnestTheChickenPlugin extends OptionHandler { Point p = (Point) getWalkData()[0]; int[] rotation = (int[]) getWalkData()[1]; Location destination = (Location) getWalkData()[2]; - final GameObject opened = object.transform(object.getId(), rotation[0]); + final Scenery opened = object.transform(object.getId(), rotation[0]); opened.setCharge(88); opened.setLocation(object.getLocation().transform((int) p.getX(), (int) p.getY(), 0)); - final GameObject second = DoorActionHandler.getSecondDoor(object, player); - ObjectBuilder.replace(object, opened, 2); + final Scenery second = DoorActionHandler.getSecondDoor(object, player); + SceneryBuilder.replace(object, opened, 2); if (second != null) { - final GameObject secondOpened = second.transform(second.getId(), rotation[1]); + final Scenery secondOpened = second.transform(second.getId(), rotation[1]); secondOpened.setCharge(88); secondOpened.setLocation(second.getLocation().transform((int) p.getX(), (int) p.getY(), 0)); - ObjectBuilder.replace(second, secondOpened, 2); + SceneryBuilder.replace(second, secondOpened, 2); } AgilityHandler.walk(player, 0, player.getLocation(), destination, null, 0, null); return true; @@ -511,11 +511,11 @@ public final class ErnestTheChickenPlugin extends OptionHandler { @Override public Location getDestination(final Node node, final Node n) { - if (n instanceof GameObject) { + if (n instanceof Scenery) { final Player player = ((Player) node); final int x = player.getLocation().getX(); final int y = player.getLocation().getY(); - Location loc = ((GameObject) n).getLocation(); + Location loc = ((Scenery) n).getLocation(); if (loc.equals(new Location(3108, 9758, 0))) { if (y <= 9757) { return Location.create(3108, 9757, 0); 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 750ab251b..1baf9ddf6 100644 --- a/Server/src/main/java/core/game/interaction/object/FieldPickingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/FieldPickingPlugin.java @@ -8,8 +8,8 @@ import core.game.node.entity.combat.ImpactHandler.HitsplatType; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; @@ -44,7 +44,7 @@ public final class FieldPickingPlugin extends OptionHandler { if (player.getAttribute("delay:picking", -1) > GameWorld.getTicks()) { return true; } - final GameObject object = (GameObject) node; + final Scenery object = (Scenery) node; final PickingPlant plant = PickingPlant.forId(object.getId()); if (plant == null) { return false; @@ -83,17 +83,17 @@ public final class FieldPickingPlugin extends OptionHandler { return true; } boolean banana = plant.name().startsWith("BANANA"); - GameObject full = null; + Scenery full = null; if (plant == PickingPlant.BANANA_TREE_4) { full = object.transform(2073); - ObjectBuilder.replace(object, full); + SceneryBuilder.replace(object, full); } if (plant == PickingPlant.FUNGI_ON_LOG) { full = object.transform(3508); - ObjectBuilder.replace(object, full); + SceneryBuilder.replace(object, full); } if (plant != PickingPlant.FUNGI_ON_LOG) { - ObjectBuilder.replace(plant == PickingPlant.BANANA_TREE_4 ? full : object, object.transform(banana ? plant.respawn : 0), banana ? 300 : plant.respawn); + SceneryBuilder.replace(plant == PickingPlant.BANANA_TREE_4 ? full : object, object.transform(banana ? plant.respawn : 0), banana ? 300 : plant.respawn); } if (!plant.name().startsWith("NETTLES")) { player.getPacketDispatch().sendMessage("You pick a " + reward.getName().toLowerCase() + "."); @@ -118,7 +118,7 @@ public final class FieldPickingPlugin extends OptionHandler { * @param object the object. * @param plant the plank. */ - private void handleFlaxPick(final Player player, final GameObject object, final PickingPlant plant) { + private void handleFlaxPick(final Player player, final Scenery object, final PickingPlant plant) { int charge = object.getCharge(); player.getAudioManager().send(2581); player.getPacketDispatch().sendMessage("You pick some flax."); @@ -137,7 +137,7 @@ public final class FieldPickingPlugin extends OptionHandler { if (charge > 1000 + RandomFunction.random(2, 8)) { object.setActive(false); object.setCharge(1000); - ObjectBuilder.replace(object, object.transform(0), plant.respawn); + SceneryBuilder.replace(object, object.transform(0), plant.respawn); return; } object.setCharge(charge + 1); 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 fac33bfb2..5f85e3aa2 100644 --- a/Server/src/main/java/core/game/interaction/object/GrandExchangeShortcut.java +++ b/Server/src/main/java/core/game/interaction/object/GrandExchangeShortcut.java @@ -8,7 +8,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -52,7 +52,7 @@ public final class GrandExchangeShortcut extends OptionHandler { return true; } player.lock(4); - final GameObject o = (GameObject) node; + final Scenery o = (Scenery) node; if (o.getId() == 9311) { ForceMovement.run(player, Location.create(3138, 3516, 0), o.getLocation(), CLIMB_DOWN); GameWorld.getPulser().submit(new Pulse(1, player) { @@ -101,7 +101,7 @@ public final class GrandExchangeShortcut extends OptionHandler { @Override public Location getDestination(Node n, Node node) { - if (((GameObject) node).getId() == 9311) { + if (((Scenery) node).getId() == 9311) { return Location.create(3138, 3516, 0); } return Location.create(3144, 3514, 0); diff --git a/Server/src/main/java/core/game/interaction/object/HaystackPlugin.java b/Server/src/main/java/core/game/interaction/object/HaystackPlugin.java index dc3834124..89d116f76 100644 --- a/Server/src/main/java/core/game/interaction/object/HaystackPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/HaystackPlugin.java @@ -7,7 +7,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; import core.tools.RandomFunction; @@ -49,7 +49,7 @@ public final class HaystackPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - final GameObject object = ((GameObject) node); + final Scenery object = ((Scenery) node); final int rand = RandomFunction.random(50); player.lock(2); player.animate(ANIMATION); diff --git a/Server/src/main/java/core/game/interaction/object/JangerBerryPlugin.java b/Server/src/main/java/core/game/interaction/object/JangerBerryPlugin.java index 3edcc740d..d4131dd6e 100644 --- a/Server/src/main/java/core/game/interaction/object/JangerBerryPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/JangerBerryPlugin.java @@ -8,8 +8,8 @@ import core.game.interaction.OptionHandler; import core.game.interaction.UseWithHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; @@ -31,9 +31,9 @@ public class JangerBerryPlugin extends OptionHandler { @Override public boolean handle(NodeUsageEvent event) { - GameObject object = event.getUsedWith().asObject(); + Scenery object = event.getUsedWith().asObject(); if (object.isActive()) - ObjectBuilder.replace(object, object.transform(2325)); + SceneryBuilder.replace(object, object.transform(2325)); event.getPlayer().getInventory().remove(event.getUsedItem()); return true; } 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 d3c43dbc3..fc6787213 100644 --- a/Server/src/main/java/core/game/interaction/object/KalphiteEntranceHandler.java +++ b/Server/src/main/java/core/game/interaction/object/KalphiteEntranceHandler.java @@ -6,8 +6,8 @@ import core.game.interaction.OptionHandler; import core.game.interaction.UseWithHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -27,10 +27,10 @@ public final class KalphiteEntranceHandler extends OptionHandler { UseWithHandler handler = new UseWithHandler(954) { @Override public boolean handle(NodeUsageEvent event) { - GameObject object = (GameObject) event.getUsedWith(); + Scenery object = (Scenery) event.getUsedWith(); if (object.getId() == 3827 || object.getId() == 23609) { if (event.getPlayer().getInventory().remove(event.getUsedItem())) { - ObjectBuilder.replace(object, object.transform(object.getId() + 1), 500); + SceneryBuilder.replace(object, object.transform(object.getId() + 1), 500); return true; } } @@ -53,7 +53,7 @@ public final class KalphiteEntranceHandler extends OptionHandler { @Override public boolean handle(final Player player, Node node, String option) { - GameObject object = (GameObject) node; + Scenery object = (Scenery) node; Location destination = null; switch (object.getId()) { case 3828: diff --git a/Server/src/main/java/core/game/interaction/object/KhardianInteractionPlugin.java b/Server/src/main/java/core/game/interaction/object/KhardianInteractionPlugin.java index 213e0eea3..23abdcd6d 100644 --- a/Server/src/main/java/core/game/interaction/object/KhardianInteractionPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/KhardianInteractionPlugin.java @@ -7,8 +7,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; @@ -80,7 +80,7 @@ public final class KhardianInteractionPlugin extends OptionHandler { if (!failed) { player.getSkills().addExperience(Skills.WOODCUTTING, 10, true); } - ObjectBuilder.replace(((GameObject) node), new GameObject(DRY_CACTUS, node.getLocation()), SPAWN_DELAY + RandomFunction.random(RegionManager.getLocalPlayers(player).size() / 2)); + SceneryBuilder.replace(((Scenery) node), new Scenery(DRY_CACTUS, node.getLocation()), SPAWN_DELAY + RandomFunction.random(RegionManager.getLocalPlayers(player).size() / 2)); break; } return true; diff --git a/Server/src/main/java/core/game/interaction/object/LadderManagingPlugin.java b/Server/src/main/java/core/game/interaction/object/LadderManagingPlugin.java index a7ecc5b05..06d722b43 100644 --- a/Server/src/main/java/core/game/interaction/object/LadderManagingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/LadderManagingPlugin.java @@ -5,7 +5,7 @@ import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; @@ -28,13 +28,13 @@ public final class LadderManagingPlugin extends OptionHandler { @Override public boolean handle(final Player player, Node node, final String option) { - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); return true; } @Override public Location getDestination(Node n, Node object) { - return ClimbActionHandler.getDestination((GameObject) object); + return ClimbActionHandler.getDestination((Scenery) object); } } diff --git a/Server/src/main/java/core/game/interaction/object/LavaMazePlugin.java b/Server/src/main/java/core/game/interaction/object/LavaMazePlugin.java index 8bc50c7a6..f060d1b8e 100644 --- a/Server/src/main/java/core/game/interaction/object/LavaMazePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/LavaMazePlugin.java @@ -5,7 +5,7 @@ import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; @@ -32,14 +32,14 @@ public final class LavaMazePlugin extends OptionHandler { ClimbActionHandler.climb(player, null, Location.create(3017, 10248, 0)); return true; } - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); return true; case 1768: if (node.getLocation().getX() == 3017) { ClimbActionHandler.climb(player, null, Location.create(3069, 3857, 0)); return true; } - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); return true; } return true; 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 d8e417be8..9d5471ff7 100644 --- a/Server/src/main/java/core/game/interaction/object/LumbridgeBasementPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/LumbridgeBasementPlugin.java @@ -10,8 +10,8 @@ import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.npc.AbstractNPC; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; @@ -56,7 +56,7 @@ public class LumbridgeBasementPlugin extends OptionHandler { ObjectDefinition.forId(40260).getHandlers().put("option:climb-through", this); ObjectDefinition.forId(41077).getHandlers().put("option:crawl-through", this); PluginManager.definePlugins(new LightCreatureNPC(), new LightCreatureHandler(), new FishMongerDialogue()); - ObjectBuilder.add(new GameObject(40260, Location.create(2526, 5828, 2), 2)); + SceneryBuilder.add(new Scenery(40260, Location.create(2526, 5828, 2), 2)); return this; } @@ -158,7 +158,7 @@ public class LumbridgeBasementPlugin extends OptionHandler { @Override public Location getDestination(Node node, Node n) { - if (n instanceof GameObject) { + if (n instanceof Scenery) { if (n.getId() == 5949) { return node.getLocation().getY() >= 9555 ? Location.create(3221, 9556, 0) : Location.create(3221, 9552, 0); } else if (n.getId() == 40262) { diff --git a/Server/src/main/java/core/game/interaction/object/LumbridgeSwampHolePlugin.java b/Server/src/main/java/core/game/interaction/object/LumbridgeSwampHolePlugin.java index 4daa75c65..253e17bf0 100644 --- a/Server/src/main/java/core/game/interaction/object/LumbridgeSwampHolePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/LumbridgeSwampHolePlugin.java @@ -7,8 +7,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; @@ -55,7 +55,7 @@ public final class LumbridgeSwampHolePlugin extends OptionHandler { return true; } if (player.getInventory().add(new Item(5341), new Item(952))) { - ObjectBuilder.replace(((GameObject) node), ((GameObject) node).transform(10373), 300); + SceneryBuilder.replace(((Scenery) node), ((Scenery) node).transform(10373), 300); } break; case "read": diff --git a/Server/src/main/java/core/game/interaction/object/MuseumGatePlugin.java b/Server/src/main/java/core/game/interaction/object/MuseumGatePlugin.java index 93f356e41..b888e1960 100644 --- a/Server/src/main/java/core/game/interaction/object/MuseumGatePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/MuseumGatePlugin.java @@ -5,7 +5,7 @@ import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; @@ -28,7 +28,7 @@ public final class MuseumGatePlugin extends OptionHandler { if (player.getLocation().getY() >= 3447) { player.getDialogueInterpreter().open(5941); } else { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); return true; } return true; 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 eb436307d..4975489fb 100644 --- a/Server/src/main/java/core/game/interaction/object/PortsObjectPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/PortsObjectPlugin.java @@ -5,7 +5,7 @@ import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import rs09.game.world.repository.Repository; import core.game.world.update.flag.context.Animation; @@ -184,7 +184,7 @@ public class PortsObjectPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - final int id = ((GameObject) node).getId(); + final int id = ((Scenery) node).getId(); switch (option) { case "climb-up": ClimbActionHandler.climb(player, new Animation(828), new Location(3048, 3208, 1)); diff --git a/Server/src/main/java/core/game/interaction/object/PriestInPerilOptionPlugin.java b/Server/src/main/java/core/game/interaction/object/PriestInPerilOptionPlugin.java index d0db4e8b7..ef058f481 100644 --- a/Server/src/main/java/core/game/interaction/object/PriestInPerilOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/PriestInPerilOptionPlugin.java @@ -10,7 +10,7 @@ import core.game.node.entity.combat.CombatStyle; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; @@ -92,7 +92,7 @@ public class PriestInPerilOptionPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { final Quest quest = player.getQuestRepository().getQuest("Priest in Peril"); - int id = node instanceof GameObject ? ((GameObject) node).getId() : ((NPC) node).getId(); + int id = node instanceof Scenery ? ((Scenery) node).getId() : ((NPC) node).getId(); switch (option) { case "study": player.getInterfaceManager().open(new Component(272)); @@ -169,7 +169,7 @@ public class PriestInPerilOptionPlugin extends OptionHandler { player.getDialogueInterpreter().sendDialogues(player, null, "Hmmm... from the looks of things, it seems as though", "somebody has been trying to force this door open. It's", "still securely locked however."); return true; } - DoorActionHandler.handleDoor(player, (GameObject) node); + DoorActionHandler.handleDoor(player, (Scenery) node); break; case 30573: player.getProperties().setTeleportLocation(Location.create(3440, 9887, 0)); @@ -196,7 +196,7 @@ public class PriestInPerilOptionPlugin extends OptionHandler { if (quest.getStage(player) < 15) { player.getPacketDispatch().sendMessage("The door is securely locked shut."); } else { - DoorActionHandler.handleDoor(player, (GameObject) node); + DoorActionHandler.handleDoor(player, (Scenery) node); } break; case "talk-through": @@ -212,7 +212,7 @@ public class PriestInPerilOptionPlugin extends OptionHandler { if (quest.getStage(player) < 17) { player.getPacketDispatch().sendMessage("The door is locked shut."); } else { - DoorActionHandler.handleDoor(player, (GameObject) node); + DoorActionHandler.handleDoor(player, (Scenery) node); } break; case 30707:/** the door to the church. */ @@ -220,7 +220,7 @@ public class PriestInPerilOptionPlugin extends OptionHandler { switch (option) { case "open": if (quest.getStage(player) > 12) { - DoorActionHandler.handleDoor(player, (GameObject) node); + DoorActionHandler.handleDoor(player, (Scenery) node); } else { player.getPacketDispatch().sendMessage("This door is securely locked from inside."); } 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 3a34ee45d..6a64be881 100644 --- a/Server/src/main/java/core/game/interaction/object/ProspectOrePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ProspectOrePlugin.java @@ -9,7 +9,7 @@ import core.game.node.entity.skill.gather.SkillingResource; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.plugin.Plugin; @@ -23,7 +23,7 @@ public class ProspectOrePlugin extends OptionHandler { @Override public boolean handle(final Player player, Node node, String option) { - final GameObject object = (GameObject) node; + final Scenery object = (Scenery) node; int tut_stage = TutorialSession.getExtension(player).getStage(); if (tut_stage == 31 && object.getId() == 3043) { GameWorld.getPulser().submit(new Pulse(1) { 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 29c68ee0a..7ff446403 100644 --- a/Server/src/main/java/core/game/interaction/object/PyreSitePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/PyreSitePlugin.java @@ -14,8 +14,8 @@ import core.game.node.entity.skill.firemaking.Log; import core.game.node.entity.skill.gather.SkillingTool; import core.game.node.item.ChanceItem; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; @@ -108,7 +108,7 @@ public final class PyreSitePlugin extends OptionHandler { * @param player the player. * @param object the ship object. */ - private void ritual(Player player, GameObject object) { + private void ritual(Player player, Scenery object) { player.lock(); USED_LOCATIONS.add(object.getLocation()); player.faceLocation(object.getLocation()); @@ -121,7 +121,7 @@ public final class PyreSitePlugin extends OptionHandler { * @param object the object. * @return the pulse. */ - private Pulse getPulse(final Player player, final GameObject object) { + private Pulse getPulse(final Player player, final Scenery object) { final LogType logType = player.getAttribute("logType", LogType.NORMAL); final SkillingTool tool = SkillingTool.getHatchet(player); final Item bones = player.getInventory().containsItem(CHEWED_BONES) ? player.getInventory().getItem(CHEWED_BONES) : player.getInventory().getItem(MANGLED_BONES); @@ -178,9 +178,9 @@ public final class PyreSitePlugin extends OptionHandler { * @param newId the new id. * @param ship the ship. */ - private void replace(int newId, GameObject ship, Player player) { - GameObject newShip = new GameObject(newId, getLocation(newId, ship), 10, ship.getLocation().getX() == 2503 ? 4 : 1); - ObjectBuilder.add(newShip); + private void replace(int newId, Scenery ship, Player player) { + Scenery newShip = new Scenery(newId, getLocation(newId, ship), 10, ship.getLocation().getX() == 2503 ? 4 : 1); + SceneryBuilder.add(newShip); } /** @@ -189,7 +189,7 @@ public final class PyreSitePlugin extends OptionHandler { * @param ship the ship. * @return the location. */ - private Location getLocation(int newId, GameObject ship) { + private Location getLocation(int newId, Scenery ship) { Location location = ship.getLocation().transform(ship.getDirection(), -2); if (ship.getLocation().getX() == 2507 || ship.getLocation().getX() == 2519) { return location.transform(-1, 0, 0); @@ -214,7 +214,7 @@ public final class PyreSitePlugin extends OptionHandler { @Override public Location getDestination(Node node, Node n) { - if (n instanceof GameObject) { + if (n instanceof Scenery) { return n.getLocation().transform(n.getDirection(), 1); } return null; diff --git a/Server/src/main/java/core/game/interaction/object/ReadSignPostPlugin.java b/Server/src/main/java/core/game/interaction/object/ReadSignPostPlugin.java index 2c122c1a9..62496d67f 100644 --- a/Server/src/main/java/core/game/interaction/object/ReadSignPostPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ReadSignPostPlugin.java @@ -6,7 +6,7 @@ import core.game.component.Component; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.net.packet.PacketRepository; import core.net.packet.context.MinimapStateContext; import core.net.packet.out.MinimapState; @@ -71,7 +71,7 @@ public class ReadSignPostPlugin extends OptionHandler { } }); player.getPacketDispatch(); - final GameObject object = (GameObject) node; + final Scenery object = (Scenery) node; Signs sign = Signs.forId(object.getId()); if (sign == null) { return false; diff --git a/Server/src/main/java/core/game/interaction/object/RedberryBushPlugin.java b/Server/src/main/java/core/game/interaction/object/RedberryBushPlugin.java index 8122478f2..66dc80fcd 100644 --- a/Server/src/main/java/core/game/interaction/object/RedberryBushPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/RedberryBushPlugin.java @@ -5,8 +5,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.plugin.Plugin; @@ -43,7 +43,7 @@ public class RedberryBushPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - if (((GameObject) node).getId() == 23630) { + if (((Scenery) node).getId() == 23630) { player.getPacketDispatch().sendMessage("There are no berries left on this bush."); player.getPacketDispatch().sendMessage("More berries will grow soon."); return true; @@ -55,7 +55,7 @@ public class RedberryBushPlugin extends OptionHandler { player.lock(4); player.animate(ANIMATION); if (counter == 2) { - ObjectBuilder.replace(((GameObject) node), new GameObject(23630, node.getLocation()), 30); + SceneryBuilder.replace(((Scenery) node), new Scenery(23630, node.getLocation()), 30); counter = 0; return true; } diff --git a/Server/src/main/java/core/game/interaction/object/RomeoQuestPlugin.java b/Server/src/main/java/core/game/interaction/object/RomeoQuestPlugin.java index 3aa82c182..6f27059ef 100644 --- a/Server/src/main/java/core/game/interaction/object/RomeoQuestPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/RomeoQuestPlugin.java @@ -5,8 +5,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.plugin.Plugin; @@ -43,7 +43,7 @@ public class RomeoQuestPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - if (((GameObject) node).getId() == 23627) { + if (((Scenery) node).getId() == 23627) { player.getPacketDispatch().sendMessage("There are no berries left on this bush."); player.getPacketDispatch().sendMessage("More berries will grow soon."); return true; @@ -54,7 +54,7 @@ public class RomeoQuestPlugin extends OptionHandler { } player.animate(ANIMATION); if (counter == 2) { - ObjectBuilder.replace(((GameObject) node), new GameObject(23627, node.getLocation()), 30); + SceneryBuilder.replace(((Scenery) node), new Scenery(23627, node.getLocation()), 30); counter = 0; return true; } diff --git a/Server/src/main/java/core/game/interaction/object/RuneCraftingGuildObjects.java b/Server/src/main/java/core/game/interaction/object/RuneCraftingGuildObjects.java index d3978bee9..fc0a90e53 100644 --- a/Server/src/main/java/core/game/interaction/object/RuneCraftingGuildObjects.java +++ b/Server/src/main/java/core/game/interaction/object/RuneCraftingGuildObjects.java @@ -4,7 +4,7 @@ import core.cache.def.impl.ObjectDefinition; 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.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; @@ -21,7 +21,7 @@ public class RuneCraftingGuildObjects extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - GameObject object = ((GameObject) node); + Scenery object = ((Scenery) node); switch(object.getId()) { case 38279: diff --git a/Server/src/main/java/core/game/interaction/object/ShantayPassPlugin.java b/Server/src/main/java/core/game/interaction/object/ShantayPassPlugin.java index 409e7866e..f4d0ff3ca 100644 --- a/Server/src/main/java/core/game/interaction/object/ShantayPassPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ShantayPassPlugin.java @@ -12,7 +12,7 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; @@ -49,7 +49,7 @@ public class ShantayPassPlugin extends OptionHandler { @Override public boolean handle(final Player player, Node node, String option) { - final int id = node instanceof GameObject ? ((GameObject) node).getId() : ((NPC) node).getId(); + final int id = node instanceof Scenery ? ((Scenery) node).getId() : ((NPC) node).getId(); switch (option) { case "open": if (id == 2693) { @@ -63,7 +63,7 @@ public class ShantayPassPlugin extends OptionHandler { // need to remove. } if (!player.getAttribute("shantay-jail", false)) { - DoorActionHandler.handleDoor(player, (GameObject) node); + DoorActionHandler.handleDoor(player, (Scenery) node); return true; } else { player.getDialogueInterpreter().open(836, null, true); @@ -96,8 +96,8 @@ public class ShantayPassPlugin extends OptionHandler { @Override public Location getDestination(Node node, Node n) { - if (n instanceof GameObject) { - final GameObject object = (GameObject) n; + if (n instanceof Scenery) { + final Scenery object = (Scenery) n; if (object.getId() == 35543) { return object.getLocation().transform(-1, node.getLocation().getY() > n.getLocation().getY() ? 1 : -1, 0); } else if (object.getId() == 35544) { 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 2bb952475..62af33c3e 100644 --- a/Server/src/main/java/core/game/interaction/object/SinclairFlourBarrelPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/SinclairFlourBarrelPlugin.java @@ -9,7 +9,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; import rs09.plugin.PluginManager; @@ -26,10 +26,10 @@ public final class SinclairFlourBarrelPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - return getFlour(player, (GameObject) node); + return getFlour(player, (Scenery) node); } - public boolean getFlour(final Player player, final GameObject object) { + public boolean getFlour(final Player player, final Scenery object) { if (!player.getInventory().containsItem(EMPTY_POT)) { player.getPacketDispatch().sendMessage("I need an empty pot to hold the flour in."); return true; 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 ba9b4e949..25a88bccf 100644 --- a/Server/src/main/java/core/game/interaction/object/SlashWebPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/SlashWebPlugin.java @@ -13,8 +13,8 @@ import core.game.node.entity.combat.equipment.WeaponInterface.WeaponInterfaces; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; import core.tools.RandomFunction; @@ -59,7 +59,7 @@ public final class SlashWebPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - final GameObject object = (GameObject) node; + final Scenery object = (Scenery) node; Item weapon = getWeapon(player, player.getEquipment()); if (weapon == null) { weapon = getWeapon(player, player.getInventory()); @@ -76,7 +76,7 @@ public final class SlashWebPlugin extends OptionHandler { player.animate(weapon == KNIFE ? KNIFE_ANIMATION : ANIMATION); if (success) { player.getPacketDispatch().sendMessage("You slash the web apart."); - ObjectBuilder.replace(object, object.getId() == 27266 || object.getId() == 29354 ? object.transform(734) : object.transform(object.getId() + 1), 100); + SceneryBuilder.replace(object, object.getId() == 27266 || object.getId() == 29354 ? object.transform(734) : object.transform(object.getId() + 1), 100); // Venture through the cobwebbed corridor in Varrock Sewers if (object.getId() == 29354) { 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 0219a99cd..6b0d73e4c 100644 --- a/Server/src/main/java/core/game/interaction/object/ThievingGuidePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ThievingGuidePlugin.java @@ -9,8 +9,8 @@ import core.game.node.entity.player.Player; import core.game.node.entity.skill.Skills; import core.game.node.item.ChanceItem; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; @@ -97,7 +97,7 @@ public class ThievingGuidePlugin extends OptionHandler { @Override public boolean pulse() { if (success) { - handleSuccess(player, (GameObject) node); + handleSuccess(player, (Scenery) node); return true; } final boolean trapped = RandomFunction.random(3) == 1; @@ -130,8 +130,8 @@ public class ThievingGuidePlugin extends OptionHandler { * @param player the player. * @param object the object. */ - public void handleSuccess(final Player player, final GameObject object) { - ObjectBuilder.replace(object, object.transform(CRACKED_SAFE), 1); + public void handleSuccess(final Player player, final Scenery object) { + SceneryBuilder.replace(object, object.transform(CRACKED_SAFE), 1); player.getPacketDispatch().sendMessage("You get some loot."); player.getSkills().addExperience(Skills.THIEVING, experience, true); addItem(player); 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 0438205c5..e68d1207f 100644 --- a/Server/src/main/java/core/game/interaction/object/TollGateOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/TollGateOptionPlugin.java @@ -6,7 +6,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import rs09.game.world.repository.Repository; import core.plugin.Initializable; import core.plugin.Plugin; @@ -22,12 +22,12 @@ public class TollGateOptionPlugin extends OptionHandler { if (option.equals("pay-toll(10gp)")) { if (player.getQuestRepository().getQuest("Prince Ali Rescue").getStage(player) > 50) { player.getPacketDispatch().sendMessage("The guards let you through for free."); - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); } else { if (player.getInventory().contains(995, 10)) { player.getInventory().remove(new Item(995, 10)); player.getPacketDispatch().sendMessage("You quickly pay the 10 gold toll and go through the gates."); - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); player.incrementAttribute("/save:" + STATS_BASE + ":" + STATS_ALKHARID_GATE, 10); return true; } else { @@ -35,7 +35,7 @@ public class TollGateOptionPlugin extends OptionHandler { } } } else { - player.getDialogueInterpreter().open(925, Repository.findNPC(925), (GameObject) node); + player.getDialogueInterpreter().open(925, Repository.findNPC(925), (Scenery) node); return true; } return true; diff --git a/Server/src/main/java/core/game/interaction/object/VampireSlayerPlugin.java b/Server/src/main/java/core/game/interaction/object/VampireSlayerPlugin.java index 9a1497a22..b723d80c0 100644 --- a/Server/src/main/java/core/game/interaction/object/VampireSlayerPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/VampireSlayerPlugin.java @@ -7,7 +7,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; @@ -54,7 +54,7 @@ public final class VampireSlayerPlugin extends OptionHandler { final Quest quest = player.getQuestRepository().getQuest("Vampire Slayer"); switch (option) { case "open": - int id = ((GameObject) node).getId(); + int id = ((Scenery) node).getId(); switch (id) { case 2614: if (quest.getStage(player) == 100) { 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 b6d6008e9..70bd2c066 100644 --- a/Server/src/main/java/core/game/interaction/object/WildernessLeverPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/WildernessLeverPlugin.java @@ -9,8 +9,8 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.TeleportManager; import core.game.node.entity.player.link.audio.Audio; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -44,14 +44,14 @@ public final class WildernessLeverPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - final GameObject object = (GameObject) node; + final Scenery object = (Scenery) node; final LeverSets set = LeverSets.forId(object.getId()); if (!set.canPull(player, object)) { return true; } set.pull(player, set.getIndex(object.getId())); if (set.getTransformId() != -1) { - ObjectBuilder.replace(object, object.transform(set.getTransformId()), 2); + SceneryBuilder.replace(object, object.transform(set.getTransformId()), 2); } return true; } @@ -93,7 +93,7 @@ public final class WildernessLeverPlugin extends OptionHandler { MAGE_BANK("mage's cave", 5959, 5960, Location.create(3090, 3956, 0), Location.create(2539, 4712, 0)), ARENA("arena", 9706, 9707, Location.create(3105, 3956, 0), Location.create(3105, 3951, 0)) { @Override - public boolean canPull(Player player, GameObject object) { + public boolean canPull(Player player, Scenery object) { if (!player.getSavedData().getActivityData().hasKilledKolodion() && object.getId() == 9706) { player.getDialogueInterpreter().sendDialogues(905, null, "You're not allowed in there. Come downstairs if you", "want to enter my arena."); return false; @@ -189,7 +189,7 @@ public final class WildernessLeverPlugin extends OptionHandler { * @param player the player. * @return {@code True} if so. */ - public boolean canPull(Player player, GameObject object) { + public boolean canPull(Player player, Scenery object) { return true; } 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 a61112beb..34c9e2ae8 100644 --- a/Server/src/main/java/core/game/interaction/object/WildernessObeliskPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/WildernessObeliskPlugin.java @@ -5,8 +5,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.TeleportManager.TeleportType; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -38,7 +38,7 @@ public final class WildernessObeliskPlugin extends OptionHandler { @Override public boolean handle(final Player player, final Node node, String option) { - final GameObject nodeObject = (GameObject) node; + final Scenery nodeObject = (Scenery) node; final Obelisk stationObelisk = Obelisk.forLocation(player.getLocation()); if (stationObelisk == null) { return false; @@ -51,22 +51,22 @@ public final class WildernessObeliskPlugin extends OptionHandler { case 0: x = x + 2; y = y + 2; - ObjectBuilder.replace(new GameObject(nodeObject.getId(), Location.create(x, y, z)), new GameObject(14825, Location.create(x, y, 0)), 6); + SceneryBuilder.replace(new Scenery(nodeObject.getId(), Location.create(x, y, z)), new Scenery(14825, Location.create(x, y, 0)), 6); break; case 1: x = x - 2; y = y + 2; - ObjectBuilder.replace(new GameObject(nodeObject.getId(), Location.create(x, y, z)), new GameObject(14825, Location.create(x, y, 0)), 6); + SceneryBuilder.replace(new Scenery(nodeObject.getId(), Location.create(x, y, z)), new Scenery(14825, Location.create(x, y, 0)), 6); break; case 2: x = x - 2; y = y - 2; - ObjectBuilder.replace(new GameObject(nodeObject.getId(), Location.create(x, y, z)), new GameObject(14825, Location.create(x, y, 0)), 6); + SceneryBuilder.replace(new Scenery(nodeObject.getId(), Location.create(x, y, z)), new Scenery(14825, Location.create(x, y, 0)), 6); break; case 3: x = x + 2; y = y - 2; - ObjectBuilder.replace(new GameObject(nodeObject.getId(), Location.create(x, y, z)), new GameObject(14825, Location.create(x, y, 0)), 6); + SceneryBuilder.replace(new Scenery(nodeObject.getId(), Location.create(x, y, z)), new Scenery(14825, Location.create(x, y, 0)), 6); break; } } diff --git a/Server/src/main/java/core/game/interaction/object/WydinDoorPlugin.java b/Server/src/main/java/core/game/interaction/object/WydinDoorPlugin.java index 58c89c29d..3ba18c13e 100644 --- a/Server/src/main/java/core/game/interaction/object/WydinDoorPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/WydinDoorPlugin.java @@ -6,7 +6,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; @@ -31,7 +31,7 @@ public final class WydinDoorPlugin extends OptionHandler { player.getDialogueInterpreter().open(557, true, true); return true; } else { - final GameObject object = (GameObject) node; + final Scenery object = (Scenery) node; DoorActionHandler.handleAutowalkDoor(player, object); } return true; @@ -39,6 +39,6 @@ public final class WydinDoorPlugin extends OptionHandler { @Override public Location getDestination(Node node, Node n) { - return DoorActionHandler.getDestination(((Entity) node), ((GameObject) n)); + return DoorActionHandler.getDestination(((Entity) node), ((Scenery) n)); } } 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 0b287eb6d..8ff994753 100644 --- a/Server/src/main/java/core/game/interaction/object/dmc/DMCHandler.java +++ b/Server/src/main/java/core/game/interaction/object/dmc/DMCHandler.java @@ -8,8 +8,8 @@ import core.game.node.entity.impl.Projectile; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; @@ -35,7 +35,7 @@ public final class DMCHandler { /** * The cannon object. */ - private GameObject cannon; + private Scenery cannon; /** * The amount of cannonballs loaded. @@ -181,7 +181,7 @@ public final class DMCHandler { * Constructs the cannon. */ public static void construct(final Player player) { - final Location spawn = RegionManager.getSpawnLocation(player, new GameObject(6, player.getLocation())); + final Location spawn = RegionManager.getSpawnLocation(player, new Scenery(6, player.getLocation())); if (spawn == null) { player.getPacketDispatch().sendMessage("There's not enough room for your cannon."); return; @@ -202,7 +202,7 @@ public final class DMCHandler { player.faceLocation(spawn.transform(Direction.NORTH_EAST)); GameWorld.getPulser().submit(new Pulse(2, player) { int count = 0; - GameObject object = null; + Scenery object = null; @Override public boolean pulse() { @@ -212,7 +212,7 @@ public final class DMCHandler { player.getInventory().add(new Item(6 + (i * 2))); } if (object != null) { - ObjectBuilder.remove(object); + SceneryBuilder.remove(object); } return true; } @@ -225,13 +225,13 @@ public final class DMCHandler { player.getInventory().add(new Item(6 + (i * 2))); } if (object != null) { - ObjectBuilder.remove(object); + SceneryBuilder.remove(object); } } }); switch (count) { case 0: - object = ObjectBuilder.add(new GameObject(7, spawn)); + object = SceneryBuilder.add(new Scenery(7, spawn)); player.getPacketDispatch().sendMessage("You place the cannon base on the ground."); return count++ == 666; case 1: @@ -242,12 +242,12 @@ public final class DMCHandler { break; case 3: player.getPacketDispatch().sendMessage("You add the furnace."); - ObjectBuilder.remove(object); - handler.configure(ObjectBuilder.add(object = object.transform(6))); + SceneryBuilder.remove(object); + handler.configure(SceneryBuilder.add(object = object.transform(6))); return true; } - ObjectBuilder.remove(object); - ObjectBuilder.add(object = object.transform(object.getId() + 1)); + SceneryBuilder.remove(object); + SceneryBuilder.add(object = object.transform(object.getId() + 1)); return ++count == 4; } }); @@ -257,7 +257,7 @@ public final class DMCHandler { * Configures the cannon. * @param cannon The cannon. */ - public void configure(GameObject cannon) { + public void configure(Scenery cannon) { this.cannon = cannon; player.removeExtension(LogoutTask.class); player.getLogoutPlugins().add(logoutPlugin = new Plugin() { @@ -282,7 +282,7 @@ public final class DMCHandler { if (decayPulse.isRunning()) { decayPulse.stop(); } - ObjectBuilder.remove(cannon); + SceneryBuilder.remove(cannon); player.removeAttribute("dmc"); player.getLogoutPlugins().remove(logoutPlugin); if (!pickup) { @@ -310,7 +310,7 @@ public final class DMCHandler { * Gets the cannon. * @return the cannon */ - public GameObject getCannon() { + public Scenery getCannon() { return cannon; } @@ -318,7 +318,7 @@ public final class DMCHandler { * Sets the cannon. * @param cannon the cannon to set. */ - public void setCannon(GameObject cannon) { + public void setCannon(Scenery cannon) { this.cannon = 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 f8a8884d7..d486db298 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 @@ -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.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; @@ -85,7 +85,7 @@ public final class GardenObjectsPlugin extends OptionHandler { @Override public boolean handle(final Player player, Node node, String option) { - GameObject object = (GameObject) node; + Scenery object = (Scenery) node; if (option.equals("pick")) { final HerbDefinition herbDef = HerbDefinition.forId(object.getId()); if (herbDef != null) { @@ -182,7 +182,7 @@ public final class GardenObjectsPlugin extends OptionHandler { * @param object the object. * @param herbDef the herbdef. */ - private void handleElementalGarden(final Player player, GameObject object, final HerbDefinition herbDef) { + private void handleElementalGarden(final Player player, Scenery object, final HerbDefinition herbDef) { player.lock(); player.addExtension(LogoutTask.class, new LocationLogoutTask(99, herbDef.getRespawn())); player.animate(ANIMATION); diff --git a/Server/src/main/java/core/game/interaction/object/sorceress/SorceressGardenObject.java b/Server/src/main/java/core/game/interaction/object/sorceress/SorceressGardenObject.java index e5e45d58f..fefc5d313 100644 --- a/Server/src/main/java/core/game/interaction/object/sorceress/SorceressGardenObject.java +++ b/Server/src/main/java/core/game/interaction/object/sorceress/SorceressGardenObject.java @@ -6,7 +6,7 @@ import core.game.node.entity.skill.Skills; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.plugin.Plugin; /** @@ -17,13 +17,13 @@ public class SorceressGardenObject extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - GardenObjectsPlugin.SeasonDefinitions def = GardenObjectsPlugin.SeasonDefinitions.forGateId(((GameObject) node).getId()); + GardenObjectsPlugin.SeasonDefinitions def = GardenObjectsPlugin.SeasonDefinitions.forGateId(((Scenery) node).getId()); if (def != null) { if (player.getSkills().getStaticLevel(Skills.THIEVING) < def.getLevel()) { player.getDialogueInterpreter().sendItemMessage(10692, "You need Thieving level of " + def.getLevel() + " to pick the lock of this gate."); return true; } - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); } return true; } 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 9e697f2c1..dbea5520c 100644 --- a/Server/src/main/java/core/game/interaction/object/wildyditch/WildernessDitchPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/wildyditch/WildernessDitchPlugin.java @@ -6,7 +6,7 @@ import core.game.interaction.MovementPulse; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; import rs09.plugin.PluginManager; @@ -49,7 +49,7 @@ public final class WildernessDitchPlugin extends OptionHandler { */ public void handleDitch(final Player player, Node node) { player.faceLocation(node.getLocation()); - GameObject ditch = (GameObject) node; + Scenery ditch = (Scenery) node; player.setAttribute("wildy_ditch", ditch); if(!player.isArtificial()) { if (ditch.getRotation() % 2 == 0) { diff --git a/Server/src/main/java/core/game/interaction/object/wildyditch/WildernessInterfacePlugin.java b/Server/src/main/java/core/game/interaction/object/wildyditch/WildernessInterfacePlugin.java index 718d3220b..3202dfd7d 100644 --- a/Server/src/main/java/core/game/interaction/object/wildyditch/WildernessInterfacePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/wildyditch/WildernessInterfacePlugin.java @@ -6,7 +6,7 @@ import core.game.component.ComponentPlugin; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; @@ -44,7 +44,7 @@ public final class WildernessInterfacePlugin extends ComponentPlugin { * @param player the player. */ public static void handleDitch(final Player player) { - GameObject ditch = player.getAttribute("wildy_ditch"); + Scenery ditch = player.getAttribute("wildy_ditch"); if (ditch == null) { return; } diff --git a/Server/src/main/java/core/game/node/Node.java b/Server/src/main/java/core/game/node/Node.java index 5ca1577b4..4f1650b69 100644 --- a/Server/src/main/java/core/game/node/Node.java +++ b/Server/src/main/java/core/game/node/Node.java @@ -5,7 +5,7 @@ import core.game.interaction.Interaction; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Direction; import core.game.world.map.Location; import core.tools.StringUtils; @@ -88,11 +88,11 @@ public abstract class Node { } /** - * Casts the game object. + * Casts the scenery. * @return the object. */ - public GameObject asObject() { - return (GameObject) this; + public Scenery asObject() { + return (Scenery) this; } /** @@ -108,7 +108,7 @@ public abstract class Node { * @return the id. */ public int getId() { - return this instanceof NPC ? ((NPC) this).getId() : this instanceof GameObject ? ((GameObject) this).getId() : this instanceof Item ? ((Item) this).getId() : -1; + return this instanceof NPC ? ((NPC) this).getId() : this instanceof Scenery ? ((Scenery) this).getId() : this instanceof Item ? ((Item) this).getId() : -1; } /** 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 1722cb460..5c3a2fde9 100644 --- a/Server/src/main/java/core/game/node/entity/npc/city/sophanem/WallShortcut.java +++ b/Server/src/main/java/core/game/node/entity/npc/city/sophanem/WallShortcut.java @@ -7,7 +7,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -40,7 +40,7 @@ public final class WallShortcut extends OptionHandler { return true; } player.lock(4); - final GameObject o = (GameObject) node; + final Scenery o = (Scenery) node; if (o.getId() == 6620) { ForceMovement.run(player, Location.create(3320, 2796, 0), o.getLocation(), CLIMB_DOWN); GameWorld.getPulser().submit(new Pulse(1, player) { 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 75b884f75..ace957e93 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/BeaverNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/BeaverNPC.java @@ -7,7 +7,7 @@ import core.game.node.entity.skill.summoning.familiar.FamiliarSpecial; import core.game.node.entity.skill.summoning.familiar.Forager; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; @@ -63,7 +63,7 @@ public class BeaverNPC extends Forager { @Override protected boolean specialMove(FamiliarSpecial special) { - final GameObject object = (GameObject) special.getNode(); + final Scenery object = (Scenery) special.getNode(); if (!isTree(object.getName())) { owner.getPacketDispatch().sendMessages("This scroll only works on naturally growing, oak, willow, arctic pine", "teak, mahogany, maple, yew, and magic trees."); return false; 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 4e5b50253..75fd3c648 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/CompostMoundNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/CompostMoundNPC.java @@ -12,7 +12,7 @@ import core.game.node.entity.skill.summoning.familiar.Familiar; import core.game.node.entity.skill.summoning.familiar.FamiliarSpecial; import core.game.node.entity.skill.summoning.familiar.Forager; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Initializable; @@ -72,7 +72,7 @@ public class CompostMoundNPC extends Forager { @Override protected boolean specialMove(FamiliarSpecial special) { - final GameObject object = (GameObject) special.getNode(); + final Scenery object = (Scenery) special.getNode(); if (!object.getName().equals("Compost Bin")) { owner.getPacketDispatch().sendMessage("This scroll can only be used on an empty compost bin."); return false; 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 a9428c0f8..315b0366c 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/DesertWyrmNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/DesertWyrmNPC.java @@ -20,7 +20,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; @@ -87,7 +87,7 @@ public final class DesertWyrmNPC extends Forager { @Override public boolean handle(final Player player, final Node node, String option) { - final GameObject rock = getClosestRock(player); + final Scenery rock = getClosestRock(player); if (!player.getFamiliarManager().isOwner((Familiar) node)) { return true; } @@ -131,21 +131,21 @@ public final class DesertWyrmNPC extends Forager { * Gets the closest combat rock. * @return the object. */ - public GameObject getClosestRock(Player player) { - List rocks = new ArrayList<>(20); + public Scenery getClosestRock(Player player) { + List rocks = new ArrayList<>(20); for (int k = 0; k < 7; k++) { for (int i = 0; i < 4; i++) { Direction dir = Direction.get(i); Location loc = player.getLocation().transform(dir.getStepX() * k, dir.getStepY() * k, 0); - GameObject object = RegionManager.getObject(loc); + Scenery object = RegionManager.getObject(loc); if (object != null && object.getName().equals("Rocks")) { rocks.add(object); } } } int ordinal = 0; - GameObject o = null; - for (GameObject r : rocks) { + Scenery o = null; + for (Scenery r : rocks) { SkillingResource resource = SkillingResource.forId(r.getId()); if (resource != null && resource.ordinal() > ordinal) { ordinal = resource.ordinal(); 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 45a4824d0..835c9f4ab 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/ForgeRegentNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/ForgeRegentNPC.java @@ -6,8 +6,8 @@ import core.game.interaction.UseWithHandler; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.RegionManager; @@ -149,12 +149,12 @@ public class ForgeRegentNPC extends Familiar { if (!ground.isActive()) { return true; } - final GameObject object = new GameObject(log.getFireId(), familiar.getLocation()); + final Scenery object = new Scenery(log.getFireId(), familiar.getLocation()); familiar.moveStep(); GroundItemManager.destroy(ground); player.getSkills().addExperience(Skills.FIREMAKING, log.getXp() + 10); familiar.faceLocation(FaceLocationFlag.getFaceLocation(familiar, object)); - ObjectBuilder.add(object, log.getLife(), FireMakingPulse.getAsh(player, log, object)); + SceneryBuilder.add(object, log.getLife(), FireMakingPulse.getAsh(player, log, object)); if (player.getViewport().getRegion().getId() == 10806) { player.getAchievementDiaryManager().finishTask(player, DiaryType.SEERS_VILLAGE, 1, 9); } 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 2168c5a68..9f41ae7f8 100644 --- a/Server/src/main/java/core/game/node/entity/npc/familiar/PyreLordNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/familiar/PyreLordNPC.java @@ -15,8 +15,8 @@ import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.RegionManager; @@ -128,12 +128,12 @@ public class PyreLordNPC extends Familiar { if (!ground.isActive()) { return true; } - final GameObject object = new GameObject(log.getFireId(), familiar.getLocation()); + final Scenery object = new Scenery(log.getFireId(), familiar.getLocation()); familiar.moveStep(); GroundItemManager.destroy(ground); player.getSkills().addExperience(Skills.FIREMAKING, log.getXp() + 10); familiar.faceLocation(FaceLocationFlag.getFaceLocation(familiar, object)); - ObjectBuilder.add(object, log.getLife(), FireMakingPulse.getAsh(player, log, object)); + SceneryBuilder.add(object, log.getLife(), FireMakingPulse.getAsh(player, log, object)); if (player.getViewport().getRegion().getId() == 10806) { player.getAchievementDiaryManager().finishTask(player, DiaryType.SEERS_VILLAGE, 1, 9); } 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 7c48e9e57..3fe12fc2f 100644 --- a/Server/src/main/java/core/game/node/entity/npc/other/ArmourSuitNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/other/ArmourSuitNPC.java @@ -1,8 +1,8 @@ package core.game.node.entity.npc.other; import core.game.node.entity.npc.AbstractNPC; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.plugin.Initializable; @@ -51,7 +51,7 @@ public final class ArmourSuitNPC extends AbstractNPC { @Override public void clear() { super.clear(); - ObjectBuilder.add(new GameObject(818, getProperties().getSpawnLocation(), 1)); + SceneryBuilder.add(new Scenery(818, getProperties().getSpawnLocation(), 1)); } @Override 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 eadb5f98f..ad8ea3b37 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/PacketDispatch.java +++ b/Server/src/main/java/core/game/node/entity/player/link/PacketDispatch.java @@ -3,7 +3,7 @@ package core.game.node.entity.player.link; import rs09.game.Varp; import core.game.content.quest.tutorials.tutorialisland.TutorialSession; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import rs09.game.system.SystemLogger; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; @@ -351,7 +351,7 @@ public final class PacketDispatch { * @param object the object. * @param animation the animation. */ - public void sendObjectAnimation(GameObject object, Animation animation) { + public void sendObjectAnimation(Scenery object, Animation animation) { animation = new Animation(animation.getId(), animation.getDelay(), animation.getPriority()); animation.setObject(object); RegionManager.getRegionChunk(object.getLocation()).flag(new AnimateObjectUpdateFlag(animation)); @@ -363,7 +363,7 @@ public final class PacketDispatch { * @param animation the animation. * @param global if the animation is global or not. */ - public void sendObjectAnimation(GameObject object, Animation animation, boolean global) { + public void sendObjectAnimation(Scenery object, Animation animation, boolean global) { if (global) { sendObjectAnimation(object, animation); return; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/AgilityShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/AgilityShortcut.java index 5cde0f776..0ebe70f18 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/AgilityShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/AgilityShortcut.java @@ -4,7 +4,7 @@ import core.cache.def.impl.ObjectDefinition; 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.node.object.Scenery; import core.game.world.map.Direction; import core.game.world.map.Location; import core.plugin.Plugin; @@ -97,7 +97,7 @@ public abstract class AgilityShortcut extends OptionHandler { * @param option the option. * @param failed the shortcut failed. */ - public abstract void run(Player player, GameObject object, String option, boolean failed); + public abstract void run(Player player, Scenery object, String option, boolean failed); /** * Checks the requirements for a player. @@ -119,7 +119,7 @@ public abstract class AgilityShortcut extends OptionHandler { * @param option2 the option. * @return {@code True} if failed. */ - private boolean checkFail(Player player, GameObject object, String option2) { + private boolean checkFail(Player player, Scenery object, String option2) { if (!canFail) { return false; } @@ -148,7 +148,7 @@ public abstract class AgilityShortcut extends OptionHandler { } - public Location pipeDestination(Player player, GameObject object, int steps) { + public Location pipeDestination(Player player, Scenery object, int steps) { player.faceLocation(object.getLocation()); int diffX = object.getLocation().getX() - player.getLocation().getX(); if (diffX < -1) { diffX = -1; } @@ -160,7 +160,7 @@ public abstract class AgilityShortcut extends OptionHandler { return dest; } - public Location agilityDestination(Player player, GameObject object, int steps) { + public Location agilityDestination(Player player, Scenery object, int steps) { player.faceLocation(object.getLocation()); int diffX = object.getLocation().getX() - player.getLocation().getX(); int diffY = object.getLocation().getY() - player.getLocation().getY(); 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 14273c22c..0def82a92 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BrimhavenArena.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BrimhavenArena.java @@ -11,8 +11,8 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.MovementHook; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; @@ -118,8 +118,8 @@ public final class BrimhavenArena extends MapZone implements Plugin { @Override public boolean interact(Entity entity, Node node, Option option) { - if (node instanceof GameObject) { - GameObject object = (GameObject) node; + if (node instanceof Scenery) { + Scenery object = (Scenery) node; if (object.getId() == 3610) { ClimbActionHandler.climb((Player) entity, Animation.create(828), object.getLocation().transform(0, 0, 3)); return true; @@ -246,20 +246,20 @@ public final class BrimhavenArena extends MapZone implements Plugin { if (GameWorld.getTicks() % ticks == 0) { sawBladeActive = !sawBladeActive; if (sawBladeActive) { - GameObject object = RegionManager.getObject(3, 2788, 9579); - ObjectBuilder.replace(object, object.transform(3567, object.getRotation(), 10), ticks); + Scenery object = RegionManager.getObject(3, 2788, 9579); + SceneryBuilder.replace(object, object.transform(3567, object.getRotation(), 10), ticks); object = RegionManager.getObject(3, 2789, 9579); - ObjectBuilder.replace(object, object.transform(0), ticks); + SceneryBuilder.replace(object, object.transform(0), ticks); object = RegionManager.getObject(3, 2783, 9551); - ObjectBuilder.replace(object, object.transform(3567, object.getRotation(), 10), ticks); + SceneryBuilder.replace(object, object.transform(3567, object.getRotation(), 10), ticks); object = RegionManager.getObject(3, 2783, 9552); - ObjectBuilder.replace(object, object.transform(0), ticks); + SceneryBuilder.replace(object, object.transform(0), ticks); object = RegionManager.getObject(3, 2761, 9584); - ObjectBuilder.replace(object, object.transform(3567, object.getRotation(), 10), ticks); + SceneryBuilder.replace(object, object.transform(3567, object.getRotation(), 10), ticks); object = RegionManager.getObject(3, 2761, 9585); - ObjectBuilder.replace(object, object.transform(0), ticks); + SceneryBuilder.replace(object, object.transform(0), ticks); } } return false; @@ -280,8 +280,8 @@ public final class BrimhavenArena extends MapZone implements Plugin { for (PlankSet set : PlankSet.values()) { Location l = set.entrance[i]; for (int x = 1; x < set.exit[i].getX() - l.getX(); x++) { - GameObject object = RegionManager.getObject(l.transform(x, 0, 0)); - ObjectBuilder.replace(object, object.transform(avail ? 3573 : 3576)); + Scenery object = RegionManager.getObject(l.transform(x, 0, 0)); + SceneryBuilder.replace(object, object.transform(avail ? 3573 : 3576)); } RegionManager.getObject(set.entrance[i]).setCharge(avail ? 1000 : 500); RegionManager.getObject(set.exit[i]).setCharge(avail ? 1000 : 500); 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 1f2691768..5892920fd 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BrimhavenCourse.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/brimhaven/BrimhavenCourse.java @@ -8,7 +8,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; @@ -27,7 +27,7 @@ public final class BrimhavenCourse extends OptionHandler { @Override public boolean handle(final Player player, Node node, String option) { - final GameObject object = (GameObject) node; + final Scenery object = (Scenery) node; Direction dir = object.getDirection(); Location start = player.getLocation(); switch (object.getId()) { @@ -102,7 +102,7 @@ public final class BrimhavenCourse extends OptionHandler { * @param player The player. * @param object The object. */ - private static void handleHandHolds(final Player player, final GameObject object) { + private static void handleHandHolds(final Player player, final Scenery object) { if (player.getSkills().getLevel(Skills.AGILITY) < 20) { player.getPacketDispatch().sendMessage("You need an agility of at least 20 to get past this obstacle!"); return; @@ -156,7 +156,7 @@ public final class BrimhavenCourse extends OptionHandler { * @param player The player. * @param object The balancing rope object. */ - private static void handleBalancingRope(final Player player, GameObject object) { + private static void handleBalancingRope(final Player player, Scenery object) { final Direction dir = object.getDirection(); boolean failed = AgilityHandler.hasFailed(player, 1, 0.1); if (failed) { @@ -180,7 +180,7 @@ public final class BrimhavenCourse extends OptionHandler { * @param player The player. * @param object The object. */ - private static void handleMonkeyBars(final Player player, GameObject object) { + private static void handleMonkeyBars(final Player player, Scenery object) { player.lock(5); final Direction dir = Direction.get((object.getDirection().toInteger() + 2) % 4); player.getAppearance().setAnimations(Animation.create(745)); @@ -222,7 +222,7 @@ public final class BrimhavenCourse extends OptionHandler { * @param player The player. * @param object The object. */ - private static void handleBalancingLedge(final Player player, GameObject object) { + private static void handleBalancingLedge(final Player player, Scenery object) { final int diff = object.getId() == 3561 ? 0 : 1; Location start = player.getLocation(); final Direction dir = Direction.getLogicalDirection(start, object.getLocation()); @@ -250,7 +250,7 @@ public final class BrimhavenCourse extends OptionHandler { * @param player The player. * @param object The object. */ - private static void handlePlankObstacle(final Player player, GameObject object) { + private static void handlePlankObstacle(final Player player, Scenery object) { final Direction dir = Direction.getLogicalDirection(player.getLocation(), object.getLocation()); final Location start = player.getLocation(); Location end = start.transform(dir.getStepX() * 7, dir.getStepY() * 7, 0); @@ -284,7 +284,7 @@ public final class BrimhavenCourse extends OptionHandler { * @param player The player. * @param object The object. */ - private static void handlePillarObstacle(final Player player, GameObject object) { + private static void handlePillarObstacle(final Player player, Scenery object) { final Direction dir = Direction.getLogicalDirection(player.getLocation(), object.getLocation()); AgilityHandler.forceWalk(player, -1, player.getLocation(), object.getLocation(), Animation.create(741), 10, 0, null); final Location start = player.getLocation(); @@ -313,7 +313,7 @@ public final class BrimhavenCourse extends OptionHandler { * @param player The player. * @param object The log balance object. */ - private static void handleLogBalance(final Player player, GameObject object) { + private static void handleLogBalance(final Player player, Scenery object) { final Direction dir = Direction.getLogicalDirection(player.getLocation(), object.getLocation()); boolean failed = AgilityHandler.hasFailed(player, 1, 0.1); if (failed) { @@ -352,7 +352,7 @@ public final class BrimhavenCourse extends OptionHandler { @Override public Location getDestination(Node node, Node n) { - GameObject object = (GameObject) n; + Scenery object = (Scenery) n; Direction dir = object.getDirection(); switch (object.getId()) { case 3566: 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 15b25b644..61faa4d70 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/AgilityPyramidCourse.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/AgilityPyramidCourse.java @@ -11,7 +11,7 @@ import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; @@ -100,7 +100,7 @@ public final class AgilityPyramidCourse extends AgilityCourse { @Override public boolean handle(final Player player, Node node, String option) { getCourse(player); // Sets the extension. - final GameObject object = (GameObject) node; + final Scenery object = (Scenery) node; if (object.getLocation().getDistance(player.getLocation()) >= 3) { player.getPacketDispatch().sendMessage("I can't reach that!"); return true; @@ -163,7 +163,7 @@ public final class AgilityPyramidCourse extends AgilityCourse { * @param player the player. * @param object the object. */ - private void handleStairs(final Player player, final GameObject object) { + private void handleStairs(final Player player, final Scenery object) { Direction dir = Direction.getLogicalDirection(player.getLocation(), object.getLocation()); Location dest = null; if (dir == Direction.NORTH) { @@ -186,7 +186,7 @@ public final class AgilityPyramidCourse extends AgilityCourse { * @param player the player. * @param object the object. */ - private void handleRockClimb(final Player player, final GameObject object) { + private void handleRockClimb(final Player player, final Scenery object) { final boolean scale = player.getLocation().getX() < object.getLocation().getX(); final Location end = object.getLocation().transform(scale ? 2 : -2, 0, 0); if (object.getId() == 16536 && player.getSkills().getStaticLevel(Skills.AGILITY) < 30) { @@ -205,7 +205,7 @@ public final class AgilityPyramidCourse extends AgilityCourse { * @param player the player. * @param object the object. */ - private void handleLowWall(final Player player, final GameObject object) { + private void handleLowWall(final Player player, final Scenery object) { Direction d = Direction.getDirection(player.getLocation(), object.getLocation()); final boolean fail = player.getSkills().getLevel(Skills.AGILITY) >= 75 ? false : hasFailed(player) ; if (player.getLocation().equals(Location.create(3355, 2848, 1)) || player.getLocation().equals(Location.create(3359, 2838, 3))) { @@ -235,7 +235,7 @@ public final class AgilityPyramidCourse extends AgilityCourse { * @param player the player. * @param object the object. */ - private void handleLedge(final Player player, final GameObject object) { + private void handleLedge(final Player player, final Scenery object) { Direction d = Direction.getLogicalDirection(player.getLocation(), getLedgeLocation(player, object)); final Direction dir = d; final int diff = object.getRotation() == 3 && dir == Direction.EAST ? 1 : object.getRotation() == 3 && dir == Direction.WEST ? 0 : d == Direction.EAST || (d == Direction.SOUTH && object.getRotation() != 0) || d == Direction.NORTH ? 0 : 1; @@ -285,7 +285,7 @@ public final class AgilityPyramidCourse extends AgilityCourse { * @param player the player. * @param object the object. */ - private void handlePlank(final Player player, final GameObject object) { + private void handlePlank(final Player player, final Scenery object) { final boolean custom = object.getLocation().equals(new Location(3365, 2835, 3)) || object.getLocation().equals(new Location(3370, 2835, 3)); final Direction dir = custom ? Direction.EAST : Direction.getLogicalDirection(player.getLocation(), object.getLocation()); final boolean fail = player.getSkills().getLevel(Skills.AGILITY) >= 75 ? false : hasFailed(player) ; @@ -308,7 +308,7 @@ public final class AgilityPyramidCourse extends AgilityCourse { * @param player the player. * @param object the object. */ - private void handleJumpGap(Player player, GameObject object) { + private void handleJumpGap(Player player, Scenery object) { final Direction dir = Direction.getDirection(player.getLocation(), getGapLocation(player, object)); final boolean fail = player.getSkills().getLevel(Skills.AGILITY) >= 75 ? false : hasFailed(player) ; player.getPacketDispatch().sendMessage("You jump the gap..."); @@ -336,7 +336,7 @@ public final class AgilityPyramidCourse extends AgilityCourse { * @param player the player. * @param object the object. */ - private void handleGapCross(final Player player, final GameObject object) { + private void handleGapCross(final Player player, final Scenery object) { final Direction dir = Direction.getLogicalDirection(player.getLocation(), getGapCrossLocation(player, object)); final boolean fail = player.getSkills().getLevel(Skills.AGILITY) >= 75 ? false : hasFailed(player) ; final Location end = player.getLocation().transform(dir, fail ? 4 : 5); @@ -367,7 +367,7 @@ public final class AgilityPyramidCourse extends AgilityCourse { * @param player the player. * @param object the object. */ - private void handlePyramidTop(final Player player, final GameObject object) { + private void handlePyramidTop(final Player player, final Scenery object) { if(player.getSavedData().getActivityData().isTopGrabbed() == true){ player.getPacketDispatch().sendMessage("You've already claimed this!"); return; @@ -411,7 +411,7 @@ public final class AgilityPyramidCourse extends AgilityCourse { * @param object the obejct. * @return the location. */ - private Location getGapLocation(Player player, GameObject object) { + private Location getGapLocation(Player player, Scenery object) { final Location[] data = getLocationData(GAP_LOCATIONS, object.getLocation()); return getClosest(new Location[] { data[0], data[1] }, player.getLocation()); } @@ -422,7 +422,7 @@ public final class AgilityPyramidCourse extends AgilityCourse { * @param object the obejct. * @return the location. */ - private Location getGapCrossLocation(Player player, GameObject object) { + private Location getGapCrossLocation(Player player, Scenery object) { final Location[] data = getLocationData(GAP_CROSS_LOCATIONS, object.getLocation()); return getClosest(new Location[] { data[4], data[5] }, player.getLocation()); } @@ -433,7 +433,7 @@ public final class AgilityPyramidCourse extends AgilityCourse { * @param object the object. * @return the location. */ - private Location getLedgeLocation(final Player player, final GameObject object) { + private Location getLedgeLocation(final Player player, final Scenery object) { final Location[] data = getLocationData(LEDGE_LOCATIONS, object.getLocation()); return getClosest(new Location[] { data[4], data[5] }, player.getLocation()); } @@ -510,7 +510,7 @@ public final class AgilityPyramidCourse extends AgilityCourse { * @param value the value. * @param save if we save. */ - public static void addConfig(final Player player, final GameObject object, final int value, boolean save) { + public static void addConfig(final Player player, final Scenery object, final int value, boolean save) { addConfig(player, object.getId(), value, save); } 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 3396b5f3a..15f6f0990 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/RollingBlock.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/pyramid/RollingBlock.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.agility.pyramid; import core.game.node.entity.skill.agility.AgilityHandler; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.MovementHook; @@ -25,7 +25,7 @@ public final class RollingBlock implements MovementHook { public boolean handle(final Entity e, final Location dest) { final Player player = (Player) e; final BlockSets set = BlockSets.forLocation(dest); - final GameObject stone = RegionManager.getObject(set.getBlockLocation()); + final Scenery stone = RegionManager.getObject(set.getBlockLocation()); final boolean backwards = isBackwards(stone.getDirection(), player.getDirection(), stone.getRotation()); final boolean fail = backwards || AgilityHandler.hasFailed(player, 2, 0.3); player.lock(5); diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/AlKharidPitShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/AlKharidPitShortcut.java index 3e6457b5d..e6d5bbb82 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/AlKharidPitShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/AlKharidPitShortcut.java @@ -5,7 +5,7 @@ import core.game.node.entity.skill.agility.AgilityShortcut; import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; @@ -35,7 +35,7 @@ public class AlKharidPitShortcut extends AgilityShortcut { } @Override - public void run(Player player, GameObject object, String option, boolean failed) { + public void run(Player player, Scenery object, String option, boolean failed) { switch (object.getId()) { case 9331: ForceMovement.run(player, player.getLocation(), Location.create(3303, 3315, 0), ANIMATION, ANIMATION, Direction.EAST, 13).setEndAnimation(Animation.RESET); @@ -48,7 +48,7 @@ public class AlKharidPitShortcut extends AgilityShortcut { @Override public Location getDestination(Node node, Node n) { - final GameObject object = (GameObject) n; + final Scenery object = (Scenery) n; if (object.getId() == 9331) { return object.getLocation().transform(1, 0, 0); } diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/BarSqueezeShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/BarSqueezeShortcut.java index 5fc66549e..f6f811718 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/BarSqueezeShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/BarSqueezeShortcut.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.agility.shortcuts; import core.game.node.entity.skill.agility.AgilityHandler; import core.game.node.entity.skill.agility.AgilityShortcut; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; @@ -42,7 +42,7 @@ public class BarSqueezeShortcut extends AgilityShortcut { } @Override - public void run(Player player, GameObject object, String option, boolean failed) { + public void run(Player player, Scenery object, String option, boolean failed) { Direction dir = Direction.getLogicalDirection(player.getLocation(), object.getLocation()); Location start = player.getLocation(); if (object.getId() == 9334 && dir == Direction.NORTH) { diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/CrumblingWallShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/CrumblingWallShortcut.java index a83adaa31..716ace6e2 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/CrumblingWallShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/CrumblingWallShortcut.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.agility.shortcuts; import core.game.node.entity.skill.agility.AgilityShortcut; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; @@ -29,7 +29,7 @@ public class CrumblingWallShortcut extends AgilityShortcut { } @Override - public void run(Player player, GameObject object, String option, boolean failed) { + public void run(Player player, Scenery object, String option, boolean failed) { ForceMovement.run(player, player.getLocation().getX() >= 2936 ? LOCATIONS[0] : LOCATIONS[1], player.getLocation().getX() >= 2936 ? LOCATIONS[1] : LOCATIONS[0], Animation.create(839), 10); } 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 adfd2e257..79a104842 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/FenceJumpShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/FenceJumpShortcut.java @@ -5,7 +5,7 @@ import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -43,7 +43,7 @@ public class FenceJumpShortcut extends AgilityShortcut { } @Override - public void run(final Player player, GameObject object, String option, boolean failed) { + public void run(final Player player, Scenery object, String option, boolean failed) { player.faceLocation(object.getLocation()); GameWorld.getPulser().submit(new Pulse(2, player) { @Override 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 7b0e80f3e..0fd8a2a53 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/KaramjaGrapple.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/KaramjaGrapple.java @@ -8,7 +8,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; @@ -60,7 +60,7 @@ public class KaramjaGrapple extends OptionHandler { public boolean handle(Player player, Node node, String option) { Location destination; Location current = player.getLocation(); - GameObject startTree, endTree; + Scenery startTree, endTree; Direction direction; if (current.getY() > 3134) { // starting at north side startTree = RegionManager.getObject(Location.create(2874, 3144, 0)); @@ -73,7 +73,7 @@ public class KaramjaGrapple extends OptionHandler { destination = Location.create(2874, 3142, 0); direction = Direction.NORTH; } - GameObject islandTree = RegionManager.getObject(Location.create(2873, 3134, 0)); + Scenery islandTree = RegionManager.getObject(Location.create(2873, 3134, 0)); switch (option) { diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/LogBalanceShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/LogBalanceShortcut.java index 0412e46f0..348ccd944 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/LogBalanceShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/LogBalanceShortcut.java @@ -6,7 +6,7 @@ import core.game.node.entity.skill.agility.AgilityHandler; import core.game.node.entity.skill.agility.AgilityShortcut; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; @@ -62,7 +62,7 @@ public class LogBalanceShortcut extends AgilityShortcut { } @Override - public void run(Player player, GameObject object, String option, boolean failed) { + public void run(Player player, Scenery object, String option, boolean failed) { Location destination = start; if (player.getLocation().getDistance(start) < player.getLocation().getDistance(end)) { destination = end; 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 2f5dfad7e..5ab3fcd23 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/MonkeyBarShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/MonkeyBarShortcut.java @@ -6,7 +6,7 @@ import core.game.node.entity.skill.agility.AgilityShortcut; import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.LocationLogoutTask; import core.game.system.task.LogoutTask; import core.game.system.task.Pulse; @@ -54,7 +54,7 @@ public class MonkeyBarShortcut extends AgilityShortcut { } @Override - public void run(final Player player, final GameObject object, String option, boolean failed) { + public void run(final Player player, final Scenery object, String option, boolean failed) { player.lock(5); Direction direct = Direction.get((object.getDirection().toInteger() + 2) % 4); if (object.getId() == 29375) { diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/RopeSwing.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/RopeSwing.java index 8c93864c5..3c3749c15 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/RopeSwing.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/RopeSwing.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.agility.shortcuts; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; @@ -15,8 +15,8 @@ public class RopeSwing extends UseWithHandler { @Override public boolean handle(NodeUsageEvent event) { System.out.println("Trying to handle."); - if(event.getUsedWith() instanceof GameObject){ - GameObject object = event.getUsedWith().asObject(); + if(event.getUsedWith() instanceof Scenery){ + Scenery object = event.getUsedWith().asObject(); int objId = object.getId(); assert event.getUsedItem() != null; 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 4271fec55..05fd4e659 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/StileShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/StileShortcut.java @@ -6,7 +6,7 @@ import core.game.node.entity.skill.agility.AgilityShortcut; import core.game.interaction.MovementPulse; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; @@ -29,7 +29,7 @@ public class StileShortcut extends AgilityShortcut { } @Override - public void run(final Player player, final GameObject object, String option, boolean failed) { + public void run(final Player player, final Scenery object, String option, boolean failed) { player.getWalkingQueue().reset(); Location loc = getLocation(player, object, true); player.getWalkingQueue().addPath(loc.getX(), loc.getY()); @@ -47,7 +47,7 @@ public class StileShortcut extends AgilityShortcut { * @param player the player. * @param object the object. */ - public static void climb(final Player player, final GameObject object) { + public static void climb(final Player player, final Scenery object) { player.lock(1); int delay = 0; GameWorld.getPulser().submit(new Pulse(delay, player) { @@ -75,7 +75,7 @@ public class StileShortcut extends AgilityShortcut { * @param start if getting the start loc. * @return the location. */ - public static Location getLocation(final Player player, final GameObject object, boolean start) { + public static Location getLocation(final Player player, final Scenery object, boolean start) { if ((object.getDirection() == Direction.NORTH || object.getDirection() == Direction.SOUTH)) { if (player.getLocation().getY() <= object.getLocation().getY()) { return start ? object.getLocation() : object.getLocation().transform(0, 1, 0); @@ -96,7 +96,7 @@ public class StileShortcut extends AgilityShortcut { * @param player the player. * @param object the object. */ - private static void handleFalconry(final Player player, GameObject object) { + private static void handleFalconry(final Player player, Scenery object) { if (player.getLocation().equals(Location.create(2371, 3621, 0))) { ActivityManager.start(player, "falconry", false); } else { 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 a34355e4b..67fd920f4 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/StrangeFloorShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/StrangeFloorShortcut.java @@ -7,7 +7,7 @@ import core.game.node.entity.skill.agility.AgilityShortcut; import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -39,7 +39,7 @@ public class StrangeFloorShortcut extends AgilityShortcut { } @Override - public void run(final Player player, GameObject object, String option, boolean failed) { + public void run(final Player player, Scenery object, String option, boolean failed) { GameWorld.getPulser().submit(new Pulse(1, player) { @Override public boolean pulse() { 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 651ef6510..214e6dbc8 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/TunnelShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/TunnelShortcut.java @@ -5,7 +5,7 @@ import core.game.node.entity.skill.agility.AgilityShortcut; import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; @@ -69,9 +69,9 @@ public class TunnelShortcut extends AgilityShortcut { } @Override - public void run(final Player player, GameObject object, String option, boolean failed) { + public void run(final Player player, Scenery object, String option, boolean failed) { player.lock(6); - final GameObject o = object; + final Scenery o = object; final Location start = player.getLocation(); final Direction dir = Direction.getDirection(start, o.getLocation()); if (object.getLocation().getX() == 2575) { 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 620fddc7c..41aa79f83 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/WaterOrbGrapple.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/WaterOrbGrapple.java @@ -8,8 +8,8 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -57,8 +57,8 @@ public class WaterOrbGrapple extends OptionHandler { public boolean handle(Player player, Node node, String option) { Location destination; Location current = player.getLocation(); - GameObject rock = RegionManager.getObject(Location.create(2841, 3426, 0)); - GameObject tree = RegionManager.getObject(Location.create(2841, 3434, 0)); + Scenery rock = RegionManager.getObject(Location.create(2841, 3426, 0)); + Scenery tree = RegionManager.getObject(Location.create(2841, 3434, 0)); System.out.println(rock); System.out.println(tree); @@ -99,8 +99,8 @@ public class WaterOrbGrapple extends OptionHandler { player.getPacketDispatch().sendPositionedGraphic(67, 10, 0, Location.create(2840,3427,0)); // break; case 4: - ObjectBuilder.replace(rock, rock.transform(rock.getId() + 1), 10); - ObjectBuilder.replace(tree, tree.transform(tree.getId() + 1), 10); + SceneryBuilder.replace(rock, rock.transform(rock.getId() + 1), 10); + SceneryBuilder.replace(tree, tree.transform(tree.getId() + 1), 10); break; case 5: break; diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/ZanarisSqueezeShortcut.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/ZanarisSqueezeShortcut.java index dc11c0818..b9a16714d 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/ZanarisSqueezeShortcut.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/ZanarisSqueezeShortcut.java @@ -5,7 +5,7 @@ import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.agility.AgilityShortcut; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; @@ -30,7 +30,7 @@ public class ZanarisSqueezeShortcut extends AgilityShortcut { } @Override - public void run(Player player, GameObject object, String option, boolean failed) { + public void run(Player player, Scenery object, String option, boolean failed) { if (player.getSkills().getLevel(Skills.AGILITY) < 66 && (object.getLocation().equals(new Location(2408, 4395)) || object.getLocation().equals(new Location(2415, 4402)))) { player.getDialogueInterpreter().sendDialogue("You need an Agility level of at least 66 to negotiate this obstacle."); return; 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 443771f40..8857bf917 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/BuildOptionPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/BuildOptionPlugin.java @@ -8,7 +8,7 @@ import core.game.content.dialogue.DialoguePlugin; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; import rs09.game.node.entity.skill.construction.Hotspot; @@ -37,7 +37,7 @@ public final class BuildOptionPlugin extends OptionHandler { player.getPacketDispatch().sendMessage("You have to be in building mode to do this."); return true; } - GameObject object = ((GameObject) node); + Scenery object = ((Scenery) node); if (option.equals("remove")) { Decoration decoration = Decoration.getDecoration(player, object); if (decoration == null || !object.isActive()) { @@ -81,7 +81,7 @@ public final class BuildOptionPlugin extends OptionHandler { * @param hotspot The hotspot. * @return {@code True} if so. */ - private static boolean isBuildable(Player player, GameObject object, Hotspot hotspot) { + private static boolean isBuildable(Player player, Scenery object, Hotspot hotspot) { Room room = player.getHouseManager().getRoom(object.getLocation()); if (room == null) { return false; @@ -133,7 +133,7 @@ public final class BuildOptionPlugin extends OptionHandler { /** * The object. */ - private GameObject object; + private Scenery object; /** * Constructs a new {@code RemoveDialogue} {@code Object}. @@ -158,7 +158,7 @@ public final class BuildOptionPlugin extends OptionHandler { @Override public boolean open(Object... args) { interpreter.sendOptions("Really remove it?", "Yes", "No"); - object = (GameObject) args[0]; + object = (Scenery) args[0]; return true; } diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/BuildRoomDialogue.java b/Server/src/main/java/core/game/node/entity/skill/construction/BuildRoomDialogue.java index 550f4e4be..ef029de68 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/BuildRoomDialogue.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/BuildRoomDialogue.java @@ -3,8 +3,8 @@ package core.game.node.entity.skill.construction; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.map.RegionChunk; @@ -28,7 +28,7 @@ public final class BuildRoomDialogue extends DialoguePlugin { /** * The door hotspot. */ - private GameObject door; + private Scenery door; /** * The direction. @@ -48,7 +48,7 @@ public final class BuildRoomDialogue extends DialoguePlugin { /** * The boundaries of the room to build. */ - private List boundaries = new ArrayList<>(20); + private List boundaries = new ArrayList<>(20); /** * The room we're building. @@ -104,7 +104,7 @@ public final class BuildRoomDialogue extends DialoguePlugin { stage = 2; return true; } - this.door = (GameObject) player.getAttribute("con:hsobject"); + this.door = (Scenery) player.getAttribute("con:hsobject"); int[] pos = BuildingUtils.getRoomPosition(player, door); roomX = pos[0]; roomY = pos[1]; @@ -175,8 +175,8 @@ public final class BuildRoomDialogue extends DialoguePlugin { @Override public boolean close() { - for (GameObject object : boundaries) { - ObjectBuilder.remove(object); + for (Scenery object : boundaries) { + SceneryBuilder.remove(object); } boundaries.clear(); return super.close(); @@ -235,20 +235,20 @@ public final class BuildRoomDialogue extends DialoguePlugin { * Draws the current boundaries of the room to build. */ private void drawGhostRoom() { - for (GameObject object : boundaries) { - ObjectBuilder.remove(object); + for (Scenery object : boundaries) { + SceneryBuilder.remove(object); } int rotation = directions[index].toInteger(); boundaries.clear(); Location base = player.getViewport().getRegion().getBaseLocation().transform(roomX << 3, roomY << 3, player.getLocation().getZ()); for (int x = 0; x < 8; x++) { for (int y = 0; y < 8; y++) { - GameObject[] objects = room.getChunk().getObjects(x, y); - for (GameObject object : objects) { + Scenery[] objects = room.getChunk().getObjects(x, y); + for (Scenery object : objects) { if (object != null && object.getDefinition().hasAction("build")) { int[] pos = RegionChunk.getRotatedPosition(x, y, object.getDefinition().getSizeX(), object.getDefinition().getSizeY(), object.getRotation(), rotation); - GameObject obj = object.transform(object.getId(), (object.getRotation() + rotation) % 4, base.transform(pos[0], pos[1], 0)); - boundaries.add(ObjectBuilder.add(obj)); + Scenery obj = object.transform(object.getId(), (object.getRotation() + rotation) % 4, base.transform(pos[0], pos[1], 0)); + boundaries.add(SceneryBuilder.add(obj)); } } } 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 55c8e72c9..0a1efea84 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/BuildingUtils.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/BuildingUtils.java @@ -5,8 +5,8 @@ import core.game.component.Component; import core.game.node.entity.player.Player; import core.game.node.entity.skill.Skills; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import core.game.world.map.BuildRegionChunk; import core.game.world.map.Direction; @@ -144,7 +144,7 @@ public final class BuildingUtils { * @param object The object. * @return {@code True} if so. */ - public static boolean isDoorHotspot(GameObject object) { + public static boolean isDoorHotspot(Scenery object) { return object.getId() >= 15305 && object.getId() <= 15322; } @@ -154,7 +154,7 @@ public final class BuildingUtils { * @param deco The decoration. * @param object The object. */ - public static void buildDecoration(final Player player, final Hotspot hotspot, final Decoration deco, final GameObject object) { + public static void buildDecoration(final Player player, final Hotspot hotspot, final Decoration deco, final Scenery object) { final int nailAmount = deco.getNailAmount(); final NailType type = nailAmount > 0 ? NailType.get(player, nailAmount) : null; if (nailAmount > 0 && type == null) { @@ -246,7 +246,7 @@ public final class BuildingUtils { * @param object The object representing the hotspot. * @param deco The decoration to set. */ - private static void setDecoration(Player player, Region region, Room room, Hotspot hotspot, GameObject object, Decoration deco) { + private static void setDecoration(Player player, Region region, Room room, Hotspot hotspot, Scenery object, Decoration deco) { Location l = object.getLocation(); HousingStyle style = player.getHouseManager().getStyle(); int decIndex = hotspot.getHotspot().getDecorationIndex(deco); @@ -268,10 +268,10 @@ public final class BuildingUtils { continue; } BuildRegionChunk chunk = (BuildRegionChunk) reg.getPlanes()[plane % 3].getChunks()[l.getChunkX()][l.getChunkY()]; - GameObject[] objects = chunk.getObjects(h.getCurrentX(), h.getCurrentY()); - for (GameObject o : objects) { + Scenery[] objects = chunk.getObjects(h.getCurrentX(), h.getCurrentY()); + for (Scenery o : objects) { if (o != null && o.getType() == object.getType()) { - ObjectBuilder.replace(o, o.transform(h.getHotspot().getDecorations()[decIndex].getObjectId(style))); + SceneryBuilder.replace(o, o.transform(h.getHotspot().getDecorations()[decIndex].getObjectId(style))); if (plane == 1) { if (r.getProperties() == RoomProperties.SKILL_HALL) { r.updateProperties(player, RoomProperties.SKILL_HALL_2); @@ -293,11 +293,11 @@ public final class BuildingUtils { } break; case CREST: - ObjectBuilder.replace(object, object.transform(deco.getObjectId(style) + player.getHouseManager().getCrest().ordinal())); + SceneryBuilder.replace(object, object.transform(deco.getObjectId(style) + player.getHouseManager().getCrest().ordinal())); hotspot.setDecorationIndex(decIndex); break; case INDIVIDUAL: - ObjectBuilder.replace(object, object.transform(deco.getObjectId(style))); + SceneryBuilder.replace(object, object.transform(deco.getObjectId(style))); hotspot.setDecorationIndex(decIndex); break; case RECURSIVE: @@ -308,9 +308,9 @@ public final class BuildingUtils { if (h != null) { h.setDecorationIndex(decIndex); int objectId = hotspot.getHotspot().getObjectId(style); - GameObject o = chunk.get(x, y, chunk.getIndex(x, y, objectId)); + Scenery o = chunk.get(x, y, chunk.getIndex(x, y, objectId)); if (o != null && objectId == o.getId()) { - ObjectBuilder.replace(o, o.transform(hotspot.getHotspot().getDecorations()[decIndex].getObjectId(style))); + SceneryBuilder.replace(o, o.transform(hotspot.getHotspot().getDecorations()[decIndex].getObjectId(style))); } } } @@ -326,9 +326,9 @@ public final class BuildingUtils { if (h != null) { h.setDecorationIndex(decIndex); int objectId = bh.getObjectId(style); - GameObject o = chunk.get(x, y, chunk.getIndex(x, y, objectId)); + Scenery o = chunk.get(x, y, chunk.getIndex(x, y, objectId)); if (o != null && objectId == o.getId()) { - ObjectBuilder.replace(o, o.transform(bh.getDecorations()[decIndex].getObjectId(style))); + SceneryBuilder.replace(o, o.transform(bh.getDecorations()[decIndex].getObjectId(style))); } } } @@ -343,7 +343,7 @@ public final class BuildingUtils { * @param player the player * @param object the object to remove */ - public static void removeDecoration(Player player, GameObject object) { + public static void removeDecoration(Player player, Scenery object) { if (object.getId() == Decoration.PORTAL.getObjectId() && player.getHouseManager().getPortalAmount() <= 1) { player.getPacketDispatch().sendMessage("You need atleast one portal, how else would you leave your house?"); return; @@ -379,7 +379,7 @@ public final class BuildingUtils { * @param object The object. * @param style The housing style. */ - private static void removeDecoration(Player player, Region region, Room room, Hotspot hotspot, GameObject object, HousingStyle style) { + private static void removeDecoration(Player player, Region region, Room room, Hotspot hotspot, Scenery object, HousingStyle style) { Location l = object.getLocation(); switch (hotspot.getHotspot().getType()) { case STAIRCASE: @@ -399,10 +399,10 @@ public final class BuildingUtils { continue; } BuildRegionChunk chunk = (BuildRegionChunk) reg.getPlanes()[plane % 3].getChunks()[l.getChunkX()][l.getChunkY()]; - GameObject[] objects = chunk.getObjects(h.getCurrentX(), h.getCurrentY()); - for (GameObject o : objects) { + Scenery[] objects = chunk.getObjects(h.getCurrentX(), h.getCurrentY()); + for (Scenery o : objects) { if (o != null && o.getType() == object.getType()) { - ObjectBuilder.replace(o, o.transform(h.getHotspot().getObjectId(style))); + SceneryBuilder.replace(o, o.transform(h.getHotspot().getObjectId(style))); break; } } @@ -426,7 +426,7 @@ public final class BuildingUtils { break; case INDIVIDUAL: case CREST: - ObjectBuilder.replace(object, object.transform(hotspot.getHotspot().getObjectId(style))); + SceneryBuilder.replace(object, object.transform(hotspot.getHotspot().getObjectId(style))); hotspot.setDecorationIndex(-1); break; case RECURSIVE: @@ -436,10 +436,10 @@ public final class BuildingUtils { Hotspot h = room.getHotspot(hotspot.getHotspot(), x, y); if (h != null) { int objectId = hotspot.getHotspot().getDecorations()[h.getDecorationIndex()].getObjectId(style); - GameObject o = chunk.get(x, y, chunk.getIndex(x, y, objectId)); + Scenery o = chunk.get(x, y, chunk.getIndex(x, y, objectId)); h.setDecorationIndex(-1); if (o != null && objectId == o.getId()) { - ObjectBuilder.replace(o, o.transform(hotspot.getHotspot().getObjectId(style))); + SceneryBuilder.replace(o, o.transform(hotspot.getHotspot().getObjectId(style))); } } } @@ -454,10 +454,10 @@ public final class BuildingUtils { Hotspot h = room.getHotspot(bh, x, y); if (h != null) { int objectId = bh.getDecorations()[h.getDecorationIndex()].getObjectId(style); - GameObject o = chunk.get(x, y, chunk.getIndex(x, y, objectId)); + Scenery o = chunk.get(x, y, chunk.getIndex(x, y, objectId)); h.setDecorationIndex(-1); if (o != null && objectId == o.getId()) { - ObjectBuilder.replace(o, o.transform(bh.getObjectId(style))); + SceneryBuilder.replace(o, o.transform(bh.getObjectId(style))); } } } @@ -474,7 +474,7 @@ public final class BuildingUtils { * @param object The object. * @return {@code True} if so. */ - private static boolean canBuildDecoration(Player player, Room room, Decoration deco, GameObject object) { + private static boolean canBuildDecoration(Player player, Room room, Decoration deco, Scenery object) { switch (deco) { case TENTACLE_MID: case TENTACLE_SIDE: @@ -498,7 +498,7 @@ public final class BuildingUtils { * @return {@code True} if so. */ @SuppressWarnings("unused") - private static boolean setLinkedHotspot(Player player, Room room, Hotspot hotspot, int decorationIndex, GameObject object) { + private static boolean setLinkedHotspot(Player player, Room room, Hotspot hotspot, int decorationIndex, Scenery object) { Location l = object.getLocation(); int z = l.getZ(); switch (hotspot.getHotspot()) { @@ -514,7 +514,7 @@ public final class BuildingUtils { Hotspot hs = r.getHotspot(h, hotspot.getCurrentX(), hotspot.getCurrentY()); if (hs != null) { hs.setDecorationIndex(decorationIndex); - ObjectBuilder.replace(object, object.transform(h.getDecorations()[decorationIndex].getObjectId(player.getHouseManager().getStyle()))); + SceneryBuilder.replace(object, object.transform(h.getDecorations()[decorationIndex].getObjectId(player.getHouseManager().getStyle()))); break; } } @@ -581,7 +581,7 @@ public final class BuildingUtils { * @param door the door hotspot the player is trying to build at * @return true if the room is built already */ - public static int[] roomExists(Player player, GameObject door) { + public static int[] roomExists(Player player, Scenery door) { int[] location = getRoomPosition(player, door); int z = player.getLocation().getZ(); if (HouseManager.isInDungeon(player)) { @@ -598,7 +598,7 @@ public final class BuildingUtils { * @param door The door. * @return The room offset [x, y]. */ - public static int[] getRoomPosition(Player player, GameObject door) { + public static int[] getRoomPosition(Player player, Scenery door) { Location l = door.getLocation(); int rotation = door.getRotation(); if (player.getLocation().getChunkX() != l.getLocation().getChunkX() 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 b4b114746..425d51927 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/ConstructionInterface.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/ConstructionInterface.java @@ -7,7 +7,7 @@ import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; import core.game.node.entity.player.Player; import core.game.node.entity.skill.Skills; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; import rs09.game.node.entity.skill.construction.Hotspot; @@ -37,7 +37,7 @@ public final class ConstructionInterface extends ComponentPlugin { case 132: player.getInterfaceManager().close(); Hotspot hotspot = player.getAttribute("con:hotspot"); - GameObject object = player.getAttribute("con:hsobject"); + Scenery object = player.getAttribute("con:hsobject"); if (hotspot == null || object == null) { SystemLogger.logErr("Failed building decoration " + hotspot + " : " + object); break; 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 71308e499..34502c90d 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/Decoration.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/Decoration.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.construction; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import rs09.game.node.entity.skill.construction.Hotspot; @@ -1183,7 +1183,7 @@ public enum Decoration { * @param player The player. * @return The decoration. */ - public static Decoration getDecoration(Player player, GameObject object) { + public static Decoration getDecoration(Player player, Scenery object) { Location l = object.getLocation(); int z = l.getZ(); if (HouseManager.isInDungeon(player)) { 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 e306dfb35..1d574a457 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/HouseManager.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/HouseManager.java @@ -8,7 +8,7 @@ import core.game.content.dialogue.FacialExpression; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; import core.game.node.entity.skill.Skills; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import core.game.world.map.*; import core.game.world.map.build.DynamicRegion; @@ -463,7 +463,7 @@ public final class HouseManager { * @param object The object. * @return The hotspot. */ - public Hotspot getHotspot(GameObject object) { + public Hotspot getHotspot(Scenery object) { Room room = getRoom(object.getLocation()); if (room == null) { return null; 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 41cbb95f2..c2dc30e80 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/PortalOptionPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/PortalOptionPlugin.java @@ -8,7 +8,7 @@ import core.game.interaction.OptionHandler; 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.node.object.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; import core.plugin.PluginManifest; @@ -37,7 +37,7 @@ public final class PortalOptionPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - GameObject object = node.asObject(); + Scenery object = node.asObject(); if (object.getId() == 13405 && option.equals("enter")) { HouseManager.leave(player); return true; 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 724f5969f..95babac91 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/Room.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/Room.java @@ -2,8 +2,8 @@ package core.game.node.entity.skill.construction; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.*; import rs09.game.node.entity.skill.construction.Hotspot; @@ -133,15 +133,15 @@ public final class Room { continue; } int index = chunk.getIndex(x, y, spot.getHotspot().getObjectId(house.getStyle())); - GameObject[][] objects = chunk.getObjects(index); - GameObject object = objects[x][y]; + Scenery[][] objects = chunk.getObjects(index); + Scenery object = objects[x][y]; if (object != null && object.getId() == spot.getHotspot().getObjectId(house.getStyle())) { if (spot.getDecorationIndex() > -1 && spot.getDecorationIndex() < spot.getHotspot().getDecorations().length) { int id = spot.getHotspot().getDecorations()[spot.getDecorationIndex()].getObjectId(house.getStyle()); if (spot.getHotspot().getType() == BuildHotspotType.CREST) { id += house.getCrest().ordinal(); } - ObjectBuilder.replace(object, object.transform(id, object.getRotation(), chunk.getCurrentBase().transform(x, y, 0))); + SceneryBuilder.replace(object, object.transform(id, object.getRotation(), chunk.getCurrentBase().transform(x, y, 0))); } else if (object.getId() == BuildHotspot.WINDOW.getObjectId(house.getStyle()) || (!house.isBuildingMode() && object.getId() == BuildHotspot.CHAPEL_WINDOW.getObjectId(house.getStyle()))) { chunk.add(object.transform(house.getStyle().getWindowStyle().getObjectId(house.getStyle()), object.getRotation(), object.getType())); @@ -169,7 +169,7 @@ public final class Room { for (int i = 0; i < BuildRegionChunk.ARRAY_SIZE; i++) { for (int x = 0; x < 8; x++) { for (int y = 0; y < 8; y++) { - GameObject object = chunk.get(x, y, i); + Scenery object = chunk.get(x, y, i); if (object != null && object.getDefinition().hasAction("Build")) { if (properties.isChamber() && BuildingUtils.isDoorHotspot(object)) { if (!placeDoors(house, chunk, object, housePlane, x, y, rotation)) { @@ -198,7 +198,7 @@ public final class Room { * @param x The x-coordinate of the object. * @param y The y-coordinate of the object. */ - private boolean placeDoors(HouseManager house, BuildRegionChunk chunk, GameObject object, int z, int x, int y, Direction rotation) { + private boolean placeDoors(HouseManager house, BuildRegionChunk chunk, Scenery object, int z, int x, int y, Direction rotation) { int doorX; int doorY; switch (rotation) { @@ -248,7 +248,7 @@ public final class Room { else if (!houseExit) { return false; } - return ObjectBuilder.replace(object, object.transform(replaceId, object.getRotation(), chunk.getCurrentBase().transform(x, y, 0)), true, true); + return SceneryBuilder.replace(object, object.transform(replaceId, object.getRotation(), chunk.getCurrentBase().transform(x, y, 0)), true, true); } /** 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 2b231aa79..d089dadf4 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/RoomBuilder.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/RoomBuilder.java @@ -4,8 +4,8 @@ import core.cache.def.impl.ObjectDefinition; import core.game.component.Component; 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.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.BuildRegionChunk; import core.game.world.map.Direction; import core.game.world.map.Location; @@ -84,7 +84,7 @@ public final class RoomBuilder { * @param deco The decoration. * @param object The object. */ - public static void buildDecoration(Player player, BuildHotspot hotspot, Decoration deco, GameObject object) { + public static void buildDecoration(Player player, BuildHotspot hotspot, Decoration deco, Scenery object) { if(!player.isAdmin()){ if (!player.getInventory().containsItems(deco.getItems())) { player.getPacketDispatch().sendMessage("You don't have the required items to build this."); @@ -98,17 +98,17 @@ public final class RoomBuilder { if (h != null) { switch(h.getHotspot().getType()) { case INDIVIDUAL: - ObjectBuilder.replace(object, object.transform(deco.getObjectId())); + SceneryBuilder.replace(object, object.transform(deco.getObjectId())); h.setDecorationIndex(hotspot.getDecorationIndex(deco)); break; case RECURSIVE: room.setAllDecorationIndex(hotspot.getDecorationIndex(deco), h.getHotspot()); - GameObject[][] objects = player.getHouseManager().getRegion().getPlanes()[l.getZ()].getChunks()[l.getLocalX() >> 3][l.getLocalY() >> 3].getObjects(); + Scenery[][] objects = player.getHouseManager().getRegion().getPlanes()[l.getZ()].getChunks()[l.getLocalX() >> 3][l.getLocalY() >> 3].getObjects(); for (int j = 0; j < objects.length; j++) { for (int k = 0; k < objects[j].length; k++) { - GameObject go = objects[j][k]; + Scenery go = objects[j][k]; if (go != null && go.getId() == object.getId()) { - ObjectBuilder.replace(go, go.transform(deco.getObjectId())); + SceneryBuilder.replace(go, go.transform(deco.getObjectId())); } } } @@ -120,9 +120,9 @@ public final class RoomBuilder { for (int y = 0; y < 8; y++) { for(BuildHotspot bh : linkedHotspots) { int index = chunk.getIndex(x, y, bh.getObjectId()); - GameObject o = chunk.get(x, y, index); + Scenery o = chunk.get(x, y, index); if (o != null && bh.getObjectId() == o.getId()) { - ObjectBuilder.replace(o, o.transform(bh.getDecorations()[0].getObjectId())); + SceneryBuilder.replace(o, o.transform(bh.getDecorations()[0].getObjectId())); room.setAllDecorationIndex(0, bh); } } @@ -138,7 +138,7 @@ public final class RoomBuilder { * @param player the player * @param object the object to remove */ - public static void removeDecoration(Player player, GameObject object) { + public static void removeDecoration(Player player, Scenery object) { Location l = object.getLocation(); Room room = player.getHouseManager().getRooms()[l.getZ()][l.getLocalX() >> 3][l.getLocalY() >> 3]; for (int i = 0; i < room.getHotspots().length; i++) { @@ -146,17 +146,17 @@ public final class RoomBuilder { if (hotspot.getChunkX() == l.getChunkOffsetX() && hotspot.getChunkY() == l.getChunkOffsetY()) { switch (hotspot.getHotspot().getType()) { case INDIVIDUAL: - ObjectBuilder.replace(object, object.transform(hotspot.getHotspot().getObjectId())); + SceneryBuilder.replace(object, object.transform(hotspot.getHotspot().getObjectId())); hotspot.setDecorationIndex(-1); return; case RECURSIVE: room.setAllDecorationIndex(-1, hotspot.getHotspot()); - GameObject[][] objects = player.getHouseManager().getRegion().getPlanes()[l.getZ()].getChunks()[l.getLocalX() >> 3][l.getLocalY() >> 3].getObjects(); + Scenery[][] objects = player.getHouseManager().getRegion().getPlanes()[l.getZ()].getChunks()[l.getLocalX() >> 3][l.getLocalY() >> 3].getObjects(); for (int j = 0; j < objects.length; j++) { for (int k = 0; k < objects[j].length; k++) { - GameObject go = objects[j][k]; + Scenery go = objects[j][k]; if (go != null && go.getId() == object.getId()) { - ObjectBuilder.replace(go, go.transform(hotspot.getHotspot().getObjectId())); + SceneryBuilder.replace(go, go.transform(hotspot.getHotspot().getObjectId())); } } } @@ -191,7 +191,7 @@ public final class RoomBuilder { * @param door the door hotspot the player is trying to build at * @return true if the room is built already */ - public static boolean roomExists(Player player, GameObject door) { + public static boolean roomExists(Player player, Scenery door) { int[] location = getRoomPosition(door); return player.getHouseManager().getRooms()[player.getLocation().getZ()][location[0]][location[1]] != null; } @@ -201,7 +201,7 @@ public final class RoomBuilder { * @param door The door. * @return The room offset [x, y]. */ - public static int[] getRoomPosition(GameObject door) { + public static int[] getRoomPosition(Scenery door) { Location l = door.getLocation(); switch (door.getRotation()) { case 0: //West @@ -224,7 +224,7 @@ public final class RoomBuilder { * @param roomY The room y-coordinate. * @return The available rotations for the room [NORTH, EAST, SOUTH, WEST]. */ - public static Direction[] getAvailableRotations(Player player, boolean[] exits, GameObject door, int roomX, int roomY) { + public static Direction[] getAvailableRotations(Player player, boolean[] exits, Scenery door, int roomX, int roomY) { Direction[] directions = new Direction[4]; //Exits go to: (0=east, 1=south, 2=west, 3=north) boolean[] exit = Arrays.copyOf(exits, exits.length); 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 7800f8e5f..85e529edd 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/RoomProperties.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/RoomProperties.java @@ -1,7 +1,7 @@ package core.game.node.entity.skill.construction; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Region; import core.game.world.map.RegionChunk; import core.game.world.map.RegionManager; @@ -937,7 +937,7 @@ public enum RoomProperties { * @return {@code True} if so. */ private boolean isExit(RegionChunk chunk, int x, int y) { - for (GameObject object : chunk.getObjects(x, y)) { + for (Scenery object : chunk.getObjects(x, y)) { if (object != null && (object.getId() == 15313 || object.getId() == 15314 || object.getId() == 15317)) { return true; } diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/BeerBarrelPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/BeerBarrelPlugin.java index 72a462920..e28be9da2 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/BeerBarrelPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/BeerBarrelPlugin.java @@ -4,7 +4,7 @@ import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.plugin.Plugin; @@ -41,7 +41,7 @@ public class BeerBarrelPlugin extends UseWithHandler { @Override public boolean handle(NodeUsageEvent event) { Player player = event.getPlayer(); - final GameObject object = (GameObject) event.getUsedWith(); + final Scenery object = (Scenery) event.getUsedWith(); if (player.getInventory().remove(new Item(1919))) { player.animate(Animation.create(833)); diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/ChairBenchPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/ChairBenchPlugin.java index fbf4656ae..498319ff6 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/ChairBenchPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/ChairBenchPlugin.java @@ -6,7 +6,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; @@ -60,7 +60,7 @@ public final class ChairBenchPlugin extends OptionHandler { @Override public boolean handle(final Player player, Node node, String option) { - GameObject object = (GameObject) node; + Scenery object = (Scenery) node; int animId = -1; int sitAnimId = -1; for (Object[] data : CHAIRS) { 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 9d0a26c01..002b3d595 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/FireplacePlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/FireplacePlugin.java @@ -8,8 +8,8 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; @@ -42,7 +42,7 @@ public final class FireplacePlugin extends OptionHandler { player.sendMessage("You need some logs and a tinderbox in order to light the fireplace."); return true; } - final GameObject obj = (GameObject) node.asObject(); + final Scenery obj = (Scenery) node.asObject(); player.lock(2); player.animate(ANIMATION); GameWorld.getPulser().submit(new Pulse(2, player) { @@ -53,7 +53,7 @@ public final class FireplacePlugin extends OptionHandler { } player.getInventory().remove(new Item(1511)); player.getSkills().addExperience(Skills.FIREMAKING, 80); - ObjectBuilder.replace(new GameObject(obj.getId(), obj.getLocation()), new GameObject(obj.getId() + 1, obj.getLocation(), obj.getRotation()), 1000); + SceneryBuilder.replace(new Scenery(obj.getId(), obj.getLocation()), new Scenery(obj.getId() + 1, obj.getLocation(), obj.getRotation()), 1000); player.sendMessage("You light the fireplace."); return true; } 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 202e7b75b..b4241e379 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/StaircasePlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/StaircasePlugin.java @@ -10,8 +10,8 @@ import core.game.node.entity.skill.construction.BuildingUtils; import core.game.node.entity.skill.construction.HouseManager; import core.game.node.entity.skill.construction.Room; import core.game.node.entity.skill.construction.RoomProperties; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import core.game.world.map.Direction; import core.game.world.map.Location; @@ -64,13 +64,13 @@ public final class StaircasePlugin extends OptionHandler { player.getPacketDispatch().sendMessage("You're not in your house right now (REPORT)."); return true; } - GameObject object = (GameObject) node; + Scenery object = (Scenery) node; switch (option) { case "open": - ObjectBuilder.replace(object, object.transform(object.getId() + 3), 200); + SceneryBuilder.replace(object, object.transform(object.getId() + 3), 200); return true; case "close": - ObjectBuilder.replace(object, object.transform(object.getId() - 3)); + SceneryBuilder.replace(object, object.transform(object.getId() - 3)); return true; case "remove-room": if (player.getLocation().getZ() != 0) { @@ -108,7 +108,7 @@ public final class StaircasePlugin extends OptionHandler { * @param house The house the player is currently in. * @param object The object. */ - private static void climb(Player player, int z, HouseManager house, GameObject object) { + private static void climb(Player player, int z, HouseManager house, Scenery object) { Location l = player.getLocation(); int plane = l.getZ() + z; int roomX = l.getChunkX(); @@ -161,7 +161,7 @@ public final class StaircasePlugin extends OptionHandler { /** * The ladder. */ - private GameObject ladder; + private Scenery ladder; /** * Constructs a new {@code ClimbPohLadder} {@code Object}. @@ -186,7 +186,7 @@ public final class StaircasePlugin extends OptionHandler { @Override public boolean open(Object... args) { house = (HouseManager) args[0]; - ladder = (GameObject) args[1]; + ladder = (Scenery) args[1]; interpreter.sendOptions("What would you like to do?", "Climb Up.", "Climb Down."); stage = 0; return true; @@ -262,7 +262,7 @@ public final class StaircasePlugin extends OptionHandler { /** * The stairs object. */ - private GameObject stairs; + private Scenery stairs; /** * Constructs a new {@code BuildDialogue} {@code Object}. @@ -292,7 +292,7 @@ public final class StaircasePlugin extends OptionHandler { roomX = (Integer) args[1]; roomY = (Integer) args[2]; room = (Room) args[3]; - stairs = (GameObject) args[4]; + stairs = (Scenery) args[4]; stage = 0; if (stairs.getId() >= 13328 && stairs.getId() <= 13330) { interpreter.sendPlainMessage(false, "These stairs don't seem to lead anywhere. Do you", "want to build a throne room upstairs?"); diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/bedroom/ClockPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/bedroom/ClockPlugin.java index 3f868f367..24b2a4da0 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/bedroom/ClockPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/bedroom/ClockPlugin.java @@ -5,7 +5,7 @@ import core.cache.def.impl.ObjectDefinition; 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.node.object.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; @@ -30,7 +30,7 @@ public class ClockPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - GameObject object = node.asObject(); + Scenery object = node.asObject(); SimpleDateFormat format = new SimpleDateFormat("mm"); int minuteDisplay = Integer.parseInt(format.format(Calendar.getInstance().getTime())); StringBuilder sb = new StringBuilder("It's "); 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 ae8c7684d..3b22c235e 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 @@ -9,7 +9,7 @@ import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.audio.Audio; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -56,8 +56,8 @@ public class BoneOfferPlugin extends UseWithHandler { @Override public boolean handle(NodeUsageEvent event) { Player player = event.getPlayer(); - GameObject left = null; - GameObject right = null; + Scenery left = null; + Scenery right = null; if (event.getUsedWith().asObject().getRotation() % 2 == 0) { left = RegionManager.getObject(event.getUsedWith().getLocation().getZ(), event.getUsedWith().getLocation().getX() + 3, event.getUsedWith().getLocation().getY()); right = RegionManager.getObject(event.getUsedWith().getLocation().getZ(), event.getUsedWith().getLocation().getX() - 2, event.getUsedWith().getLocation().getY()); @@ -80,7 +80,7 @@ public class BoneOfferPlugin extends UseWithHandler { * @param right the right brazier * @param b the bone used */ - private void worship(final Player player, final GameObject altar, final GameObject left, final GameObject right, final Bones b) { + private void worship(final Player player, final Scenery altar, final Scenery left, final Scenery right, final Bones b) { if (player.getIronmanManager().isIronman() && !player.getHouseManager().isInHouse(player)) { player.sendMessage("You cannot do this on someone else's altar."); return; @@ -113,7 +113,7 @@ public class BoneOfferPlugin extends UseWithHandler { * Checks if the burner is lit. * @param obj the object. */ - private boolean isLit(GameObject obj) { + private boolean isLit(Scenery obj) { return obj != null && obj.getId() != 15271 && ObjectDefinition.forId(obj.getId()).getOptions() != null && !ObjectDefinition.forId(obj.getId()).hasAction("Light"); } @@ -122,7 +122,7 @@ public class BoneOfferPlugin extends UseWithHandler { * @param altar the altar object * @return the base bonus. */ - private double getBase(GameObject altar) { + private double getBase(Scenery altar) { double base = 150.0; if (altar == null) { return base; @@ -156,7 +156,7 @@ public class BoneOfferPlugin extends UseWithHandler { * @param isRight if the right is lit. * @return the mod. */ - private double getMod(GameObject altar, boolean isLeft, boolean isRight) { + private double getMod(Scenery altar, boolean isLeft, boolean isRight) { double total = getBase(altar); if (isLeft) { total += 50.0; diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/BeerBarrelPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/BeerBarrelPlugin.java index 0c8b8d908..2f994df57 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/BeerBarrelPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/BeerBarrelPlugin.java @@ -5,7 +5,7 @@ import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.update.flag.context.Animation; import core.plugin.Initializable; import core.plugin.Plugin; @@ -42,7 +42,7 @@ public class BeerBarrelPlugin extends UseWithHandler { @Override public boolean handle(NodeUsageEvent event) { Player player = event.getPlayer(); - final GameObject object = (GameObject) event.getUsedWith(); + final Scenery object = (Scenery) event.getUsedWith(); if (player.getInventory().remove(new Item(1919))) { player.animate(Animation.create(3661 + (object.getId() - 13569))); 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 08eb4d2e4..bb3cb82c7 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/portalchamber/PortalChamberPlugin.java @@ -10,7 +10,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.skill.construction.Decoration; import core.game.node.entity.skill.runecrafting.Rune; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.plugin.Initializable; import core.plugin.Plugin; @@ -118,7 +118,7 @@ public class PortalChamberPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - GameObject object = node.asObject(); + Scenery object = node.asObject(); switch (option) { case "direct-portal": if (!player.getHouseManager().isBuildingMode()) { 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 9bf0d284d..2f82c6126 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/workshop/ClockmakersBenchPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/workshop/ClockmakersBenchPlugin.java @@ -12,7 +12,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; import rs09.plugin.PluginManager; @@ -123,7 +123,7 @@ public class ClockmakersBenchPlugin extends OptionHandler { @Override public boolean open(Object... args) { - GameObject object = (GameObject) args[0]; + Scenery object = (Scenery) args[0]; decoration = Decoration.forObjectId(object.getId()); if (decoration != null) { switch (decoration) { 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 2bf2afc0b..e86f6305b 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/workshop/ToolsPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/workshop/ToolsPlugin.java @@ -10,7 +10,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.plugin.Plugin; import rs09.plugin.PluginManager; @@ -86,7 +86,7 @@ public class ToolsPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - GameObject object = node.asObject(); + Scenery object = node.asObject(); ToolStore ts = ToolStore.forId(object.getId()); if (ts != null) { player.getDialogueInterpreter().open(DialogueInterpreter.getDialogueKey("con:tools"), ts); diff --git a/Server/src/main/java/core/game/node/entity/skill/cooking/CookingRewrite.kt b/Server/src/main/java/core/game/node/entity/skill/cooking/CookingRewrite.kt index bdb1387a8..292b2c010 100644 --- a/Server/src/main/java/core/game/node/entity/skill/cooking/CookingRewrite.kt +++ b/Server/src/main/java/core/game/node/entity/skill/cooking/CookingRewrite.kt @@ -1,6 +1,6 @@ package core.game.node.entity.skill.cooking -import core.game.node.`object`.GameObject +import core.game.node.`object`.Scenery import core.game.node.entity.player.Player import core.game.node.item.Item import org.rs09.consts.Items @@ -56,7 +56,7 @@ class CookingRewrite : InteractionListener() { val COOKING_OBJs = intArrayOf(24313,21302, 13528, 13529, 13533, 13531, 13536, 13539, 13542, 2728, 2729, 2730, 2731, 2732, 2859, 3038, 3039, 3769, 3775, 4265, 4266, 5249, 5499, 5631, 5632, 5981, 9682, 10433, 11404, 11405, 11406, 12102, 12796, 13337, 13881, 14169, 14919, 15156, 20000, 20001, 21620, 21792, 22713, 22714, 23046, 24283, 24284, 25155, 25156, 25465, 25730, 27297, 29139, 30017, 32099, 33500, 34495, 34546, 36973, 37597, 37629, 37726, 114, 4172, 5275, 8750, 16893, 22154, 34410, 34565, 114, 9085, 9086, 9087, 12269, 15398, 25440, 25441, 2724, 2725, 2726, 4618, 4650, 5165, 6093, 6094, 6095, 6096, 8712, 9439, 9440, 9441, 10824, 17640, 17641, 17642, 17643, 18039, 21795, 24285, 24329, 27251, 33498, 35449, 36815, 36816, 37426, 40110) @JvmStatic - fun cook(player: Player, `object`: GameObject?, initial: Int, product: Int, amount: Int) { + fun cook(player: Player, `object`: Scenery?, initial: Int, product: Int, amount: Int) { val food = Item(initial) if (food.name.toLowerCase().contains("pizza")) { player.pulseManager.run(PizzaCookingPulse(player, `object`, initial, product, amount)) diff --git a/Server/src/main/java/core/game/node/entity/skill/cooking/IntentionalBurnPulse.java b/Server/src/main/java/core/game/node/entity/skill/cooking/IntentionalBurnPulse.java index 3a0493f5b..323ef620c 100644 --- a/Server/src/main/java/core/game/node/entity/skill/cooking/IntentionalBurnPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/cooking/IntentionalBurnPulse.java @@ -2,13 +2,13 @@ package core.game.node.entity.skill.cooking; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; public class IntentionalBurnPulse extends StandardCookingPulse { int initial,product,amount; Player player; - GameObject object; - IntentionalBurnPulse(Player player, GameObject object, int initial, int product, int amount){ + Scenery object; + IntentionalBurnPulse(Player player, Scenery object, int initial, int product, int amount){ super(player,object,initial,product,amount); this.initial = initial; this.product = product; @@ -35,7 +35,7 @@ public class IntentionalBurnPulse extends StandardCookingPulse { } @Override - public boolean cook(Player player, GameObject object, boolean burned, int initial, int product) { + public boolean cook(Player player, Scenery object, boolean burned, int initial, int product) { super.animate(); Item initialItem = new Item(initial); Item productItem = new Item(product); diff --git a/Server/src/main/java/core/game/node/entity/skill/cooking/PieCookingPulse.java b/Server/src/main/java/core/game/node/entity/skill/cooking/PieCookingPulse.java index 1cced5c8c..9de2dcf92 100644 --- a/Server/src/main/java/core/game/node/entity/skill/cooking/PieCookingPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/cooking/PieCookingPulse.java @@ -3,12 +3,12 @@ package core.game.node.entity.skill.cooking; import core.cache.def.impl.ItemDefinition; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; public class PieCookingPulse extends StandardCookingPulse { - private GameObject object; + private Scenery object; private Player player; - public PieCookingPulse(Player player, GameObject object, int initial, int product, int amount){ + public PieCookingPulse(Player player, Scenery object, int initial, int product, int amount){ super(player,object,initial,product,amount); this.object = object; this.player = player; diff --git a/Server/src/main/java/core/game/node/entity/skill/cooking/PizzaCookingPulse.java b/Server/src/main/java/core/game/node/entity/skill/cooking/PizzaCookingPulse.java index bde151b12..0f3926457 100644 --- a/Server/src/main/java/core/game/node/entity/skill/cooking/PizzaCookingPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/cooking/PizzaCookingPulse.java @@ -2,13 +2,13 @@ package core.game.node.entity.skill.cooking; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; public class PizzaCookingPulse extends StandardCookingPulse { - GameObject object; + Scenery object; Player player; - PizzaCookingPulse(Player player, GameObject object,int initial, int product, int amount){ + PizzaCookingPulse(Player player, Scenery object, int initial, int product, int amount){ super(player,object,initial,product,amount); this.object = object; this.player = player; 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 b188465ae..c258046ae 100644 --- a/Server/src/main/java/core/game/node/entity/skill/cooking/StandardCookingPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/cooking/StandardCookingPulse.java @@ -10,7 +10,7 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.entity.skill.Skills; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; @@ -28,12 +28,12 @@ public class StandardCookingPulse extends Pulse { public static final Audio SOUND = new Audio(2577, 1, 1); private int initial, product, amount, level; - private GameObject object; + private Scenery object; private Player player; private double experience; private boolean burned = false; - public StandardCookingPulse(Player player, GameObject object, int initial, int product, int amount) { + public StandardCookingPulse(Player player, Scenery object, int initial, int product, int amount) { this.player = player; this.object = object; this.initial = initial; @@ -113,7 +113,7 @@ public class StandardCookingPulse extends Pulse { return amount < 1; } - public boolean isBurned(final Player player, final GameObject object, int food) { + public boolean isBurned(final Player player, final Scenery object, int food) { boolean hasGauntlets = player.getEquipment().containsItem(new Item(Items.COOKING_GAUNTLETS_775)); double burn_stop = (double) CookableItems.getBurnLevel(food); CookableItems item = CookableItems.forId(food); @@ -131,7 +131,7 @@ public class StandardCookingPulse extends Pulse { return host_ratio > client_ratio; } - public boolean cook(final Player player, final GameObject object, final boolean burned, final int initial, final int product) { + public boolean cook(final Player player, final Scenery object, final boolean burned, final int initial, final int product) { Item initialItem = new Item(initial); Item productItem = new Item(product); player.lock(getDelay()); @@ -243,7 +243,7 @@ public class StandardCookingPulse extends Pulse { return cook(player, object, burned, initial, product); } - private Animation getAnimation(final GameObject object) { + private Animation getAnimation(final Scenery object) { return !object.getName().toLowerCase().equals("fire") ? RANGE_ANIMATION : FIRE_ANIMATION; } } diff --git a/Server/src/main/java/core/game/node/entity/skill/crafting/WeaveOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/WeaveOptionPlugin.java index 2ef1d8fc9..d2f3e383a 100644 --- a/Server/src/main/java/core/game/node/entity/skill/crafting/WeaveOptionPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/crafting/WeaveOptionPlugin.java @@ -12,7 +12,7 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; import core.tools.StringUtils; @@ -36,7 +36,7 @@ public final class WeaveOptionPlugin extends OptionHandler { new SkillDialogueHandler(player, SkillDialogue.THREE_OPTION, WeavingItem.SACK.getProduct(), WeavingItem.BASKET.getProduct(), WeavingItem.CLOTH.getProduct()) { @Override public void create(int amount, int index) { - player.getPulseManager().run(new WeavePulse(player, (GameObject) node, WeavingItem.values()[index], amount)); + player.getPulseManager().run(new WeavePulse(player, (Scenery) node, WeavingItem.values()[index], amount)); } }.open(); return true; @@ -47,7 +47,7 @@ public final class WeaveOptionPlugin extends OptionHandler { * @author 'Vexia * @version 1.0 */ - public static final class WeavePulse extends SkillPulse { + public static final class WeavePulse extends SkillPulse { /** * Represents the animation to use. @@ -75,7 +75,7 @@ public final class WeaveOptionPlugin extends OptionHandler { * @param node the node. * @param amount the amount. */ - public WeavePulse(Player player, GameObject node, final WeavingItem type, final int amount) { + public WeavePulse(Player player, Scenery node, final WeavingItem type, final int amount) { super(player, node); this.type = type; this.amount = amount; 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 fea2509da..d078eb17d 100644 --- a/Server/src/main/java/core/game/node/entity/skill/firemaking/FireMakingPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/firemaking/FireMakingPulse.java @@ -10,8 +10,8 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import rs09.game.world.GameWorld; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; @@ -128,8 +128,8 @@ public final class FireMakingPulse extends SkillPulse { } // GameObject originalOnSpot = // RegionManager.getObject(player.getLocation()); - final GameObject object = new GameObject(fire.getFireId(), player.getLocation()); - ObjectBuilder.add(object, fire.getLife(), getAsh(player, fire, object)); + final Scenery object = new Scenery(fire.getFireId(), player.getLocation()); + SceneryBuilder.add(object, fire.getLife(), getAsh(player, fire, object)); GroundItemManager.destroy(groundItem); player.moveStep(); player.faceLocation(FaceLocationFlag.getFaceLocation(player, object)); @@ -189,7 +189,7 @@ public final class FireMakingPulse extends SkillPulse { * @param object the object. * @return {@code GroundItem} the itemm. */ - public static GroundItem getAsh(final Player player, Log fire, final GameObject object) { + public static GroundItem getAsh(final Player player, Log fire, final Scenery object) { final GroundItem ash = new GroundItem(new Item(592), object.getLocation(), player); ash.setDecayTime(fire.getLife() + 200); return ash; 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 dcb850cf2..9d95c2135 100644 --- a/Server/src/main/java/core/game/node/entity/skill/gather/GatheringSkillPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/gather/GatheringSkillPulse.java @@ -12,8 +12,8 @@ import core.game.node.entity.player.Player; import core.game.node.entity.skill.SkillPulse; import core.game.node.entity.skill.Skills; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.tools.RandomFunction; import core.tools.StringUtils; @@ -26,7 +26,7 @@ import java.util.List; * Handles a gathering skill, such as woodcutting, mining, ... * @author Emperor */ -public final class GatheringSkillPulse extends SkillPulse { +public final class GatheringSkillPulse extends SkillPulse { /** * The gem rewards. @@ -63,7 +63,7 @@ public final class GatheringSkillPulse extends SkillPulse { * @param player The player. * @param node The gathering resource. */ - public GatheringSkillPulse(Player player, GameObject node) { + public GatheringSkillPulse(Player player, Scenery node) { super(player, node); } @@ -218,9 +218,9 @@ public final class GatheringSkillPulse extends SkillPulse { // return true; // } if (resource.getEmptyId() > -1) { - ObjectBuilder.replace(node, node.transform(resource.getEmptyId()), resource.getRespawnDuration()); + SceneryBuilder.replace(node, node.transform(resource.getEmptyId()), resource.getRespawnDuration()); } else { - ObjectBuilder.replace(node, node.transform(0), resource.getRespawnDuration()); + SceneryBuilder.replace(node, node.transform(0), resource.getRespawnDuration()); } node.setActive(false); return true; 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 8ac2a8215..ae0191c36 100644 --- a/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java @@ -14,8 +14,8 @@ import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.gather.SkillingTool; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; @@ -37,11 +37,11 @@ public class WoodcuttingSkillPulse extends Pulse { private WoodcuttingNode resource; private int ticks; private Player player; - private GameObject node; + private Scenery node; protected boolean resetAnimation = true; - public WoodcuttingSkillPulse(Player player, GameObject node) { + public WoodcuttingSkillPulse(Player player, Scenery node) { super(1, player, node); this.player = player; this.node = node; @@ -200,9 +200,9 @@ public class WoodcuttingSkillPulse extends Pulse { return true; } if (resource.getEmptyId() > -1) { - ObjectBuilder.replace(node, node.transform(resource.getEmptyId()), resource.getRespawnDuration()); + SceneryBuilder.replace(node, node.transform(resource.getEmptyId()), resource.getRespawnDuration()); } else { - ObjectBuilder.replace(node, node.transform(0), resource.getRespawnDuration()); + SceneryBuilder.replace(node, node.transform(0), resource.getRespawnDuration()); } node.setActive(false); return true; diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/DeadfallSetting.java b/Server/src/main/java/core/game/node/entity/skill/hunter/DeadfallSetting.java index 399be025a..db5e8be4c 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/DeadfallSetting.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/DeadfallSetting.java @@ -5,8 +5,8 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Direction; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; @@ -59,7 +59,7 @@ public final class DeadfallSetting extends TrapSetting { @Override public boolean clear(TrapWrapper wrapper, int type) { if (super.clear(wrapper, type)) { - ObjectBuilder.add(wrapper.getObject().transform(getNodeForObjectId(wrapper.isCaught() ? wrapper.getOriginalId() : wrapper.getObject().getId()))); + SceneryBuilder.add(wrapper.getObject().transform(getNodeForObjectId(wrapper.isCaught() ? wrapper.getOriginalId() : wrapper.getObject().getId()))); return true; } return false; @@ -118,7 +118,7 @@ public final class DeadfallSetting extends TrapSetting { } @Override - public GameObject buildObject(Player player, Node node) { + public Scenery buildObject(Player player, Node node) { return node.asObject().transform(getObjectForNode(node)); } @@ -136,7 +136,7 @@ public final class DeadfallSetting extends TrapSetting { * Gets the list of locations. * @return the locations. */ - private List getLocations(GameObject object) { + private List getLocations(Scenery object) { List locs = new ArrayList<>(20); if (object.getDirection() == Direction.NORTH) { locs.add(object.getLocation().transform(1, -1, 0)); diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/HunterManager.java b/Server/src/main/java/core/game/node/entity/skill/hunter/HunterManager.java index 4ed193c38..d55652b23 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/HunterManager.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/HunterManager.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.hunter; import core.game.node.entity.skill.Skills; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import java.util.ArrayList; import java.util.Iterator; @@ -71,7 +71,7 @@ public final class HunterManager { * @param object the object. * @return {@code True} if registered. */ - public boolean register(Traps trap, Node node, final GameObject object) { + public boolean register(Traps trap, Node node, final Scenery object) { final TrapWrapper wrapper = new TrapWrapper(player, trap, object); trap.getSettings().reward(player, node, wrapper); wrapper.setHook(trap.addHook(wrapper)); @@ -92,7 +92,7 @@ public final class HunterManager { * @param object the object. * @return {@code True} if they're the owner. */ - public boolean isOwner(GameObject object) { + public boolean isOwner(Scenery object) { return getUid(object) == getUid(); } @@ -101,7 +101,7 @@ public final class HunterManager { * @param object the object. * @return the wrapper. */ - public TrapWrapper getWrapper(GameObject object) { + public TrapWrapper getWrapper(Scenery object) { for (TrapWrapper wrapper : traps) { if (wrapper.getObject() == object || (wrapper.getSecondary() != null && wrapper.getSecondary() == object)) { return wrapper; @@ -143,7 +143,7 @@ public final class HunterManager { * @param object the object. * @return the uid. */ - public int getUid(GameObject object) { + public int getUid(Scenery object) { return object.getAttributes().getAttribute("trap-uid", 0); } 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 7074e8772..e7f208c1d 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/HunterPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/HunterPlugin.java @@ -17,7 +17,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.plugin.Plugin; @@ -91,10 +91,10 @@ public final class HunterPlugin extends OptionHandler { case "deactivate": case "retrieve": case "check": - trap.dismantle(player, (GameObject) node); + trap.dismantle(player, (Scenery) node); return true; case "investigate": - trap.investigate(player, (GameObject) node); + trap.investigate(player, (Scenery) node); return true; } return true; @@ -146,7 +146,7 @@ public final class HunterPlugin extends OptionHandler { @Override public boolean handle(NodeUsageEvent event) { final Player player = event.getPlayer(); - final GameObject object = event.getUsedWith() instanceof GameObject ? (GameObject) event.getUsedWith() : (GameObject) event.getUsed(); + final Scenery object = event.getUsedWith() instanceof Scenery ? (Scenery) event.getUsedWith() : (Scenery) event.getUsed(); final Item item = event.getUsedItem(); if (!player.getHunterManager().isOwner(object)) { player.sendMessage("This isn't your trap!"); diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/NetTrapSetting.java b/Server/src/main/java/core/game/node/entity/skill/hunter/NetTrapSetting.java index 55299b6d0..c19dc2788 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/NetTrapSetting.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/NetTrapSetting.java @@ -4,8 +4,8 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; @@ -38,16 +38,16 @@ public final class NetTrapSetting extends TrapSetting { public boolean clear(TrapWrapper wrapper, int type) { if (super.clear(wrapper, type)) { if (wrapper.getSecondary() != null && wrapper.getSecondary().isActive()) { - ObjectBuilder.remove(wrapper.getSecondary()); + SceneryBuilder.remove(wrapper.getSecondary()); } - ObjectBuilder.add(wrapper.getObject().transform(wrapper.getNetType().getOriginal())); + SceneryBuilder.add(wrapper.getObject().transform(wrapper.getNetType().getOriginal())); return true; } return false; } @Override - public void returnItems(GameObject object, TrapWrapper wrapper, int type) { + public void returnItems(Scenery object, TrapWrapper wrapper, int type) { super.returnItems(object, wrapper, type); if (type == 0) { for (Item i : super.getItems()) { @@ -58,7 +58,7 @@ public final class NetTrapSetting extends TrapSetting { @Override public void reward(Player player, Node node, TrapWrapper wrapper) { - GameObject object = wrapper.getObject(); + Scenery object = wrapper.getObject(); wrapper.setNetType(NetTrap.forId(node.getId())); int rotation = 0; int increment = 0; @@ -67,8 +67,8 @@ public final class NetTrapSetting extends TrapSetting { rotation = (int) netInfo[0]; increment = (int) netInfo[1]; x = (boolean) netInfo[2]; - GameObject secondary = new GameObject(wrapper.getNetType().getNet(), object.getLocation().transform(x ? increment : 0, !x ? increment : 0, 0), rotation); - secondary = ObjectBuilder.add(secondary); + Scenery secondary = new Scenery(wrapper.getNetType().getNet(), object.getLocation().transform(x ? increment : 0, !x ? increment : 0, 0), rotation); + secondary = SceneryBuilder.add(secondary); wrapper.setSecondary(secondary); player.moveStep(); wrapper.addItem(getItems()); @@ -79,7 +79,7 @@ public final class NetTrapSetting extends TrapSetting { public void handleCatch(int counter, TrapWrapper wrapper, TrapNode node, NPC npc, boolean success) { switch (counter) { case 2: - ObjectBuilder.remove(wrapper.getSecondary()); + SceneryBuilder.remove(wrapper.getSecondary()); break; case 3: npc.moveStep(); @@ -89,8 +89,8 @@ public final class NetTrapSetting extends TrapSetting { } @Override - public GameObject buildObject(Player player, Node node) { - return ((GameObject) node).transform(NetTrap.forId(node.getId()).getBent()); + public Scenery buildObject(Player player, Node node) { + return ((Scenery) node).transform(NetTrap.forId(node.getId()).getBent()); } @Override diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/TrapCreatePulse.java b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapCreatePulse.java index ffbdf7104..a7751004e 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/TrapCreatePulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapCreatePulse.java @@ -6,8 +6,8 @@ import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; @@ -84,16 +84,16 @@ public final class TrapCreatePulse extends SkillPulse { if (++ticks % (trap.getSettings().getSetupAnimation().getDefinition().getDurationTicks()) != 0) { return false; } - GameObject object = trap.getSettings().buildObject(player, node); + Scenery object = trap.getSettings().buildObject(player, node); if (isGroundSetup() || groundItem != null) { GroundItemManager.destroy(groundItem); } if (!trap.getSettings().isObjectTrap()) { player.moveStep(); } else { - ObjectBuilder.remove(node.asObject()); + SceneryBuilder.remove(node.asObject()); } - object = ObjectBuilder.add(object); + object = SceneryBuilder.add(object); player.getHunterManager().register(trap, node, object); return true; } diff --git a/Server/src/main/java/core/game/node/entity/skill/hunter/TrapDismantlePulse.java b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapDismantlePulse.java index 91d81342b..e7b0fb288 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/TrapDismantlePulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapDismantlePulse.java @@ -4,13 +4,13 @@ import core.game.content.global.SkillingPets; import core.game.node.entity.skill.SkillPulse; import core.game.node.entity.skill.Skills; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; /** * Handles the dismantling of a trap. * @author Vexia */ -public final class TrapDismantlePulse extends SkillPulse { +public final class TrapDismantlePulse extends SkillPulse { /** * The trap wrapper. @@ -32,7 +32,7 @@ public final class TrapDismantlePulse extends SkillPulse { * @param player the player. * @param node the node. */ - public TrapDismantlePulse(Player player, GameObject node, final TrapWrapper wrapper) { + public TrapDismantlePulse(Player player, Scenery node, final TrapWrapper wrapper) { super(player, node); this.trap = wrapper.getType(); this.wrapper = wrapper; 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 96f19b252..b206cafe4 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/TrapSetting.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapSetting.java @@ -8,8 +8,8 @@ import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -135,7 +135,7 @@ public class TrapSetting { * @return {@code True} if cleared. */ public boolean clear(TrapWrapper wrapper, int type) { - GameObject object = wrapper.getObject(); + Scenery object = wrapper.getObject(); returnItems(object, wrapper, type); wrapper.getType().getHooks().remove(wrapper.getHook()); removeObject(wrapper); @@ -148,7 +148,7 @@ public class TrapSetting { * @param wrapper the wrapper. * @param type the type. */ - public void returnItems(GameObject object, TrapWrapper wrapper, int type) { + public void returnItems(Scenery object, TrapWrapper wrapper, int type) { boolean ground = type == 0; Player player = wrapper.getPlayer(); if (!isObjectTrap()) { @@ -213,17 +213,17 @@ public class TrapSetting { * @param object the object. * @return {@code True} if so. */ - public boolean removeObject(GameObject object) { - return ObjectBuilder.remove(object); + public boolean removeObject(Scenery object) { + return SceneryBuilder.remove(object); } /** - * Builds a game object. + * Builds a scenery. * @param node the node. * @return the object. */ - public GameObject buildObject(Player player, Node node) { - return new GameObject(objectIds[0], player.getLocation()); + public Scenery buildObject(Player player, Node node) { + return new Scenery(objectIds[0], player.getLocation()); } /** @@ -231,7 +231,7 @@ public class TrapSetting { * @param player the player. * @param object the object. */ - public void investigate(Player player, GameObject object) { + public void investigate(Player player, Scenery object) { if (!player.getHunterManager().isOwner(object)) { player.sendMessage("This isn't your trap."); return; 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 95d628bdf..626b94165 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/TrapWrapper.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/TrapWrapper.java @@ -3,8 +3,8 @@ package core.game.node.entity.skill.hunter; import core.game.node.entity.skill.hunter.NetTrapSetting.NetTrap; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; @@ -46,12 +46,12 @@ public final class TrapWrapper { /** * The object of the trap. */ - private GameObject object; + private Scenery object; /** - * The secondary game object. + * The secondary scenery. */ - private GameObject secondary; + private Scenery secondary; /** * The trap hook. @@ -94,7 +94,7 @@ public final class TrapWrapper { * @param type the type. * @param object the object. */ - public TrapWrapper(final Player player, Traps type, GameObject object) { + public TrapWrapper(final Player player, Traps type, Scenery object) { this.player = player; this.type = type; this.object = object; @@ -122,9 +122,9 @@ public final class TrapWrapper { * @param id the id. */ public void setObject(final int id) { - GameObject newObject = object.transform(id); - ObjectBuilder.remove(object); - this.object = ObjectBuilder.add(newObject); + Scenery newObject = object.transform(id); + SceneryBuilder.remove(object); + this.object = SceneryBuilder.add(newObject); this.object.getAttributes().setAttribute("trap-uid", player.getHunterManager().getUid()); } @@ -217,7 +217,7 @@ public final class TrapWrapper { * Gets the object. * @return The object. */ - public GameObject getObject() { + public Scenery getObject() { return object; } @@ -362,7 +362,7 @@ public final class TrapWrapper { * Gets the secondary. * @return The secondary. */ - public GameObject getSecondary() { + public Scenery getSecondary() { return secondary; } @@ -370,7 +370,7 @@ public final class TrapWrapper { * Sets the secondary. * @param secondary The secondary to set. */ - public void setSecondary(GameObject secondary) { + public void setSecondary(Scenery secondary) { this.secondary = secondary; this.secondary.getAttributes().setAttribute("trap-uid", player.getName().hashCode()); } @@ -395,7 +395,7 @@ public final class TrapWrapper { * Sets the object. * @param object The object to set. */ - public void setObject(GameObject object) { + public void setObject(Scenery object) { this.object = object; } 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 9fd9aed0b..259367a0a 100644 --- a/Server/src/main/java/core/game/node/entity/skill/hunter/Traps.java +++ b/Server/src/main/java/core/game/node/entity/skill/hunter/Traps.java @@ -4,7 +4,7 @@ import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import rs09.game.system.SystemLogger; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; @@ -93,7 +93,7 @@ public enum Traps { * @param player the player. * @param object the object. */ - public void dismantle(Player player, GameObject object) { + public void dismantle(Player player, Scenery object) { if (!player.getHunterManager().isOwner(object)) { player.sendMessage("This isn't your trap!"); return; @@ -111,7 +111,7 @@ public enum Traps { * @param player the player. * @param object the object. */ - public void investigate(Player player, GameObject object) { + public void investigate(Player player, Scenery object) { getSettings().investigate(player, object); } diff --git a/Server/src/main/java/core/game/node/entity/skill/magic/ChargeOrbSpells.java b/Server/src/main/java/core/game/node/entity/skill/magic/ChargeOrbSpells.java index 173f3d6a5..c954889d3 100644 --- a/Server/src/main/java/core/game/node/entity/skill/magic/ChargeOrbSpells.java +++ b/Server/src/main/java/core/game/node/entity/skill/magic/ChargeOrbSpells.java @@ -8,7 +8,7 @@ import core.game.node.entity.combat.equipment.SpellType; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.SpellBookManager.SpellBook; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Initializable; @@ -85,11 +85,11 @@ public final class ChargeOrbSpells extends MagicSpell { @Override public boolean cast(Entity entity, Node target) { - if (!(target instanceof GameObject)) { + if (!(target instanceof Scenery)) { return false; } Player p = (Player) entity; - GameObject obj = (GameObject) target; + Scenery obj = (Scenery) target; if (obj == null || obj.getId() != objectId) { p.getPacketDispatch().sendMessage("You can't cast this spell on this object!"); return false; 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 3fc78027b..33dc7c1d6 100644 --- a/Server/src/main/java/core/game/node/entity/skill/magic/lunar/FertileSoilSpell.java +++ b/Server/src/main/java/core/game/node/entity/skill/magic/lunar/FertileSoilSpell.java @@ -8,7 +8,7 @@ import core.game.node.entity.player.link.SpellBookManager.SpellBook; import core.game.node.entity.skill.magic.MagicSpell; import core.game.node.entity.skill.magic.Runes; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Graphics; import core.plugin.Initializable; @@ -51,7 +51,7 @@ public final class FertileSoilSpell extends MagicSpell { @Override public boolean cast(Entity entity, Node target) { final Player player = ((Player) entity); - final GameObject object = (GameObject) target; + final Scenery object = (Scenery) target; final FarmingPatch fPatch = FarmingPatch.forObject(object); if(fPatch == null){ player.sendMessage("Um... I don't want to fertilize that!"); diff --git a/Server/src/main/java/core/game/node/entity/skill/runecrafting/Altar.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/Altar.java index d14a4e503..41fb75ded 100644 --- a/Server/src/main/java/core/game/node/entity/skill/runecrafting/Altar.java +++ b/Server/src/main/java/core/game/node/entity/skill/runecrafting/Altar.java @@ -2,7 +2,7 @@ package core.game.node.entity.skill.runecrafting; import core.cache.def.impl.ItemDefinition; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; /** * Represents an altar an it's relative information(corresponding ruin, etc) @@ -151,7 +151,7 @@ public enum Altar { * @param object the object. * @return the Altar or Null. */ - public static Altar forObject(final GameObject object) { + public static Altar forObject(final Scenery object) { for (Altar altar : values()) { if (altar.getObject() == object.getId() || altar.getPortal() == object.getId() || object.getId() == altar.getRiftId()) { return altar; diff --git a/Server/src/main/java/core/game/node/entity/skill/runecrafting/CombinationRunePlugin.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/CombinationRunePlugin.java index 4c8baef2c..a1c83515c 100644 --- a/Server/src/main/java/core/game/node/entity/skill/runecrafting/CombinationRunePlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/runecrafting/CombinationRunePlugin.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.runecrafting; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.plugin.Plugin; /** @@ -30,7 +30,7 @@ public final class CombinationRunePlugin extends UseWithHandler { @Override public boolean handle(NodeUsageEvent event) { final Player player = event.getPlayer(); - final Altar altar = Altar.forObject(((GameObject) event.getUsedWith())); + final Altar altar = Altar.forObject(((Scenery) event.getUsedWith())); final CombinationRune combo = CombinationRune.forAltar(altar, event.getUsedItem()); if (combo == null) { return false; diff --git a/Server/src/main/java/core/game/node/entity/skill/runecrafting/EnchantTiaraPlugin.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/EnchantTiaraPlugin.java index 521709f96..78a1c0b21 100644 --- a/Server/src/main/java/core/game/node/entity/skill/runecrafting/EnchantTiaraPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/runecrafting/EnchantTiaraPlugin.java @@ -3,7 +3,7 @@ package core.game.node.entity.skill.runecrafting; import core.game.interaction.NodeUsageEvent; import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.plugin.Plugin; /** @@ -30,7 +30,7 @@ public final class EnchantTiaraPlugin extends UseWithHandler { @Override public boolean handle(NodeUsageEvent event) { Player player = event.getPlayer(); - Altar altar = Altar.forObject(((GameObject) event.getUsedWith())); + Altar altar = Altar.forObject(((Scenery) event.getUsedWith())); if (!player.getInventory().containsItem(altar.getTalisman().getTalisman())) { return false; } diff --git a/Server/src/main/java/core/game/node/entity/skill/runecrafting/MysteriousRuin.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/MysteriousRuin.java index bf91fec2e..3e9e94f2e 100644 --- a/Server/src/main/java/core/game/node/entity/skill/runecrafting/MysteriousRuin.java +++ b/Server/src/main/java/core/game/node/entity/skill/runecrafting/MysteriousRuin.java @@ -2,7 +2,7 @@ package core.game.node.entity.skill.runecrafting; import core.game.container.impl.EquipmentContainer; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; /** @@ -138,7 +138,7 @@ public enum MysteriousRuin { * @param object the object. * @return the MysteriousRuin or Null. */ - public static MysteriousRuin forObject(final GameObject object) { + public static MysteriousRuin forObject(final Scenery object) { for (MysteriousRuin ruin : values()) { for (int i : ruin.getObject()) { if (i == object.getId()) { 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 755be2f23..096284106 100644 --- a/Server/src/main/java/core/game/node/entity/skill/runecrafting/MysteriousRuinPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/runecrafting/MysteriousRuinPlugin.java @@ -5,7 +5,7 @@ import core.game.interaction.UseWithHandler; import core.game.node.entity.player.Player; import core.game.node.entity.player.info.Rights; import core.game.node.entity.player.link.diary.DiaryType; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; @@ -47,7 +47,7 @@ public final class MysteriousRuinPlugin extends UseWithHandler { return true; } final Talisman talisman = Talisman.forItem(event.getUsedItem()); - final MysteriousRuin ruin = MysteriousRuin.forObject(((GameObject) event.getUsedWith())); + final MysteriousRuin ruin = MysteriousRuin.forObject(((Scenery) event.getUsedWith())); if (talisman != ruin.getTalisman() && talisman != Talisman.ELEMENTAL) { return false; } 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 43f1490d1..2d38d7cff 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 @@ -12,7 +12,7 @@ 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.node.object.Scenery; import core.game.system.task.Pulse; import core.game.world.map.Location; import core.net.packet.PacketRepository; @@ -89,7 +89,7 @@ public class RunecraftingPlugin extends OptionHandler { } switch (option) { case "use": - final Altar altar = Altar.forObject(((GameObject) node)); + final Altar altar = Altar.forObject(((Scenery) node)); player.getProperties().setTeleportLocation(altar.getRuin().getBase()); break; case "craft-rune": @@ -97,21 +97,21 @@ public class RunecraftingPlugin extends OptionHandler { player.sendMessage("You can only craft Astral runes on Lunar Isle."); return true; } - player.getPulseManager().run(new RuneCraftPulse(player, null, Altar.forObject(((GameObject) node)), false, null)); + player.getPulseManager().run(new RuneCraftPulse(player, null, Altar.forObject(((Scenery) node)), false, null)); break; case "locate": final Talisman talisman = Talisman.forItem(((Item) node)); talisman.locate(player); break; case "enter": - final MysteriousRuin ruin = MysteriousRuin.forObject(((GameObject) node)); + final MysteriousRuin ruin = MysteriousRuin.forObject(((Scenery) node)); if (ruin == null) { return true; } ruin.enter(player); break; case "climb": - int id = ((GameObject) node).getId(); + int id = ((Scenery) node).getId(); switch (id) { case 26849: ClimbActionHandler.climb(player, null, new Location(3271, 4861, 0)); 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 d814b8ac2..3c14bd93e 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 @@ -9,7 +9,7 @@ import core.game.node.Node; import core.game.node.entity.impl.Animator.Priority; 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.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -51,7 +51,7 @@ public final class AbyssPlugin extends OptionHandler { player.getDialogueInterpreter().open(node.getId(), node, true); break; case "exit-through": - Altar altar = Altar.forObject((GameObject) node); + Altar altar = Altar.forObject((Scenery) node); if (altar != null) { altar.enterRift(player); } @@ -62,8 +62,8 @@ public final class AbyssPlugin extends OptionHandler { case "distract": case "go-through": case "burn-down": - final AbbysalObstacle obstacle = AbbysalObstacle.forObject(((GameObject) node)); - obstacle.handle(player, ((GameObject) node)); + final AbbysalObstacle obstacle = AbbysalObstacle.forObject(((Scenery) node)); + obstacle.handle(player, ((Scenery) node)); break; } return true; @@ -97,7 +97,7 @@ public final class AbyssPlugin extends OptionHandler { public enum AbbysalObstacle { BOIL("burn-down", new Location[] { Location.create(3024, 4833, 0), Location.create(3053, 4830, 0) }, 7165) { @Override - public void handle(final Player player, final GameObject object) { + public void handle(final Player player, final Scenery object) { if (!player.getInventory().contains(590, 1)) { player.getPacketDispatch().sendMessage("You don't have a tinderbox to burn it."); return; @@ -137,7 +137,7 @@ public final class AbyssPlugin extends OptionHandler { }, MINE("mine", new Location[] { Location.create(3030, 4821, 0), Location.create(3048, 4822, 0) }, 7158, 7153) { @Override - public void handle(final Player player, final GameObject object) { + public void handle(final Player player, final Scenery object) { final SkillingTool tool = setTool(true, player); if (tool == null) { player.getPacketDispatch().sendMessage("You need a pickaxe in order to do that."); @@ -178,7 +178,7 @@ public final class AbyssPlugin extends OptionHandler { }, CHOP("chop", new Location[] { Location.create(3050, 4824, 0), Location.create(3028, 4824, 0) }, 7161, 7144) { @Override - public void handle(final Player player, final GameObject object) { + public void handle(final Player player, final Scenery object) { final SkillingTool tool = setTool(false, player); if (tool == null) { player.getPacketDispatch().sendMessage("You need an axe in order to do that."); @@ -219,7 +219,7 @@ public final class AbyssPlugin extends OptionHandler { }, SQUEEZE("squeeze-through", new Location[] { Location.create(3048, 4842, 0), Location.create(3031, 4842, 0) }, 7164, 7147) { @Override - public void handle(final Player player, final GameObject object) { + public void handle(final Player player, final Scenery object) { player.animate(new Animation(1331)); player.lock(3); player.lock(3); @@ -251,7 +251,7 @@ public final class AbyssPlugin extends OptionHandler { }, DISTRACT("distract", new Location[] { Location.create(3029, 4841, 0), Location.create(3051, 4838, 0) }, 7168, 7150) { @Override - public void handle(final Player player, final GameObject object) { + public void handle(final Player player, final Scenery object) { int[] emotes = { 855, 856, 857, 858, 859, 860, 861, 862, 863, 864, 865, 866, 2113, 2109, 2111, 2106, 2107, 2108, 0x558, 2105, 2110, 2112, 0x84F, 0x850, 1131, 1130, 1129, 1128, 1745, 3544, 3543, 2836 }; int index = RandomFunction.random(emotes.length); player.animate(new Animation(emotes[index])); @@ -289,7 +289,7 @@ public final class AbyssPlugin extends OptionHandler { }, PASSAGE("go-through", new Location[] { Location.create(3040, 4844, 0) }, 7154) { @Override - public void handle(final Player player, final GameObject object) { + public void handle(final Player player, final Scenery object) { player.getProperties().setTeleportLocation(getLocations()[0]); } }; @@ -341,7 +341,7 @@ public final class AbyssPlugin extends OptionHandler { * @param object the object. * @return the AbbysalObstacle or Null. */ - public static AbbysalObstacle forObject(final GameObject object) { + public static AbbysalObstacle forObject(final Scenery object) { for (AbbysalObstacle obstacle : values()) { for (int i : obstacle.getObjects()) { if (i == object.getId()) { @@ -357,7 +357,7 @@ public final class AbyssPlugin extends OptionHandler { * @param object the object. * @return the index. */ - public int getIndex(final GameObject object) { + public int getIndex(final Scenery object) { for (int i = 0; i < objects.length; i++) { if (getObjects()[i] == object.getId()) { return i; @@ -371,7 +371,7 @@ public final class AbyssPlugin extends OptionHandler { * @param player the player. * @param object the object. */ - public void handle(final Player player, final GameObject object) { + public void handle(final Player player, final Scenery object) { } 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 da4f73f4a..11541ea6d 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/FishingExplosivePlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/FishingExplosivePlugin.java @@ -15,7 +15,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.HintIconManager; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; @@ -116,7 +116,7 @@ public final class FishingExplosivePlugin extends OptionHandler { final int delay = (int) (2 + (player.getLocation().getDistance(event.getUsedWith().getLocation())) * 0.5); player.animate(ANIMATION); player.getPacketDispatch().sendMessage("You hurl the shuddering vial into the water..."); - sendProjectile(player, (GameObject) event.getUsedWith()); + sendProjectile(player, (Scenery) event.getUsedWith()); GameWorld.getPulser().submit(new Pulse(delay, player) { @Override public boolean pulse() { @@ -146,7 +146,7 @@ public final class FishingExplosivePlugin extends OptionHandler { * @param player the player. * @param object the object. */ - private void sendProjectile(final Player player, final GameObject object) { + private void sendProjectile(final Player player, final Scenery object) { Projectile p = Projectile.create(player, null, 49, 30, 20, 30, Projectile.getSpeed(player, object.getLocation())); p.setEndLocation(object.getLocation()); p.send(); diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerTowerPlugin.java b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerTowerPlugin.java index 34f62d5a8..b903209bc 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerTowerPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerTowerPlugin.java @@ -5,8 +5,8 @@ import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.plugin.Initializable; @@ -47,7 +47,7 @@ public final class SlayerTowerPlugin extends OptionHandler { switch (node.getId()) { case 4490: case 4487: - DoorActionHandler.handleAutowalkDoor(player, (GameObject) node); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) node); switchStatue(); return true; } @@ -59,10 +59,10 @@ public final class SlayerTowerPlugin extends OptionHandler { */ private void switchStatue() { for (Location l : LOCATIONS) { - GameObject object = RegionManager.getObject(l); + Scenery object = RegionManager.getObject(l); if (object != null) { int id = object.getId() == OPEN_ID ? CLOSED_ID : OPEN_ID; - ObjectBuilder.replace(object, object.transform(id)); + SceneryBuilder.replace(object, object.transform(id)); } } } diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerTowerZone.java b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerTowerZone.java index c25793144..646ad36e1 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerTowerZone.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerTowerZone.java @@ -6,7 +6,7 @@ import core.game.interaction.Option; import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.zone.MapZone; import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneBuilder; @@ -44,7 +44,7 @@ public final class SlayerTowerZone extends MapZone implements Plugin { return true; } if (target.getId() == 10527 || target.getId() == 10528) { - DoorActionHandler.handleAutowalkDoor(player, (GameObject) target); + DoorActionHandler.handleAutowalkDoor(player, (Scenery) target); return true; } } 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 049516d61..e9e86aa25 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 @@ -13,8 +13,8 @@ import core.game.node.entity.combat.ImpactHandler.HitsplatType; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -113,7 +113,7 @@ public final class AncientCavern extends MapZone implements Plugin { handleLog(player); return true; case 25362: - rummageSkeleton(player, (GameObject) target); + rummageSkeleton(player, (Scenery) target); return true; } } @@ -176,7 +176,7 @@ public final class AncientCavern extends MapZone implements Plugin { * @param player the player. * @param object the object. */ - private void rummageSkeleton(Player player, GameObject object) { + private void rummageSkeleton(Player player, Scenery object) { final boolean fullInvy = player.getInventory().freeSlots() < 1; final int random = RandomFunction.random(0, 2); player.getPacketDispatch().sendMessages("You rummage in the sharp, slimy pile of bones in search of something useful..."); @@ -207,15 +207,15 @@ public final class AncientCavern extends MapZone implements Plugin { * @param object the object. * @param spawn the spawn. */ - private void removeSkeleton(final GameObject object, final NPC spawn) { - ObjectBuilder.remove(object); + private void removeSkeleton(final Scenery object, final NPC spawn) { + SceneryBuilder.remove(object); GameWorld.getPulser().submit(new Pulse(200) { @Override public boolean pulse() { if (spawn != null && spawn.isActive()) { spawn.clear(); } - ObjectBuilder.add(object); + SceneryBuilder.add(object); return true; } }); 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 1fbedd62d..d9eeb3a88 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/FremennikDungeon.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/FremennikDungeon.java @@ -8,7 +8,7 @@ import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.combat.ImpactHandler.HitsplatType; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Direction; @@ -47,9 +47,9 @@ public final class FremennikDungeon extends MapZone implements Plugin { @Override public boolean interact(Entity entity, Node target, Option option) { - if (entity instanceof Player && target instanceof GameObject) { + if (entity instanceof Player && target instanceof Scenery) { final Player player = (Player) entity; - final GameObject object = (GameObject) target; + final Scenery object = (Scenery) target; final Direction dir = Direction.getLogicalDirection(player.getLocation(), object.getLocation()); switch (target.getId()) { case 9326:// pyrefiend area. 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 9bc3613cf..38b7ff206 100644 --- a/Server/src/main/java/core/game/node/entity/skill/smithing/FurnaceOptionPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/smithing/FurnaceOptionPlugin.java @@ -12,7 +12,7 @@ import core.game.node.Node; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -52,7 +52,7 @@ public final class FurnaceOptionPlugin extends OptionHandler { @Override public boolean handle(final Player player, Node node, String option) { - switch (((GameObject) node).getId()) { + switch (((Scenery) node).getId()) { case 3044: handleTutorialIsland(player); return true; diff --git a/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningCreator.java b/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningCreator.java index 1a7f10f6e..a3ae10264 100644 --- a/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningCreator.java +++ b/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningCreator.java @@ -6,7 +6,7 @@ import core.game.node.entity.skill.SkillPulse; import core.game.node.entity.skill.Skills; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.game.world.update.flag.context.Animation; @@ -98,7 +98,7 @@ public final class SummoningCreator { /** * Represents the object. */ - private GameObject object; + private Scenery object; /** * Represents the amount to make. 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 2831fe9d6..2c52ec3f6 100644 --- a/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningTrainingRoom.java +++ b/Server/src/main/java/core/game/node/entity/skill/summoning/SummoningTrainingRoom.java @@ -16,7 +16,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.quest.Quest; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.map.Location; @@ -77,7 +77,7 @@ public final class SummoningTrainingRoom extends OptionHandler { @Override public boolean handle(final Player player, Node node, String option) { - GameObject object = (GameObject) node; + Scenery object = (Scenery) node; Location loc = null; Quest quest = player.getQuestRepository().getQuest("Wolf Whistle"); int questVal = quest.getStage(player) == 0 ? 0 : quest.getStage(player) > 0 && quest.getStage(player) < 100 ? 5 : 28893; @@ -141,7 +141,7 @@ public final class SummoningTrainingRoom extends OptionHandler { break; case 100: case 60: - ClimbActionHandler.climbLadder(player, (GameObject) node, option); + ClimbActionHandler.climbLadder(player, (Scenery) node, option); break; default: player.getDialogueInterpreter().sendDialogue("There is a loud crash from upstairs, followed by the tinkling of", "broken glass."); diff --git a/Server/src/main/java/core/game/node/entity/skill/thieving/PickableDoorHandler.java b/Server/src/main/java/core/game/node/entity/skill/thieving/PickableDoorHandler.java index 09290c5ef..ffbd88fee 100644 --- a/Server/src/main/java/core/game/node/entity/skill/thieving/PickableDoorHandler.java +++ b/Server/src/main/java/core/game/node/entity/skill/thieving/PickableDoorHandler.java @@ -10,7 +10,7 @@ import core.game.node.entity.Entity; import core.game.node.entity.combat.ImpactHandler; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Direction; import core.game.world.map.Location; import core.plugin.Plugin; @@ -61,11 +61,11 @@ public class PickableDoorHandler extends OptionHandler { player.getPacketDispatch().sendMessage("The door is locked."); return true; } - door.open(player, (GameObject) node); + door.open(player, (Scenery) node); return true; } if (option.equals("pick-lock")) { - door.pickLock(player, (GameObject) node); + door.pickLock(player, (Scenery) node); return true; } System.out.println("Unhandled door: " + node.getId()); @@ -74,8 +74,8 @@ public class PickableDoorHandler extends OptionHandler { @Override public Location getDestination(Node node, Node n) { - if (n instanceof GameObject) { - GameObject object = (GameObject) n; + if (n instanceof Scenery) { + Scenery object = (Scenery) n; if (object.getDefinition().hasAction("pick-lock")) { return DoorActionHandler.getDestination((Entity) node, object); } @@ -151,7 +151,7 @@ public class PickableDoorHandler extends OptionHandler { * @param player the player. * @param object the object. */ - public void open(Player player, GameObject object) { + public void open(Player player, Scenery object) { if (isInside(player, object)) { DoorActionHandler.handleAutowalkDoor(player, object); player.getPacketDispatch().sendMessage("You go through the door."); @@ -165,7 +165,7 @@ public class PickableDoorHandler extends OptionHandler { * @param player the player. * @param object the object. */ - public void pickLock(Player player, GameObject object) { + public void pickLock(Player player, Scenery object) { boolean success = RandomFunction.random(12) >= 4; if (isInside(player, object)) { player.getPacketDispatch().sendMessage("The door is already unlocked."); @@ -196,7 +196,7 @@ public class PickableDoorHandler extends OptionHandler { * @param object the object. * @return {@code True} if so. */ - private boolean isInside(Player player, GameObject object) { + private boolean isInside(Player player, Scenery object) { boolean inside = false; Direction dir = Direction.getLogicalDirection(player.getLocation(), object.getLocation()); Direction direction = object.getDirection(); diff --git a/Server/src/main/java/core/game/node/entity/skill/thieving/Stall.java b/Server/src/main/java/core/game/node/entity/skill/thieving/Stall.java index 53225b659..4679a531b 100644 --- a/Server/src/main/java/core/game/node/entity/skill/thieving/Stall.java +++ b/Server/src/main/java/core/game/node/entity/skill/thieving/Stall.java @@ -1,7 +1,7 @@ package core.game.node.entity.skill.thieving; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.tools.RandomFunction; import java.util.*; @@ -87,7 +87,7 @@ public enum Stall { return rewards[RandomFunction.random(rewards.length)]; } - public static Stall forObject(final GameObject object) { + public static Stall forObject(final Scenery object) { return idMap.get(object.getId()); } } 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 3e30a2ddd..02f150cd7 100644 --- a/Server/src/main/java/core/game/node/entity/skill/thieving/StallThiefPulse.java +++ b/Server/src/main/java/core/game/node/entity/skill/thieving/StallThiefPulse.java @@ -6,8 +6,8 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import rs09.game.world.GameWorld; import core.game.world.map.Location; import core.game.world.map.RegionManager; @@ -19,7 +19,7 @@ import core.tools.StringUtils; * Represents the pulse used to thieve a stall. * @author 'Vexia */ -public final class StallThiefPulse extends SkillPulse { +public final class StallThiefPulse extends SkillPulse { /** * Represents the stealing animation. @@ -42,7 +42,7 @@ public final class StallThiefPulse extends SkillPulse { * @param node the node. * @param stall the stall. */ - public StallThiefPulse(Player player, GameObject node, final Stall stall) { + public StallThiefPulse(Player player, Scenery node, final Stall stall) { super(player, node); this.stall = stall; } @@ -103,7 +103,7 @@ public final class StallThiefPulse extends SkillPulse { player.getAchievementDiaryManager().finishTask(player,DiaryType.VARROCK,0, 12); } if (node.isActive()) { - ObjectBuilder.replace(((GameObject) node), ((GameObject) node).transform(stall.getEmpty(node.getId())), stall.getDelay()); + SceneryBuilder.replace(((Scenery) node), ((Scenery) node).transform(stall.getEmpty(node.getId())), stall.getDelay()); } final Item item = stall.getRandomLoot(); player.getInventory().add(item); 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 f11546869..ee82c875d 100644 --- a/Server/src/main/java/core/game/node/entity/skill/thieving/ThievableChestPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/thieving/ThievableChestPlugin.java @@ -7,8 +7,8 @@ import core.game.node.Node; import core.game.node.entity.combat.ImpactHandler.HitsplatType; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import core.game.node.object.ObjectBuilder; +import core.game.node.object.Scenery; +import core.game.node.object.SceneryBuilder; import core.game.system.task.Pulse; import rs09.game.world.GameWorld; import core.game.world.update.flag.context.Animation; @@ -45,12 +45,12 @@ public final class ThievableChestPlugin extends OptionHandler { switch (option) { case "open": if (chest != null) { - chest.open(player, (GameObject) node); + chest.open(player, (Scenery) node); return true; } return true; case "search for traps": - chest.searchTraps(player, (GameObject) node); + chest.searchTraps(player, (Scenery) node); return true; } return true; @@ -125,7 +125,7 @@ public final class ThievableChestPlugin extends OptionHandler { * @param player the player. * @param object the object. */ - private void open(final Player player, final GameObject object) { + private void open(final Player player, final Scenery object) { if (isRespawning()) { player.sendMessage("It looks like this chest has already been looted."); return; @@ -140,7 +140,7 @@ public final class ThievableChestPlugin extends OptionHandler { * @param player the player. * @param object the object. */ - private void searchTraps(final Player player, final GameObject object) { + private void searchTraps(final Player player, final Scenery object) { player.faceLocation(object.getLocation()); if (isRespawning()) { player.sendMessage("It looks like this chest has already been looted."); @@ -182,7 +182,7 @@ public final class ThievableChestPlugin extends OptionHandler { player.sendMessage("You find treasure inside!"); player.getSkills().addExperience(Skills.THIEVING, experience, true); if (object.isActive()) { - ObjectBuilder.replace(object, object.transform(2574), 3); + SceneryBuilder.replace(object, object.transform(2574), 3); } setRespawn(); return true; 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 8ed6feb03..a62326d19 100644 --- a/Server/src/main/java/core/game/node/entity/skill/thieving/ThievingOptionPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/thieving/ThievingOptionPlugin.java @@ -4,7 +4,7 @@ import core.cache.def.impl.ObjectDefinition; 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.node.object.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; @@ -28,7 +28,7 @@ public class ThievingOptionPlugin extends OptionHandler { switch (option) { case "steal-from": case "steal from": - player.getPulseManager().run(new StallThiefPulse(player, (GameObject) node, Stall.forObject((GameObject) node))); + player.getPulseManager().run(new StallThiefPulse(player, (Scenery) node, Stall.forObject((Scenery) node))); player.getLocks().lockInteractions(6); break; } diff --git a/Server/src/main/java/core/game/node/object/Constructed.java b/Server/src/main/java/core/game/node/object/Constructed.java index 1c9d57680..e17e79dcd 100644 --- a/Server/src/main/java/core/game/node/object/Constructed.java +++ b/Server/src/main/java/core/game/node/object/Constructed.java @@ -7,12 +7,12 @@ import core.game.world.map.Location; * Represents a constructed object. * @author Emperor */ -public class Constructed extends GameObject { +public class Constructed extends Scenery { /** - * The game object we've replaced. + * The scenery we've replaced. */ - private GameObject replaced; + private Scenery replaced; /** * The ground items places after the tick is up. @@ -97,7 +97,7 @@ public class Constructed extends GameObject { * Gets the replaced. * @return The replaced. */ - public GameObject getReplaced() { + public Scenery getReplaced() { return replaced; } @@ -105,7 +105,7 @@ public class Constructed extends GameObject { * Sets the replaced. * @param replaced The replaced to set. */ - public void setReplaced(GameObject replaced) { + public void setReplaced(Scenery replaced) { this.replaced = replaced; } diff --git a/Server/src/main/java/core/game/node/object/GameObject.java b/Server/src/main/java/core/game/node/object/Scenery.java similarity index 80% rename from Server/src/main/java/core/game/node/object/GameObject.java rename to Server/src/main/java/core/game/node/object/Scenery.java index 2d5fc7408..32c2cc61b 100644 --- a/Server/src/main/java/core/game/node/object/GameObject.java +++ b/Server/src/main/java/core/game/node/object/Scenery.java @@ -12,10 +12,10 @@ import core.game.world.map.Direction; import core.game.world.map.Location; /** - * Represents a game object. + * Represents a scenery. * @author Emperor */ -public class GameObject extends Node { +public class Scenery extends Node { /** * The object id. @@ -60,44 +60,44 @@ public class GameObject extends Node { /** * The child objects. */ - private final GameObject[] childs; + private final Scenery[] childs; /** - * The game object wrapper (used for object configurations). + * The scenery wrapper (used for object configurations). */ - private GameObject wrapper; + private Scenery wrapper; /** - * Constructs a new game object. + * Constructs a new scenery. * @param id The object id. * @param x The object x-coordinate. * @param y The object y-coordinate. * @param z The object z-coordinate. */ - public GameObject(int id, int x, int y, int z) { + public Scenery(int id, int x, int y, int z) { this(id, Location.create(x, y, z), 10, 0); } /** - * Constructs a new game object. + * Constructs a new scenery. * @param id The object id. * @param location The object's location. */ - public GameObject(int id, Location location) { + public Scenery(int id, Location location) { this(id, location, 10, 0); } /** - * Constructs a new game object. + * Constructs a new scenery. * @param id The object id. * @param location The object's location. * @param rotation The object's rotation. */ - public GameObject(int id, Location location, int rotation) { + public Scenery(int id, Location location, int rotation) { this(id, location, 10, rotation); } - public GameObject(int id, Location location, int rotation, Direction direction) { + public Scenery(int id, Location location, int rotation, Direction direction) { this(id, location, 10, rotation); } @@ -110,7 +110,7 @@ public class GameObject extends Node { * @param type The object type. * @param rotation The rotation. */ - public GameObject(int id, int x, int y, int z, int type, int rotation) { + public Scenery(int id, int x, int y, int z, int type, int rotation) { this(id, Location.create(x, y, z), type, rotation); } @@ -120,7 +120,7 @@ public class GameObject extends Node { * @param type The object type. * @param rotation The rotation. */ - public GameObject(int id, int type, int rotation) { + public Scenery(int id, int type, int rotation) { this(id, Location.create(0, 0, 0), type, rotation); } @@ -131,7 +131,7 @@ public class GameObject extends Node { * @param type The object type. * @param rotation The rotation. */ - public GameObject(int id, Location location, int type, int rotation) { + public Scenery(int id, Location location, int type, int rotation) { super(ObjectDefinition.forId(id).getName(), location); if (rotation < 0) { rotation += 4; @@ -149,7 +149,7 @@ public class GameObject extends Node { this.definition = ObjectDefinition.forId(id); super.size = definition.sizeX; if (definition.childrenIds != null && definition.childrenIds.length > 0) { - this.childs = new GameObject[definition.childrenIds.length]; + this.childs = new Scenery[definition.childrenIds.length]; for (int i = 0; i < childs.length; i++) { childs[i] = transform(definition.childrenIds[i]); childs[i].wrapper = this; @@ -199,10 +199,10 @@ public class GameObject extends Node { * @param player The player. * @return The child object. */ - public GameObject getChild(Player player) { + public Scenery getChild(Player player) { if (childs != null) { ObjectDefinition def = definition.getChildObject(player); - for (GameObject child : childs) { + for (Scenery child : childs) { if (child.getId() == def.getId()) { return child; } @@ -234,20 +234,20 @@ public class GameObject extends Node { /** * Gets a transformed object of this object. * @param id The new object id. - * @return The constructed game object. + * @return The constructed scenery. */ - public GameObject transform(int id) { - return new GameObject(id, location, type, rotation); + public Scenery transform(int id) { + return new Scenery(id, location, type, rotation); } /** * Gets a transformed object of this object. * @param id The new object id. * @param rotation The new rotation. - * @return The constructed game object. + * @return The constructed scenery. */ - public GameObject transform(int id, int rotation) { - return new GameObject(id, location, type, rotation); + public Scenery transform(int id, int rotation) { + return new Scenery(id, location, type, rotation); } /** @@ -255,10 +255,10 @@ public class GameObject extends Node { * @param id The new object id. * @param rotation The new rotation. * @param location The new location. - * @return The constructed game object. + * @return The constructed scenery. */ - public GameObject transform(int id, int rotation, Location location) { - return new GameObject(id, location, type, rotation); + public Scenery transform(int id, int rotation, Location location) { + return new Scenery(id, location, type, rotation); } /** @@ -266,10 +266,10 @@ public class GameObject extends Node { * @param id The new object id. * @param rotation The new rotation. * @param type The object type. - * @return The constructed game object. + * @return The constructed scenery. */ - public GameObject transform(int id, int rotation, int type) { - return new GameObject(id, location, type, rotation); + public Scenery transform(int id, int rotation, int type) { + return new Scenery(id, location, type, rotation); } /** @@ -281,7 +281,7 @@ public class GameObject extends Node { } /** - * Gets this game object as Constructed object. + * Gets this scenery as Constructed object. * @return The {@link Constructed} object. */ public Constructed asConstructed() { @@ -332,16 +332,16 @@ public class GameObject extends Node { @Override public boolean equals(Object obj) { - if (obj == null || !(obj instanceof GameObject)) { + if (obj == null || !(obj instanceof Scenery)) { return false; } - GameObject other = (GameObject) obj; + Scenery other = (Scenery) obj; return other.id == id && other.location.equals(location) && rotation == other.rotation && other.type == type; } @Override public String toString() { - return "[GameObject " + id + ", " + location + ", type=" + type + ", rot=" + rotation + "]"; + return "[Scenery " + id + ", " + location + ", type=" + type + ", rot=" + rotation + "]"; } /** @@ -403,7 +403,7 @@ public class GameObject extends Node { * Gets the childs. * @return The childs. */ - public GameObject[] getChilds() { + public Scenery[] getChilds() { return childs; } @@ -411,7 +411,7 @@ public class GameObject extends Node { * Gets the wrapper. * @return The wrapper. */ - public GameObject getWrapper() { + public Scenery getWrapper() { if (wrapper == null) { return this; } @@ -422,7 +422,7 @@ public class GameObject extends Node { * Sets the wrapper. * @param wrapper The wrapper to set. */ - public void setWrapper(GameObject wrapper) { + public void setWrapper(Scenery wrapper) { this.wrapper = wrapper; } diff --git a/Server/src/main/java/core/game/node/object/ObjectBuilder.java b/Server/src/main/java/core/game/node/object/SceneryBuilder.java similarity index 76% rename from Server/src/main/java/core/game/node/object/ObjectBuilder.java rename to Server/src/main/java/core/game/node/object/SceneryBuilder.java index 40b59f090..02daf3dd5 100644 --- a/Server/src/main/java/core/game/node/object/ObjectBuilder.java +++ b/Server/src/main/java/core/game/node/object/SceneryBuilder.java @@ -15,33 +15,33 @@ import core.game.world.update.flag.chunk.ObjectUpdateFlag; * * @author Emperor */ -public final class ObjectBuilder { +public final class SceneryBuilder { /** - * Replaces a game object. + * Replaces a scenery. * * @param remove The object to remove. * @param construct The object to add. * @return {@code True} if successful. */ - public static boolean replace(GameObject remove, GameObject construct) { + public static boolean replace(Scenery remove, Scenery construct) { return replace(remove, construct, true, false); } /** - * Replaces a game object. + * Replaces a scenery. * * @param remove The object to remove. * @param construct The object to add. * @param clip If clipping should be adjusted. * @return {@code True} if successful. */ - public static boolean replace(GameObject remove, GameObject construct, boolean clip, boolean permanent) { + public static boolean replace(Scenery remove, Scenery construct, boolean clip, boolean permanent) { if (!clip) { return replaceClientSide(remove, construct, -1); } remove = remove.getWrapper(); - GameObject current = LandscapeParser.removeGameObject(remove); + Scenery current = LandscapeParser.removeScenery(remove); if (current == null) { if (GameWorld.getSettings().isDevMode()) { SystemLogger.logErr("Object could not be replaced - object to remove is invalid."); @@ -53,9 +53,9 @@ public final class ObjectBuilder { current.setRestorePulse(null); } if (current instanceof Constructed) { - GameObject previous = ((Constructed) current).getReplaced(); + Scenery previous = ((Constructed) current).getReplaced(); if (previous != null && previous.equals(construct)) { - LandscapeParser.addGameObject(previous); + LandscapeParser.addScenery(previous); update(current, previous); return true; } @@ -64,7 +64,7 @@ public final class ObjectBuilder { if (!permanent) { constructed.setReplaced(current); } - LandscapeParser.addGameObject(constructed); + LandscapeParser.addScenery(constructed); update(current, constructed); return true; } @@ -77,7 +77,7 @@ public final class ObjectBuilder { * @param restoreTicks The restoration ticks. * @return {@code True} if successful. */ - private static boolean replaceClientSide(final GameObject remove, final GameObject construct, int restoreTicks) { + private static boolean replaceClientSide(final Scenery remove, final Scenery construct, int restoreTicks) { RegionManager.getRegionChunk(remove.getLocation()).flag(new ObjectUpdateFlag(remove, true)); RegionManager.getRegionChunk(construct.getLocation()).flag(new ObjectUpdateFlag(construct, false)); if (restoreTicks > 0) { @@ -92,31 +92,31 @@ public final class ObjectBuilder { } /** - * Replaces a game object temporarily. + * Replaces a scenery temporarily. * * @param remove The object to remove. * @param construct The object to add. * @param restoreTicks The amount of ticks before the object gets restored. * @return {@code True} if successful. */ - public static boolean replace(GameObject remove, GameObject construct, int restoreTicks) { + public static boolean replace(Scenery remove, Scenery construct, int restoreTicks) { return replace(remove, construct, restoreTicks, true); } /** - * Replaces a game object temporarily. + * Replaces a scenery temporarily. * * @param remove The object to remove. * @param construct The object to add. * @param restoreTicks The amount of ticks before the object gets restored. * @return {@code True} if successful. */ - public static boolean replace(GameObject remove, GameObject construct, int restoreTicks, final boolean clip) { + public static boolean replace(Scenery remove, Scenery construct, int restoreTicks, final boolean clip) { if (!clip) { return replaceClientSide(remove, construct, restoreTicks); } remove = remove.getWrapper(); - GameObject current = LandscapeParser.removeGameObject(remove); + Scenery current = LandscapeParser.removeScenery(remove); if (current == null) { if (GameWorld.getSettings().isDevMode()) { SystemLogger.logErr("Object could not be replaced - object to remove is invalid."); @@ -128,7 +128,7 @@ public final class ObjectBuilder { current.setRestorePulse(null); } if (current instanceof Constructed) { - GameObject previous = ((Constructed) current).getReplaced(); + Scenery previous = ((Constructed) current).getReplaced(); if (previous != null && previous.equals(construct)) { // Shouldn't happen. throw new IllegalStateException("Can't temporarily replace an already temporary object!"); @@ -136,7 +136,7 @@ public final class ObjectBuilder { } final Constructed constructed = construct.asConstructed(); constructed.setReplaced(current); - LandscapeParser.addGameObject(constructed); + LandscapeParser.addScenery(constructed); update(current, constructed); if (restoreTicks < 0) { return true; @@ -153,27 +153,27 @@ public final class ObjectBuilder { } /** - * Adds a game object. + * Adds a scenery. * * @param object The object to add. * @return {@code True} if successful. */ - public static Constructed add(GameObject object) { + public static Constructed add(Scenery object) { return add(object, -1); } /** - * Adds a game object. + * Adds a scenery. * * @param object The object to add. * @param ticks The amount of ticks this object should last for (-1 for * permanent). * @return {@code True} if successful. */ - public static Constructed add(GameObject object, int ticks, final GroundItem... items) { + public static Constructed add(Scenery object, int ticks, final GroundItem... items) { object = object.getWrapper(); final Constructed constructed = object.asConstructed(); - LandscapeParser.addGameObject(constructed); + LandscapeParser.addScenery(constructed); update(constructed); if (ticks > -1) { GameWorld.getPulser().submit(new Pulse(ticks, object) { @@ -208,7 +208,7 @@ public final class ObjectBuilder { for (int x = 0; x <= differenceX; x++) { for (int y = 0; y <= differenceY; y++){ - GameObject object = new GameObject(objectId, Location.create(southWest.getX() + x, southWest.getY() + y, southWest.getZ())); + Scenery object = new Scenery(objectId, Location.create(southWest.getX() + x, southWest.getY() + y, southWest.getZ())); remove(object); } } @@ -216,17 +216,17 @@ public final class ObjectBuilder { } /** - * Removes a game object. + * Removes a scenery. * * @param object The object to remove. * @return {@code True} if successful. */ - public static boolean remove(GameObject object) { + public static boolean remove(Scenery object) { if (object == null) { return false; } object = object.getWrapper(); - GameObject current = LandscapeParser.removeGameObject(object); + Scenery current = LandscapeParser.removeScenery(object); if (current == null) { return false; } @@ -235,13 +235,13 @@ public final class ObjectBuilder { } /** - * Removes a game object. + * Removes a scenery. * * @param object the object. * @param respawnTicks the respawn ticks. * @return {@code True}if removed. */ - public static boolean remove(final GameObject object, int respawnTicks) { + public static boolean remove(final Scenery object, int respawnTicks) { if (remove(object)) { GameWorld.getPulser().submit(new Pulse(respawnTicks) { @@ -258,12 +258,12 @@ public final class ObjectBuilder { } /** - * Updates the game object on all the player's screen. + * Updates the scenery on all the player's screen. * - * @param objects The game objects. + * @param objects The scenerys. */ - public static void update(GameObject... objects) { - for (GameObject o : objects) { + public static void update(Scenery... objects) { + for (Scenery o : objects) { if (o == null) { continue; } 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 ebbd1f388..8a9eac3ef 100644 --- a/Server/src/main/java/core/game/world/map/BuildRegionChunk.java +++ b/Server/src/main/java/core/game/world/map/BuildRegionChunk.java @@ -5,13 +5,13 @@ import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.Item; import core.game.node.object.Constructed; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import rs09.game.system.SystemLogger; import core.game.world.map.build.LandscapeParser; import core.net.packet.IoBuffer; -import core.net.packet.out.ClearObject; +import core.net.packet.out.ClearScenery; import core.net.packet.out.ConstructGroundItem; -import core.net.packet.out.ConstructObject; +import core.net.packet.out.ConstructScenery; /** * A region chunk, used for easily modifying objects. @@ -28,7 +28,7 @@ public class BuildRegionChunk extends RegionChunk { /** * The list of changes made. */ - private final GameObject[][][] objects; + private final Scenery[][][] objects; /** * Constructs a new {@code BuildRegionChunk} {@code Object} @@ -38,7 +38,7 @@ public class BuildRegionChunk extends RegionChunk { */ public BuildRegionChunk(Location base, int rotation, RegionPlane plane) { super(base, rotation, plane); - this.objects = new GameObject[ARRAY_SIZE][8][8]; + this.objects = new Scenery[ARRAY_SIZE][8][8]; this.objects[0] = super.objects; } @@ -48,13 +48,13 @@ public class BuildRegionChunk extends RegionChunk { for (int i = 0; i < objects.length; i++) { for (int x = 0; x < SIZE; x++) { for (int y = 0; y < SIZE; y++) { - GameObject o = objects[i][x][y]; + Scenery o = objects[i][x][y]; if (o instanceof Constructed) { - ConstructObject.write(buffer, o); + ConstructScenery.write(buffer, o); updated = true; } else if (o != null && !o.isRenderable()) { - ClearObject.write(buffer, o); + ClearScenery.write(buffer, o); updated = true; } } @@ -80,7 +80,7 @@ public class BuildRegionChunk extends RegionChunk { SystemLogger.logErr("Region chunk was already rotated!"); return; } - GameObject[][][] copy = new GameObject[ARRAY_SIZE][SIZE][SIZE]; + Scenery[][][] copy = new Scenery[ARRAY_SIZE][SIZE][SIZE]; int baseX = currentBase.getLocalX(); int baseY = currentBase.getLocalY(); for (int x = 0; x < SIZE; x++) { @@ -98,16 +98,16 @@ public class BuildRegionChunk extends RegionChunk { for (int i = 0; i < objects.length; i++) { for (int x = 0; x < SIZE; x++) { for (int y = 0; y < SIZE; y++) { - GameObject object = copy[i][x][y]; + Scenery object = copy[i][x][y]; if (object != null) { int[] pos = getRotatedPosition(x, y, object.getDefinition().getSizeX(), object.getDefinition().getSizeY(), object.getRotation(), rotation); - GameObject obj = object.transform(object.getId(), (object.getRotation() + rotation) % 4, object.getLocation().transform(pos[0] - x, pos[1] - y, 0)); + Scenery obj = object.transform(object.getId(), (object.getRotation() + rotation) % 4, object.getLocation().transform(pos[0] - x, pos[1] - y, 0)); if (object instanceof Constructed) { obj = obj.asConstructed(); } obj.setActive(object.isActive()); obj.setRenderable(object.isRenderable()); - LandscapeParser.flagGameObject(plane, baseX + pos[0], baseY + pos[1], obj, true, true); + LandscapeParser.flagScenery(plane, baseX + pos[0], baseY + pos[1], obj, true, true); } } } @@ -120,7 +120,7 @@ public class BuildRegionChunk extends RegionChunk { for (int i = 0; i < chunk.objects.length; i++) { for (int x = 0; x < SIZE; x++) { for (int y = 0; y < SIZE; y++) { - GameObject o = objects[i][x][y]; + Scenery o = objects[i][x][y]; if (o instanceof Constructed) { chunk.objects[i][x][y] = o.transform(o.getId(), o.getRotation()).asConstructed(); } @@ -148,13 +148,13 @@ public class BuildRegionChunk extends RegionChunk { } /** - * Removes the game object. + * Removes the scenery. * @param object The object to remove. */ - public void remove(GameObject object) { + public void remove(Scenery object) { int chunkX = object.getLocation().getChunkOffsetX(); int chunkY = object.getLocation().getChunkOffsetY(); - GameObject current = null; + Scenery current = null; int index = -1; int i = 0; while ((current == null || current.getId() != object.getId()) && i < objects.length) { @@ -175,13 +175,13 @@ public class BuildRegionChunk extends RegionChunk { } /** - * Adds the game object. + * Adds the scenery. * @param object The object to add. */ - public void add(GameObject object) { + public void add(Scenery object) { int chunkX = object.getLocation().getChunkOffsetX(); int chunkY = object.getLocation().getChunkOffsetY(); - GameObject current = null; + Scenery current = null; int index = -1; int i = 0; while ((current == null || current.getId() != object.getId()) && i < objects.length) { @@ -208,14 +208,14 @@ public class BuildRegionChunk extends RegionChunk { * Stores an object on the region chunk. * @param object The object. */ - public void store(GameObject object) { + public void store(Scenery object) { if (object == null) { return; } int chunkX = object.getLocation().getChunkOffsetX(); int chunkY = object.getLocation().getChunkOffsetY(); for (int i = 0; i < objects.length; i++) { - GameObject stat = objects[i][chunkX][chunkY]; + Scenery stat = objects[i][chunkX][chunkY]; if (stat == null || stat.getId() < 1) { objects[i][chunkX][chunkY] = object; object.setActive(true); @@ -242,7 +242,7 @@ public class BuildRegionChunk extends RegionChunk { */ public int getIndex(int x, int y, int objectId) { for (int i = 0; i < objects.length; i++) { - GameObject o = get(x, y, i); + Scenery o = get(x, y, i); if (o != null && ((objectId > -1 && o.getId() == objectId) || (objectId == -1 && o.getDefinition().hasOptions(false)))) { return i; } @@ -251,19 +251,19 @@ public class BuildRegionChunk extends RegionChunk { } /** - * Gets a game object. + * Gets a scenery. * @param x The chunk x-coordinate. * @param y The chunk y-coordinate. * @param index The index (0 = default). * @return The object. */ - public GameObject get(int x, int y, int index) { + public Scenery get(int x, int y, int index) { return objects[index][x][y]; } @Override - public GameObject[] getObjects(int chunkX, int chunkY) { - GameObject[] objects = new GameObject[ARRAY_SIZE]; + public Scenery[] getObjects(int chunkX, int chunkY) { + Scenery[] objects = new Scenery[ARRAY_SIZE]; for (int i = 0; i < ARRAY_SIZE; i++) { objects[i] = this.objects[i][chunkX][chunkY]; } @@ -275,7 +275,7 @@ public class BuildRegionChunk extends RegionChunk { * @param index The index. * @return The objects array. */ - public GameObject[][] getObjects(int index) { + public Scenery[][] getObjects(int index) { return objects[index]; } } \ No newline at end of file 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 98be34994..f528f2527 100644 --- a/Server/src/main/java/core/game/world/map/RegionChunk.java +++ b/Server/src/main/java/core/game/world/map/RegionChunk.java @@ -3,15 +3,15 @@ package core.game.world.map; import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; 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; import core.net.packet.IoBuffer; -import core.net.packet.out.ClearObject; +import core.net.packet.out.ClearScenery; import core.net.packet.out.ConstructGroundItem; -import core.net.packet.out.ConstructObject; +import core.net.packet.out.ConstructScenery; import core.net.packet.out.UpdateAreaPosition; import java.util.ArrayList; @@ -50,9 +50,9 @@ public class RegionChunk { protected List items; /** - * The game objects in this chunk. + * The scenerys in this chunk. */ - protected GameObject[][] objects; + protected Scenery[][] objects; /** * The rotation. @@ -74,7 +74,7 @@ public class RegionChunk { this.currentBase = base; this.rotation = rotation; this.plane = plane; - this.objects = new GameObject[SIZE][SIZE]; + this.objects = new Scenery[SIZE][SIZE]; } /** @@ -128,20 +128,20 @@ public class RegionChunk { int baseY = currentBase.getLocalY(); for (int x = 0; x < SIZE; x++) { for (int y = 0; y < SIZE; y++) { - GameObject dyn = objects[x][y]; + Scenery dyn = objects[x][y]; if (dyn == null || plane.getObjects() == null) { continue; } - GameObject stat = plane.getObjects()[baseX + x][baseY + y]; + Scenery stat = plane.getObjects()[baseX + x][baseY + y]; if (!dyn.isRenderable() && stat != null) { - ClearObject.write(buffer, stat); + ClearScenery.write(buffer, stat); updated = true; } else if (dyn != stat) { if (stat != null) { - ClearObject.write(buffer, stat); + ClearScenery.write(buffer, stat); } - ConstructObject.write(buffer, dyn); + ConstructScenery.write(buffer, dyn); updated = true; } } @@ -185,8 +185,8 @@ public class RegionChunk { SystemLogger.logErr("Region chunk was already rotated!"); return; } - GameObject[][] copy = new GameObject[SIZE][SIZE]; - GameObject[][] staticCopy = new GameObject[SIZE][SIZE]; + Scenery[][] copy = new Scenery[SIZE][SIZE]; + Scenery[][] staticCopy = new Scenery[SIZE][SIZE]; int baseX = currentBase.getLocalX(); int baseY = currentBase.getLocalY(); for (int x = 0; x < SIZE; x++) { @@ -200,8 +200,8 @@ public class RegionChunk { rotation = direction.toInteger(); for (int x = 0; x < SIZE; x++) { for (int y = 0; y < SIZE; y++) { - GameObject object = copy[x][y]; - GameObject stat = staticCopy[x][y]; + Scenery object = copy[x][y]; + Scenery stat = staticCopy[x][y]; boolean match = object == stat; if (stat == null) { continue; @@ -209,7 +209,7 @@ public class RegionChunk { int[] pos = getRotatedPosition(x, y, stat.getDefinition().getSizeX(), stat.getDefinition().getSizeY(), stat.getRotation(), rotation); if (object != null) { object = object.transform(object.getId(), (object.getRotation() + rotation) % 4, object.getLocation().transform(pos[0] - x, pos[1] - y, 0)); - LandscapeParser.flagGameObject(plane, baseX + pos[0], baseY + pos[1], object, true, true); + LandscapeParser.flagScenery(plane, baseX + pos[0], baseY + pos[1], object, true, true); } if (match) { stat = object; @@ -269,20 +269,20 @@ public class RegionChunk { } /** - * Gets the game objects located on the coordinates in this chunk. + * Gets the scenerys located on the coordinates in this chunk. * @param chunkX The chunk x-coordinate (0-7). * @param chunkY The chunk y-coordinate (0-7). * @return The objects. */ - public GameObject[] getObjects(int chunkX, int chunkY) { - return new GameObject[] { objects[chunkX][chunkY] }; + public Scenery[] getObjects(int chunkX, int chunkY) { + return new Scenery[] { objects[chunkX][chunkY] }; } /** * Gets the objects. * @return The objects. */ - public GameObject[][] getObjects() { + public Scenery[][] getObjects() { return objects; } @@ -290,7 +290,7 @@ public class RegionChunk { * Sets the objects. * @param objects The objects to set. */ - public void setObjects(GameObject[][] objects) { + public void setObjects(Scenery[][] objects) { this.objects = objects; } 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 0be48460a..1a7ef923f 100644 --- a/Server/src/main/java/core/game/world/map/RegionManager.java +++ b/Server/src/main/java/core/game/world/map/RegionManager.java @@ -4,7 +4,7 @@ import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import rs09.game.system.SystemLogger; import core.game.world.map.zone.ZoneBorders; import core.tools.RandomFunction; @@ -293,22 +293,22 @@ public final class RegionManager { } /** - * Gets the game object on the current location. + * Gets the scenery on the current location. * @param l The location. - * @return The game object, or {@code null} if no object was found. + * @return The scenery, or {@code null} if no object was found. */ - public static GameObject getObject(Location l) { + public static Scenery getObject(Location l) { return getObject(l.getZ(), l.getX(), l.getY()); } /** - * Gets the game object on the current absolute coordinates. + * Gets the scenery on the current absolute coordinates. * @param z The height. * @param x The x-coordinate. * @param y The y-coordinate. - * @return The game object, or {@code null} if no object was found. + * @return The scenery, or {@code null} if no object was found. */ - public static GameObject getObject(int z, int x, int y) { + public static Scenery getObject(int z, int x, int y) { return getObject(z, x, y, -1); } @@ -318,15 +318,15 @@ public final class RegionManager { * @param x The x-coordinate. * @param y The y-coordinate. * @param objectId The object id. - * @return The game object, or {@code null} if no object was found. + * @return The scenery, or {@code null} if no object was found. */ - public static GameObject getObject(int z, int x, int y, int objectId) { + public static Scenery getObject(int z, int x, int y, int objectId) { int regionId = ((x >> 6) << 8) | y >> 6; x -= ((x >> 6) << 6); y -= ((y >> 6) << 6); Region region = forId(regionId); Region.load(region); - GameObject object = region.getPlanes()[z].getChunkObject(x, y, objectId); + Scenery object = region.getPlanes()[z].getChunkObject(x, y, objectId); if (object != null && !object.isRenderable()) { return null; } 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 1ab5b9a96..ba4a56cbf 100644 --- a/Server/src/main/java/core/game/world/map/RegionPlane.java +++ b/Server/src/main/java/core/game/world/map/RegionPlane.java @@ -5,8 +5,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.Item; -import core.game.node.object.GameObject; -import rs09.game.system.SystemLogger; +import core.game.node.object.Scenery; import core.game.world.map.build.DynamicRegion; import core.game.world.map.build.RegionFlags; import core.game.world.update.flag.chunk.ItemUpdateFlag; @@ -39,9 +38,9 @@ public final class RegionPlane { public static final int CHUNK_SIZE = REGION_SIZE >> 3; /** - * Represents a removed game object. + * Represents a removed scenery. */ - public static final GameObject NULL_OBJECT = new GameObject(0, Location.create(0, 0, 0)); + public static final Scenery NULL_OBJECT = new Scenery(0, Location.create(0, 0, 0)); /** * The plane. @@ -79,9 +78,9 @@ public final class RegionPlane { private final List players; /** - * The game objects. + * The scenerys. */ - private GameObject[][] objects; + private Scenery[][] objects; /** * Constructs a new {@code RegionPlane} {@code Object}. @@ -96,7 +95,7 @@ public final class RegionPlane { Location base = region.getBaseLocation(); this.flags = new RegionFlags(plane, base.getX(), base.getY()); this.projectileFlags = new RegionFlags(plane, base.getX(), base.getY(), true); - this.objects = new GameObject[REGION_SIZE][REGION_SIZE]; + this.objects = new Scenery[REGION_SIZE][REGION_SIZE]; this.chunks = new RegionChunk[CHUNK_SIZE][CHUNK_SIZE]; } @@ -108,13 +107,13 @@ public final class RegionPlane { } /** - * Adds a game object. + * Adds a scenery. * @param object The object to add. * @param x The x-coordinate. * @param y The y-coordinate. * @param landscape If this object is added through landscape parsing. */ - public void add(GameObject object, int x, int y, boolean landscape) { + public void add(Scenery object, int x, int y, boolean landscape) { setChunkObject(x, y, object); if (landscape) { objects[x][y] = object; @@ -142,7 +141,7 @@ public final class RegionPlane { } /** - * Removes a game object. + * Removes a scenery. * @param x The x-coordinate. * @param y The y-coordinate. */ @@ -151,7 +150,7 @@ public final class RegionPlane { } /** - * Removes a game object. + * Removes a scenery. * @param x The x-coordinate. * @param y The y-coordinate. * @param objectId The object id. @@ -162,7 +161,7 @@ public final class RegionPlane { int offsetX = x - chunkX * CHUNK_SIZE; int offsetY = y - chunkY * CHUNK_SIZE; RegionChunk chunk = getRegionChunk(chunkX, chunkY); - GameObject remove = new GameObject(0, region.getBaseLocation().transform(x, y, plane), 22, 0); + Scenery remove = new Scenery(0, region.getBaseLocation().transform(x, y, plane), 22, 0); remove.setRenderable(false); if (chunk instanceof BuildRegionChunk) { int index = ((BuildRegionChunk) chunk).getIndex(offsetX, offsetY, objectId); @@ -178,7 +177,7 @@ public final class RegionPlane { * @param y The regional y-coordinate. * @param object The object to set. */ - private void setChunkObject(int x, int y, GameObject object) { + private void setChunkObject(int x, int y, Scenery object) { int chunkX = x / CHUNK_SIZE; int chunkY = y / CHUNK_SIZE; int offsetX = x - chunkX * CHUNK_SIZE; @@ -192,10 +191,10 @@ public final class RegionPlane { } /** - * Gets the game objects. - * @return The game objects. + * Gets the scenerys. + * @return The scenerys. */ - public GameObject[][] getObjects() { + public Scenery[][] getObjects() { return objects; } @@ -350,9 +349,9 @@ public final class RegionPlane { * Gets an object from a region chunk. * @param x The region x-coordinate. * @param y The region y-coordinate. - * @return The game object. + * @return The scenery. */ - public GameObject getChunkObject(int x, int y) { + public Scenery getChunkObject(int x, int y) { return getChunkObject(x, y, -1); } @@ -361,9 +360,9 @@ public final class RegionPlane { * @param x The region x-coordinate. * @param y The region y-coordinate. * @param objectId The object id. - * @return The game object. + * @return The scenery. */ - public GameObject getChunkObject(int x, int y, int objectId) { + public Scenery getChunkObject(int x, int y, int objectId) { int chunkX = x / CHUNK_SIZE; int chunkY = y / CHUNK_SIZE; int offsetX = x - chunkX * CHUNK_SIZE; @@ -380,7 +379,7 @@ public final class RegionPlane { * Gets an object from a region chunk. * @param x The region x-coordinate. * @param y The region y-coordinate. - * @return The game object. + * @return The scenery. */ public List getChunkItems(int x, int y) { int chunkX = x / CHUNK_SIZE; diff --git a/Server/src/main/java/core/game/world/map/build/DynamicRegion.java b/Server/src/main/java/core/game/world/map/build/DynamicRegion.java index 71e20b145..10f231770 100644 --- a/Server/src/main/java/core/game/world/map/build/DynamicRegion.java +++ b/Server/src/main/java/core/game/world/map/build/DynamicRegion.java @@ -5,7 +5,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.music.MusicZone; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.*; import core.game.world.map.zone.RegionZone; import core.game.world.map.zone.ZoneBorders; @@ -312,9 +312,9 @@ public final class DynamicRegion extends Region { for (int j = y << 3; j < (y + 1) << 3; j++) { p.getFlags().getClippingFlags()[i][j] = -1; p.getProjectileFlags().getClippingFlags()[i][j] = -1; - GameObject object = p.getObjects()[i][j]; + Scenery object = p.getObjects()[i][j]; if (object != null) { - LandscapeParser.removeGameObject(object); + LandscapeParser.removeScenery(object); } else { p.add(null, i, j, true); } @@ -336,19 +336,19 @@ public final class DynamicRegion extends Region { p.getFlags().getLandscape()[toX][toY] = rp.getFlags().getLandscape()[fromX][fromY]; p.getFlags().getClippingFlags()[toX][toY] = rp.getFlags().getClippingFlags()[fromX][fromY]; p.getProjectileFlags().getClippingFlags()[toX][toY] = rp.getProjectileFlags().getClippingFlags()[fromX][fromY]; - GameObject[] objects = { rp.getChunkObject(fromX, fromY) }; + Scenery[] objects = { rp.getChunkObject(fromX, fromY) }; RegionChunk ch = rp.getChunks()[fromX >> 3][fromY >> 3]; if (ch instanceof BuildRegionChunk) { BuildRegionChunk bc = (BuildRegionChunk) ch; - objects = new GameObject[BuildRegionChunk.ARRAY_SIZE]; + objects = new Scenery[BuildRegionChunk.ARRAY_SIZE]; for (int k = 0; k < objects.length; k++) { objects[k] = bc.get(i, j, k); } } - for (GameObject object : objects) { + for (Scenery object : objects) { if (object != null) { object = object.transform(object.getId(), object.getRotation(), getBaseLocation().transform(toX, toY, 0)); - LandscapeParser.flagGameObject(p, toX, toY, object, false, true);//chunk instanceof BuildRegionChunk);//.addGameObject(object, true); + LandscapeParser.flagScenery(p, toX, toY, object, false, true);//chunk instanceof BuildRegionChunk);//.addGameObject(object, true); } else { p.add(null, toX, toY, true); } diff --git a/Server/src/main/java/core/game/world/map/build/LandscapeParser.java b/Server/src/main/java/core/game/world/map/build/LandscapeParser.java index 6b6529dd5..10f1c3ae2 100644 --- a/Server/src/main/java/core/game/world/map/build/LandscapeParser.java +++ b/Server/src/main/java/core/game/world/map/build/LandscapeParser.java @@ -2,7 +2,7 @@ package core.game.world.map.build; import core.cache.def.impl.ObjectDefinition; import core.cache.misc.buffer.ByteBufferUtils; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.game.world.map.Region; import core.game.world.map.RegionManager; @@ -50,8 +50,8 @@ public final class LandscapeParser { z--; } if (z >= 0 && z <= 3) { - GameObject object = new GameObject(objectId, Location.create((r.getX() << 6) + x, (r.getY() << 6) + y, z), type, rotation); - flagGameObject(r.getPlanes()[z], x, y, object, true, storeObjects); + Scenery object = new Scenery(objectId, Location.create((r.getX() << 6) + x, (r.getY() << 6) + y, z), type, rotation); + flagScenery(r.getPlanes()[z], x, y, object, true, storeObjects); } } else { System.out.println("Object out of bounds: " + objectId + " - " + x + ", " + y + ", " + z); @@ -61,31 +61,31 @@ public final class LandscapeParser { } /** - * Adds a game object temporarily. + * Adds a scenery temporarily. * @param object The object to add. */ - public static void addGameObject(GameObject object) { - addGameObject(object, false); + public static void addScenery(Scenery object) { + addScenery(object, false); } /** - * Adds a game object. + * Adds a scenery. * @param object The object to add. * @param landscape If the object should be added permanent. */ - public static void addGameObject(GameObject object, boolean landscape) { + public static void addScenery(Scenery object, boolean landscape) { Location l = object.getLocation(); - flagGameObject(RegionManager.getRegionPlane(l), l.getLocalX(), l.getLocalY(), object, landscape, false); + flagScenery(RegionManager.getRegionPlane(l), l.getLocalX(), l.getLocalY(), object, landscape, false); } /** - * Flags a game object on the plane's clipping flags. + * Flags a scenery on the plane's clipping flags. * @param plane The plane. * @param object The object. - * @param landscape If we are adding this game object permanent. + * @param landscape If we are adding this scenery permanent. * @param storeObjects If all objects should be stored (rather than just the objects with options). */ - public static void flagGameObject(RegionPlane plane, int localX, int localY, GameObject object, boolean landscape, boolean storeObjects) { + public static void flagScenery(RegionPlane plane, int localX, int localY, Scenery object, boolean landscape, boolean storeObjects) { Region.load(plane.getRegion()); ObjectDefinition def = object.getDefinition(); int sizeX; @@ -147,9 +147,9 @@ public final class LandscapeParser { * @param localY The local y-coordinate. * @param landscape The landscape. */ - private static void addPlaneObject(RegionPlane plane, GameObject object, int localX, int localY, boolean landscape, boolean storeAll) { + private static void addPlaneObject(RegionPlane plane, Scenery object, int localX, int localY, boolean landscape, boolean storeAll) { if (landscape && !storeAll) { - GameObject current = plane.getObjects()[localX][localY]; + Scenery current = plane.getObjects()[localX][localY]; if (current != null && current.getDefinition().getChildObject(null).hasOptions(!object.getDefinition().getChildObject(null).hasOptions(false))) { return; } @@ -158,11 +158,11 @@ public final class LandscapeParser { } /** - * Removes a game object. + * Removes a scenery. * @param object The object. - * @return The removed game object. + * @return The removed scenery. */ - public static GameObject removeGameObject(GameObject object) { + public static Scenery removeScenery(Scenery object) { if (!object.isRenderable()) { return null; } @@ -170,7 +170,7 @@ public final class LandscapeParser { Region.load(plane.getRegion()); int localX = object.getLocation().getLocalX(); int localY = object.getLocation().getLocalY(); - GameObject current = plane.getChunkObject(localX, localY, object.getId()); + Scenery current = plane.getChunkObject(localX, localY, object.getId()); if (current == null || current.getId() != object.getId()) { return null; } 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 c5036c6d8..6c9cb36ba 100644 --- a/Server/src/main/java/core/game/world/map/path/Pathfinder.java +++ b/Server/src/main/java/core/game/world/map/path/Pathfinder.java @@ -3,7 +3,7 @@ package core.game.world.map.path; import core.game.node.Node; import core.game.node.entity.Entity; import core.game.node.item.GroundItem; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.game.world.map.RegionManager; import rs09.game.world.map.path.SmartPathfinder; @@ -142,8 +142,8 @@ public abstract class Pathfinder { * @return The path. */ public static Path find(Location start, int moverSize, Node destination, boolean near, Pathfinder finder, ClipMaskSupplier clipMaskSupplier) { - if (destination instanceof GameObject) { - GameObject object = (GameObject) destination; + if (destination instanceof Scenery) { + Scenery object = (Scenery) destination; int type = object.getType(); int rotation = object.getRotation(); if (type == 10 || type == 11 || type == 22) { 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 d3d0e5c8a..e00107bd9 100644 --- a/Server/src/main/java/core/game/world/objectparser/ObjectParser.java +++ b/Server/src/main/java/core/game/world/objectparser/ObjectParser.java @@ -1,7 +1,7 @@ package core.game.world.objectparser; import rs09.ServerConstants; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import rs09.game.world.GameWorld; import core.game.world.map.build.LandscapeParser; import core.plugin.Initializable; @@ -80,7 +80,7 @@ public class ObjectParser extends StartupPlugin { dir = 6; break; } - LandscapeParser.addGameObject(new GameObject(id, x, y, z, objType, dir)); + LandscapeParser.addScenery(new Scenery(id, x, y, z, objType, dir)); break; } case "remove": { @@ -89,7 +89,7 @@ public class ObjectParser extends StartupPlugin { int y = Integer.parseInt(parseElement.getAttribute("y")); int z = Integer.parseInt(parseElement.getAttribute("z")); int objType = 10; - LandscapeParser.removeGameObject(new GameObject(id,x,y,z)); + LandscapeParser.removeScenery(new Scenery(id,x,y,z)); } } } diff --git a/Server/src/main/java/core/game/world/update/flag/chunk/ObjectUpdateFlag.java b/Server/src/main/java/core/game/world/update/flag/chunk/ObjectUpdateFlag.java index 601c7e118..2b06271d7 100644 --- a/Server/src/main/java/core/game/world/update/flag/chunk/ObjectUpdateFlag.java +++ b/Server/src/main/java/core/game/world/update/flag/chunk/ObjectUpdateFlag.java @@ -1,10 +1,10 @@ package core.game.world.update.flag.chunk; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.update.flag.UpdateFlag; import core.net.packet.IoBuffer; -import core.net.packet.out.ClearObject; -import core.net.packet.out.ConstructObject; +import core.net.packet.out.ClearScenery; +import core.net.packet.out.ConstructScenery; /** * The object update flag. @@ -15,7 +15,7 @@ public class ObjectUpdateFlag extends UpdateFlag { /** * The object to update. */ - private final GameObject object; + private final Scenery object; /** * If we should remove the object. @@ -27,7 +27,7 @@ public class ObjectUpdateFlag extends UpdateFlag { * @param object The object to update. * @param remove If we should remove the object. */ - public ObjectUpdateFlag(GameObject object, boolean remove) { + public ObjectUpdateFlag(Scenery object, boolean remove) { super(null); this.object = object; this.remove = remove; @@ -36,9 +36,9 @@ public class ObjectUpdateFlag extends UpdateFlag { @Override public void write(IoBuffer buffer) { if (remove) { - ClearObject.write(buffer, object); + ClearScenery.write(buffer, object); } else { - ConstructObject.write(buffer, object); + ConstructScenery.write(buffer, object); } } diff --git a/Server/src/main/java/core/game/world/update/flag/context/Animation.java b/Server/src/main/java/core/game/world/update/flag/context/Animation.java index 0b0f848ea..712a76282 100644 --- a/Server/src/main/java/core/game/world/update/flag/context/Animation.java +++ b/Server/src/main/java/core/game/world/update/flag/context/Animation.java @@ -2,7 +2,7 @@ package core.game.world.update.flag.context; import core.cache.def.impl.AnimationDefinition; import core.game.node.entity.impl.Animator.Priority; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; /** * Represents an animation. @@ -38,7 +38,7 @@ public class Animation { /** * The object to animate. */ - private GameObject object; + private Scenery object; /** * Constructs a new {@code Animation} {@code Object}. @@ -140,7 +140,7 @@ public class Animation { * Gets the object. * @return The object. */ - public GameObject getObject() { + public Scenery getObject() { return object; } @@ -148,7 +148,7 @@ public class Animation { * Sets the object. * @param object The object to set. */ - public void setObject(GameObject object) { + public void setObject(Scenery object) { this.object = object; } diff --git a/Server/src/main/java/core/game/world/update/flag/player/FaceLocationFlag.java b/Server/src/main/java/core/game/world/update/flag/player/FaceLocationFlag.java index f8ad46396..458ab7f5c 100644 --- a/Server/src/main/java/core/game/world/update/flag/player/FaceLocationFlag.java +++ b/Server/src/main/java/core/game/world/update/flag/player/FaceLocationFlag.java @@ -1,7 +1,7 @@ package core.game.world.update.flag.player; import core.game.node.Node; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.UpdateFlag; import core.net.packet.IoBuffer; @@ -29,8 +29,8 @@ public class FaceLocationFlag extends UpdateFlag { public static Location getFaceLocation(Node n, Node node) { int x = node.size() >> 1; int y = node.size() >> 1; - if (node instanceof GameObject) { - GameObject o = (GameObject) node; + if (node instanceof Scenery) { + Scenery o = (Scenery) node; x = o.getDefinition().sizeX >> 1; y = o.getDefinition().sizeY >> 1; if (o.getRotation() % 2 != 0) { diff --git a/Server/src/main/java/core/net/packet/PacketRepository.java b/Server/src/main/java/core/net/packet/PacketRepository.java index 350d63682..d3b3e83c1 100644 --- a/Server/src/main/java/core/net/packet/PacketRepository.java +++ b/Server/src/main/java/core/net/packet/PacketRepository.java @@ -49,8 +49,8 @@ public final class PacketRepository { OUTGOING_PACKETS.put(InterfaceConfig.class, new InterfaceConfig()); // OUTGOING_PACKETS.put(PingPacket.class, new PingPacket()); // OUTGOING_PACKETS.put(UpdateAreaPosition.class, new UpdateAreaPosition()); // - OUTGOING_PACKETS.put(ConstructObject.class, new ConstructObject()); // - OUTGOING_PACKETS.put(ClearObject.class, new ClearObject()); // + OUTGOING_PACKETS.put(ConstructScenery.class, new ConstructScenery()); // + OUTGOING_PACKETS.put(ClearScenery.class, new ClearScenery()); // OUTGOING_PACKETS.put(HintIcon.class, new HintIcon()); // OUTGOING_PACKETS.put(ClearMinimapFlag.class, new ClearMinimapFlag()); // OUTGOING_PACKETS.put(InteractionOption.class, new InteractionOption()); // diff --git a/Server/src/main/java/core/net/packet/context/BuildObjectContext.java b/Server/src/main/java/core/net/packet/context/BuildSceneryContext.java similarity index 60% rename from Server/src/main/java/core/net/packet/context/BuildObjectContext.java rename to Server/src/main/java/core/net/packet/context/BuildSceneryContext.java index a7229f3bb..df37baa03 100644 --- a/Server/src/main/java/core/net/packet/context/BuildObjectContext.java +++ b/Server/src/main/java/core/net/packet/context/BuildSceneryContext.java @@ -1,7 +1,7 @@ package core.net.packet.context; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.net.packet.Context; /** @@ -9,7 +9,7 @@ import core.net.packet.Context; * construct/clear object outgoing packet. * @author Emperor */ -public final class BuildObjectContext implements Context { +public final class BuildSceneryContext implements Context { /** * The player. @@ -17,18 +17,18 @@ public final class BuildObjectContext implements Context { private final Player player; /** - * The list of game objects to send. + * The list of scenerys to send. */ - private final GameObject gameObject; + private final Scenery scenery; /** * Constructs a new {@code BuildObjectContext} {@code Object}. * @param player The player - * @param gameObject the game object to send. + * @param scenery the scenery to send. */ - public BuildObjectContext(Player player, GameObject gameObject) { + public BuildSceneryContext(Player player, Scenery scenery) { this.player = player; - this.gameObject = gameObject; + this.scenery = scenery; } @Override @@ -40,8 +40,8 @@ public final class BuildObjectContext implements Context { * Gets the gameObject. * @return The gameObject. */ - public GameObject getGameObject() { - return gameObject; + public Scenery getScenery() { + return scenery; } } \ No newline at end of file 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 a9b19c591..a15c8ff55 100644 --- a/Server/src/main/java/core/net/packet/in/InteractionPacket.java +++ b/Server/src/main/java/core/net/packet/in/InteractionPacket.java @@ -12,7 +12,7 @@ import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.GroundItem; import core.game.node.item.GroundItemManager; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.game.world.map.RegionManager; import core.net.packet.IncomingPacket; @@ -226,7 +226,7 @@ public final class InteractionPacket implements IncomingPacket { * @param objectId The object id. */ public static void handleObjectInteraction(final Player player, int optionIndex, int x, int y, int objectId) { - GameObject object = RegionManager.getObject(player.getLocation().getZ(), x, y, objectId); + Scenery object = RegionManager.getObject(player.getLocation().getZ(), x, y, objectId); if (objectId == 29735) {//player safety. player.getPulseManager().run(new MovementPulse(player, Location.create(x, y, player .getLocation().getZ())) { @Override @@ -239,12 +239,12 @@ public final class InteractionPacket implements IncomingPacket { return; } if (objectId == 6898) { - object = new GameObject(6898, new Location(3219, 9618)); + object = new Scenery(6898, new Location(3219, 9618)); } else if (objectId == 6899) { - object = new GameObject(6899, new Location(3221, 9618)); + object = new Scenery(6899, new Location(3221, 9618)); } if (object == null || object.getId() != objectId) { - player.debug("GameObject(" + objectId + ") interaction was " + object + " at location " + x + ", " + y + "."); + player.debug("Scenery(" + objectId + ") interaction was " + object + " at location " + x + ", " + y + "."); PacketRepository.send(ClearMinimapFlag.class, new PlayerContext(player)); Interaction.handleInvalidInteraction(player, object, Option.NULL); return; 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 b6f9e6230..03f9e3c2c 100644 --- a/Server/src/main/java/core/net/packet/in/InterfaceUseOnPacket.java +++ b/Server/src/main/java/core/net/packet/in/InterfaceUseOnPacket.java @@ -10,7 +10,7 @@ import core.game.node.entity.player.Player; import core.game.node.entity.player.link.SpellBookManager; import core.game.node.item.GroundItemManager; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import rs09.game.node.entity.skill.magic.SpellListener; import rs09.game.node.entity.skill.magic.SpellListeners; import rs09.game.node.entity.skill.magic.SpellUtils; @@ -141,7 +141,7 @@ public class InterfaceUseOnPacket implements IncomingPacket { componentId = payload & 0xFFFF; int objectId = buffer.getShortA(); player.debug("Option usage [inter=" + interfaceId + ", child=" + componentId + ", target=(" + objectId + "," + x + "," + y + "), item=" + itemId + "]."); - GameObject object = RegionManager.getObject(player.getLocation().getZ(), x, y); + Scenery object = RegionManager.getObject(player.getLocation().getZ(), x, y); if (object == null) { object = RegionManager.getObject(Location.create(x, y, 0)); } 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 7692c1225..b913a2164 100644 --- a/Server/src/main/java/core/net/packet/in/ItemActionPacket.java +++ b/Server/src/main/java/core/net/packet/in/ItemActionPacket.java @@ -8,7 +8,7 @@ import core.game.interaction.UseWithHandler; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; import core.game.node.item.Item; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.RegionManager; import core.net.packet.IncomingPacket; import core.net.packet.IoBuffer; @@ -157,7 +157,7 @@ public class ItemActionPacket implements IncomingPacket { buffer.getShort(); int objectId = buffer.getShortA(); int z = player.getLocation().getZ(); - GameObject object = RegionManager.getObject(z, x, y); + Scenery object = RegionManager.getObject(z, x, y); if(objectId != 6898) { if (object == null || object.getId() != objectId) { PacketRepository.send(ClearMinimapFlag.class, new PlayerContext(player)); @@ -169,7 +169,7 @@ public class ItemActionPacket implements IncomingPacket { break; } } else { - object = new GameObject(6898,x,y,z); + object = new Scenery(6898,x,y,z); } used = player.getInventory().get(slot); if (used == null || used.getId() != id) { diff --git a/Server/src/main/java/core/net/packet/out/AnimateObjectPacket.java b/Server/src/main/java/core/net/packet/out/AnimateObjectPacket.java index 5ce73df5a..db24d5dcf 100644 --- a/Server/src/main/java/core/net/packet/out/AnimateObjectPacket.java +++ b/Server/src/main/java/core/net/packet/out/AnimateObjectPacket.java @@ -1,7 +1,7 @@ package core.net.packet.out; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.game.world.update.flag.context.Animation; import core.net.packet.IoBuffer; @@ -20,7 +20,7 @@ public class AnimateObjectPacket implements OutgoingPacket * @param buffer The buffer. */ public static IoBuffer write(IoBuffer buffer, Animation animation) { - GameObject object = animation.getObject(); + Scenery object = animation.getObject(); Location l = object.getLocation(); buffer.put(20); buffer.putS((l.getChunkOffsetX() << 4) | (l.getChunkOffsetY() & 0x7)); @@ -32,7 +32,7 @@ public class AnimateObjectPacket implements OutgoingPacket @Override public void send(AnimateObjectContext context) { Player player = context.getPlayer(); - GameObject object = context.getAnimation().getObject(); + Scenery object = context.getAnimation().getObject(); IoBuffer buffer = write(UpdateAreaPosition.getBuffer(player, object.getLocation().getChunkBase()), context.getAnimation()); buffer.cypherOpcode(context.getPlayer().getSession().getIsaacPair().getOutput());player.getSession().write(buffer); } diff --git a/Server/src/main/java/core/net/packet/out/ClearObject.java b/Server/src/main/java/core/net/packet/out/ClearScenery.java similarity index 68% rename from Server/src/main/java/core/net/packet/out/ClearObject.java rename to Server/src/main/java/core/net/packet/out/ClearScenery.java index 98e4d5748..a2767a070 100644 --- a/Server/src/main/java/core/net/packet/out/ClearObject.java +++ b/Server/src/main/java/core/net/packet/out/ClearScenery.java @@ -1,24 +1,24 @@ package core.net.packet.out; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.net.packet.IoBuffer; import core.net.packet.OutgoingPacket; -import core.net.packet.context.BuildObjectContext; +import core.net.packet.context.BuildSceneryContext; /** - * The clear game object outgoing packet. + * The clear scenery outgoing packet. * @author Emperor */ -public final class ClearObject implements OutgoingPacket { +public final class ClearScenery implements OutgoingPacket { /** * Writes the packet. * @param buffer The buffer. * @param object The object. */ - public static IoBuffer write(IoBuffer buffer, GameObject object) { + public static IoBuffer write(IoBuffer buffer, Scenery object) { Location l = object.getLocation(); buffer.put(195) // Opcode .putC((object.getType() << 2) + (object.getRotation() & 3)).put((l.getChunkOffsetX() << 4) | (l.getChunkOffsetY() & 0x7)); @@ -26,9 +26,9 @@ public final class ClearObject implements OutgoingPacket { } @Override - public void send(BuildObjectContext context) { + public void send(BuildSceneryContext context) { Player player = context.getPlayer(); - GameObject o = context.getGameObject(); + Scenery o = context.getScenery(); IoBuffer buffer = write(UpdateAreaPosition.getBuffer(player, o.getLocation().getChunkBase()), o); buffer.cypherOpcode(context.getPlayer().getSession().getIsaacPair().getOutput());player.getSession().write(buffer); diff --git a/Server/src/main/java/core/net/packet/out/ConstructObject.java b/Server/src/main/java/core/net/packet/out/ConstructScenery.java similarity index 68% rename from Server/src/main/java/core/net/packet/out/ConstructObject.java rename to Server/src/main/java/core/net/packet/out/ConstructScenery.java index 91eb48e10..6f36f5010 100644 --- a/Server/src/main/java/core/net/packet/out/ConstructObject.java +++ b/Server/src/main/java/core/net/packet/out/ConstructScenery.java @@ -1,33 +1,33 @@ package core.net.packet.out; import core.game.node.entity.player.Player; -import core.game.node.object.GameObject; +import core.game.node.object.Scenery; import core.game.world.map.Location; import core.net.packet.IoBuffer; import core.net.packet.OutgoingPacket; -import core.net.packet.context.BuildObjectContext; +import core.net.packet.context.BuildSceneryContext; /** - * The construct game object packet. + * The construct scenery packet. * @author Emperor */ -public final class ConstructObject implements OutgoingPacket { +public final class ConstructScenery implements OutgoingPacket { /** * Writes the packet. * @param buffer The buffer. * @param object The object. */ - public static IoBuffer write(IoBuffer buffer, GameObject object) { + public static IoBuffer write(IoBuffer buffer, Scenery object) { Location l = object.getLocation(); buffer.put(179).putA((object.getType() << 2) | (object.getRotation() & 0x3)).put((l.getChunkOffsetX() << 4) | (l.getChunkOffsetY() & 0x7)).putShortA(object.getId()); return buffer; } @Override - public void send(BuildObjectContext context) { + public void send(BuildSceneryContext context) { Player player = context.getPlayer(); - GameObject o = context.getGameObject(); + Scenery o = context.getScenery(); IoBuffer buffer = write(UpdateAreaPosition.getBuffer(player, o.getLocation().getChunkBase()), o); buffer.cypherOpcode(context.getPlayer().getSession().getIsaacPair().getOutput());player.getSession().write(buffer); diff --git a/Server/src/main/kotlin/api/ContentAPI.kt b/Server/src/main/kotlin/api/ContentAPI.kt index 0dc908e46..697abf12e 100644 --- a/Server/src/main/kotlin/api/ContentAPI.kt +++ b/Server/src/main/kotlin/api/ContentAPI.kt @@ -4,8 +4,8 @@ import core.cache.def.impl.ItemDefinition import core.game.component.Component import core.game.content.dialogue.FacialExpression import core.game.node.Node -import core.game.node.`object`.GameObject -import core.game.node.`object`.ObjectBuilder +import core.game.node.`object`.Scenery +import core.game.node.`object`.SceneryBuilder import core.game.node.entity.Entity import core.game.node.entity.combat.ImpactHandler import core.game.node.entity.impl.Animator @@ -251,11 +251,11 @@ object ContentAPI { * @param for_ticks the number of ticks the object should be replaced for. Use -1 for permanent. */ @JvmStatic - fun replaceObject(toReplace: GameObject, with: Int, for_ticks: Int) { + fun replaceObject(toReplace: Scenery, with: Int, for_ticks: Int) { if (for_ticks == -1) { - ObjectBuilder.replace(toReplace, toReplace.transform(with)) + SceneryBuilder.replace(toReplace, toReplace.transform(with)) } else { - ObjectBuilder.replace(toReplace, toReplace.transform(with), for_ticks) + SceneryBuilder.replace(toReplace, toReplace.transform(with), for_ticks) } toReplace.isActive = false } @@ -341,7 +341,7 @@ object ContentAPI { * Send an object animation */ @JvmStatic - fun animateObject(player: Player, obj: GameObject, animationId: Int, global: Boolean = false) { + fun animateObject(player: Player, obj: Scenery, animationId: Int, global: Boolean = false) { player.packetDispatch.sendObjectAnimation(obj, getAnimation(animationId), global) } @@ -684,7 +684,7 @@ object ContentAPI { fun adjustCharge(node: Node, amount: Int){ when(node){ is Item -> node.charge += amount - is GameObject -> node.charge += amount + is Scenery -> node.charge += amount else -> SystemLogger.logErr("Attempt to adjust the charge of invalid type: ${node.javaClass.simpleName}") } } @@ -698,7 +698,7 @@ object ContentAPI { fun getCharge(node: Node): Int{ when(node){ is Item -> return node.charge - is GameObject -> return node.charge + is Scenery -> return node.charge else -> SystemLogger.logErr("Attempt to get charge of invalid type: ${node.javaClass.simpleName}").also { return -1 } } } @@ -712,7 +712,7 @@ object ContentAPI { fun setCharge(node: Node, charge: Int){ when(node){ is Item -> node.charge = charge - is GameObject -> node.charge = charge + is Scenery -> node.charge = charge else -> SystemLogger.logErr("Attempt to set the charge of invalid type: ${node.javaClass.simpleName}") } } diff --git a/Server/src/main/kotlin/rs09/game/ai/general/ScriptAPI.kt b/Server/src/main/kotlin/rs09/game/ai/general/ScriptAPI.kt index 6599dd5e7..567aca3b3 100644 --- a/Server/src/main/kotlin/rs09/game/ai/general/ScriptAPI.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/ScriptAPI.kt @@ -9,7 +9,7 @@ import core.game.content.consumable.effects.HealingEffect 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.`object`.Scenery import core.game.node.entity.Entity import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player @@ -94,7 +94,7 @@ class ScriptAPI(private val bot: Player) { } } } - return if(entity == null) null else entity as GameObject + return if(entity == null) null else entity as Scenery } else { var entity: Node? = null var minDistance = Double.MAX_VALUE @@ -128,7 +128,7 @@ class ScriptAPI(private val bot: Player) { } } } - return if(entity == null) null else entity as GameObject + return if(entity == null) null else entity as Scenery } else { var entity: Node? = null var minDistance = Double.MAX_VALUE @@ -161,7 +161,7 @@ class ScriptAPI(private val bot: Player) { } } } - return if(entity == null) null else entity as GameObject + return if(entity == null) null else entity as Scenery } else { var entity: Node? = null var minDistance = Double.MAX_VALUE @@ -224,8 +224,8 @@ class ScriptAPI(private val bot: Player) { * @return the nearest matching object or null. * @author Ceikry */ - fun getNearestGameObject(loc: Location, objectId: Int): GameObject? { - var nearestObject: GameObject? = null + fun getNearestGameObject(loc: Location, objectId: Int): Scenery? { + var nearestObject: Scenery? = null val minDistance = Double.MAX_VALUE for (o in RegionManager.forId(loc.regionId).planes[0].objects) { for (obj in o) { @@ -470,7 +470,7 @@ class ScriptAPI(private val bot: Player) { * @author Ceikry & Kermit */ fun sellAllOnGeAdv(){ - val ge: GameObject? = getNearestNode("Desk", true) as GameObject? + val ge: Scenery? = getNearestNode("Desk", true) as Scenery? class toCounterPulseAll : MovementPulse(bot, ge, DestinationFlag.OBJECT) { override fun pulse(): Boolean { for(item in bot.bank.toArray()) { diff --git a/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/Adventurer.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/Adventurer.kt index 6d87103dd..4a0cf8a67 100644 --- a/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/Adventurer.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/Adventurer.kt @@ -2,7 +2,7 @@ package rs09.game.ai.general.scriptrepository import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse -import core.game.node.`object`.GameObject +import core.game.node.`object`.Scenery import core.game.node.entity.combat.CombatStyle import rs09.game.node.entity.combat.CombatSwingHandler import core.game.node.entity.skill.Skills @@ -1088,7 +1088,7 @@ class Adventurer(val style: CombatStyle): Script() { state = State.TELEPORTING } sold = false - val ge: GameObject? = scriptAPI.getNearestNode("Desk", true) as GameObject? + val ge: Scenery? = scriptAPI.getNearestNode("Desk", true) as Scenery? if (ge == null || bot.bank.isEmpty) state = State.EXPLORE class GEPulse : MovementPulse(bot, ge, DestinationFlag.OBJECT) { override fun pulse(): Boolean { @@ -1109,7 +1109,7 @@ class Adventurer(val style: CombatStyle): Script() { if (counter++ == 300) { state = State.TELEPORTING } - val bank: GameObject? = scriptAPI.getNearestNode("Bank booth", true) as GameObject? + val bank: Scenery? = scriptAPI.getNearestNode("Bank booth", true) as Scenery? if (badedge.insideBorder(bot) || bot.location == badedge2 || bot.location == badedge3 || bot.location == badedge4) { bot.randomWalk(5, 5) } diff --git a/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerSession.kt b/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerSession.kt index 9d12b3f8b..58c80d4f3 100644 --- a/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerSession.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerSession.kt @@ -1,8 +1,8 @@ package rs09.game.content.activity.fishingtrawler import core.game.component.Component -import core.game.node.`object`.GameObject -import core.game.node.`object`.ObjectBuilder +import core.game.node.`object`.Scenery +import core.game.node.`object`.SceneryBuilder import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.entity.state.EntityState @@ -225,7 +225,7 @@ class FishingTrawlerSession(var region: DynamicRegion, val activity: FishingTraw fun spawnHole(){ if(hole_locations.isEmpty() && used_locations.isEmpty()) return val holeLocation = hole_locations.random().also { hole_locations.remove(it) } - if(!ObjectBuilder.replace(GameObject(PATCHED_ID, holeLocation), GameObject(LEAKING_ID, holeLocation, if (holeLocation.y == HOLE_NORTH_Y) 1 else 3)) && !ObjectBuilder.replace(GameObject(2177, holeLocation), GameObject(LEAKING_ID, holeLocation, if (holeLocation.y == HOLE_NORTH_Y) 1 else 3))) { + if(!SceneryBuilder.replace(Scenery(PATCHED_ID, holeLocation), Scenery(LEAKING_ID, holeLocation, if (holeLocation.y == HOLE_NORTH_Y) 1 else 3)) && !SceneryBuilder.replace(Scenery(2177, holeLocation), Scenery(LEAKING_ID, holeLocation, if (holeLocation.y == HOLE_NORTH_Y) 1 else 3))) { maxHoles -= 1 } } @@ -234,9 +234,9 @@ class FishingTrawlerSession(var region: DynamicRegion, val activity: FishingTraw return maxHoles - hole_locations.size } - fun repairHole(player: Player,obj: GameObject){ + fun repairHole(player: Player,obj: Scenery){ if(player.inventory.remove(Item(Items.SWAMP_PASTE_1941))){ - ObjectBuilder.replace(obj,GameObject(PATCHED_ID,obj.location,obj.rotation)) + SceneryBuilder.replace(obj, Scenery(PATCHED_ID, obj.location, obj.rotation)) hole_locations.add(obj.location) if(RandomFunction.random(100) <= 30){ murphy?.sendChat("That's the stuff! Fill those holes!") diff --git a/Server/src/main/kotlin/rs09/game/content/activity/fog/FogInteractionHandler.kt b/Server/src/main/kotlin/rs09/game/content/activity/fog/FogInteractionHandler.kt index 77e009f33..8d12de0c6 100644 --- a/Server/src/main/kotlin/rs09/game/content/activity/fog/FogInteractionHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/fog/FogInteractionHandler.kt @@ -4,7 +4,7 @@ import core.game.content.global.action.ClimbActionHandler import core.game.interaction.DestinationFlag import core.game.interaction.MovementPulse import core.game.node.Node -import core.game.node.`object`.GameObject +import core.game.node.`object`.Scenery import core.game.node.entity.player.Player import core.plugin.Initializable import core.plugin.Plugin @@ -16,13 +16,13 @@ class FogInteractionHandler : PluginInteraction(30204, 30203){ override fun handle(player: Player?, node: Node?): Boolean { when(node?.id){ - 30204 -> player?.pulseManager?.run(ClimbPulse(player,node as GameObject)).also { return true } - 30203 -> player?.pulseManager?.run(ClimbPulse(player, node as GameObject)).also { return true } + 30204 -> player?.pulseManager?.run(ClimbPulse(player,node as Scenery)).also { return true } + 30203 -> player?.pulseManager?.run(ClimbPulse(player, node as Scenery)).also { return true } } return false } - class ClimbPulse(val player: Player,val obj: GameObject) : MovementPulse(player,obj, DestinationFlag.OBJECT){ + class ClimbPulse(val player: Player,val obj: Scenery) : MovementPulse(player,obj, DestinationFlag.OBJECT){ override fun pulse(): Boolean { player.faceLocation(obj.location) when(obj.id) { diff --git a/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStar.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStar.kt index 213020d97..5c4d89176 100644 --- a/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStar.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStar.kt @@ -1,7 +1,7 @@ package rs09.game.content.global.worldevents.shootingstar -import core.game.node.`object`.GameObject -import core.game.node.`object`.ObjectBuilder +import core.game.node.`object`.Scenery +import core.game.node.`object`.SceneryBuilder import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.world.map.Location @@ -46,7 +46,7 @@ class ShootingStar(var level: ShootingStarType = ShootingStarType.values().rando var location = "Canifis Bank" var maxDust = level.totalStardust var dustLeft = level.totalStardust - var starObject = GameObject(level.objectId, crash_locations.get(location)) + var starObject = Scenery(level.objectId, crash_locations.get(location)) var isDiscovered = false var ticks = 0 var isSpawned = false @@ -57,7 +57,7 @@ class ShootingStar(var level: ShootingStarType = ShootingStarType.values().rando */ fun degrade() { if(level.ordinal == 0){ - ObjectBuilder.remove(starObject) + SceneryBuilder.remove(starObject) isSpawned = false starSprite.location = starObject.location starSprite.init() @@ -68,8 +68,8 @@ class ShootingStar(var level: ShootingStarType = ShootingStarType.values().rando maxDust = level.totalStardust dustLeft = level.totalStardust - val newStar = GameObject(level.objectId, starObject.location) - ObjectBuilder.replace(starObject, newStar) + val newStar = Scenery(level.objectId, starObject.location) + SceneryBuilder.replace(starObject, newStar) starObject = newStar } @@ -81,10 +81,10 @@ class ShootingStar(var level: ShootingStarType = ShootingStarType.values().rando * Fires the shooting star (spawns a new one). Only used when spawning new shooting stars, not for downgrading existing ones. */ fun fire() { - ObjectBuilder.remove(starObject) + SceneryBuilder.remove(starObject) rebuildVars() clearSprite() - ObjectBuilder.add(starObject) + SceneryBuilder.add(starObject) isSpawned = true Repository.sendNews("A shooting star level ${level.ordinal + 1} just crashed near ${location.toLowerCase()}!") } @@ -97,7 +97,7 @@ class ShootingStar(var level: ShootingStarType = ShootingStarType.values().rando location = crash_locations.entries.random().key maxDust = level.totalStardust dustLeft = level.totalStardust - starObject = GameObject(level.objectId, crash_locations.get(location)) + starObject = Scenery(level.objectId, crash_locations.get(location)) isDiscovered = false ticks = 0 } diff --git a/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt index 647b2b58b..dac8fa0a3 100644 --- a/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarMiningPulse.kt @@ -1,7 +1,7 @@ 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.`object`.Scenery import core.game.node.entity.player.Player import core.game.node.entity.skill.SkillPulse import core.game.node.entity.skill.Skills @@ -13,7 +13,7 @@ import rs09.game.world.repository.Repository /** * The pulse used to handle mining shooting stars. */ -class ShootingStarMiningPulse(player: Player?, node: GameObject?, val star: ShootingStar) : SkillPulse(player, node) { +class ShootingStarMiningPulse(player: Player?, node: Scenery?, val star: ShootingStar) : SkillPulse(player, node) { /** * The amount of ticks it takes to get star dust. */ diff --git a/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TFTInteractionListeners.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TFTInteractionListeners.kt index 6802b2ffe..a7293a1c9 100644 --- a/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TFTInteractionListeners.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TFTInteractionListeners.kt @@ -1,7 +1,7 @@ package rs09.game.content.quest.members.thefremenniktrials import core.game.content.dialogue.FacialExpression -import core.game.node.`object`.GameObject +import core.game.node.`object`.Scenery import core.game.node.entity.impl.Animator import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player @@ -155,7 +155,7 @@ class TFTInteractionListeners : InteractionListener(){ } fun getRandomLocation(player: Player?): Location{ - var obj: GameObject? = null + var obj: Scenery? = null while(obj?.id != 5138) { val objects = player?.viewport?.chunks?.random()?.random()?.objects diff --git a/Server/src/main/kotlin/rs09/game/content/quest/members/thelostcity/DramenTreeListener.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thelostcity/DramenTreeListener.kt index ebd03ea6f..d709baa1c 100644 --- a/Server/src/main/kotlin/rs09/game/content/quest/members/thelostcity/DramenTreeListener.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thelostcity/DramenTreeListener.kt @@ -1,7 +1,7 @@ package rs09.game.content.quest.members.thelostcity import core.game.content.quest.members.lostcity.TreeSpiritNPC -import core.game.node.`object`.GameObject +import core.game.node.`object`.Scenery import core.game.node.entity.skill.gather.GatheringSkillPulse import core.game.node.entity.skill.gather.SkillingTool import core.game.world.map.Location @@ -35,7 +35,7 @@ class DramenTreeListener : InteractionListener() { spirit.sendChat("You must defeat me before touching the tree!") return@on true } - player.getPulseManager().run(GatheringSkillPulse(player, node as GameObject?)) + player.getPulseManager().run(GatheringSkillPulse(player, node as Scenery?)) return@on true } diff --git a/Server/src/main/kotlin/rs09/game/interaction/object/GutanothChestPlugin.kt b/Server/src/main/kotlin/rs09/game/interaction/object/GutanothChestPlugin.kt index d678487d8..016bd378a 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/object/GutanothChestPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/GutanothChestPlugin.kt @@ -1,7 +1,7 @@ package rs09.game.interaction.`object` -import core.game.node.`object`.GameObject -import core.game.node.`object`.ObjectBuilder +import core.game.node.`object`.Scenery +import core.game.node.`object`.SceneryBuilder import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.item.GroundItemManager @@ -20,20 +20,20 @@ class GutanothChestInteractionHandler : InteractionListener(){ on(CHEST,OBJECT,"open"){player,node -> val delay = player.getAttribute("gutanoth-chest-delay", 0L) - GameWorld.Pulser.submit(ChestPulse(player,System.currentTimeMillis() > delay, node as GameObject)) + GameWorld.Pulser.submit(ChestPulse(player,System.currentTimeMillis() > delay, node as Scenery)) return@on true } } - class ChestPulse(val player: Player, val isLoot: Boolean, val chest: GameObject): Pulse(){ + class ChestPulse(val player: Player, val isLoot: Boolean, val chest: Scenery): Pulse(){ var ticks = 0 override fun pulse(): Boolean { when(ticks++){ 0 -> { player.lock() player.animator.animate(Animation(536)) - ObjectBuilder.replace(chest, GameObject(2828,chest.location,chest.rotation), 5) + SceneryBuilder.replace(chest, Scenery(2828, chest.location, chest.rotation), 5) } 2 -> {lootChest(player)} 3 -> {player.unlock(); return true} diff --git a/Server/src/main/kotlin/rs09/game/interaction/object/JungleBushHandler.kt b/Server/src/main/kotlin/rs09/game/interaction/object/JungleBushHandler.kt index 3a92a38b7..00d975f7d 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/object/JungleBushHandler.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/JungleBushHandler.kt @@ -1,7 +1,7 @@ package rs09.game.interaction.`object` -import core.game.node.`object`.GameObject -import core.game.node.`object`.ObjectBuilder +import core.game.node.`object`.Scenery +import core.game.node.`object`.SceneryBuilder import core.game.node.entity.player.Player import core.game.node.item.Item import core.game.system.task.Pulse @@ -31,7 +31,7 @@ class JungleBushHandler : InteractionListener(){ when(ticks++){ 0 -> player.animator.animate(chop_a).also { player.lock() } 1 -> player.animator.animate(chop_b) - 2 -> ObjectBuilder.replace(toChop, GameObject(chopped_bush, toChop.location, toChop.rotation),20) + 2 -> SceneryBuilder.replace(toChop, Scenery(chopped_bush, toChop.location, toChop.rotation),20) 3 -> {player.walkingQueue.reset(); player.walkingQueue.addPath(toChop.location.x, toChop.location.y,true)} 4 -> player.unlock().also { return true } } diff --git a/Server/src/main/kotlin/rs09/game/interaction/object/MuddyChestHandler.kt b/Server/src/main/kotlin/rs09/game/interaction/object/MuddyChestHandler.kt index 94daaffb9..96b95c24d 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/object/MuddyChestHandler.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/MuddyChestHandler.kt @@ -1,7 +1,7 @@ package rs09.game.interaction.`object` -import core.game.node.`object`.GameObject -import core.game.node.`object`.ObjectBuilder +import core.game.node.`object`.Scenery +import core.game.node.`object`.SceneryBuilder import core.game.node.item.GroundItemManager import core.game.node.item.Item import core.game.world.update.flag.context.Animation @@ -23,7 +23,7 @@ class MuddyChestHandler : InteractionListener() { if(player.inventory.containsItem(key)){ player.inventory.remove(key) player.animator.animate(Animation(536)) - ObjectBuilder.replace(node.asObject(),GameObject(171, node.location, node.asObject().rotation),3) + SceneryBuilder.replace(node.asObject(), Scenery(171, node.location, node.asObject().rotation),3) for(item in chestLoot){ if(!player.inventory.add(item)) GroundItemManager.create(item,player) } diff --git a/Server/src/main/kotlin/rs09/game/interaction/object/TarBarrelListener.kt b/Server/src/main/kotlin/rs09/game/interaction/object/TarBarrelListener.kt index 7109a5664..e1a6c86b4 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/object/TarBarrelListener.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/TarBarrelListener.kt @@ -1,6 +1,6 @@ package rs09.game.interaction.`object` -import core.game.node.`object`.ObjectBuilder +import core.game.node.`object`.SceneryBuilder import core.game.node.item.Item import core.tools.RandomFunction import org.rs09.consts.Items @@ -37,7 +37,7 @@ class TarBarrelListener : InteractionListener() { if (node.asObject().charge <= 0) { player.sendMessage(EMPTY_BARREL_STRING) - ObjectBuilder.replace(node.asObject(), node.asObject().transform(EMPTY_TAR_BARREL_16688), 38) + SceneryBuilder.replace(node.asObject(), node.asObject().transform(EMPTY_TAR_BARREL_16688), 38) node.asObject().charge = 1000 } } diff --git a/Server/src/main/kotlin/rs09/game/interaction/region/dungeons/brimhaven/BrimhavenUtils.kt b/Server/src/main/kotlin/rs09/game/interaction/region/dungeons/brimhaven/BrimhavenUtils.kt index 614b17e3a..28e3e3d2e 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/region/dungeons/brimhaven/BrimhavenUtils.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/region/dungeons/brimhaven/BrimhavenUtils.kt @@ -1,8 +1,8 @@ package rs09.game.interaction.region.dungeons.brimhaven import core.game.content.global.action.ClimbActionHandler -import core.game.node.`object`.GameObject -import core.game.node.`object`.ObjectBuilder +import core.game.node.`object`.Scenery +import core.game.node.`object`.SceneryBuilder import core.game.node.entity.player.Player import core.game.node.entity.player.link.diary.DiaryType import core.game.node.entity.skill.Skills @@ -15,7 +15,7 @@ import core.game.world.update.flag.context.Animation import rs09.game.world.GameWorld object BrimhavenUtils { - fun getVineDestination(player: Player, node: GameObject): Location { + fun getVineDestination(player: Player, node: Scenery): Location { if (node.rotation % 2 != 0) { return if (player.location.x > node.location.x) { node.location.transform(-1, 0, 0) @@ -26,7 +26,7 @@ object BrimhavenUtils { } else node.location.transform(0, 1, 0) } - fun handleStairs(node: GameObject, player: Player){ + fun handleStairs(node: Scenery, player: Player){ when(node.id){ 5094 -> ClimbActionHandler.climb(player, null, Location.create(2643, 9594, 2)) 5096 -> ClimbActionHandler.climb(player, null, Location.create(2649, 9591, 0)) @@ -39,7 +39,7 @@ object BrimhavenUtils { } } - fun handleSteppingStones(player: Player, node: GameObject){ + fun handleSteppingStones(player: Player, node: Scenery){ if (player.skills.getLevel(Skills.AGILITY) < 12) { player.packetDispatch.sendMessage("You need an agility level of 12 to cross this.") return @@ -70,7 +70,7 @@ object BrimhavenUtils { }) } - fun handleVines(player: Player, node: GameObject){ + fun handleVines(player: Player, node: Scenery){ val level: Int = 10 + (node.id - 5103) * 6 if (player.skills.getLevel(Skills.WOODCUTTING) < level) { player.packetDispatch.sendMessage("You need a woodcutting level of $level to chop down this vine.") @@ -84,7 +84,7 @@ object BrimhavenUtils { player.animate(tool.animation) player.pulseManager.run(object : Pulse(3, player) { override fun pulse(): Boolean { - if (ObjectBuilder.replace(node.asObject(), node.asObject().transform(0), 2)) { + if (SceneryBuilder.replace(node.asObject(), node.asObject().transform(0), 2)) { val destination = getVineDestination(player,node.asObject()) player.lock(3) player.walkingQueue.reset() diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/BarbarianOutpostCourse.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/BarbarianOutpostCourse.kt index 4c882a886..046bfa0c4 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/BarbarianOutpostCourse.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/BarbarianOutpostCourse.kt @@ -8,7 +8,7 @@ import core.game.content.global.action.ClimbActionHandler import core.game.content.global.action.DoorActionHandler import core.game.content.quest.miniquest.barcrawl.BarcrawlManager import core.game.node.Node -import core.game.node.`object`.GameObject +import core.game.node.`object`.Scenery import core.game.node.entity.combat.ImpactHandler.HitsplatType import core.game.node.entity.player.Player import core.game.node.entity.skill.agility.AgilityCourse @@ -45,11 +45,11 @@ class BarbarianOutpostCourse 2115, 2116 -> if (!player.barcrawlManager.isFinished || player.barcrawlManager.isStarted) { player.dialogueInterpreter.open(384) } else { - DoorActionHandler.handleAutowalkDoor(player, node as GameObject) + DoorActionHandler.handleAutowalkDoor(player, node as Scenery) } - 2282 -> handleRopeSwing(player, node as GameObject) - 2294 -> handleLogBalance(player, node as GameObject) - 2302 -> handleLedgeBalance(player, node as GameObject) + 2282 -> handleRopeSwing(player, node as Scenery) + 2294 -> handleLogBalance(player, node as Scenery) + 2302 -> handleLedgeBalance(player, node as Scenery) 20211 -> { if (player.location.x < node.location.x) { return true @@ -78,7 +78,7 @@ class BarbarianOutpostCourse * @param player the player. * @param object the object. */ - private fun handleRopeSwing(player: Player, `object`: GameObject) { + private fun handleRopeSwing(player: Player, `object`: Scenery) { if (player.location.y < 3554) { player.packetDispatch.sendMessage("You cannot do that from here.") return @@ -101,7 +101,7 @@ class BarbarianOutpostCourse * @param player the player. * @param object the object. */ - private fun handleLogBalance(player: Player, `object`: GameObject) { + private fun handleLogBalance(player: Player, `object`: Scenery) { val failed = AgilityHandler.hasFailed(player, 1, 0.5) val end = if (failed) Location.create(2545, 3546, 0) else Location.create(2541, 3546, 0) player.packetDispatch.sendMessage("You walk carefully across the slippery log...") @@ -148,7 +148,7 @@ class BarbarianOutpostCourse * @param player the player. * @param object the object. */ - private fun handleLedgeBalance(player: Player, `object`: GameObject) { + private fun handleLedgeBalance(player: Player, `object`: Scenery) { val failed = AgilityHandler.hasFailed(player, 1, 0.3) val end = if (failed) Location.create(2534, 3547, 1) else Location.create(2532, 3547, 1) AgilityHandler.walk(player, if (failed) -1 else 3, Location.create(2536, 3547, 1), end, Animation.create(157), if (failed) 0.0 else 22.0, if (failed) null else "You skillfully edge across the gap.") @@ -173,7 +173,7 @@ class BarbarianOutpostCourse } override fun getDestination(node: Node, n: Node): Location? { - if (n is GameObject) { + if (n is Scenery) { when (n.getId()) { 2282 -> return Location.create(2551, 3554, 0) } diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/GnomeStrongholdCourse.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/GnomeStrongholdCourse.kt index 1a8a90bcd..6c1c065dc 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/GnomeStrongholdCourse.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/GnomeStrongholdCourse.kt @@ -2,7 +2,7 @@ package rs09.game.node.entity.skill.agility import core.cache.def.impl.ObjectDefinition import core.game.node.Node -import core.game.node.`object`.GameObject +import core.game.node.`object`.Scenery import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.entity.skill.agility.AgilityCourse @@ -30,7 +30,7 @@ class GnomeStrongholdCourse @JvmOverloads constructor(player: Player? = null) : AgilityCourse(player, 7, 39.0) { override fun handle(player: Player, node: Node, option: String): Boolean { getCourse(player) // Sets the extension. - val `object` = node as GameObject + val `object` = node as Scenery when (`object`.id) { 2295 -> { TRAINERS[0]!!.sendChat("Okay get over that log, quick quick!") @@ -101,7 +101,7 @@ class GnomeStrongholdCourse } override fun getDestination(node: Node, n: Node): Location? { - val `object` = n as GameObject + val `object` = n as Scenery when (`object`.id) { 2295 -> return Location.create(2474, 3436, 0) 2286 -> { diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/WildernessCourse.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/WildernessCourse.kt index 6be8ac1dc..482108063 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/WildernessCourse.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/WildernessCourse.kt @@ -3,7 +3,7 @@ package rs09.game.node.entity.skill.agility import core.cache.def.impl.ObjectDefinition import core.game.content.global.action.DoorActionHandler import core.game.node.Node -import core.game.node.`object`.GameObject +import core.game.node.`object`.Scenery import core.game.node.entity.player.Player import core.game.node.entity.player.link.TeleportManager import core.game.node.entity.skill.Skills @@ -31,7 +31,7 @@ class WildernessCourse @JvmOverloads constructor(player: Player? = null) : AgilityCourse(player, 5, 499.0) { override fun handle(player: Player, node: Node, option: String): Boolean { getCourse(player) // Sets the extension. - val `object` = node as GameObject + val `object` = node as Scenery when (`object`.id) { 2309 -> handleEntrance(player, `object`) 2307, 2308 -> { @@ -52,7 +52,7 @@ class WildernessCourse * @param player the player. * @param object the object. */ - private fun handleEntrance(player: Player, `object`: GameObject) { + private fun handleEntrance(player: Player, `object`: Scenery) { if (player.location.y > 3916 || player.skills.getLevel(Skills.AGILITY) >= 52) { DoorActionHandler.handleAutowalkDoor(player, `object`) if (player.location.y <= 3916) { @@ -68,7 +68,7 @@ class WildernessCourse * @param player the player. * @param object the object. */ - private fun handleEntranceObstacle(player: Player, `object`: GameObject) { + private fun handleEntranceObstacle(player: Player, `object`: Scenery) { GameWorld.Pulser.submit(object : Pulse(1, player) { var counter = 0 val fail = AgilityHandler.hasFailed(player, 1, 0.3) @@ -103,7 +103,7 @@ class WildernessCourse * @param player the pipe. * @param object the object. */ - private fun handlePipe(player: Player, `object`: GameObject) { + private fun handlePipe(player: Player, `object`: Scenery) { if (`object`.location.y == 3948) { player.packetDispatch.sendMessage("You can't do that from here.") return @@ -152,7 +152,7 @@ class WildernessCourse * @param player the player. * @param object the object. */ - private fun handleRopeSwing(player: Player, `object`: GameObject) { + private fun handleRopeSwing(player: Player, `object`: Scenery) { if (player.location.y < 3554) { player.packetDispatch.sendMessage("You cannot do that from here.") return @@ -175,7 +175,7 @@ class WildernessCourse * @param player the player. * @param object the object. */ - private fun handleSteppingStones(player: Player, `object`: GameObject) { + private fun handleSteppingStones(player: Player, `object`: Scenery) { player.locks.lock() val fail = AgilityHandler.hasFailed(player, 1, 0.3) player.addExtension(LogoutTask::class.java, LocationLogoutTask(12, player.location)) @@ -204,7 +204,7 @@ class WildernessCourse * @param player the player. * @param object the object. */ - private fun handleLogBalance(player: Player, `object`: GameObject) { + private fun handleLogBalance(player: Player, `object`: Scenery) { val failed = AgilityHandler.hasFailed(player, 1, 0.5) val end = if (failed) Location.create(2998, 3945, 0) else Location.create(2994, 3945, 0) player.packetDispatch.sendMessage("You walk carefully across the slippery log...") @@ -226,7 +226,7 @@ class WildernessCourse * @param player the player. * @param object the object. */ - private fun handleRockClimb(player: Player, `object`: GameObject) { + private fun handleRockClimb(player: Player, `object`: Scenery) { AgilityHandler.forceWalk(player, 4, Location.create(2994, 3937, 0), Location.create(2994, 3933, 0), Animation.create(740), 8, 0.0, "You reach the top.") GameWorld.Pulser.submit(object : Pulse(4, player) { override fun pulse(): Boolean { diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/BasaltRockShortcut.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/BasaltRockShortcut.kt index 032793a13..d4783da04 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/BasaltRockShortcut.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/BasaltRockShortcut.kt @@ -1,7 +1,7 @@ package rs09.game.node.entity.skill.agility.shortcuts import core.game.node.Node -import core.game.node.`object`.GameObject +import core.game.node.`object`.Scenery import core.game.node.entity.player.Player import core.game.node.entity.skill.agility.AgilityHandler import core.game.node.entity.skill.agility.AgilityShortcut @@ -61,7 +61,7 @@ class BasaltRockShortcut : AgilityShortcut { * instead of the rock below them */ override fun getDestination(n: Node?, node: Node): Location? { - val obj = node as GameObject + val obj = node as Scenery if (obj.id == 4550) { return Location.create(2522, 3597, 0) //Beach South* } else if (obj.id == 4551) { @@ -86,7 +86,7 @@ class BasaltRockShortcut : AgilityShortcut { return super.getDestination(obj, node) } - override fun run(player: Player, obj: GameObject, option: String, failed: Boolean) { + override fun run(player: Player, obj: Scenery, option: String, failed: Boolean) { GameWorld.Pulser.submit(object : Pulse(1, player) { override fun pulse(): Boolean { when (obj.id) { diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/PipeShortcut.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/PipeShortcut.kt index 7d4d11063..3dabe17d3 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/PipeShortcut.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/PipeShortcut.kt @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.agility.shortcuts -import core.game.node.`object`.GameObject +import core.game.node.`object`.Scenery import core.game.node.entity.player.Player import core.game.node.entity.player.link.diary.DiaryType import core.game.node.entity.skill.agility.AgilityHandler @@ -59,7 +59,7 @@ class PipeShortcut : AgilityShortcut { * Run for the main fire event * Use this for unlocking achievement diaries + any other unlocks */ - override fun run(player: Player, obj: GameObject, option: String, failed: Boolean) { + override fun run(player: Player, obj: Scenery, option: String, failed: Boolean) { if (obj.id == 29370) player.achievementDiaryManager.finishTask(player, DiaryType.VARROCK, 2, 1) @@ -77,7 +77,7 @@ class PipeShortcut : AgilityShortcut { * player = player, the player that is being force-walked * -1 = course index, should this be counted as an agility course +1? * player.location, gets the player location (start of pipe) - * pipeDestination(player, obj, 6) = custom made for pipes, player = player, obj is getting the game object location, 6 is the amount to move forward. || More info found in AgilityShortcut.java + * pipeDestination(player, obj, 6) = custom made for pipes, player = player, obj is getting the scenery location, 6 is the amount to move forward. || More info found in AgilityShortcut.java * Animation.create(10580) = what animation we should play when the user is interacting with that object * 10 = speed at which the player moves through the object * 0.0 = experience that we should award the player on successful completion* SET EXPERIENCE IN METHOD newInstance diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/RockClimbShortcut.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/RockClimbShortcut.kt index 20b7a16d5..82c204a42 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/RockClimbShortcut.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/RockClimbShortcut.kt @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.agility.shortcuts -import core.game.node.`object`.GameObject +import core.game.node.`object`.Scenery import core.game.node.entity.impl.ForceMovement import core.game.node.entity.player.Player import core.game.node.entity.skill.Skills @@ -33,7 +33,7 @@ class RockClimbShortcut ), 1, 0.0, "climb") { - override fun run(player: Player, `object`: GameObject, option: String, failed: Boolean) { + override fun run(player: Player, `object`: Scenery, option: String, failed: Boolean) { //Scaling down val ANIMATION = Animation(1148) //Scaling Up diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/ConstructionDoorPlugin.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/ConstructionDoorPlugin.kt index 3ef3bc72d..805933101 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/ConstructionDoorPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/ConstructionDoorPlugin.kt @@ -4,7 +4,7 @@ import core.cache.def.impl.ObjectDefinition import core.game.content.global.action.DoorActionHandler import core.game.interaction.OptionHandler import core.game.node.Node -import core.game.node.`object`.GameObject +import core.game.node.`object`.Scenery import core.game.node.entity.player.Player import core.game.node.entity.skill.construction.BuildHotspot import core.game.node.entity.skill.construction.HousingStyle @@ -38,7 +38,7 @@ class ConstructionDoorPlugin : OptionHandler() { } override fun handle(player: Player, node: Node, option: String): Boolean { - val `object` = node as GameObject + val `object` = node as Scenery val second = DoorActionHandler.getSecondDoor(`object`, player) when (option) { "pick-lock", "force" -> return false //TODO @@ -52,7 +52,7 @@ class ConstructionDoorPlugin : OptionHandler() { * @param object The door. * @return The replace object id. */ - private fun getReplaceId(`object`: GameObject): Int { + private fun getReplaceId(`object`: Scenery): Int { for (data in REPLACEMENT) { if (`object`.id == data[0]) { return data[1] diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/chapel/BurnerListener.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/chapel/BurnerListener.kt index eca00c257..998499707 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/chapel/BurnerListener.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/chapel/BurnerListener.kt @@ -1,7 +1,7 @@ package rs09.game.node.entity.skill.construction.decoration.chapel -import core.game.node.`object`.GameObject -import core.game.node.`object`.ObjectBuilder +import core.game.node.`object`.Scenery +import core.game.node.`object`.SceneryBuilder import core.game.node.item.Item import core.game.world.update.flag.context.Animation import core.tools.RandomFunction @@ -31,9 +31,9 @@ class BurnerListener : InteractionListener() { player.lock(1) player.animate(Animation.create(3687)) player.sendMessage("You burn some marrentill in the incense burner.") - ObjectBuilder.replace( + SceneryBuilder.replace( node.asObject(), - GameObject(node.asObject().id + 1, node.location), + Scenery(node.asObject().id + 1, node.location), RandomFunction.random(100, 175) ) } diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/study/TelescopePlugin.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/study/TelescopePlugin.kt index f3bf82b8d..5e199ad02 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/study/TelescopePlugin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/study/TelescopePlugin.kt @@ -4,7 +4,7 @@ import core.cache.def.impl.ObjectDefinition import core.game.component.Component import core.game.interaction.OptionHandler import core.game.node.Node -import core.game.node.`object`.GameObject +import core.game.node.`object`.Scenery import core.game.node.entity.player.Player import core.game.system.task.Pulse import core.game.world.update.flag.context.Animation @@ -31,7 +31,7 @@ class TelescopePlugin : OptionHandler() { val delay: Int = 25000 + (25000 / 3) val timeLeft = delay - star.ticks val fakeTimeLeftBecauseFuckPlayers = TimeUnit.MILLISECONDS.toMinutes(timeLeft * 600L) + if(RandomFunction.random(0,100) % 2 == 0) 2 else -2 - val obj = node?.asObject() as GameObject + val obj = node?.asObject() as Scenery player?.lock() player?.animate(ANIMATION) player?.interfaceManager?.open(Component(782)).also { player?.unlock() diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/cooking/CookingDialogue.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/cooking/CookingDialogue.kt index 12b1432b8..50ff30aba 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/cooking/CookingDialogue.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/cooking/CookingDialogue.kt @@ -1,7 +1,7 @@ package rs09.game.node.entity.skill.cooking import core.cache.def.impl.ItemDefinition -import core.game.node.`object`.GameObject +import core.game.node.`object`.Scenery import core.game.node.entity.player.link.RunScript import core.game.node.entity.skill.cooking.CookableItems import core.game.node.entity.skill.cooking.CookingRewrite.Companion.cook @@ -14,7 +14,7 @@ import rs09.tools.START_DIALOGUE class CookingDialogue(vararg val args: Any) : DialogueFile(){ var initial = 0 var product = 0 - var `object`: GameObject? = null + var `object`: Scenery? = null var sinew = false override fun handle(componentID: Int, buttonID: Int) { when(stage){ @@ -27,13 +27,13 @@ class CookingDialogue(vararg val args: Any) : DialogueFile(){ } else { product = CookableItems.forId(initial).cooked } - `object` = args.get(1) as GameObject + `object` = args.get(1) as Scenery } 4 -> { initial = args.get(0) as Int product = args.get(1) as Int sinew = args.get(2) as Boolean - `object` = args.get(3) as GameObject + `object` = args.get(3) as Scenery if (sinew) { player!!.dialogueInterpreter.sendOptions( "Select one", diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBins.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBins.kt index 9b6e24601..6f64ad034 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBins.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBins.kt @@ -2,7 +2,7 @@ package rs09.game.node.entity.skill.farming import core.cache.def.impl.ObjectDefinition import core.cache.def.impl.VarbitDefinition -import core.game.node.`object`.GameObject +import core.game.node.`object`.Scenery import core.game.node.entity.player.Player import rs09.game.node.entity.state.newsys.states.FarmingState @@ -17,7 +17,7 @@ enum class CompostBins(val varpIndex: Int, val varpOffest: Int) { val bins = values().map { (it.varpIndex shl it.varpOffest) to it }.toMap() @JvmStatic - fun forObject(obj: GameObject): CompostBins?{ + fun forObject(obj: Scenery): CompostBins?{ return forObjectID(obj.id) } diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FarmingPatch.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FarmingPatch.kt index 1ecddf411..f5a57245e 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FarmingPatch.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FarmingPatch.kt @@ -2,7 +2,7 @@ package rs09.game.node.entity.skill.farming import core.cache.def.impl.ObjectDefinition import core.cache.def.impl.VarbitDefinition -import core.game.node.`object`.GameObject +import core.game.node.`object`.Scenery import core.game.node.entity.player.Player import rs09.game.node.entity.state.newsys.states.FarmingState @@ -68,7 +68,7 @@ enum class FarmingPatch(val varpIndex: Int, val varpOffset: Int, val type: Patch val patches = FarmingPatch.values().map { (it.varpIndex shl it.varpOffset) to it }.toMap() @JvmStatic - fun forObject(obj: GameObject): FarmingPatch?{ + fun forObject(obj: Scenery): FarmingPatch?{ return forObjectID(obj.id) } diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/mining/MiningSkillPulse.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/mining/MiningSkillPulse.kt index 5e273a558..cb7695613 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/mining/MiningSkillPulse.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/mining/MiningSkillPulse.kt @@ -7,8 +7,8 @@ import core.game.content.global.SkillingPets import core.game.content.quest.tutorials.tutorialisland.TutorialSession import core.game.content.quest.tutorials.tutorialisland.TutorialStage import core.game.node.Node -import core.game.node.`object`.GameObject -import core.game.node.`object`.ObjectBuilder +import core.game.node.`object`.Scenery +import core.game.node.`object`.SceneryBuilder import core.game.node.entity.impl.Animator import core.game.node.entity.npc.drop.DropFrequency import core.game.node.entity.player.Player @@ -17,11 +17,9 @@ 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 @@ -29,7 +27,6 @@ import org.rs09.consts.Items 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.stringtools.colorize /** * Mining skill pulse @@ -196,7 +193,7 @@ class MiningSkillPulse(private val player: Player, private val node: Node) : Pul //transform to depleted version if (!isMiningEssence && resource!!.getRespawnRate() != 0) { - ObjectBuilder.replace(node as GameObject, GameObject(resource!!.emptyId, node.getLocation(), node.rotation), resource!!.respawnDuration) + SceneryBuilder.replace(node as Scenery, Scenery(resource!!.emptyId, node.getLocation(), node.rotation), resource!!.respawnDuration) node.setActive(false) return true } diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/HunterTracking.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/HunterTracking.kt index 4e0517780..6ad505c83 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/HunterTracking.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/HunterTracking.kt @@ -2,7 +2,7 @@ package rs09.game.node.entity.skill.hunter.tracking import core.game.interaction.OptionHandler import core.game.node.Node -import core.game.node.`object`.GameObject +import core.game.node.`object`.Scenery import core.game.node.entity.player.Player import core.game.node.entity.skill.Skills import core.game.node.item.GroundItemManager @@ -38,7 +38,7 @@ abstract class HunterTracking : OptionHandler(){ * Gets the initial trail based on the ID of the hole object the player clicked on * @author Ceikry */ - fun getInitialTrail(obj: GameObject): TrailDefinition? { + fun getInitialTrail(obj: Scenery): TrailDefinition? { return initialMap[obj.id]?.random() } @@ -46,7 +46,7 @@ abstract class HunterTracking : OptionHandler(){ * Generates the entire trail all at once. * @author Ceikry */ - fun generateTrail(startobj: GameObject, player: Player) { + fun generateTrail(startobj: Scenery, player: Player) { val trail = player.getAttribute(attribute, ArrayList()) val initialTrail = getInitialTrail(startobj) if(initialTrail == null) { diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/magic/LunarListeners.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/magic/LunarListeners.kt index 1937d8bf0..9856c94b8 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/magic/LunarListeners.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/magic/LunarListeners.kt @@ -1,7 +1,7 @@ package rs09.game.node.entity.skill.magic import core.game.component.Component -import core.game.node.`object`.GameObject +import core.game.node.`object`.Scenery import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.entity.player.link.TeleportManager @@ -138,7 +138,7 @@ class LunarListeners : SpellListener("lunar") { } } - fun curePlant(player: Player, obj: GameObject){ + fun curePlant(player: Player, obj: Scenery){ val fPatch = FarmingPatch.forObject(obj) if(fPatch == null){ player.sendMessage("You attempt to cast Cure Plant on ${obj.definition.name}!") diff --git a/Server/src/main/kotlin/rs09/game/system/command/oldsys/VisualCommand.kt b/Server/src/main/kotlin/rs09/game/system/command/oldsys/VisualCommand.kt index d0d291d78..2ebdd2f1d 100644 --- a/Server/src/main/kotlin/rs09/game/system/command/oldsys/VisualCommand.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/oldsys/VisualCommand.kt @@ -3,8 +3,8 @@ 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.`object`.Scenery +import core.game.node.`object`.SceneryBuilder import core.game.node.entity.combat.ImpactHandler.HitsplatType import core.game.node.entity.impl.Projectile import core.game.node.entity.npc.NPC @@ -38,7 +38,7 @@ class VisualCommand : CommandPlugin() { override fun parse(player: Player?, name: String?, args: Array?): Boolean { var location: Location? = null - var `object`: GameObject? = null + var `object`: Scenery? = null var o: Player? = null when (name) { "invisible", "invis", "seti" -> { @@ -170,8 +170,8 @@ class VisualCommand : CommandPlugin() { "char" -> CharacterDesign.open(player) "savenpc" -> return true "objwithanim" -> { - val go = GameObject(toInteger(args!![1]!!), player!!.location, 0) - ObjectBuilder.add(go) + val go = Scenery(toInteger(args!![1]!!), player!!.location, 0) + SceneryBuilder.add(go) player.packetDispatch.sendObjectAnimation(go, Animation.create(toInteger(args[2]!!))) return true } diff --git a/Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RottenPotatoUseWithHandler.kt b/Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RottenPotatoUseWithHandler.kt index a665437e9..1172e3613 100644 --- a/Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RottenPotatoUseWithHandler.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/rottenpotato/RottenPotatoUseWithHandler.kt @@ -1,7 +1,7 @@ package rs09.game.system.command.rottenpotato import core.game.node.Node -import core.game.node.`object`.GameObject +import core.game.node.`object`.Scenery import core.game.node.entity.npc.NPC import core.game.node.entity.player.Player import core.game.node.item.Item @@ -13,7 +13,7 @@ import core.game.node.item.Item object RottenPotatoUseWithHandler{ @JvmStatic fun handle(node: Node, player: Player){ - if(node is GameObject){ + if(node is Scenery){ val go = node.asObject() } diff --git a/Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt index ea214638b..3f1ddc769 100644 --- a/Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/MiscCommandSet.kt @@ -6,7 +6,7 @@ import core.cache.def.impl.ObjectDefinition import core.cache.def.impl.VarbitDefinition import core.game.component.Component import core.game.ge.OfferState -import core.game.node.`object`.GameObject +import core.game.node.`object`.Scenery import core.game.node.entity.player.info.Rights import core.game.node.entity.player.link.RunScript import core.game.node.entity.skill.Skills @@ -52,7 +52,7 @@ class MiscCommandSet : CommandSet(Command.Privilege.ADMIN){ define("loc", Command.Privilege.STANDARD){ player, _-> val l = player.location val r = player.viewport.region - var obj: GameObject? = null + var obj: Scenery? = null notify(player,"Absolute: " + l + ", regional: [" + l.localX + ", " + l.localY + "], chunk: [" + l.chunkOffsetX + ", " + l.chunkOffsetY + "], flag: [" + RegionManager.isTeleportPermitted(l) + ", " + RegionManager.getClippingFlag(l) + ", " + RegionManager.isLandscape(l) + "].") notify(player,"Region: [id=" + l.regionId + ", active=" + r.isActive + ", instanced=" + (r is DynamicRegion) + "], obj=" + RegionManager.getObject(l) + ".") notify(player,"Object: " + RegionManager.getObject(l).also{obj = it} + ".") diff --git a/Server/src/main/kotlin/rs09/game/system/command/sets/SpawnCommandSet.kt b/Server/src/main/kotlin/rs09/game/system/command/sets/SpawnCommandSet.kt index cc838b2d8..5ce550da6 100644 --- a/Server/src/main/kotlin/rs09/game/system/command/sets/SpawnCommandSet.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/sets/SpawnCommandSet.kt @@ -1,8 +1,8 @@ package rs09.game.system.command.sets import core.cache.Cache -import core.game.node.`object`.GameObject -import core.game.node.`object`.ObjectBuilder +import core.game.node.`object`.Scenery +import core.game.node.`object`.SceneryBuilder import core.game.node.entity.npc.NPC import core.game.node.item.Item import rs09.game.system.SystemLogger @@ -66,8 +66,8 @@ class SpawnCommandSet : CommandSet(Command.Privilege.ADMIN){ reject(player,"syntax error: id (optional) type rotation or rotation") return@define } - val `object` = if (args.size > 3) GameObject(CommandPlugin.toInteger(args[1]!!), player!!.location, CommandPlugin.toInteger(args[2]!!), CommandPlugin.toInteger(args[3]!!)) else if (args.size == 3) GameObject(CommandPlugin.toInteger(args[1]!!), player!!.location, CommandPlugin.toInteger(args[2]!!)) else GameObject(CommandPlugin.toInteger(args[1]!!), player!!.location) - ObjectBuilder.add(`object`) + val `object` = if (args.size > 3) Scenery(CommandPlugin.toInteger(args[1]!!), player!!.location, CommandPlugin.toInteger(args[2]!!), CommandPlugin.toInteger(args[3]!!)) else if (args.size == 3) Scenery(CommandPlugin.toInteger(args[1]!!), player!!.location, CommandPlugin.toInteger(args[2]!!)) else Scenery(CommandPlugin.toInteger(args[1]!!), player!!.location) + SceneryBuilder.add(`object`) SystemLogger.logInfo("object = $`object`") } }