diff --git a/Server/src/main/java/core/cache/Cache.java b/Server/src/main/java/core/cache/Cache.java index da89ea948..0194eb874 100644 --- a/Server/src/main/java/core/cache/Cache.java +++ b/Server/src/main/java/core/cache/Cache.java @@ -9,7 +9,7 @@ import core.cache.def.impl.AnimationDefinition; import core.cache.def.impl.GraphicDefinition; import core.cache.def.impl.ItemDefinition; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import rs09.game.system.SystemLogger; /** @@ -67,7 +67,7 @@ public final class Cache { } } ItemDefinition.parse(); - ObjectDefinition.parse(); + SceneryDefinition.parse(); } /** @@ -216,7 +216,7 @@ public final class Cache { } /** - * Method used to return the {@link ObjectDefinition} size. + * Method used to return the {@link SceneryDefinition} size. * * @return the size. */ diff --git a/Server/src/main/java/core/cache/def/impl/ObjectDefinition.java b/Server/src/main/java/core/cache/def/impl/SceneryDefinition.java similarity index 96% rename from Server/src/main/java/core/cache/def/impl/ObjectDefinition.java rename to Server/src/main/java/core/cache/def/impl/SceneryDefinition.java index 9bd1c8bd9..1e55ae82f 100644 --- a/Server/src/main/java/core/cache/def/impl/ObjectDefinition.java +++ b/Server/src/main/java/core/cache/def/impl/SceneryDefinition.java @@ -17,12 +17,12 @@ import java.util.Map; * Represents an object's definition. * @author Emperor */ -public class ObjectDefinition extends Definition { +public class SceneryDefinition extends Definition { /** * The item definitions mapping. */ - private static final Map DEFINITIONS = new HashMap(); + private static final Map DEFINITIONS = new HashMap(); /** * The default option handlers. @@ -447,7 +447,7 @@ public class ObjectDefinition extends Definition { /** * Construct a new {@code ObjectDefinition} {@code Object}. */ - public ObjectDefinition() { + public SceneryDefinition() { anInt3835 = -1; anInt3860 = -1; configFileId = -1; @@ -572,16 +572,16 @@ public class ObjectDefinition extends Definition { for (int objectId = 0; objectId < Cache.getObjectDefinitionsSize(); objectId++) { byte[] data = Cache.getIndexes()[16].getFileData(getContainerId(objectId), objectId & 0xff); if (data == null) { - ObjectDefinition.getDefinitions().put(objectId, new ObjectDefinition()); + SceneryDefinition.getDefinitions().put(objectId, new SceneryDefinition()); //SystemLogger.logErr("Could not load object definitions for id " + objectId + " - no data!"); continue; } - ObjectDefinition def = ObjectDefinition.parseDefinition(objectId, ByteBuffer.wrap(data)); + SceneryDefinition def = SceneryDefinition.parseDefinition(objectId, ByteBuffer.wrap(data)); if (def == null) { // SystemLogger.logErr("Could not load object definitions for id " + objectId + " - no definitions found!"); return; } - ObjectDefinition.getDefinitions().put(objectId, def); + SceneryDefinition.getDefinitions().put(objectId, def); data = null; } } @@ -591,12 +591,12 @@ public class ObjectDefinition extends Definition { * @param objectId The object's id. * @return The object definition. */ - public static ObjectDefinition forId(int objectId) { - ObjectDefinition def = DEFINITIONS.get(objectId); + public static SceneryDefinition forId(int objectId) { + SceneryDefinition def = DEFINITIONS.get(objectId); if (def != null) { return def; } - DEFINITIONS.put(objectId, def = new ObjectDefinition()); + DEFINITIONS.put(objectId, def = new SceneryDefinition()); def.id = objectId; return def; } @@ -609,8 +609,8 @@ public class ObjectDefinition extends Definition { * @param buffer The buffer. * @return The object definition. */ - public static ObjectDefinition parseDefinition(int objectId, ByteBuffer buffer) { - ObjectDefinition def = new ObjectDefinition(); + public static SceneryDefinition parseDefinition(int objectId, ByteBuffer buffer) { + SceneryDefinition def = new SceneryDefinition(); def.id = objectId; // SystemLogger.logErr("----------------------------------------------------\n\n\n"); while (true) { @@ -852,7 +852,7 @@ public class ObjectDefinition extends Definition { } for (int i = 0; i < childrenIds.length; i++) { if (childrenIds[i] != -1) { - ObjectDefinition def = forId(childrenIds[i]); + SceneryDefinition def = forId(childrenIds[i]); if (def.hasOptions(false)) { return true; } @@ -866,7 +866,7 @@ public class ObjectDefinition extends Definition { * @param player The player to get it for. * @return The object definition. */ - public ObjectDefinition getChildObject(Player player) { + public SceneryDefinition getChildObject(Player player) { if (childrenIds == null || childrenIds.length < 1) { return this; } @@ -1586,7 +1586,7 @@ public class ObjectDefinition extends Definition { * Get the definitions. * @return the definitions */ - public static Map getDefinitions() { + public static Map getDefinitions() { return DEFINITIONS; } @@ -1598,7 +1598,7 @@ public class ObjectDefinition extends Definition { * option handler. */ public static OptionHandler getOptionHandler(int nodeId, String name) { - ObjectDefinition def = forId(nodeId); + SceneryDefinition def = forId(nodeId); OptionHandler handler = def.getConfiguration("option:" + name); if (handler != null) { return handler; 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 c1da57a6a..a0b20ec96 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 @@ -1,6 +1,6 @@ package core.game.content.activity.bountyhunter; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.activity.ActivityManager; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -19,13 +19,13 @@ public final class BHOptionHandler extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(28110).getHandlers().put("option:exit", this); - ObjectDefinition.forId(28119).getHandlers().put("option:enter", this); - ObjectDefinition.forId(28120).getHandlers().put("option:enter", this); - ObjectDefinition.forId(28121).getHandlers().put("option:enter", this); - ObjectDefinition.forId(28122).getHandlers().put("option:exit", this); - ObjectDefinition.forId(28115).getHandlers().put("option:view", this); - ObjectDefinition.forId(28116).getHandlers().put("option:view", this); + SceneryDefinition.forId(28110).getHandlers().put("option:exit", this); + SceneryDefinition.forId(28119).getHandlers().put("option:enter", this); + SceneryDefinition.forId(28120).getHandlers().put("option:enter", this); + SceneryDefinition.forId(28121).getHandlers().put("option:enter", this); + SceneryDefinition.forId(28122).getHandlers().put("option:exit", this); + SceneryDefinition.forId(28115).getHandlers().put("option:view", this); + SceneryDefinition.forId(28116).getHandlers().put("option:view", this); return this; } diff --git a/Server/src/main/java/core/game/content/activity/duel/DuelArea.java b/Server/src/main/java/core/game/content/activity/duel/DuelArea.java index 71abff60b..c315f5d80 100644 --- a/Server/src/main/java/core/game/content/activity/duel/DuelArea.java +++ b/Server/src/main/java/core/game/content/activity/duel/DuelArea.java @@ -1,6 +1,6 @@ package core.game.content.activity.duel; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.container.Container; import core.game.container.impl.EquipmentContainer; import core.game.content.dialogue.DialogueAction; @@ -570,7 +570,7 @@ public class DuelArea extends MapZone { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(3203).getHandlers().put("option:forfeit", this); + SceneryDefinition.forId(3203).getHandlers().put("option:forfeit", this); return this; } diff --git a/Server/src/main/java/core/game/content/activity/fog/FOGActivityPlugin.java b/Server/src/main/java/core/game/content/activity/fog/FOGActivityPlugin.java index f9434cb85..6bbbb4ed9 100644 --- a/Server/src/main/java/core/game/content/activity/fog/FOGActivityPlugin.java +++ b/Server/src/main/java/core/game/content/activity/fog/FOGActivityPlugin.java @@ -1,6 +1,6 @@ package core.game.content.activity.fog; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.activity.ActivityPlugin; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -55,7 +55,7 @@ public class FOGActivityPlugin extends ActivityPlugin { PluginManager.definePlugin(new OptionHandler() { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(30204).getHandlers().put("option:enter", this); + SceneryDefinition.forId(30204).getHandlers().put("option:enter", this); return this; } diff --git a/Server/src/main/java/core/game/content/activity/guild/CraftingGuildPlugin.java b/Server/src/main/java/core/game/content/activity/guild/CraftingGuildPlugin.java index e44966350..2a42fb592 100644 --- a/Server/src/main/java/core/game/content/activity/guild/CraftingGuildPlugin.java +++ b/Server/src/main/java/core/game/content/activity/guild/CraftingGuildPlugin.java @@ -1,7 +1,7 @@ package core.game.content.activity.guild; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.dialogue.DialoguePlugin; import core.game.content.global.Skillcape; import core.game.content.global.action.DoorActionHandler; @@ -32,7 +32,7 @@ public final class CraftingGuildPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2647).getHandlers().put("option:open", this); + SceneryDefinition.forId(2647).getHandlers().put("option:open", this); NPCDefinition.forId(804).getHandlers().put("option:trade", this); new MasterCrafterDialogue().init(); new TannerDialogue().init(); diff --git a/Server/src/main/java/core/game/content/activity/guild/FishingGuild.java b/Server/src/main/java/core/game/content/activity/guild/FishingGuild.java index bd7f1947c..04e422031 100644 --- a/Server/src/main/java/core/game/content/activity/guild/FishingGuild.java +++ b/Server/src/main/java/core/game/content/activity/guild/FishingGuild.java @@ -1,6 +1,6 @@ package core.game.content.activity.guild; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.plugin.Initializable; import core.game.content.dialogue.DialoguePlugin; import core.game.content.global.Skillcape; @@ -23,7 +23,7 @@ public final class FishingGuild extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2025).getHandlers().put("option:open", this); + SceneryDefinition.forId(2025).getHandlers().put("option:open", this); new MasterFisherDialogue().init(); return this; } diff --git a/Server/src/main/java/core/game/content/activity/guild/HeroGuildPlugin.java b/Server/src/main/java/core/game/content/activity/guild/HeroGuildPlugin.java index 9fcf411a6..3a2b34b41 100644 --- a/Server/src/main/java/core/game/content/activity/guild/HeroGuildPlugin.java +++ b/Server/src/main/java/core/game/content/activity/guild/HeroGuildPlugin.java @@ -1,6 +1,6 @@ package core.game.content.activity.guild; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.EnchantedJewellery; import core.game.content.global.action.DoorActionHandler; import core.game.node.entity.skill.summoning.familiar.Familiar; @@ -26,8 +26,8 @@ public final class HeroGuildPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2624).getHandlers().put("option:open", this); - ObjectDefinition.forId(2625).getHandlers().put("option:open", this); + SceneryDefinition.forId(2624).getHandlers().put("option:open", this); + SceneryDefinition.forId(2625).getHandlers().put("option:open", this); PluginManager.definePlugin(new JewelleryRechargePlugin()); return this; } diff --git a/Server/src/main/java/core/game/content/activity/guild/MiningGuildPlugin.java b/Server/src/main/java/core/game/content/activity/guild/MiningGuildPlugin.java index c85061e6b..e8a1c6944 100644 --- a/Server/src/main/java/core/game/content/activity/guild/MiningGuildPlugin.java +++ b/Server/src/main/java/core/game/content/activity/guild/MiningGuildPlugin.java @@ -1,6 +1,6 @@ package core.game.content.activity.guild; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.ClimbActionHandler; import core.game.content.global.action.DoorActionHandler; import core.game.node.entity.skill.Skills; @@ -24,9 +24,9 @@ public final class MiningGuildPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2113).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(30941).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(2112).getHandlers().put("option:open", this); + SceneryDefinition.forId(2113).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(30941).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(2112).getHandlers().put("option:open", this); return this; } diff --git a/Server/src/main/java/core/game/content/activity/guild/RangingGuildPlugin.java b/Server/src/main/java/core/game/content/activity/guild/RangingGuildPlugin.java index ce1178663..9d7216344 100644 --- a/Server/src/main/java/core/game/content/activity/guild/RangingGuildPlugin.java +++ b/Server/src/main/java/core/game/content/activity/guild/RangingGuildPlugin.java @@ -2,7 +2,7 @@ package core.game.content.activity.guild; import java.util.List; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; @@ -46,10 +46,10 @@ public final class RangingGuildPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2514).getHandlers().put("option:open", this); - ObjectDefinition.forId(2511).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(2512).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(2513).getHandlers().put("option:fire-at", this); + SceneryDefinition.forId(2514).getHandlers().put("option:open", this); + SceneryDefinition.forId(2511).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(2512).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(2513).getHandlers().put("option:fire-at", this); new RangingGuildDoorman().init(); new GuardDialogue().init(); new LeatherWorkerDialogue().init(); 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 e9580550c..9f94f10f3 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 @@ -1,7 +1,7 @@ package core.game.content.activity.guild; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.dialogue.DialoguePlugin; import core.game.content.global.Skillcape; import core.game.content.global.action.ClimbActionHandler; @@ -27,12 +27,12 @@ public final class WizardGuildPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(1600).getHandlers().put("option:open", this); - ObjectDefinition.forId(1601).getHandlers().put("option:open", this); + SceneryDefinition.forId(1600).getHandlers().put("option:open", this); + SceneryDefinition.forId(1601).getHandlers().put("option:open", this); NPCDefinition.forId(462).getHandlers().put("option:teleport", this); - ObjectDefinition.forId(2154).getHandlers().put("option:open", this); - ObjectDefinition.forId(2155).getHandlers().put("option:open", this); - ObjectDefinition.forId(1722).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(2154).getHandlers().put("option:open", this); + SceneryDefinition.forId(2155).getHandlers().put("option:open", this); + SceneryDefinition.forId(1722).getHandlers().put("option:climb-up", this); new WizardDistentorDialogue().init(); new ZavisticRarveDialogue().init(); new ProfessorImblewynDialogue().init(); 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 e87909196..adaea18f0 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 @@ -1,6 +1,6 @@ package core.game.content.activity.gwd; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.plugin.Initializable; import core.game.content.dialogue.FacialExpression; import core.game.node.entity.skill.Skills; @@ -26,10 +26,10 @@ public final class GodwarsEntranceHandler extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(26340).getHandlers().put("option:tie-rope", this); - ObjectDefinition.forId(26341).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(26338).getHandlers().put("option:move", this); - ObjectDefinition.forId(26305).getHandlers().put("option:crawl-through", this); + SceneryDefinition.forId(26340).getHandlers().put("option:tie-rope", this); + SceneryDefinition.forId(26341).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(26338).getHandlers().put("option:move", this); + SceneryDefinition.forId(26305).getHandlers().put("option:crawl-through", this); return this; } 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 c5e335599..0b27e6034 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 @@ -1,6 +1,6 @@ package core.game.content.activity.gwd; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.container.impl.EquipmentContainer; import core.game.content.global.action.DoorActionHandler; @@ -331,7 +331,7 @@ public final class GodwarsMapzone extends MapZone implements Plugin { @Override public boolean pulse() { object.getDefinition().getOptions()[1] = "open"; - ObjectDefinition.getOptionHandler(object.getId(), "open").handle(player, object, "open"); + SceneryDefinition.getOptionHandler(object.getId(), "open").handle(player, object, "open"); return true; } }); 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 7467f1e89..4141ea044 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 @@ -1,7 +1,7 @@ package core.game.content.activity.magearena; import core.cache.def.impl.ItemDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.dialogue.DialogueAction; import core.game.content.global.GodType; import core.game.interaction.OptionHandler; @@ -53,11 +53,11 @@ public final class MageArenaPlugin extends OptionHandler { ItemDefinition.forId(2412).getHandlers().put("option:take", this); ItemDefinition.forId(2413).getHandlers().put("option:take", this); ItemDefinition.forId(2414).getHandlers().put("option:take", this); - ObjectDefinition.forId(2873).getHandlers().put("option:pray at", this); - ObjectDefinition.forId(2874).getHandlers().put("option:pray at", this); - ObjectDefinition.forId(2875).getHandlers().put("option:pray at", this); - ObjectDefinition.forId(2878).getHandlers().put("option:step-into", this); - ObjectDefinition.forId(2879).getHandlers().put("option:step-into", this); + SceneryDefinition.forId(2873).getHandlers().put("option:pray at", this); + SceneryDefinition.forId(2874).getHandlers().put("option:pray at", this); + SceneryDefinition.forId(2875).getHandlers().put("option:pray at", this); + SceneryDefinition.forId(2878).getHandlers().put("option:step-into", this); + SceneryDefinition.forId(2879).getHandlers().put("option:step-into", this); return this; } diff --git a/Server/src/main/java/core/game/content/activity/mta/MageTrainingArenaPlugin.java b/Server/src/main/java/core/game/content/activity/mta/MageTrainingArenaPlugin.java index 74e7d94d0..eab29ad89 100644 --- a/Server/src/main/java/core/game/content/activity/mta/MageTrainingArenaPlugin.java +++ b/Server/src/main/java/core/game/content/activity/mta/MageTrainingArenaPlugin.java @@ -2,7 +2,7 @@ package core.game.content.activity.mta; import core.cache.def.impl.ItemDefinition; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.activity.mta.impl.TelekineticZone; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -41,13 +41,13 @@ public class MageTrainingArenaPlugin extends OptionHandler { public Plugin newInstance(Object arg) throws Throwable { ItemDefinition.forId(6885).getHandlers().put("option:destroy", this); ItemDefinition.forId(6885).getHandlers().put("option:talk-to", this); - ObjectDefinition.forId(10721).getHandlers().put("option:enter", this); + SceneryDefinition.forId(10721).getHandlers().put("option:enter", this); NPCDefinition.forId(3103).getHandlers().put("option:trade-with", this); for (MTAType type : MTAType.values()) { if (type.getZone() != null) { ZoneBuilder.configure(type.getZone()); } - ObjectDefinition.forId(type.getObjectId()).getHandlers().put("option:enter", this); + SceneryDefinition.forId(type.getObjectId()).getHandlers().put("option:enter", this); } ItemDefinition.forId(TelekineticZone.STATUE).getHandlers().put("option:observe", this); ItemDefinition.forId(TelekineticZone.STATUE).getHandlers().put("option:reset", this); 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 7d4ff503b..8ee51fb65 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 @@ -143,7 +143,7 @@ public class AlchemistZone extends MTAZone { player.getDialogueInterpreter().sendDialogue("This item isn't yours to wield, it belongs to the arena!"); return true; } else if (target.getName().equals("Cupboard")) { - search(player, target.asObject()); + search(player, target.asScenery()); return true; } } 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 4706a1eb8..d1080b04c 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 @@ -140,7 +140,7 @@ public class EnchantingZone extends MTAZone { if (e instanceof Player) { Player player = e.asPlayer(); if (target.getId() >= 10799 && target.getId() <= 10802) { - Shapes.forId(target.getId()).take(player, target.asObject()); + Shapes.forId(target.getId()).take(player, target.asScenery()); return true; } if (target.getId() == 10803) { 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 3fb085f03..c9c053c83 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 @@ -135,7 +135,7 @@ public class GraveyardZone extends MTAZone { deposit(player); return true; } else if (target.getId() >= 10725 && target.getId() <= 10728) { - BoneType.forObject(target.getId()).grab(player, target.asObject()); + BoneType.forObject(target.getId()).grab(player, target.asScenery()); return true; } } 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 d69bb259e..a6f8a4092 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 @@ -3,7 +3,7 @@ package core.game.content.activity.partyroom; import java.util.ArrayList; import java.util.List; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; @@ -50,7 +50,7 @@ public final class BalloonManager extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { for (PartyBalloon balloon : PartyBalloon.values()) { - ObjectDefinition.forId(balloon.getBalloonId()).getHandlers().put("option:burst", this); + SceneryDefinition.forId(balloon.getBalloonId()).getHandlers().put("option:burst", this); } return this; } @@ -59,7 +59,7 @@ public final class BalloonManager extends OptionHandler { public boolean handle(Player player, Node node, String option) { switch (option) { case "burst": - PartyBalloon.forId(node.getId()).burst(player, node.asObject()); + PartyBalloon.forId(node.getId()).burst(player, node.asScenery()); return true; } return true; 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 bae49863e..ac0724d82 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 @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; import api.ContentAPI; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; @@ -17,7 +17,6 @@ import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; -import core.game.node.entity.player.link.RunScript; import core.game.node.item.Item; import core.game.node.object.Scenery; import core.game.node.object.SceneryBuilder; @@ -69,10 +68,10 @@ public final class PartyRoomPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(CLOSED_CHEST).getHandlers().put("option:open", this); - ObjectDefinition.forId(OPEN_CHEST).getHandlers().put("option:deposit", this); - ObjectDefinition.forId(OPEN_CHEST).getHandlers().put("option:shut", this); - ObjectDefinition.forId(LEVER).getHandlers().put("option:pull", this); + SceneryDefinition.forId(CLOSED_CHEST).getHandlers().put("option:open", this); + SceneryDefinition.forId(OPEN_CHEST).getHandlers().put("option:deposit", this); + SceneryDefinition.forId(OPEN_CHEST).getHandlers().put("option:shut", this); + SceneryDefinition.forId(LEVER).getHandlers().put("option:pull", this); PluginManager.definePlugin(new DepositInterfaceHandler()); PluginManager.definePlugin(new BalloonManager()); return this; @@ -83,7 +82,7 @@ public final class PartyRoomPlugin extends OptionHandler { switch (node.getId()) { case CLOSED_CHEST: player.animate(Animation.create(536)); - SceneryBuilder.replace(node.asObject(), node.asObject().transform(OPEN_CHEST)); + SceneryBuilder.replace(node.asScenery(), node.asScenery().transform(OPEN_CHEST)); break; case OPEN_CHEST: switch (option) { @@ -92,12 +91,12 @@ public final class PartyRoomPlugin extends OptionHandler { break; case "shut": player.animate(Animation.create(535)); - SceneryBuilder.replace(node.asObject(), node.asObject().transform(CLOSED_CHEST)); + SceneryBuilder.replace(node.asScenery(), node.asScenery().transform(CLOSED_CHEST)); break; } break; case LEVER: - handleLever(player, node.asObject()); + handleLever(player, node.asScenery()); break; } return true; 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 b6be59c0d..e79fefa3f 100644 --- a/Server/src/main/java/core/game/content/activity/pestcontrol/PCObjectHandler.java +++ b/Server/src/main/java/core/game/content/activity/pestcontrol/PCObjectHandler.java @@ -1,6 +1,6 @@ package core.game.content.activity.pestcontrol; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import rs09.game.world.GameWorld; import core.game.content.activity.ActivityManager; import core.game.interaction.OptionHandler; @@ -33,47 +33,47 @@ public final class PCObjectHandler extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { // Barricades - ObjectDefinition.forId(14227).getHandlers().put("option:repair", this); - ObjectDefinition.forId(14228).getHandlers().put("option:repair", this); - ObjectDefinition.forId(14229).getHandlers().put("option:repair", this); - ObjectDefinition.forId(14230).getHandlers().put("option:repair", this); - ObjectDefinition.forId(14231).getHandlers().put("option:repair", this); - ObjectDefinition.forId(14232).getHandlers().put("option:repair", this); + SceneryDefinition.forId(14227).getHandlers().put("option:repair", this); + SceneryDefinition.forId(14228).getHandlers().put("option:repair", this); + SceneryDefinition.forId(14229).getHandlers().put("option:repair", this); + SceneryDefinition.forId(14230).getHandlers().put("option:repair", this); + SceneryDefinition.forId(14231).getHandlers().put("option:repair", this); + SceneryDefinition.forId(14232).getHandlers().put("option:repair", this); // Gates - ObjectDefinition.forId(14233).getHandlers().put("option:open", this); - ObjectDefinition.forId(14234).getHandlers().put("option:close", this); - ObjectDefinition.forId(14235).getHandlers().put("option:open", this); - ObjectDefinition.forId(14236).getHandlers().put("option:close", this); - ObjectDefinition.forId(14237).getHandlers().put("option:open", this); - ObjectDefinition.forId(14237).getHandlers().put("option:repair", this); - ObjectDefinition.forId(14238).getHandlers().put("option:close", this); - ObjectDefinition.forId(14238).getHandlers().put("option:repair", this); - ObjectDefinition.forId(14239).getHandlers().put("option:open", this); - ObjectDefinition.forId(14239).getHandlers().put("option:repair", this); - ObjectDefinition.forId(14240).getHandlers().put("option:close", this); - ObjectDefinition.forId(14240).getHandlers().put("option:repair", this); - ObjectDefinition.forId(14241).getHandlers().put("option:open", this); - ObjectDefinition.forId(14241).getHandlers().put("option:repair", this); - ObjectDefinition.forId(14242).getHandlers().put("option:close", this); - ObjectDefinition.forId(14242).getHandlers().put("option:repair", this); - ObjectDefinition.forId(14243).getHandlers().put("option:open", this); - ObjectDefinition.forId(14243).getHandlers().put("option:repair", this); - ObjectDefinition.forId(14244).getHandlers().put("option:close", this); - ObjectDefinition.forId(14244).getHandlers().put("option:repair", this); - ObjectDefinition.forId(14245).getHandlers().put("option:open", this); - ObjectDefinition.forId(14245).getHandlers().put("option:repair", this); - ObjectDefinition.forId(14246).getHandlers().put("option:close", this); - ObjectDefinition.forId(14246).getHandlers().put("option:repair", this); - ObjectDefinition.forId(14247).getHandlers().put("option:open", this); - ObjectDefinition.forId(14247).getHandlers().put("option:repair", this); - ObjectDefinition.forId(14248).getHandlers().put("option:close", this); - ObjectDefinition.forId(14248).getHandlers().put("option:repair", this); + SceneryDefinition.forId(14233).getHandlers().put("option:open", this); + SceneryDefinition.forId(14234).getHandlers().put("option:close", this); + SceneryDefinition.forId(14235).getHandlers().put("option:open", this); + SceneryDefinition.forId(14236).getHandlers().put("option:close", this); + SceneryDefinition.forId(14237).getHandlers().put("option:open", this); + SceneryDefinition.forId(14237).getHandlers().put("option:repair", this); + SceneryDefinition.forId(14238).getHandlers().put("option:close", this); + SceneryDefinition.forId(14238).getHandlers().put("option:repair", this); + SceneryDefinition.forId(14239).getHandlers().put("option:open", this); + SceneryDefinition.forId(14239).getHandlers().put("option:repair", this); + SceneryDefinition.forId(14240).getHandlers().put("option:close", this); + SceneryDefinition.forId(14240).getHandlers().put("option:repair", this); + SceneryDefinition.forId(14241).getHandlers().put("option:open", this); + SceneryDefinition.forId(14241).getHandlers().put("option:repair", this); + SceneryDefinition.forId(14242).getHandlers().put("option:close", this); + SceneryDefinition.forId(14242).getHandlers().put("option:repair", this); + SceneryDefinition.forId(14243).getHandlers().put("option:open", this); + SceneryDefinition.forId(14243).getHandlers().put("option:repair", this); + SceneryDefinition.forId(14244).getHandlers().put("option:close", this); + SceneryDefinition.forId(14244).getHandlers().put("option:repair", this); + SceneryDefinition.forId(14245).getHandlers().put("option:open", this); + SceneryDefinition.forId(14245).getHandlers().put("option:repair", this); + SceneryDefinition.forId(14246).getHandlers().put("option:close", this); + SceneryDefinition.forId(14246).getHandlers().put("option:repair", this); + SceneryDefinition.forId(14247).getHandlers().put("option:open", this); + SceneryDefinition.forId(14247).getHandlers().put("option:repair", this); + SceneryDefinition.forId(14248).getHandlers().put("option:close", this); + SceneryDefinition.forId(14248).getHandlers().put("option:repair", this); // Towers - ObjectDefinition.forId(14296).getHandlers().put("option:climb", this); + SceneryDefinition.forId(14296).getHandlers().put("option:climb", this); // Lander crossing plank - ObjectDefinition.forId(14315).getHandlers().put("option:cross", this); - ObjectDefinition.forId(25631).getHandlers().put("option:cross", this); - ObjectDefinition.forId(25632).getHandlers().put("option:cross", this); + SceneryDefinition.forId(14315).getHandlers().put("option:cross", this); + SceneryDefinition.forId(25631).getHandlers().put("option:cross", this); + SceneryDefinition.forId(25632).getHandlers().put("option:cross", this); return this; } 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 f973f2b9f..2e351fc2c 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 @@ -5,7 +5,7 @@ import java.util.List; import core.cache.def.impl.ItemDefinition; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.plugin.Initializable; import core.game.node.entity.skill.Skills; @@ -241,7 +241,7 @@ public final class PuroPuroPlugin extends MapZone implements Plugin { @Override public Plugin newInstance(Object arg) throws Throwable { NPCDefinition.forId(6070).getHandlers().put("option:trade", this); - ObjectDefinition.forId(24991).getHandlers().put("option:enter", this); + SceneryDefinition.forId(24991).getHandlers().put("option:enter", this); ItemDefinition.forId(11273).getHandlers().put("option:toggle-view", this); ItemDefinition.forId(11258).getHandlers().put("option:butterfly-jar", this); ItemDefinition.forId(11258).getHandlers().put("option:impling-jar", this); 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 2d7448988..0749c1373 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 @@ -197,7 +197,7 @@ public class PlunderZones implements Plugin { } return true; } - PlunderObject object = target instanceof NPC ? null : new PlunderObject(target.asObject()); //PlunderObject(target.getId(),target.getLocation()); + PlunderObject object = target instanceof NPC ? null : new PlunderObject(target.asScenery()); //PlunderObject(target.getId(),target.getLocation()); PlunderObjectManager manager = player.getPlunderObjectManager(); boolean alreadyOpened = manager.openedMap.getOrDefault(object.getLocation(),false); boolean charmed = manager.charmedMap.getOrDefault(object.getLocation(),false); @@ -243,7 +243,7 @@ public class PlunderZones implements Plugin { if (!alreadyOpened && (success || charmed)) { player.getPacketDispatch().sendMessage("You successfully search the urn..."); - SceneryBuilder.replace(target.asObject(), target.asObject().transform(object.openId), 5); + SceneryBuilder.replace(target.asScenery(), target.asScenery().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..."); - SceneryBuilder.replace(target.asObject(), target.asObject().transform(object.snakeId), 5); + SceneryBuilder.replace(target.asScenery(), target.asScenery().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 b838a1ef9..e3c9e8d13 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 @@ -1,7 +1,7 @@ package core.game.content.activity.pyramidplunder; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -43,16 +43,16 @@ public final class PyramidOptionHandler extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(16484).getHandlers().put("option:search", this); - ObjectDefinition.forId(16485).getHandlers().put("option:search", this); - ObjectDefinition.forId(16487).getHandlers().put("option:search", this); - ObjectDefinition.forId(16488).getHandlers().put("option:search", this); - ObjectDefinition.forId(16490).getHandlers().put("option:search", this); - ObjectDefinition.forId(16491).getHandlers().put("option:search", this); - ObjectDefinition.forId(16493).getHandlers().put("option:search", this); - ObjectDefinition.forId(16494).getHandlers().put("option:enter", this); - ObjectDefinition.forId(16458).getHandlers().put("option:leave tomb", this); - ObjectDefinition.forId(16459).getHandlers().put("option:leave tomb", this); + SceneryDefinition.forId(16484).getHandlers().put("option:search", this); + SceneryDefinition.forId(16485).getHandlers().put("option:search", this); + SceneryDefinition.forId(16487).getHandlers().put("option:search", this); + SceneryDefinition.forId(16488).getHandlers().put("option:search", this); + SceneryDefinition.forId(16490).getHandlers().put("option:search", this); + SceneryDefinition.forId(16491).getHandlers().put("option:search", this); + SceneryDefinition.forId(16493).getHandlers().put("option:search", this); + SceneryDefinition.forId(16494).getHandlers().put("option:enter", this); + SceneryDefinition.forId(16458).getHandlers().put("option:leave tomb", this); + SceneryDefinition.forId(16459).getHandlers().put("option:leave tomb", this); NPCDefinition.forId(4476).getHandlers().put("option:start-minigame", this); NPCDefinition.forId(4476).getHandlers().put("option:talk-to",this); return null; 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 201516f32..a07972b2f 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 @@ -1,6 +1,6 @@ package core.game.content.activity.stronghold; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.component.ComponentPlugin; import core.game.content.dialogue.DialogueInterpreter; @@ -59,7 +59,7 @@ public final class StrongHoldSecurityPlugin extends MapZone implements Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(16154).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(16154).getHandlers().put("option:climb-down", this); return this; } diff --git a/Server/src/main/java/core/game/content/activity/stronghold/playersafety/PSOptionHandler.java b/Server/src/main/java/core/game/content/activity/stronghold/playersafety/PSOptionHandler.java index 760547e4f..4fdf20945 100644 --- a/Server/src/main/java/core/game/content/activity/stronghold/playersafety/PSOptionHandler.java +++ b/Server/src/main/java/core/game/content/activity/stronghold/playersafety/PSOptionHandler.java @@ -12,7 +12,7 @@ import static core.game.content.activity.stronghold.playersafety.StrongHoldOfPla import static core.game.content.activity.stronghold.playersafety.StrongHoldOfPlayerSafetyPlugin.forId; import core.cache.def.impl.ItemDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.dialogue.DialogueAction; import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; @@ -34,23 +34,23 @@ public class PSOptionHandler extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(JAIL_ENTRANCE_ID_ENTER).getHandlers().put("option:use", this); - ObjectDefinition.forId(JAIL_ENTRANCE_LEAVE).getHandlers().put("option:leave", this); - ObjectDefinition.forId(JAIL_STAIRS_UP).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(JAIL_STAIRS_DOWN).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(29732).getHandlers().put("option:open", this); - ObjectDefinition.forId(29624).getHandlers().put("option:open", this); - ObjectDefinition.forId(29728).getHandlers().put("option:enter", this); - ObjectDefinition.forId(29735).getHandlers().put("option:pull-back", this); - ObjectDefinition.forId(29623).getHandlers().put("option:use", this); - ObjectDefinition.forId(29730).getHandlers().put("option:pull", this); - ObjectDefinition.forId(29731).getHandlers().put("option:pull", this); - ObjectDefinition.forId(29577).getHandlers().put("option:open", this); - ObjectDefinition.forId(29578).getHandlers().put("option:search", this); + SceneryDefinition.forId(JAIL_ENTRANCE_ID_ENTER).getHandlers().put("option:use", this); + SceneryDefinition.forId(JAIL_ENTRANCE_LEAVE).getHandlers().put("option:leave", this); + SceneryDefinition.forId(JAIL_STAIRS_UP).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(JAIL_STAIRS_DOWN).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(29732).getHandlers().put("option:open", this); + SceneryDefinition.forId(29624).getHandlers().put("option:open", this); + SceneryDefinition.forId(29728).getHandlers().put("option:enter", this); + SceneryDefinition.forId(29735).getHandlers().put("option:pull-back", this); + SceneryDefinition.forId(29623).getHandlers().put("option:use", this); + SceneryDefinition.forId(29730).getHandlers().put("option:pull", this); + SceneryDefinition.forId(29731).getHandlers().put("option:pull", this); + SceneryDefinition.forId(29577).getHandlers().put("option:open", this); + SceneryDefinition.forId(29578).getHandlers().put("option:search", this); ItemDefinition.forId(TEST_PAPER_ITEM_ID).getHandlers().put("option:take exam", this); - ObjectDefinition.forId(29729).getHandlers().put("option:climb", this); + SceneryDefinition.forId(29729).getHandlers().put("option:climb", this); for (JailPlaques plaque : JailPlaques.values()) { - ObjectDefinition.forId(plaque.getObjectId()).getHandlers().put("option:read-plaque on", this); + SceneryDefinition.forId(plaque.getObjectId()).getHandlers().put("option:read-plaque on", this); } return this; } @@ -61,7 +61,7 @@ public class PSOptionHandler extends OptionHandler { boolean locked = config == (1 << 29) || config == (0 << 26); switch (node.getId()) { case 29577:// chest - SceneryBuilder.replace(node.asObject(), node.asObject().transform(29578), 60); + SceneryBuilder.replace(node.asScenery(), node.asScenery().transform(29578), 60); return true; case 29578: switch (option) { @@ -127,7 +127,7 @@ public class PSOptionHandler extends OptionHandler { if (!player.getSavedData().getGlobalData().hasReadPlaques()) { player.sendMessage("This door is locked."); } else { - DoorActionHandler.handleAutowalkDoor(player, node.asObject()); + DoorActionHandler.handleAutowalkDoor(player, node.asScenery()); } return true; case 29728: 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 6f871b667..3d3390a2f 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 @@ -1,7 +1,7 @@ package core.game.content.activity.wguild; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.dialogue.DialogueInterpreter; import core.game.content.dialogue.DialoguePlugin; import core.game.content.global.action.DoorActionHandler; @@ -31,8 +31,8 @@ public final class WarriorsGuild extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(15653).getHandlers().put("option:open", this); - ObjectDefinition.forId(1530).getHandlers().put("option:open", this); + SceneryDefinition.forId(15653).getHandlers().put("option:open", this); + SceneryDefinition.forId(1530).getHandlers().put("option:open", this); NPCDefinition.forId(4287).getHandlers().put("option:claim-shield", this); NPCDefinition.setOptionHandler("claim-tokens", this); PluginManager.definePlugin(new ClaimTokenDialogue()); 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 7ec7414ef..73a48d4fe 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 @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.container.impl.EquipmentContainer; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -89,7 +89,7 @@ public final class BarrelRoom extends MapZone implements Plugin { PluginManager.definePlugin(new OptionHandler() { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(15668).getHandlers().put("option:pick-up", this); + SceneryDefinition.forId(15668).getHandlers().put("option:pick-up", this); return this; } 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 e8d9945b7..9cd0f92f7 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 @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import core.cache.def.impl.ItemDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; @@ -167,7 +167,7 @@ public final class CatapultRoom extends MapZone implements Plugin { @Override public Plugin newInstance(Object arg) throws Throwable { ItemDefinition.forId(SHIELD_ID).getHandlers().put("option:wield", this); - ObjectDefinition.forId(15657).getHandlers().put("option:view", this); + SceneryDefinition.forId(15657).getHandlers().put("option:view", this); return this; } 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 a267a21c0..650069a1d 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 @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.container.impl.EquipmentContainer; import core.plugin.Initializable; import core.game.content.dialogue.DialogueInterpreter; @@ -135,8 +135,8 @@ public final class CyclopesRoom extends MapZone implements Plugin { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(15641).getHandlers().put("option:open", this); - ObjectDefinition.forId(15644).getHandlers().put("option:open", this); + SceneryDefinition.forId(15641).getHandlers().put("option:open", this); + SceneryDefinition.forId(15644).getHandlers().put("option:open", this); return this; } 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 6588c4a99..ea11ce859 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 @@ -1,6 +1,6 @@ package core.game.content.activity.wguild.dummy; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.plugin.Initializable; import core.game.node.entity.skill.Skills; @@ -97,9 +97,9 @@ public final class DummyRoom extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(15656).getHandlers().put("option:view", this); + SceneryDefinition.forId(15656).getHandlers().put("option:view", this); for (Dummy dummy : Dummy.values()) { - ObjectDefinition.forId(dummy.getObject().getId()).getHandlers().put("option:hit", this); + SceneryDefinition.forId(dummy.getObject().getId()).getHandlers().put("option:hit", this); } GameWorld.getPulser().submit(new Pulse(10) { boolean activeDummy; 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 becbf9610..205bd63d2 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 @@ -1,7 +1,7 @@ package core.game.content.activity.wguild.shot; import core.cache.def.impl.ItemDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.container.impl.EquipmentContainer; import core.plugin.Initializable; import core.game.content.dialogue.DialogueInterpreter; @@ -73,8 +73,8 @@ public final class ShotPutRoom extends DialoguePlugin { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(15664).getHandlers().put("option:throw", this); - ObjectDefinition.forId(15665).getHandlers().put("option:throw", this); + SceneryDefinition.forId(15664).getHandlers().put("option:throw", this); + SceneryDefinition.forId(15665).getHandlers().put("option:throw", this); ItemDefinition.forId(8858).getHandlers().put("option:take", this); ItemDefinition.forId(8859).getHandlers().put("option:take", this); return this; diff --git a/Server/src/main/java/core/game/content/dialogue/DairyChurnOptionPlugin.java b/Server/src/main/java/core/game/content/dialogue/DairyChurnOptionPlugin.java index 4de26e336..d4d768963 100644 --- a/Server/src/main/java/core/game/content/dialogue/DairyChurnOptionPlugin.java +++ b/Server/src/main/java/core/game/content/dialogue/DairyChurnOptionPlugin.java @@ -1,6 +1,6 @@ package core.game.content.dialogue; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -17,11 +17,11 @@ public final class DairyChurnOptionPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(10093).getHandlers().put("option:churn", this); - ObjectDefinition.forId(10094).getHandlers().put("option:churn", this); - ObjectDefinition.forId(25720).getHandlers().put("option:churn", this); - ObjectDefinition.forId(34800).getHandlers().put("option:churn", this); - ObjectDefinition.forId(35931).getHandlers().put("option:churn", this); + SceneryDefinition.forId(10093).getHandlers().put("option:churn", this); + SceneryDefinition.forId(10094).getHandlers().put("option:churn", this); + SceneryDefinition.forId(25720).getHandlers().put("option:churn", this); + SceneryDefinition.forId(34800).getHandlers().put("option:churn", this); + SceneryDefinition.forId(35931).getHandlers().put("option:churn", this); return this; } diff --git a/Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardHandler.java b/Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardHandler.java index b51105cd9..d2c011b97 100644 --- a/Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardHandler.java +++ b/Server/src/main/java/core/game/content/global/worldevents/shootingstar/ScoreboardHandler.java @@ -1,6 +1,6 @@ package core.game.content.global.worldevents.shootingstar; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -24,7 +24,7 @@ public class ScoreboardHandler extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(38669).getHandlers().put("option:read",this); + SceneryDefinition.forId(38669).getHandlers().put("option:read",this); return this; } diff --git a/Server/src/main/java/core/game/content/global/worldevents/shootingstar/StarChartPlugin.java b/Server/src/main/java/core/game/content/global/worldevents/shootingstar/StarChartPlugin.java index ac57c4a5b..b5373e3dd 100644 --- a/Server/src/main/java/core/game/content/global/worldevents/shootingstar/StarChartPlugin.java +++ b/Server/src/main/java/core/game/content/global/worldevents/shootingstar/StarChartPlugin.java @@ -1,6 +1,6 @@ package core.game.content.global.worldevents.shootingstar; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; @@ -39,12 +39,12 @@ public class StarChartPlugin extends ComponentPlugin { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(25582).getHandlers().put("option:look-at",this); - ObjectDefinition.forId(25581).getHandlers().put("option:look-at",this); - ObjectDefinition.forId(25580).getHandlers().put("option:look-at",this); - ObjectDefinition.forId(25583).getHandlers().put("option:look-at",this); - ObjectDefinition.forId(25579).getHandlers().put("option:look-at",this); - ObjectDefinition.forId(25578).getHandlers().put("option:look-at",this); + SceneryDefinition.forId(25582).getHandlers().put("option:look-at",this); + SceneryDefinition.forId(25581).getHandlers().put("option:look-at",this); + SceneryDefinition.forId(25580).getHandlers().put("option:look-at",this); + SceneryDefinition.forId(25583).getHandlers().put("option:look-at",this); + SceneryDefinition.forId(25579).getHandlers().put("option:look-at",this); + SceneryDefinition.forId(25578).getHandlers().put("option:look-at",this); return this; } } 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 042d302eb..c4378fa17 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 @@ -3,7 +3,7 @@ import java.util.List; import core.cache.def.impl.ItemDefinition; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; @@ -240,10 +240,10 @@ public class ChristmasEvent extends HolidayEvent { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(28296).getHandlers().put("option:collect", this); + SceneryDefinition.forId(28296).getHandlers().put("option:collect", this); ItemDefinition.forId(BALL_OF_SNOW.getId()).getHandlers().put("option:build", this); for (int i = 28266; i < 28296; i++) { - ObjectDefinition.forId(i).getHandlers().put("option:add-to", this); + SceneryDefinition.forId(i).getHandlers().put("option:add-to", this); } ItemDefinition.forId(SNOWGLOBE.getId()).getHandlers().put("option:shake", this); return this; @@ -276,7 +276,7 @@ public class ChristmasEvent extends HolidayEvent { } break; case "add-to": - if (node.asObject().getId() == 28295) { + if (node.asScenery().getId() == 28295) { player.sendMessage("You need a " + (player.getZoneMonitor().isInZone(getName()) ? "weapon or hat " : "hat") + " to complete this snowman."); return true; } @@ -291,9 +291,9 @@ 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)); - SceneryBuilder.replace(node.asObject(), node.asObject().transform(node.asObject().getId() + 1)); - if (node.asObject().getId() + 1 >= 28295) { + player.animate(Animation.create(node.asScenery().getId() <= 28278 ? 7532 : 7533)); + SceneryBuilder.replace(node.asScenery(), node.asScenery().transform(node.asScenery().getId() + 1)); + if (node.asScenery().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."); } else { @@ -433,7 +433,7 @@ public class ChristmasEvent extends HolidayEvent { id = 6748; } final int npcId = id; - SceneryBuilder.remove(event.getUsedWith().asObject()); + SceneryBuilder.remove(event.getUsedWith().asScenery()); 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 d45f60254..e97188198 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 @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import rs09.ServerConstants; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.plugin.Initializable; import core.game.content.dialogue.DialogueAction; @@ -223,10 +223,10 @@ public class DeathMansionEvent extends HolidayEvent { player.teleport(PORTAL_LOCATION); return true; case 27276: - handlePassageWay(player, target.asObject()); + handlePassageWay(player, target.asScenery()); return true; case 27266: - passSpiderWeb(player, target.asObject()); + passSpiderWeb(player, target.asScenery()); return true; case 27242: case 27243: @@ -304,7 +304,7 @@ public class DeathMansionEvent extends HolidayEvent { @Override public void handle(Player player, int buttonId) { if (buttonId == 2) { - item.search(player, target.asObject()); + item.search(player, target.asScenery()); } else { player.animate(Animation.create(7271)); player.getDialogueInterpreter().sendDialogues(player, FacialExpression.SUSPICIOUS, "Arrghhh! My eyes!"); @@ -318,9 +318,9 @@ public class DeathMansionEvent extends HolidayEvent { @Override public void handle(Player player, int buttonId) { if (buttonId == 1) { - item.search(player, target.asObject()); + item.search(player, target.asScenery()); } else { - player.getPacketDispatch().sendSceneryAnimation(target.asObject(), Animation.create(7278)); + player.getPacketDispatch().sendSceneryAnimation(target.asScenery(), Animation.create(7278)); player.animate(Animation.create(7272)); player.getDialogueInterpreter().sendDialogues(player, FacialExpression.DISGUSTED, "That wasn't such a good idea."); } @@ -328,7 +328,7 @@ public class DeathMansionEvent extends HolidayEvent { }); return true; } - item.search(player, target.asObject()); + item.search(player, target.asScenery()); return true; case 27278: final Location end = target.getLocation().equals(new Location(1633, 4824, 0)) ? new Location(1630, 4824, 0) : target.getLocation().equals(new Location(1627, 4819, 0)) ? new Location(1627, 4819, 0) : target.getLocation().equals(new Location(1630, 4819, 0)) ? new Location(1627, 4819, 0) : target.getLocation().equals(1624, 4822, 0) ? new Location(1624, 4828, 0) : new Location(1637, 4820, 0); @@ -359,7 +359,7 @@ public class DeathMansionEvent extends HolidayEvent { }); } - player.getPacketDispatch().sendSceneryAnimation(target.asObject(), Animation.create(7296)); + player.getPacketDispatch().sendSceneryAnimation(target.asScenery(), Animation.create(7296)); AgilityHandler.walk(player, -1, player.getLocation(), target.getLocation(), null, 0.0, null); GameWorld.getPulser().submit(new Pulse(1, player) { @@ -749,7 +749,7 @@ public class DeathMansionEvent extends HolidayEvent { if (item == null || event.getUsedItem().getId() != item.getItem().getId()) { return false; } - item.useWithEvent(player, event.getUsedWith().asObject()); + item.useWithEvent(player, event.getUsedWith().asScenery()); return true; } @@ -1478,7 +1478,7 @@ public class DeathMansionEvent extends HolidayEvent { @Override public Plugin newInstance(Object arg) throws Throwable { PluginManager.definePlugin(new DarkPortalDialogue()); - ObjectDefinition.forId(DEATH_PORTAL).getHandlers().put("option:enter", this); + SceneryDefinition.forId(DEATH_PORTAL).getHandlers().put("option:enter", this); return this; } 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 a07c9fe25..708aaaeb0 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 @@ -1,7 +1,7 @@ package core.game.content.quest.free.blackknightsfortress; import core.cache.def.impl.ItemDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.ClimbActionHandler; import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; @@ -52,15 +52,15 @@ public final class BKFortressPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { ItemDefinition.forId(9589).getHandlers().put("option:read", this); - ObjectDefinition.forId(74).getHandlers().put("option:open", this); - ObjectDefinition.forId(73).getHandlers().put("option:open", this); - ObjectDefinition.forId(2337).getHandlers().put("option:open", this); - ObjectDefinition.forId(2338).getHandlers().put("option:open", this); - ObjectDefinition.forId(2341).getHandlers().put("option:push", this); - ObjectDefinition.forId(17148).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(17149).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(17160).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(2342).getHandlers().put("option:listen-at", this); + SceneryDefinition.forId(74).getHandlers().put("option:open", this); + SceneryDefinition.forId(73).getHandlers().put("option:open", this); + SceneryDefinition.forId(2337).getHandlers().put("option:open", this); + SceneryDefinition.forId(2338).getHandlers().put("option:open", this); + SceneryDefinition.forId(2341).getHandlers().put("option:push", this); + SceneryDefinition.forId(17148).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(17149).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(17160).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(2342).getHandlers().put("option:listen-at", this); return this; } 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 2ed331ab5..315252acd 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 @@ -1,7 +1,7 @@ package core.game.content.quest.free.demonslayer; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -34,11 +34,11 @@ public final class DemonSlayerPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(881).getHandlers().put("option:open", this); - ObjectDefinition.forId(882).getHandlers().put("option:close", this); - ObjectDefinition.forId(882).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(DRAIN_ID).getHandlers().put("option:search", this); - ObjectDefinition.forId(17429).getHandlers().put("option:take", this); + SceneryDefinition.forId(881).getHandlers().put("option:open", this); + SceneryDefinition.forId(882).getHandlers().put("option:close", this); + SceneryDefinition.forId(882).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(DRAIN_ID).getHandlers().put("option:search", this); + SceneryDefinition.forId(17429).getHandlers().put("option:take", this); NPCDefinition.forId(DemonSlayerCutscene.DELRITH).getHandlers().put("option:attack", this); NPCDefinition.forId(DemonSlayerCutscene.WEAKENED_DELRITH).getHandlers().put("option:banish", this); return this; 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 a04b1685f..681d87eca 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 @@ -2,7 +2,7 @@ package core.game.content.quest.free.dragonslayer; import core.cache.def.impl.ItemDefinition; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.ClimbActionHandler; import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; @@ -40,63 +40,63 @@ public final class DragonSlayerPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(25115).getHandlers().put("option:open", this);// magic + SceneryDefinition.forId(25115).getHandlers().put("option:open", this);// magic // door. NPCDefinition.forId(747).getHandlers().put("option:trade", this);// oziach. - ObjectDefinition.forId(2595).getHandlers().put("option:open", this);// maze + SceneryDefinition.forId(2595).getHandlers().put("option:open", this);// maze // main // door. // maze first floor. - ObjectDefinition.forId(32968).getHandlers().put("option:open", this); - ObjectDefinition.forId(2602).getHandlers().put("option:open", this); - ObjectDefinition.forId(2596).getHandlers().put("option:open", this);// red + SceneryDefinition.forId(32968).getHandlers().put("option:open", this); + SceneryDefinition.forId(2602).getHandlers().put("option:open", this); + SceneryDefinition.forId(2596).getHandlers().put("option:open", this);// red // door. - ObjectDefinition.forId(1752).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(25038).getHandlers().put("option:climb-up", this);// trapdoor + SceneryDefinition.forId(1752).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(25038).getHandlers().put("option:climb-up", this);// trapdoor // ladder - ObjectDefinition.forId(25214).getHandlers().put("option:open", this);// trapdoor - ObjectDefinition.forId(1746).getHandlers().put("option:climb-down", this);// ladder - ObjectDefinition.forId(2605).getHandlers().put("option:climb-down", this);// ladder + SceneryDefinition.forId(25214).getHandlers().put("option:open", this);// trapdoor + SceneryDefinition.forId(1746).getHandlers().put("option:climb-down", this);// ladder + SceneryDefinition.forId(2605).getHandlers().put("option:climb-down", this);// ladder // maze second floor. - ObjectDefinition.forId(2597).getHandlers().put("option:open", this);// orange + SceneryDefinition.forId(2597).getHandlers().put("option:open", this);// orange // door. - ObjectDefinition.forId(1747).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(25045).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(1747).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(25045).getHandlers().put("option:climb-down", this); // maze third floor - ObjectDefinition.forId(2598).getHandlers().put("option:open", this);// yellow + SceneryDefinition.forId(2598).getHandlers().put("option:open", this);// yellow // door. // basement floor - ObjectDefinition.forId(2599).getHandlers().put("option:open", this);// blue + SceneryDefinition.forId(2599).getHandlers().put("option:open", this);// blue // door. - ObjectDefinition.forId(2600).getHandlers().put("option:open", this);// purple + SceneryDefinition.forId(2600).getHandlers().put("option:open", this);// purple // door. - ObjectDefinition.forId(2601).getHandlers().put("option:open", this);// green + SceneryDefinition.forId(2601).getHandlers().put("option:open", this);// green // door. - ObjectDefinition.forId(2603).getHandlers().put("option:open", this);// closed + SceneryDefinition.forId(2603).getHandlers().put("option:open", this);// closed // chest. - ObjectDefinition.forId(2604).getHandlers().put("option:search", this);// search + SceneryDefinition.forId(2604).getHandlers().put("option:search", this);// search // chest. - ObjectDefinition.forId(2604).getHandlers().put("option:close", this);// search + SceneryDefinition.forId(2604).getHandlers().put("option:close", this);// search // chest. - ObjectDefinition.forId(1755).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(1755).getHandlers().put("option:climb-up", this); // map parts ItemDefinition.forId(DragonSlayer.MAZE_PIECE.getId()).getHandlers().put("option:study", this); ItemDefinition.forId(DragonSlayer.MAGIC_PIECE.getId()).getHandlers().put("option:study", this); ItemDefinition.forId(DragonSlayer.WORMBRAIN_PIECE.getId()).getHandlers().put("option:study", this); ItemDefinition.forId(DragonSlayer.CRANDOR_MAP.getId()).getHandlers().put("option:study", this); // dwarv mine - ObjectDefinition.forId(2587).getHandlers().put("option:open", this); + SceneryDefinition.forId(2587).getHandlers().put("option:open", this); NPCDefinition.forId(745).getHandlers().put("option:talk-to", this); // lady lumby - ObjectDefinition.forId(25036).getHandlers().put("option:repair", this); - ObjectDefinition.forId(2589).getHandlers().put("option:repair", this); + SceneryDefinition.forId(25036).getHandlers().put("option:repair", this); + SceneryDefinition.forId(2589).getHandlers().put("option:repair", this); // crandor - ObjectDefinition.forId(25154).getHandlers().put("option:enter", this); - ObjectDefinition.forId(2606).getHandlers().put("option:open", this); - ObjectDefinition.forId(25213).getHandlers().put("option:climb", this); - ObjectDefinition.forId(25161).getHandlers().put("option:climb-over", this); + SceneryDefinition.forId(25154).getHandlers().put("option:enter", this); + SceneryDefinition.forId(2606).getHandlers().put("option:open", this); + SceneryDefinition.forId(25213).getHandlers().put("option:climb", this); + SceneryDefinition.forId(25161).getHandlers().put("option:climb-over", this); NPCDefinition.forId(742).getHandlers().put("option:attack", this); NPCDefinition.forId(745).getHandlers().put("option:attack", this); // reward items @@ -106,9 +106,9 @@ public final class DragonSlayerPlugin extends OptionHandler { ItemDefinition.forId(2669).getHandlers().put("option:wear", this); ItemDefinition.forId(2661).getHandlers().put("option:wear", this); // guild - ObjectDefinition.forId(24357).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(10558).getHandlers().put("option:open", this); - ObjectDefinition.forId(10560).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(24357).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(10558).getHandlers().put("option:open", this); + SceneryDefinition.forId(10560).getHandlers().put("option:climb-up", this); return this; } 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 0cff85767..7b9e93bb6 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 @@ -1,7 +1,7 @@ package core.game.content.quest.free.goblindiplomacy; import core.cache.def.impl.ItemDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.NodeUsageEvent; import core.game.interaction.OptionHandler; import core.game.interaction.UseWithHandler; @@ -37,7 +37,7 @@ public final class GoblinDiplomacyPlugin extends OptionHandler { public Plugin newInstance(Object arg) throws Throwable { ItemDefinition.forId(288).getHandlers().put("option:wear", this); for (int object : CRATES) { - ObjectDefinition.forId(object).getHandlers().put("option:search", this); + SceneryDefinition.forId(object).getHandlers().put("option:search", this); } for (GoblinMailPlugin.GoblinMail mail : GoblinMailPlugin.GoblinMail.values()) { ItemDefinition.forId(mail.getProduct().getId()).getHandlers().put("option:wear", this); 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 16b7addfd..10e7e3638 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 @@ -1,7 +1,7 @@ package core.game.content.quest.free.piratestreasure; import core.cache.def.impl.ItemDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.DigAction; import core.game.content.global.action.DigSpadeHandler; import core.game.interaction.OptionHandler; @@ -30,7 +30,7 @@ public final class PiratesTreasurePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2079).getHandlers().put("option:open", this);// blue + SceneryDefinition.forId(2079).getHandlers().put("option:open", this);// blue // moon // chest(pirates // treasure 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 a1f17d99e..5691ae5d4 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 @@ -1,7 +1,7 @@ package core.game.content.quest.free.princealirescue; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -24,9 +24,9 @@ public class PrinceAliRescuePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2881).getHandlers().put("option:open", this);// prison + SceneryDefinition.forId(2881).getHandlers().put("option:open", this);// prison // door. - ObjectDefinition.forId(4639).getHandlers().put("option:open", this);// door + SceneryDefinition.forId(4639).getHandlers().put("option:open", this);// door // to // jail NPCDefinition.forId(925).getHandlers().put("option:talk-to", this); 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 b9007794f..501cac1b1 100644 --- a/Server/src/main/java/core/game/content/quest/free/shieldofarrav/ShieldArravPlugin.java +++ b/Server/src/main/java/core/game/content/quest/free/shieldofarrav/ShieldArravPlugin.java @@ -1,7 +1,7 @@ package core.game.content.quest.free.shieldofarrav; import core.cache.def.impl.ItemDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.content.global.action.ClimbActionHandler; import core.game.content.global.action.DoorActionHandler; @@ -38,19 +38,19 @@ public final class ShieldArravPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2402).getHandlers().put("option:search", this); - ObjectDefinition.forId(2397).getHandlers().put("option:open", this); - ObjectDefinition.forId(2399).getHandlers().put("option:open", this); - ObjectDefinition.forId(2398).getHandlers().put("option:open", this); + SceneryDefinition.forId(2402).getHandlers().put("option:search", this); + SceneryDefinition.forId(2397).getHandlers().put("option:open", this); + SceneryDefinition.forId(2399).getHandlers().put("option:open", this); + SceneryDefinition.forId(2398).getHandlers().put("option:open", this); ItemDefinition.forId(761).getHandlers().put("option:read", this); - ObjectDefinition.forId(2403).getHandlers().put("option:open", this); - ObjectDefinition.forId(2404).getHandlers().put("option:close", this); - ObjectDefinition.forId(2404).getHandlers().put("option:search", this); + SceneryDefinition.forId(2403).getHandlers().put("option:open", this); + SceneryDefinition.forId(2404).getHandlers().put("option:close", this); + SceneryDefinition.forId(2404).getHandlers().put("option:search", this); ItemDefinition.forId(767).getHandlers().put("option:take", this); - ObjectDefinition.forId(24356).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(2400).getHandlers().put("option:open", this); - ObjectDefinition.forId(2401).getHandlers().put("option:search", this); - ObjectDefinition.forId(2401).getHandlers().put("option:shut", this); + SceneryDefinition.forId(24356).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(2400).getHandlers().put("option:open", this); + SceneryDefinition.forId(2401).getHandlers().put("option:search", this); + SceneryDefinition.forId(2401).getHandlers().put("option:shut", this); ItemDefinition.forId(ShieldofArrav.PHOENIX_CERTIFICATE.getId()).getHandlers().put("option:read", this); ItemDefinition.forId(ShieldofArrav.BLACKARM_CERTIFICATE.getId()).getHandlers().put("option:read", this); ItemDefinition.forId(769).getHandlers().put("option:read", this); 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 e0e01904a..2b2c99f1e 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 @@ -1,6 +1,6 @@ package core.game.content.quest.free.therestlessghost; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.Entity; @@ -61,7 +61,7 @@ public final class RestlessGhostPlugin extends OptionHandler { public Plugin newInstance(Object arg) throws Throwable { for (int coffin : COFFIN_IDS) { for (String option : OPTIONS) { - ObjectDefinition.forId(coffin).getHandlers().put("option:" + option, this); + SceneryDefinition.forId(coffin).getHandlers().put("option:" + option, this); } } new RestlessGhostNPC().newInstance(arg); diff --git a/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AnimalMagnetismPlugin.java b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AnimalMagnetismPlugin.java index 2031fb6c5..02bd09e84 100644 --- a/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AnimalMagnetismPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/animalmagnetism/AnimalMagnetismPlugin.java @@ -5,7 +5,7 @@ import java.util.Map; import core.cache.def.impl.ItemDefinition; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; @@ -48,7 +48,7 @@ public final class AnimalMagnetismPlugin extends OptionHandler { ItemDefinition.forId(4251).getHandlers().put("option:drop", this); ItemDefinition.forId(4252).getHandlers().put("option:drop", this); NPCDefinition.forId(5198).getHandlers().put("option:trade", this); - ObjectDefinition.forId(5167).getHandlers().put("option:push", this); + SceneryDefinition.forId(5167).getHandlers().put("option:push", this); AnimalMagnetism.RESEARCH_NOTES.getDefinition().getHandlers().put("option:translate", this); ItemDefinition.forId(AnimalMagnetism.CRONE_AMULET.getId()).getHandlers().put("option:wear", this); ItemDefinition.forId(AnimalMagnetism.CRONE_AMULET.getId()).getHandlers().put("option:equip", this); diff --git a/Server/src/main/java/core/game/content/quest/members/dwarfcannon/DwarfCannonPlugin.java b/Server/src/main/java/core/game/content/quest/members/dwarfcannon/DwarfCannonPlugin.java index dbece0bd3..6a9646129 100644 --- a/Server/src/main/java/core/game/content/quest/members/dwarfcannon/DwarfCannonPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/dwarfcannon/DwarfCannonPlugin.java @@ -1,6 +1,6 @@ package core.game.content.quest.members.dwarfcannon; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; @@ -37,16 +37,16 @@ public class DwarfCannonPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(3).getHandlers().put("option:open", this); - ObjectDefinition.forId(5).getHandlers().put("option:inspect", this); - ObjectDefinition.forId(2).getHandlers().put("option:enter", this); - ObjectDefinition.forId(13).getHandlers().put("option:climb-over", this); - ObjectDefinition.forId(15601).getHandlers().put("option:inspect", this); + SceneryDefinition.forId(3).getHandlers().put("option:open", this); + SceneryDefinition.forId(5).getHandlers().put("option:inspect", this); + SceneryDefinition.forId(2).getHandlers().put("option:enter", this); + SceneryDefinition.forId(13).getHandlers().put("option:climb-over", this); + SceneryDefinition.forId(15601).getHandlers().put("option:inspect", this); for (int i = 15; i < 21; i++) { - ObjectDefinition.forId(i).getHandlers().put("option:inspect", this); + SceneryDefinition.forId(i).getHandlers().put("option:inspect", this); } - ObjectDefinition.forId(15596).getHandlers().put("option:take", this); - ObjectDefinition.forId(1).getHandlers().put("option:search", this); + SceneryDefinition.forId(15596).getHandlers().put("option:take", this); + SceneryDefinition.forId(1).getHandlers().put("option:search", this); UseWithHandler.addHandler(5, UseWithHandler.OBJECT_TYPE, new UseWithHandler(1) { @Override @@ -85,13 +85,13 @@ public class DwarfCannonPlugin extends OptionHandler { switch (node.getId()) { case 3: if (!node.getLocation().equals(new Location(3015, 3453, 0))) { - return DoorActionHandler.handleAutowalkDoor(player, node.asObject()); + return DoorActionHandler.handleAutowalkDoor(player, node.asScenery()); } if (quest.getStage(player) < 70) { player.sendMessage("The door is locked."); break; } - return DoorActionHandler.handleAutowalkDoor(player, node.asObject()); + return DoorActionHandler.handleAutowalkDoor(player, node.asScenery()); case 5: if (quest.getStage(player) == 50) { player.getDialogueInterpreter().sendDialogues(player, null, "I guess I'd better fix it with the toolkit I was given."); @@ -110,7 +110,7 @@ public class DwarfCannonPlugin extends OptionHandler { ClimbActionHandler.climb(player, new Animation(828), new Location(2623, 3391, 0)); break; case 15601: - if (node.getId() != node.asObject().getWrapper().getId()) { + if (node.getId() != node.asScenery().getWrapper().getId()) { player.getDialogueInterpreter().sendDialogues(player, null, "I think I've already fixed this one."); } return true; @@ -245,7 +245,7 @@ public class DwarfCannonPlugin extends OptionHandler { @Override public Location getDestination(Node node, Node n) { if (n.getId() == 3) { - return DoorActionHandler.getDestination(node.asPlayer(), n.asObject()); + return DoorActionHandler.getDestination(node.asPlayer(), n.asScenery()); } else if (n.getId() == 15601) { if (n.getLocation().equals(new Location(2565, 3456, 0))) { return new Location(2566, 3456, 0); diff --git a/Server/src/main/java/core/game/content/quest/members/fishingcontest/FenceInteraction.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/FenceInteraction.java index 5f1f0e2c8..649a16186 100644 --- a/Server/src/main/java/core/game/content/quest/members/fishingcontest/FenceInteraction.java +++ b/Server/src/main/java/core/game/content/quest/members/fishingcontest/FenceInteraction.java @@ -23,7 +23,7 @@ public class FenceInteraction extends PluginInteraction { @Override public boolean handle(Player player, Node node) { - player.getPulseManager().run(new MovementPulse(player, node.asObject().getLocation().transform(player.getLocation().getX() == node.getLocation().getX() ? 0 : -1, 0, 0)) { + player.getPulseManager().run(new MovementPulse(player, node.asScenery().getLocation().transform(player.getLocation().getX() == node.getLocation().getX() ? 0 : -1, 0, 0)) { @Override public boolean pulse() { GameWorld.getPulser().submit(new SqueezePulse(player)); 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 488be78dc..645bd4467 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 @@ -27,7 +27,7 @@ public class GarlicPipeInteraction extends PluginInteraction { public boolean handle(Player player, NodeUsageEvent event) { System.out.println("Trying to handle it"); if(event.getUsed() instanceof Item && event.getUsedWith() instanceof Scenery){ - Scenery usedWith = event.getUsedWith().asObject(); + Scenery usedWith = event.getUsedWith().asScenery(); 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){ @@ -49,7 +49,7 @@ public class GarlicPipeInteraction extends PluginInteraction { @Override public boolean handle(Player player, Node node) { if(node instanceof Scenery){ - Scenery object = node.asObject(); + Scenery object = node.asScenery(); 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/GateInteraction.java b/Server/src/main/java/core/game/content/quest/members/fishingcontest/GateInteraction.java index 76638f9c0..08f706856 100644 --- a/Server/src/main/java/core/game/content/quest/members/fishingcontest/GateInteraction.java +++ b/Server/src/main/java/core/game/content/quest/members/fishingcontest/GateInteraction.java @@ -27,7 +27,7 @@ public class GateInteraction extends PluginInteraction { public boolean handleGate(Player player, Node node){ if(!player.getAttribute("fishing_contest:pass-shown",false) || player.getQuestRepository().getStage("Fishing Contest") < 10) { - player.getPulseManager().run(new MovementPulse(player, node.asObject().getLocation().transform(1, 0, 0)) { + player.getPulseManager().run(new MovementPulse(player, node.asScenery().getLocation().transform(1, 0, 0)) { @Override public boolean pulse() { if(player.getQuestRepository().getStage("Fishing Contest") >= 10){ @@ -49,7 +49,7 @@ public class GateInteraction extends PluginInteraction { public boolean handleGruborGate(Player player, Node node){ if(node.getLocation().withinDistance(Location.create(2650, 3469, 0),4)) { - player.getPulseManager().run(new MovementPulse(player, node.asObject().getLocation().transform(0,-1 , 0)) { + player.getPulseManager().run(new MovementPulse(player, node.asScenery().getLocation().transform(0,-1 , 0)) { @Override public boolean pulse() { player.getDialogueInterpreter().sendDialogue("This gate is locked."); 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 65435727e..4926b1fec 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 @@ -15,7 +15,7 @@ public class StairInteraction extends PluginInteraction { @Override public boolean handle(Player player, Node node) { if(!player.getQuestRepository().isComplete("Fishing Contest")) { - Scenery object = node.asObject(); + Scenery object = node.asScenery(); switch (object.getId()) { case 57: handleStairs(player,232,object); 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 6ad525a61..e047d096f 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 @@ -23,9 +23,9 @@ public class VineInteraction extends PluginInteraction { @Override public boolean handle(Player player, Node node) { if(node instanceof Scenery){ - Scenery obj = node.asObject(); + Scenery obj = node.asScenery(); 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)) { + player.getPulseManager().run(new MovementPulse(player, node.asScenery().getLocation().transform(0, 0, 0)) { @Override public boolean pulse() { if(player.getInventory().containsItem(FishingContest.SPADE)) { 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 f452ff66b..2b54ff4c5 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 @@ -1,6 +1,6 @@ package core.game.content.quest.members.junglepotion; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.dialogue.DialogueInterpreter; import core.game.content.dialogue.DialoguePlugin; import core.game.interaction.OptionHandler; @@ -22,10 +22,10 @@ public final class JunglePotionPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2584).getHandlers().put("option:search", this); - ObjectDefinition.forId(2585).getHandlers().put("option:climb", this); + SceneryDefinition.forId(2584).getHandlers().put("option:search", this); + SceneryDefinition.forId(2585).getHandlers().put("option:climb", this); for (JungleObjective s : JungleObjective.values()) { - ObjectDefinition.forId(s.getObjectId()).getHandlers().put("option:search", this); + SceneryDefinition.forId(s.getObjectId()).getHandlers().put("option:search", this); } SceneryBuilder.add(new Scenery(2585, Location.create(2828, 9522, 0), 8, 0)); return this; 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 c4213a1a0..543372b47 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 @@ -1,7 +1,7 @@ package core.game.content.quest.members.lostcity; import core.cache.def.impl.ItemDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.dialogue.FacialExpression; import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; @@ -42,9 +42,9 @@ public final class LostCityPlugin extends OptionHandler { ItemDefinition.forId(1215).getHandlers().put("option:wield", this); ItemDefinition.forId(1231).getHandlers().put("option:wield", this); ItemDefinition.forId(5680).getHandlers().put("option:wield", this); - ObjectDefinition.forId(2409).getHandlers().put("option:chop", this); - ObjectDefinition.forId(2406).getHandlers().put("option:open", this); - ObjectDefinition.forId(1292).getHandlers().put("option:chop down", this); + SceneryDefinition.forId(2409).getHandlers().put("option:chop", this); + SceneryDefinition.forId(2406).getHandlers().put("option:open", this); + SceneryDefinition.forId(1292).getHandlers().put("option:chop down", this); return this; } 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 3c189463c..8cf7ffd26 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 @@ -1,7 +1,7 @@ package core.game.content.quest.members.merlinscrystal; import core.cache.def.impl.ItemDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.activity.ActivityManager; import core.game.content.activity.CutscenePlugin; import core.game.content.dialogue.DialogueInterpreter; @@ -61,14 +61,14 @@ public final class MerlinCrystalPlugin extends OptionHandler { public Plugin newInstance(Object arg) throws Throwable { PluginManager.definePlugin(new MerlinCrystalDialogue()); PluginManager.definePlugin(new MerlinCrystalItemHandler()); - ObjectDefinition.forId(63).getHandlers().put("option:hide-in", this); - ObjectDefinition.forId(40026).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(72).getHandlers().put("option:open", this); - ObjectDefinition.forId(71).getHandlers().put("option:open", this); - ObjectDefinition.forId(71).getHandlers().put("option:knock-at", this); - ObjectDefinition.forId(72).getHandlers().put("option:knock-at", this); + SceneryDefinition.forId(63).getHandlers().put("option:hide-in", this); + SceneryDefinition.forId(40026).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(72).getHandlers().put("option:open", this); + SceneryDefinition.forId(71).getHandlers().put("option:open", this); + SceneryDefinition.forId(71).getHandlers().put("option:knock-at", this); + SceneryDefinition.forId(72).getHandlers().put("option:knock-at", this); ItemDefinition.forId(530).getHandlers().put("option:drop", this); - ObjectDefinition.forId(62).getHandlers().put("option:smash", this); + SceneryDefinition.forId(62).getHandlers().put("option:smash", this); return this; } @@ -82,7 +82,7 @@ public final class MerlinCrystalPlugin extends OptionHandler { player.sendMessages("You attempt to smash the crystal...", "... and it shatters under the force of Excalibur!"); player.animate(Animation.create(390)); player.lock(); - SceneryBuilder.remove(node.asObject(), 60); + SceneryBuilder.remove(node.asScenery(), 60); quest.setStage(player, 99); final NPC merlin = NPC.create(249, Location.create(2767, 3493, 2)); merlin.init(); @@ -125,7 +125,7 @@ public final class MerlinCrystalPlugin extends OptionHandler { break; } } else { - DoorActionHandler.handleAutowalkDoor(player, node.asObject()); + DoorActionHandler.handleAutowalkDoor(player, node.asScenery()); } return true; case 530: diff --git a/Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElvesObstacles.java b/Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElvesObstacles.java index 8cc28ef43..18a62246f 100644 --- a/Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElvesObstacles.java +++ b/Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElvesObstacles.java @@ -1,6 +1,6 @@ package core.game.content.quest.members.rovingelves; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.node.entity.skill.agility.AgilityHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -21,14 +21,14 @@ public final class RovingElvesObstacles extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(3999).getHandlers().put("option:enter", this); - ObjectDefinition.forId(3939).getHandlers().put("option:enter", this); - ObjectDefinition.forId(3998).getHandlers().put("option:enter", this); - ObjectDefinition.forId(3938).getHandlers().put("option:enter", this); - ObjectDefinition.forId(3937).getHandlers().put("option:enter", this); - ObjectDefinition.forId(3924).getHandlers().put("option:jump", this); - ObjectDefinition.forId(3925).getHandlers().put("option:jump", this); - ObjectDefinition.forId(8742).getHandlers().put("option:pass", this); + SceneryDefinition.forId(3999).getHandlers().put("option:enter", this); + SceneryDefinition.forId(3939).getHandlers().put("option:enter", this); + SceneryDefinition.forId(3998).getHandlers().put("option:enter", this); + SceneryDefinition.forId(3938).getHandlers().put("option:enter", this); + SceneryDefinition.forId(3937).getHandlers().put("option:enter", this); + SceneryDefinition.forId(3924).getHandlers().put("option:jump", this); + SceneryDefinition.forId(3925).getHandlers().put("option:jump", this); + SceneryDefinition.forId(8742).getHandlers().put("option:pass", this); return this; } diff --git a/Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElvesPlugin.java b/Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElvesPlugin.java index ff40664e7..c04388c8c 100644 --- a/Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElvesPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/rovingelves/RovingElvesPlugin.java @@ -1,7 +1,7 @@ package core.game.content.quest.members.rovingelves; import core.cache.def.impl.ItemDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -21,7 +21,7 @@ public final class RovingElvesPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(5252).getHandlers().put("option:search", this); + SceneryDefinition.forId(5252).getHandlers().put("option:search", this); ItemDefinition.forId(RovingElves.CONSECRATION_SEED_CHARGED.getId()).getHandlers().put("option:plant", this); return this; } 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 53480de83..7e25f0095 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 @@ -2,7 +2,7 @@ package core.game.content.quest.members.thetouristrap; import core.cache.def.impl.AnimationDefinition; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.content.activity.ActivityManager; import core.game.content.activity.ActivityPlugin; @@ -48,66 +48,66 @@ public final class TouristTrapPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2673).getHandlers().put("option:open", this); - ObjectDefinition.forId(2674).getHandlers().put("option:open", this); - ObjectDefinition.forId(2673).getHandlers().put("option:search", this); - ObjectDefinition.forId(2674).getHandlers().put("option:search", this); - ObjectDefinition.forId(2688).getHandlers().put("option:open", this); - ObjectDefinition.forId(2688).getHandlers().put("option:search", this); - ObjectDefinition.forId(2687).getHandlers().put("option:open", this); - ObjectDefinition.forId(2687).getHandlers().put("option:search", this); - ObjectDefinition.forId(2685).getHandlers().put("option:open", this); - ObjectDefinition.forId(2685).getHandlers().put("option:open", this); - ObjectDefinition.forId(2686).getHandlers().put("option:search", this); - ObjectDefinition.forId(2686).getHandlers().put("option:search", this); - ObjectDefinition.forId(18958).getHandlers().put("option:search", this); - ObjectDefinition.forId(18958).getHandlers().put("option:look at", this); - ObjectDefinition.forId(18959).getHandlers().put("option:search", this); - ObjectDefinition.forId(18959).getHandlers().put("option:look at", this); - ObjectDefinition.forId(18888).getHandlers().put("option:look at", this); - ObjectDefinition.forId(18888).getHandlers().put("option:operate", this); - ObjectDefinition.forId(36748).getHandlers().put("option:talk-to", this); - ObjectDefinition.forId(18869).getHandlers().put("option:bend", this); - ObjectDefinition.forId(18870).getHandlers().put("option:escape", this); - ObjectDefinition.forId(2689).getHandlers().put("option:open", this); - ObjectDefinition.forId(1528).getHandlers().put("option:open", this); - ObjectDefinition.forId(1529).getHandlers().put("option:close", this); - ObjectDefinition.forId(18899).getHandlers().put("option:search", this); - ObjectDefinition.forId(18899).getHandlers().put("option:look at", this); - ObjectDefinition.forId(18878).getHandlers().put("option:search", this); - ObjectDefinition.forId(18878).getHandlers().put("option:look at", this); - ObjectDefinition.forId(18879).getHandlers().put("option:search", this); - ObjectDefinition.forId(18879).getHandlers().put("option:look at", this); - ObjectDefinition.forId(18898).getHandlers().put("option:search", this); - ObjectDefinition.forId(18898).getHandlers().put("option:look at", this); - ObjectDefinition.forId(18902).getHandlers().put("option:search", this); - ObjectDefinition.forId(18871).getHandlers().put("option:climb", this); - ObjectDefinition.forId(18923).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(18924).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(2676).getHandlers().put("option:open", this); - ObjectDefinition.forId(2675).getHandlers().put("option:open", this); - ObjectDefinition.forId(2676).getHandlers().put("option:watch", this); - ObjectDefinition.forId(2675).getHandlers().put("option:watch", this); - ObjectDefinition.forId(2690).getHandlers().put("option:open", this); - ObjectDefinition.forId(2691).getHandlers().put("option:open", this); - ObjectDefinition.forId(2698).getHandlers().put("option:walk through", this); - ObjectDefinition.forId(2699).getHandlers().put("option:walk through", this); - ObjectDefinition.forId(2677).getHandlers().put("option:open", this); - ObjectDefinition.forId(2678).getHandlers().put("option:search", this); - ObjectDefinition.forId(2684).getHandlers().put("option:search", this); - ObjectDefinition.forId(2684).getHandlers().put("option:look at", this); - ObjectDefinition.forId(2680).getHandlers().put("option:search", this); - ObjectDefinition.forId(2680).getHandlers().put("option:look-in", this); - ObjectDefinition.forId(2681).getHandlers().put("option:search", this); - ObjectDefinition.forId(2681).getHandlers().put("option:look in", this); - ObjectDefinition.forId(18962).getHandlers().put("option:search", this); - ObjectDefinition.forId(18962).getHandlers().put("option:look in", this); - ObjectDefinition.forId(18963).getHandlers().put("option:search", this); - ObjectDefinition.forId(18963).getHandlers().put("option:look in", this); - ObjectDefinition.forId(18951).getHandlers().put("option:look at", this); - ObjectDefinition.forId(18951).getHandlers().put("option:use", this); - ObjectDefinition.forId(2684).getHandlers().put("option:search", this); - ObjectDefinition.forId(2684).getHandlers().put("option:look at", this); + SceneryDefinition.forId(2673).getHandlers().put("option:open", this); + SceneryDefinition.forId(2674).getHandlers().put("option:open", this); + SceneryDefinition.forId(2673).getHandlers().put("option:search", this); + SceneryDefinition.forId(2674).getHandlers().put("option:search", this); + SceneryDefinition.forId(2688).getHandlers().put("option:open", this); + SceneryDefinition.forId(2688).getHandlers().put("option:search", this); + SceneryDefinition.forId(2687).getHandlers().put("option:open", this); + SceneryDefinition.forId(2687).getHandlers().put("option:search", this); + SceneryDefinition.forId(2685).getHandlers().put("option:open", this); + SceneryDefinition.forId(2685).getHandlers().put("option:open", this); + SceneryDefinition.forId(2686).getHandlers().put("option:search", this); + SceneryDefinition.forId(2686).getHandlers().put("option:search", this); + SceneryDefinition.forId(18958).getHandlers().put("option:search", this); + SceneryDefinition.forId(18958).getHandlers().put("option:look at", this); + SceneryDefinition.forId(18959).getHandlers().put("option:search", this); + SceneryDefinition.forId(18959).getHandlers().put("option:look at", this); + SceneryDefinition.forId(18888).getHandlers().put("option:look at", this); + SceneryDefinition.forId(18888).getHandlers().put("option:operate", this); + SceneryDefinition.forId(36748).getHandlers().put("option:talk-to", this); + SceneryDefinition.forId(18869).getHandlers().put("option:bend", this); + SceneryDefinition.forId(18870).getHandlers().put("option:escape", this); + SceneryDefinition.forId(2689).getHandlers().put("option:open", this); + SceneryDefinition.forId(1528).getHandlers().put("option:open", this); + SceneryDefinition.forId(1529).getHandlers().put("option:close", this); + SceneryDefinition.forId(18899).getHandlers().put("option:search", this); + SceneryDefinition.forId(18899).getHandlers().put("option:look at", this); + SceneryDefinition.forId(18878).getHandlers().put("option:search", this); + SceneryDefinition.forId(18878).getHandlers().put("option:look at", this); + SceneryDefinition.forId(18879).getHandlers().put("option:search", this); + SceneryDefinition.forId(18879).getHandlers().put("option:look at", this); + SceneryDefinition.forId(18898).getHandlers().put("option:search", this); + SceneryDefinition.forId(18898).getHandlers().put("option:look at", this); + SceneryDefinition.forId(18902).getHandlers().put("option:search", this); + SceneryDefinition.forId(18871).getHandlers().put("option:climb", this); + SceneryDefinition.forId(18923).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(18924).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(2676).getHandlers().put("option:open", this); + SceneryDefinition.forId(2675).getHandlers().put("option:open", this); + SceneryDefinition.forId(2676).getHandlers().put("option:watch", this); + SceneryDefinition.forId(2675).getHandlers().put("option:watch", this); + SceneryDefinition.forId(2690).getHandlers().put("option:open", this); + SceneryDefinition.forId(2691).getHandlers().put("option:open", this); + SceneryDefinition.forId(2698).getHandlers().put("option:walk through", this); + SceneryDefinition.forId(2699).getHandlers().put("option:walk through", this); + SceneryDefinition.forId(2677).getHandlers().put("option:open", this); + SceneryDefinition.forId(2678).getHandlers().put("option:search", this); + SceneryDefinition.forId(2684).getHandlers().put("option:search", this); + SceneryDefinition.forId(2684).getHandlers().put("option:look at", this); + SceneryDefinition.forId(2680).getHandlers().put("option:search", this); + SceneryDefinition.forId(2680).getHandlers().put("option:look-in", this); + SceneryDefinition.forId(2681).getHandlers().put("option:search", this); + SceneryDefinition.forId(2681).getHandlers().put("option:look in", this); + SceneryDefinition.forId(18962).getHandlers().put("option:search", this); + SceneryDefinition.forId(18962).getHandlers().put("option:look in", this); + SceneryDefinition.forId(18963).getHandlers().put("option:search", this); + SceneryDefinition.forId(18963).getHandlers().put("option:look in", this); + SceneryDefinition.forId(18951).getHandlers().put("option:look at", this); + SceneryDefinition.forId(18951).getHandlers().put("option:use", this); + SceneryDefinition.forId(2684).getHandlers().put("option:search", this); + SceneryDefinition.forId(2684).getHandlers().put("option:look at", this); NPCDefinition.forId(830).getHandlers().put("option:watch", this); NPCDefinition.forId(4975).getHandlers().put("option:talk-to", this); NPCDefinition.forId(4976).getHandlers().put("option:talk-to", this); 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 8ad69fd2b..6706df812 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 @@ -5,7 +5,7 @@ import java.util.List; import core.cache.def.impl.ItemDefinition; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.dialogue.FacialExpression; import core.game.content.global.action.ClimbActionHandler; import core.game.content.global.action.DoorActionHandler; @@ -103,26 +103,26 @@ public final class WaterfallPlugin extends OptionHandler { public Plugin newInstance(Object arg) throws Throwable { PluginManager.definePlugin(new WaterfallUseWithHandler()); NPCDefinition.forId(305).getHandlers().put("option:talk-to", this); - ObjectDefinition.forId(1987).getHandlers().put("option:board", this); - ObjectDefinition.forId(2020).getHandlers().put("option:climb", this); - ObjectDefinition.forId(2022).getHandlers().put("option:get in", this); - ObjectDefinition.forId(10283).getHandlers().put("option:swim", this); - ObjectDefinition.forId(1996).getHandlers().put("option:swim to", this); - ObjectDefinition.forId(1989).getHandlers().put("option:search", this); - ObjectDefinition.forId(1990).getHandlers().put("option:search", this); - ObjectDefinition.forId(1991).getHandlers().put("option:open", this); - ObjectDefinition.forId(37247).getHandlers().put("option:open", this); - ObjectDefinition.forId(32711).getHandlers().put("option:open", this); - ObjectDefinition.forId(33046).getHandlers().put("option:open", this); - ObjectDefinition.forId(42313).getHandlers().put("option:open",this); - ObjectDefinition.forId(33047).getHandlers().put("option:search", this); - ObjectDefinition.forId(33047).getHandlers().put("option:close", this); - ObjectDefinition.forId(33066).getHandlers().put("option:search", this); - ObjectDefinition.forId(1999).getHandlers().put("option:search", this); - ObjectDefinition.forId(42319).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(2002).getHandlers().put("option:open", this); - ObjectDefinition.forId(1992).getHandlers().put("option:read", this); - ObjectDefinition.forId(2014).getHandlers().put("option:take treasure", this); + SceneryDefinition.forId(1987).getHandlers().put("option:board", this); + SceneryDefinition.forId(2020).getHandlers().put("option:climb", this); + SceneryDefinition.forId(2022).getHandlers().put("option:get in", this); + SceneryDefinition.forId(10283).getHandlers().put("option:swim", this); + SceneryDefinition.forId(1996).getHandlers().put("option:swim to", this); + SceneryDefinition.forId(1989).getHandlers().put("option:search", this); + SceneryDefinition.forId(1990).getHandlers().put("option:search", this); + SceneryDefinition.forId(1991).getHandlers().put("option:open", this); + SceneryDefinition.forId(37247).getHandlers().put("option:open", this); + SceneryDefinition.forId(32711).getHandlers().put("option:open", this); + SceneryDefinition.forId(33046).getHandlers().put("option:open", this); + SceneryDefinition.forId(42313).getHandlers().put("option:open",this); + SceneryDefinition.forId(33047).getHandlers().put("option:search", this); + SceneryDefinition.forId(33047).getHandlers().put("option:close", this); + SceneryDefinition.forId(33066).getHandlers().put("option:search", this); + SceneryDefinition.forId(1999).getHandlers().put("option:search", this); + SceneryDefinition.forId(42319).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(2002).getHandlers().put("option:open", this); + SceneryDefinition.forId(1992).getHandlers().put("option:read", this); + SceneryDefinition.forId(2014).getHandlers().put("option:take treasure", this); return this; } diff --git a/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowPlugin.java b/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowPlugin.java index a30ce39fc..664683215 100644 --- a/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowPlugin.java +++ b/Server/src/main/java/core/game/content/quest/members/whatliesbelow/WLBelowPlugin.java @@ -1,6 +1,6 @@ package core.game.content.quest.members.whatliesbelow; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.node.entity.player.link.diary.DiaryType; import core.game.content.activity.ActivityManager; @@ -38,9 +38,9 @@ public class WLBelowPlugin extends OptionHandler { PluginManager.definePlugin(new AnnaJonesDialogue()); PluginManager.definePlugin(new SurokMagisDialogue()); PluginManager.definePlugin(new RatBurgissDialogue()); - ObjectDefinition.forId(23095).getHandlers().put("option:use", this); - ObjectDefinition.forId(23058).getHandlers().put("option:enter", this); - ObjectDefinition.forId(23057).getHandlers().put("option:excavate", this); + SceneryDefinition.forId(23095).getHandlers().put("option:use", this); + SceneryDefinition.forId(23058).getHandlers().put("option:enter", this); + SceneryDefinition.forId(23057).getHandlers().put("option:excavate", this); WhatLiesBelow.RATS_PAPER.getDefinition().getHandlers().put("option:read", this); WhatLiesBelow.EMPTY_FOLDER.getDefinition().getHandlers().put("option:read", this); WhatLiesBelow.USED_FOLDER.getDefinition().getHandlers().put("option:read", this); 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 7f4439031..c8309e225 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 @@ -1,7 +1,7 @@ package core.game.content.quest.members.witchshouse; import core.cache.def.impl.ItemDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.DoorActionHandler; import core.game.interaction.NodeUsageEvent; import core.game.interaction.OptionHandler; @@ -174,19 +174,19 @@ public class WitchsHousePlugin extends OptionHandler { public Plugin newInstance(Object arg) throws Throwable { PluginManager.definePlugin(new WitchsHouseUseWithHandler()); PluginManager.definePlugin(new MouseNPC()); - ObjectDefinition.forId(2867).getHandlers().put("option:look-under", this); - ObjectDefinition.forId(2861).getHandlers().put("option:open", this); - ObjectDefinition.forId(2865).getHandlers().put("option:open", this); - ObjectDefinition.forId(2866).getHandlers().put("option:open", this); - ObjectDefinition.forId(2862).getHandlers().put("option:open", this); - ObjectDefinition.forId(24724).getHandlers().put("option:wind-up", this); - ObjectDefinition.forId(24673).getHandlers().put("option:walk-down", this); - ObjectDefinition.forId(24672).getHandlers().put("option:walk-up", this); - ObjectDefinition.forId(24721).getHandlers().put("option:play", this); - ObjectDefinition.forId(24692).getHandlers().put("option:search", this); - ObjectDefinition.forId(2869).getHandlers().put("option:search", this); - ObjectDefinition.forId(2863).getHandlers().put("option:open", this); - ObjectDefinition.forId(2864).getHandlers().put("option:check", this); + SceneryDefinition.forId(2867).getHandlers().put("option:look-under", this); + SceneryDefinition.forId(2861).getHandlers().put("option:open", this); + SceneryDefinition.forId(2865).getHandlers().put("option:open", this); + SceneryDefinition.forId(2866).getHandlers().put("option:open", this); + SceneryDefinition.forId(2862).getHandlers().put("option:open", this); + SceneryDefinition.forId(24724).getHandlers().put("option:wind-up", this); + SceneryDefinition.forId(24673).getHandlers().put("option:walk-down", this); + SceneryDefinition.forId(24672).getHandlers().put("option:walk-up", this); + SceneryDefinition.forId(24721).getHandlers().put("option:play", this); + SceneryDefinition.forId(24692).getHandlers().put("option:search", this); + SceneryDefinition.forId(2869).getHandlers().put("option:search", this); + SceneryDefinition.forId(2863).getHandlers().put("option:open", this); + SceneryDefinition.forId(2864).getHandlers().put("option:check", this); ItemDefinition.forId(2408).getHandlers().put("option:read", this); return this; diff --git a/Server/src/main/java/core/game/content/quest/miniquest/surok/HuntForSurokPlugin.java b/Server/src/main/java/core/game/content/quest/miniquest/surok/HuntForSurokPlugin.java index 153f8115e..a6ae5157f 100644 --- a/Server/src/main/java/core/game/content/quest/miniquest/surok/HuntForSurokPlugin.java +++ b/Server/src/main/java/core/game/content/quest/miniquest/surok/HuntForSurokPlugin.java @@ -1,6 +1,6 @@ package core.game.content.quest.miniquest.surok; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -21,7 +21,7 @@ public class HuntForSurokPlugin extends OptionHandler { PluginManager.definePlugin(new MishkalunDornDialogue()); PluginManager.definePlugin(new SilasDahcsnuDialogue()); PluginManager.definePlugin(new SurokMagisDialogue()); - ObjectDefinition.forId(28780).getHandlers().put("option:use", this); + SceneryDefinition.forId(28780).getHandlers().put("option:use", this); return this; } 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 e925dd054..ca052868f 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 @@ -1,7 +1,7 @@ package core.game.content.quest.tutorials.tutorialisland; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.ClimbActionHandler; import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; @@ -24,25 +24,25 @@ public class TutorialIslandPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(3015).getHandlers().put("option:open", this); - ObjectDefinition.forId(3016).getHandlers().put("option:open", this); + SceneryDefinition.forId(3015).getHandlers().put("option:open", this); + SceneryDefinition.forId(3016).getHandlers().put("option:open", this); NPCDefinition.forId(2796).getHandlers().put("option:skip-tutorial", this); - ObjectDefinition.forId(3014).getHandlers().put("option:open", this); - ObjectDefinition.forId(3017).getHandlers().put("option:open", this); - ObjectDefinition.forId(3018).getHandlers().put("option:open", this); - ObjectDefinition.forId(3019).getHandlers().put("option:open", this); - ObjectDefinition.forId(3020).getHandlers().put("option:open", this); - ObjectDefinition.forId(3021).getHandlers().put("option:open", this); - ObjectDefinition.forId(3022).getHandlers().put("option:open", this); - ObjectDefinition.forId(3023).getHandlers().put("option:open", this); - ObjectDefinition.forId(3024).getHandlers().put("option:open", this); - ObjectDefinition.forId(3025).getHandlers().put("option:open", this); - ObjectDefinition.forId(3026).getHandlers().put("option:open", this); - ObjectDefinition.forId(3029).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(3030).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(3031).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(1740).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(3028).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(3014).getHandlers().put("option:open", this); + SceneryDefinition.forId(3017).getHandlers().put("option:open", this); + SceneryDefinition.forId(3018).getHandlers().put("option:open", this); + SceneryDefinition.forId(3019).getHandlers().put("option:open", this); + SceneryDefinition.forId(3020).getHandlers().put("option:open", this); + SceneryDefinition.forId(3021).getHandlers().put("option:open", this); + SceneryDefinition.forId(3022).getHandlers().put("option:open", this); + SceneryDefinition.forId(3023).getHandlers().put("option:open", this); + SceneryDefinition.forId(3024).getHandlers().put("option:open", this); + SceneryDefinition.forId(3025).getHandlers().put("option:open", this); + SceneryDefinition.forId(3026).getHandlers().put("option:open", this); + SceneryDefinition.forId(3029).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(3030).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(3031).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(1740).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(3028).getHandlers().put("option:climb-up", this); // PluginManager.definePlugin(new BrotherBraceDialogue(), new CombatInstructorDialogue(), new TutorialBook(), new FinancialAdvisorDialogue(), new MasterChefDialogue(), new MiningInstructorDialogue(), new QuestGuideDialogue(), new RSGuideDialogue(), new SurvivalExpertDialogue(), new TutorialCompletionDialogue()); return this; } diff --git a/Server/src/main/java/core/game/content/ttrail/TreasureTrailPlugin.java b/Server/src/main/java/core/game/content/ttrail/TreasureTrailPlugin.java index eda615013..23cbcfe7f 100644 --- a/Server/src/main/java/core/game/content/ttrail/TreasureTrailPlugin.java +++ b/Server/src/main/java/core/game/content/ttrail/TreasureTrailPlugin.java @@ -1,7 +1,7 @@ package core.game.content.ttrail; import core.cache.def.impl.ItemDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; @@ -91,7 +91,7 @@ public final class TreasureTrailPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(19171).getHandlers().put("option:squeeze-through", this); + SceneryDefinition.forId(19171).getHandlers().put("option:squeeze-through", this); return this; } 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 b2d19a9cc..a3d4a3cb5 100644 --- a/Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java +++ b/Server/src/main/java/core/game/content/zone/ChaosTunnelZone.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.activity.ActivityManager; import core.game.interaction.Option; import core.game.interaction.OptionHandler; @@ -61,10 +61,10 @@ public final class ChaosTunnelZone extends MapZone implements Plugin { @Override public Plugin newInstance(Object arg) throws Throwable { for (int i = 0; i < ENTRANCE_DATA.length; i++) { - ObjectDefinition.forId((int) ENTRANCE_DATA[i][0]).getHandlers().put("option:enter", this); - ObjectDefinition.forId((int) ENTRANCE_DATA[i][2]).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId((int) ENTRANCE_DATA[i][0]).getHandlers().put("option:enter", this); + SceneryDefinition.forId((int) ENTRANCE_DATA[i][2]).getHandlers().put("option:climb-up", this); } - ObjectDefinition.forId(23074).getHandlers().put("option:climb", this); + SceneryDefinition.forId(23074).getHandlers().put("option:climb", this); return this; } @@ -122,7 +122,7 @@ public final class ChaosTunnelZone extends MapZone implements Plugin { entity.asPlayer().sendMessage("You can't go back throught his portal."); return true; } - teleport(entity.asPlayer(), target.asObject()); + teleport(entity.asPlayer(), target.asScenery()); break; } } diff --git a/Server/src/main/java/core/game/content/zone/WildernessAreaZone.java b/Server/src/main/java/core/game/content/zone/WildernessAreaZone.java index b182a7373..118076c52 100644 --- a/Server/src/main/java/core/game/content/zone/WildernessAreaZone.java +++ b/Server/src/main/java/core/game/content/zone/WildernessAreaZone.java @@ -78,7 +78,7 @@ public class WildernessAreaZone extends MapZone implements Plugin { switch (buttonId) { case 2: if (player.getInventory().remove(new Item(995, 7500))) { - DoorActionHandler.handleDoor(player, node.asObject()); + DoorActionHandler.handleDoor(player, node.asScenery()); player.sendMessage("You pay 7500 coins and enter the resource arena."); } break; @@ -91,7 +91,7 @@ public class WildernessAreaZone extends MapZone implements Plugin { player.sendMessage("You do not have enough coins to enter the Arena."); return true; } - DoorActionHandler.handleDoor(player, node.asObject()); + DoorActionHandler.handleDoor(player, node.asScenery()); return true; case "Players-inside": if (player.getLocation().getY() < 3495) { 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 18c0de8d0..22b603758 100644 --- a/Server/src/main/java/core/game/content/zone/YanilleAgilityDungeon.java +++ b/Server/src/main/java/core/game/content/zone/YanilleAgilityDungeon.java @@ -82,7 +82,7 @@ public class YanilleAgilityDungeon extends MapZone implements Plugin { return true; case 35969: case 2303: - handleBalancingLedge(player, target.asObject()); + handleBalancingLedge(player, target.asScenery()); return true; case 377: if (!player.getInventory().contains(993, 1)) { @@ -99,7 +99,7 @@ public class YanilleAgilityDungeon extends MapZone implements Plugin { for (Item item : HERBS) { player.getInventory().add(item, player); } - SceneryBuilder.replace(target.asObject(), target.asObject().transform(target.getId() + 1), 5); + SceneryBuilder.replace(target.asScenery(), target.asScenery().transform(target.getId() + 1), 5); } return true; case 378: 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 126c833be..2870baa70 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 @@ -90,12 +90,12 @@ public final class PhasmatysZone extends MapZone implements Plugin { return true; case 7434: // Trapdoors in bar if (option.getName().equalsIgnoreCase("open")) { - SceneryBuilder.replace(target.asObject(), target.asObject().transform(7435)); + SceneryBuilder.replace(target.asScenery(), target.asScenery().transform(7435)); } break; case 7435: // open trapdoor in bar if (option.getName().equalsIgnoreCase("close")) { - SceneryBuilder.replace(target.asObject(), target.asObject().transform(7434)); + SceneryBuilder.replace(target.asScenery(), target.asScenery().transform(7434)); } break; case 9308: diff --git a/Server/src/main/java/core/game/content/zone/rellekka/LightHousePlugin.java b/Server/src/main/java/core/game/content/zone/rellekka/LightHousePlugin.java index 56317ca56..009e8dca8 100644 --- a/Server/src/main/java/core/game/content/zone/rellekka/LightHousePlugin.java +++ b/Server/src/main/java/core/game/content/zone/rellekka/LightHousePlugin.java @@ -1,6 +1,6 @@ package core.game.content.zone.rellekka; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -19,8 +19,8 @@ public class LightHousePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(4577).getHandlers().put("option:walk-through", this); - ObjectDefinition.forId(4383).getHandlers().put("option:climb", this); + SceneryDefinition.forId(4577).getHandlers().put("option:walk-through", this); + SceneryDefinition.forId(4383).getHandlers().put("option:climb", this); return this; } @@ -28,7 +28,7 @@ public class LightHousePlugin extends OptionHandler { public boolean handle(Player player, Node node, String option) { switch (node.getId()) { case 4577: - DoorActionHandler.handleDoor(player, node.asObject()); + DoorActionHandler.handleDoor(player, node.asScenery()); return true; case 4383: return false; @@ -39,7 +39,7 @@ public class LightHousePlugin extends OptionHandler { @Override public Location getDestination(Node node, Node n) { if (n.getName().equals("Door")) { - return DoorActionHandler.getDestination((Entity) node, n.asObject()); + return DoorActionHandler.getDestination((Entity) node, n.asScenery()); } return null; } 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 49a965738..299a833da 100644 --- a/Server/src/main/java/core/game/content/zone/rellekka/RellekkaZone.java +++ b/Server/src/main/java/core/game/content/zone/rellekka/RellekkaZone.java @@ -1,7 +1,7 @@ package core.game.content.zone.rellekka; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.plugin.Initializable; import core.game.node.entity.skill.agility.AgilityHandler; @@ -164,10 +164,10 @@ public final class RellekkaZone extends MapZone implements Plugin { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(4616).getHandlers().put("option:cross", this); - ObjectDefinition.forId(4615).getHandlers().put("option:cross", this); - ObjectDefinition.forId(5847).getHandlers().put("option:climb-over", this); - ObjectDefinition.forId(5008).getHandlers().put("option:enter",this); + SceneryDefinition.forId(4616).getHandlers().put("option:cross", this); + SceneryDefinition.forId(4615).getHandlers().put("option:cross", this); + SceneryDefinition.forId(5847).getHandlers().put("option:climb-over", this); + SceneryDefinition.forId(5008).getHandlers().put("option:enter",this); return this; } 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 089a27285..6a3bbf6f0 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 @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.dialogue.DialogueAction; import core.game.content.global.action.ClimbActionHandler; import core.game.node.entity.skill.Skills; @@ -221,9 +221,9 @@ public final class WaterBirthDungeonZone extends MapZone implements Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(8958).getHandlers().put("option:open", this); - ObjectDefinition.forId(8959).getHandlers().put("option:open", this); - ObjectDefinition.forId(8960).getHandlers().put("option:open", this); + SceneryDefinition.forId(8958).getHandlers().put("option:open", this); + SceneryDefinition.forId(8959).getHandlers().put("option:open", this); + SceneryDefinition.forId(8960).getHandlers().put("option:open", this); NPCDefinition.forId(2440).getHandlers().put("option:destroy", this); NPCDefinition.forId(2443).getHandlers().put("option:destroy", this); NPCDefinition.forId(2446).getHandlers().put("option:destroy", this); @@ -249,7 +249,7 @@ public final class WaterBirthDungeonZone extends MapZone implements Plugin { * @return the valid children. */ public int[] getValidChildren(int wrapper) { - final ObjectDefinition definition = ObjectDefinition.forId(wrapper); + final SceneryDefinition definition = SceneryDefinition.forId(wrapper); final List list = new ArrayList<>(20); if (definition.getChildrenIds() == null) { SystemLogger.logErr("Null child wrapper in option handler wrapperId=" + wrapper); diff --git a/Server/src/main/java/core/game/interaction/UseWithHandler.java b/Server/src/main/java/core/game/interaction/UseWithHandler.java index 7d95bf74b..43c1d4220 100644 --- a/Server/src/main/java/core/game/interaction/UseWithHandler.java +++ b/Server/src/main/java/core/game/interaction/UseWithHandler.java @@ -1,6 +1,6 @@ package core.game.interaction; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; @@ -203,7 +203,7 @@ public abstract class UseWithHandler implements Plugin { * @return the valid children. */ public int[] getValidChildren(int wrapper) { - final ObjectDefinition definition = ObjectDefinition.forId(wrapper); + final SceneryDefinition definition = SceneryDefinition.forId(wrapper); final List list = new ArrayList<>(20); if (definition.getChildrenIds() == null) { SystemLogger.logErr("Null child wrapper in option handler wrapperId=" + wrapper); 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 9bde101c9..720d45702 100644 --- a/Server/src/main/java/core/game/interaction/city/BedabinPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/BedabinPlugin.java @@ -1,7 +1,7 @@ package core.game.interaction.city; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; @@ -23,8 +23,8 @@ public final class BedabinPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2700).getHandlers().put("option:walk-through", this); - ObjectDefinition.forId(2672).getHandlers().put("option:use", this); + SceneryDefinition.forId(2700).getHandlers().put("option:walk-through", this); + SceneryDefinition.forId(2672).getHandlers().put("option:use", this); NPCDefinition.forId(834).getHandlers().put("option:talk-to", this); return this; } 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 f791a1c55..65de24ea1 100644 --- a/Server/src/main/java/core/game/interaction/city/BurthorpePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/BurthorpePlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.city; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -19,7 +19,7 @@ public final class BurthorpePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(4627).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(4627).getHandlers().put("option:climb-up", this); return this; } 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 5054b8f5e..03c6a26d1 100644 --- a/Server/src/main/java/core/game/interaction/city/CamelotNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/CamelotNodePlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.city; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -19,7 +19,7 @@ public final class CamelotNodePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(26017).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(26017).getHandlers().put("option:climb-down", this); return this; } 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 16e90d608..ab34f6a9f 100644 --- a/Server/src/main/java/core/game/interaction/city/DraynorManorPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/DraynorManorPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.city; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.dialogue.FacialExpression; import core.game.content.global.action.ClimbActionHandler; import core.game.content.global.action.DoorActionHandler; @@ -61,17 +61,17 @@ public final class DraynorManorPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(156).getHandlers().put("option:search", this); - ObjectDefinition.forId(155).getHandlers().put("option:search", this); - ObjectDefinition.forId(160).getHandlers().put("option:pull", this); - ObjectDefinition.forId(131).getHandlers().put("option:open", this); - ObjectDefinition.forId(133).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(134).getHandlers().put("option:open", this); - ObjectDefinition.forId(135).getHandlers().put("option:open", this); - ObjectDefinition.forId(152).getHandlers().put("option:search", this); - ObjectDefinition.forId(153).getHandlers().put("option:search", this); - ObjectDefinition.forId(11498).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(37703).getHandlers().put("option:squeeze-through", this); + SceneryDefinition.forId(156).getHandlers().put("option:search", this); + SceneryDefinition.forId(155).getHandlers().put("option:search", this); + SceneryDefinition.forId(160).getHandlers().put("option:pull", this); + SceneryDefinition.forId(131).getHandlers().put("option:open", this); + SceneryDefinition.forId(133).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(134).getHandlers().put("option:open", this); + SceneryDefinition.forId(135).getHandlers().put("option:open", this); + SceneryDefinition.forId(152).getHandlers().put("option:search", this); + SceneryDefinition.forId(153).getHandlers().put("option:search", this); + SceneryDefinition.forId(11498).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(37703).getHandlers().put("option:squeeze-through", this); return this; } 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 58ccffa94..e1fb8e301 100644 --- a/Server/src/main/java/core/game/interaction/city/DraynorNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/DraynorNodePlugin.java @@ -1,7 +1,7 @@ package core.game.interaction.city; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.object.SceneryBuilder; @@ -37,8 +37,8 @@ public final class DraynorNodePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { NPCDefinition.forId(922).getHandlers().put("option:make-dyes", this); - ObjectDefinition.forId(7092).getHandlers().put("option:observe", this); - ObjectDefinition.forId(6434).getHandlers().put("option:open", this); + SceneryDefinition.forId(7092).getHandlers().put("option:observe", this); + SceneryDefinition.forId(6434).getHandlers().put("option:open", this); ActivityManager.register(new TelescopeCutscene()); return this; } @@ -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")) { - SceneryBuilder.replace(node.asObject(), node.asObject().transform(6435), 500); + SceneryBuilder.replace(node.asScenery(), node.asScenery().transform(6435), 500); } break; } 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 f138ffea2..382540d62 100644 --- a/Server/src/main/java/core/game/interaction/city/EdgevilleNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/EdgevilleNodePlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.city; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -22,15 +22,15 @@ public final class EdgevilleNodePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(9262).getHandlers().put("option:take-seed", this); - ObjectDefinition.forId(9261).getHandlers().put("option:take-seed", this); - ObjectDefinition.forId(30806).getHandlers().put("option:take-seed", this); - ObjectDefinition.forId(12265).getHandlers().put("option:climb", this); + SceneryDefinition.forId(9262).getHandlers().put("option:take-seed", this); + SceneryDefinition.forId(9261).getHandlers().put("option:take-seed", this); + SceneryDefinition.forId(30806).getHandlers().put("option:take-seed", this); + SceneryDefinition.forId(12265).getHandlers().put("option:climb", this); - ObjectDefinition.forId(12266).getHandlers().put("option:open", this); + SceneryDefinition.forId(12266).getHandlers().put("option:open", this); - ObjectDefinition.forId(26933).getHandlers().put("option:open", this); - ObjectDefinition.forId(26934).getHandlers().put("option:close", this); + SceneryDefinition.forId(26933).getHandlers().put("option:open", this); + SceneryDefinition.forId(26934).getHandlers().put("option:close", this); return this; } @@ -55,12 +55,12 @@ public final class EdgevilleNodePlugin extends OptionHandler { break; case 26933: // Trapdoors at edgeville dungeon entrance if (option.equalsIgnoreCase("open")) { - SceneryBuilder.replace(node.asObject(), node.asObject().transform(26934), 500); + SceneryBuilder.replace(node.asScenery(), node.asScenery().transform(26934), 500); } break; case 26934: // Trapdoors at edgeville dungeon entrance if (option.equalsIgnoreCase("close")) { - SceneryBuilder.replace(node.asObject(), node.asObject().transform(26933)); + SceneryBuilder.replace(node.asScenery(), node.asScenery().transform(26933)); } } return true; diff --git a/Server/src/main/java/core/game/interaction/city/EntranaObjectPlugin.java b/Server/src/main/java/core/game/interaction/city/EntranaObjectPlugin.java index 2eb2bdb7d..a61706255 100644 --- a/Server/src/main/java/core/game/interaction/city/EntranaObjectPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/EntranaObjectPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.city; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -25,8 +25,8 @@ public final class EntranaObjectPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2408).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(2407).getHandlers().put("option:open", this);// magic door + SceneryDefinition.forId(2408).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(2407).getHandlers().put("option:open", this);// magic door return this; } 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 65d455dbe..7a07be6b0 100644 --- a/Server/src/main/java/core/game/interaction/city/FaladorNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/FaladorNodePlugin.java @@ -2,7 +2,7 @@ package core.game.interaction.city; import core.cache.def.impl.ItemDefinition; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.DoorActionHandler; import core.plugin.Initializable; import core.game.node.entity.skill.Skills; @@ -46,25 +46,25 @@ public final class FaladorNodePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2271).getHandlers().put("option:open", this);// sir + SceneryDefinition.forId(2271).getHandlers().put("option:open", this);// sir // vyvans // cupboard // (closed) - ObjectDefinition.forId(2272).getHandlers().put("option:shut", this);// sir + SceneryDefinition.forId(2272).getHandlers().put("option:shut", this);// sir // vyvans // cupboard // (open) - ObjectDefinition.forId(2272).getHandlers().put("option:search", this);// sir + SceneryDefinition.forId(2272).getHandlers().put("option:search", this);// sir // vyvans // cupboard // (open) // dwarven mine - ObjectDefinition.forId(30868).getHandlers().put("option:squeeze-through", this); - ObjectDefinition.forId(5020).getHandlers().put("option:ride", this); + SceneryDefinition.forId(30868).getHandlers().put("option:squeeze-through", this); + SceneryDefinition.forId(5020).getHandlers().put("option:ride", this); ItemDefinition.forId(245).getHandlers().put("option:take", this); // fally park. NPCDefinition.forId(2290).getHandlers().put("option:talk-to", this); - ObjectDefinition.forId(11708).getHandlers().put("option:close", this); + SceneryDefinition.forId(11708).getHandlers().put("option:close", this); return this; } 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 f01c7b5d6..6e5d79974 100644 --- a/Server/src/main/java/core/game/interaction/city/GnomeStrongholdPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/GnomeStrongholdPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.city; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.agility.AgilityHandler; import core.game.interaction.OptionHandler; @@ -26,11 +26,11 @@ public final class GnomeStrongholdPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(190).getHandlers().put("option:open", this); - ObjectDefinition.forId(1967).getHandlers().put("option:open", this); - ObjectDefinition.forId(1968).getHandlers().put("option:open", this); - ObjectDefinition.forId(9316).getHandlers().put("option:climb",this); - ObjectDefinition.forId(9317).getHandlers().put("option:climb",this); + SceneryDefinition.forId(190).getHandlers().put("option:open", this); + SceneryDefinition.forId(1967).getHandlers().put("option:open", this); + SceneryDefinition.forId(1968).getHandlers().put("option:open", this); + SceneryDefinition.forId(9316).getHandlers().put("option:climb",this); + SceneryDefinition.forId(9317).getHandlers().put("option:climb",this); return this; } 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 0c9081e95..a5960cfa7 100644 --- a/Server/src/main/java/core/game/interaction/city/HamHideoutPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/HamHideoutPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.city; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -29,11 +29,11 @@ public final class HamHideoutPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(5490).getHandlers().put("option:open", this); - ObjectDefinition.forId(5490).getHandlers().put("option:pick-lock", this); - ObjectDefinition.forId(5491).getHandlers().put("option:close", this); - ObjectDefinition.forId(5491).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(5493).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(5490).getHandlers().put("option:open", this); + SceneryDefinition.forId(5490).getHandlers().put("option:pick-lock", this); + SceneryDefinition.forId(5491).getHandlers().put("option:close", this); + SceneryDefinition.forId(5491).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(5493).getHandlers().put("option:climb-up", this); return this; } 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 62b105c09..5893c1868 100644 --- a/Server/src/main/java/core/game/interaction/city/KaramajaOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/KaramajaOptionPlugin.java @@ -1,7 +1,7 @@ package core.game.interaction.city; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.plugin.Initializable; import org.rs09.consts.Items; @@ -73,26 +73,26 @@ public final class KaramajaOptionPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2072).getHandlers().put("option:search", this);// banana crate. - ObjectDefinition.forId(2072).getHandlers().put("option:fill", this);// banana crate. - ObjectDefinition.forId(2078).getHandlers().put("option:search", this);// random crate. - ObjectDefinition.forId(492).getHandlers().put("option:climb-down", this);// musa point rock - ObjectDefinition.forId(1764).getHandlers().put("option:climb", this);// musa dungeon rope - ObjectDefinition.forId(3617).getHandlers().put("option:climb-down", this);// agility ladder - ObjectDefinition.forId(3618).getHandlers().put("option:climb-up", this);// agility ladder + SceneryDefinition.forId(2072).getHandlers().put("option:search", this);// banana crate. + SceneryDefinition.forId(2072).getHandlers().put("option:fill", this);// banana crate. + SceneryDefinition.forId(2078).getHandlers().put("option:search", this);// random crate. + SceneryDefinition.forId(492).getHandlers().put("option:climb-down", this);// musa point rock + SceneryDefinition.forId(1764).getHandlers().put("option:climb", this);// musa dungeon rope + SceneryDefinition.forId(3617).getHandlers().put("option:climb-down", this);// agility ladder + SceneryDefinition.forId(3618).getHandlers().put("option:climb-up", this);// agility ladder NPCDefinition.forId(437).getHandlers().put("option:pay", this);// capn izzy NPCDefinition.forId(1055).getHandlers().put("option:trade", this);// capn izzy trader (tickets) - ObjectDefinition.forId(2626).getHandlers().put("option:open", this);// grubors locked door - ObjectDefinition.forId(2628).getHandlers().put("option:open", this);// the shrimp and parrot door (chef) - ObjectDefinition.forId(2627).getHandlers().put("option:open", this);// garv door - ObjectDefinition.forId(1591).getHandlers().put("option:open", this);// garv door + SceneryDefinition.forId(2626).getHandlers().put("option:open", this);// grubors locked door + SceneryDefinition.forId(2628).getHandlers().put("option:open", this);// the shrimp and parrot door (chef) + SceneryDefinition.forId(2627).getHandlers().put("option:open", this);// garv door + SceneryDefinition.forId(1591).getHandlers().put("option:open", this);// garv door NPCDefinition.forId(1178).getHandlers().put("option:fish", this);// lubufu fishing spot - ObjectDefinition.forId(5083).getHandlers().put("option:enter", this);// sanibock dungeon entrance - ObjectDefinition.forId(2439).getHandlers().put("option:open", this); + SceneryDefinition.forId(5083).getHandlers().put("option:enter", this);// sanibock dungeon entrance + SceneryDefinition.forId(2439).getHandlers().put("option:open", this); for (int pineapple : PINEAPPLE_OBJECTS) { - ObjectDefinition.forId(pineapple).getHandlers().put("option:pick", this);// pineapple picking + SceneryDefinition.forId(pineapple).getHandlers().put("option:pick", this);// pineapple picking } - ObjectDefinition.forId(2975).getHandlers().put("option:shake", this); // leafy palm tree + SceneryDefinition.forId(2975).getHandlers().put("option:shake", this); // leafy palm tree return this; } @@ -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..."); - SceneryBuilder.replace(node.asObject(), node.asObject().transform(2976), 60); // 35 second cool-down + SceneryBuilder.replace(node.asScenery(), node.asScenery().transform(2976), 60); // 35 second cool-down player.lock(); final Pulse palmPulse = new Pulse(2) { @Override diff --git a/Server/src/main/java/core/game/interaction/city/KhardianDesertPlugin.java b/Server/src/main/java/core/game/interaction/city/KhardianDesertPlugin.java index e1894795f..6d473da80 100644 --- a/Server/src/main/java/core/game/interaction/city/KhardianDesertPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/KhardianDesertPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.city; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -19,10 +19,10 @@ public final class KhardianDesertPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(6481).getHandlers().put("option:enter", this); - ObjectDefinition.forId(6545).getHandlers().put("option:open", this); - ObjectDefinition.forId(6547).getHandlers().put("option:open", this); - ObjectDefinition.forId(6551).getHandlers().put("option:use", this); + SceneryDefinition.forId(6481).getHandlers().put("option:enter", this); + SceneryDefinition.forId(6545).getHandlers().put("option:open", this); + SceneryDefinition.forId(6547).getHandlers().put("option:open", this); + SceneryDefinition.forId(6551).getHandlers().put("option:use", this); return this; } @@ -35,7 +35,7 @@ public final class KhardianDesertPlugin extends OptionHandler { case 6545: case 6547: // player.getPacketDispatch().sendMessage("A mystical power has sealed this door..."); - DoorActionHandler.handleAutowalkDoor(player, node.asObject()); + DoorActionHandler.handleAutowalkDoor(player, node.asScenery()); break; case 6551: player.teleport(new Location(3233, 2887, 0)); 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 90997862f..7b9d63629 100644 --- a/Server/src/main/java/core/game/interaction/city/LumbridgeNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/LumbridgeNodePlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.city; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.node.entity.player.link.diary.DiaryType; import core.game.component.Component; import core.game.content.activity.ActivityManager; @@ -38,13 +38,13 @@ public final class LumbridgeNodePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(36978).getHandlers().put("option:play", this); - ObjectDefinition.forId(37335).getHandlers().put("option:raise", this); - ObjectDefinition.forId(37095).getHandlers().put("option:shoot-at", this); - ObjectDefinition.forId(36976).getHandlers().put("option:ring", this); - ObjectDefinition.forId(22114).getHandlers().put("option:open", this); - ObjectDefinition.forId(29355).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(37655).getHandlers().put("option:view", this); + SceneryDefinition.forId(36978).getHandlers().put("option:play", this); + SceneryDefinition.forId(37335).getHandlers().put("option:raise", this); + SceneryDefinition.forId(37095).getHandlers().put("option:shoot-at", this); + SceneryDefinition.forId(36976).getHandlers().put("option:ring", this); + SceneryDefinition.forId(22114).getHandlers().put("option:open", this); + SceneryDefinition.forId(29355).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(37655).getHandlers().put("option:view", this); return this; } @@ -57,7 +57,7 @@ public final class LumbridgeNodePlugin extends OptionHandler { ClimbActionHandler.climb(player, ClimbActionHandler.CLIMB_UP, new Location(3210, 3216, 0)); break; } - ClimbActionHandler.climbLadder(player, node.asObject(), "climb-up"); + ClimbActionHandler.climbLadder(player, node.asScenery(), "climb-up"); return true; case 37095: if (!player.getEquipment().contains(9706, 1) || !player.getEquipment().contains(9705, 1)) { diff --git a/Server/src/main/java/core/game/interaction/city/LunarIslePlugin.java b/Server/src/main/java/core/game/interaction/city/LunarIslePlugin.java index a5e2876f5..0931271a5 100644 --- a/Server/src/main/java/core/game/interaction/city/LunarIslePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/LunarIslePlugin.java @@ -1,7 +1,7 @@ package core.game.interaction.city; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -20,8 +20,8 @@ public final class LunarIslePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(16777).getHandlers().put("option:close", this); - ObjectDefinition.forId(16774).getHandlers().put("option:open", this); + SceneryDefinition.forId(16777).getHandlers().put("option:close", this); + SceneryDefinition.forId(16774).getHandlers().put("option:open", this); NPCDefinition.forId(4512).getHandlers().put("option:go-inside", this); return this; } 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 a3ab89f3f..a9b728140 100644 --- a/Server/src/main/java/core/game/interaction/city/MonasteryPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/MonasteryPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.city; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -19,7 +19,7 @@ public final class MonasteryPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2641).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(2641).getHandlers().put("option:climb-up", this); return this; } 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 ea35b1c09..ee072e70f 100644 --- a/Server/src/main/java/core/game/interaction/city/PortSarimPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/PortSarimPlugin.java @@ -1,7 +1,7 @@ package core.game.interaction.city; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; @@ -48,16 +48,16 @@ public final class PortSarimPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { NPCDefinition.forId(2704).getHandlers().put("option:talk-to", this); - ObjectDefinition.forId(9565).getHandlers().put("option:open", this); - ObjectDefinition.forId(9565).getHandlers().put("option:pick-lock", this); - ObjectDefinition.forId(9563).getHandlers().put("option:open", this); + SceneryDefinition.forId(9565).getHandlers().put("option:open", this); + SceneryDefinition.forId(9565).getHandlers().put("option:pick-lock", this); + SceneryDefinition.forId(9563).getHandlers().put("option:open", this); for (int i : MONKS) { NPCDefinition.forId(i).getHandlers().put("option:take-boat", this); } - ObjectDefinition.forId(2071).getHandlers().put("option:search", this); + SceneryDefinition.forId(2071).getHandlers().put("option:search", this); NPCDefinition.forId(745).getHandlers().put("option:attack", this); - ObjectDefinition.forId(33173).getHandlers().put("option:exit", this); - ObjectDefinition.forId(33174).getHandlers().put("option:enter", this); + SceneryDefinition.forId(33173).getHandlers().put("option:exit", this); + SceneryDefinition.forId(33174).getHandlers().put("option:enter", this); return this; } diff --git a/Server/src/main/java/core/game/interaction/city/RCGuildMap.java b/Server/src/main/java/core/game/interaction/city/RCGuildMap.java index 3b5b405f3..d2b9270f2 100644 --- a/Server/src/main/java/core/game/interaction/city/RCGuildMap.java +++ b/Server/src/main/java/core/game/interaction/city/RCGuildMap.java @@ -1,6 +1,6 @@ package core.game.interaction.city; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -15,7 +15,7 @@ public class RCGuildMap extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(38422).getHandlers().put("option:study",this); + SceneryDefinition.forId(38422).getHandlers().put("option:study",this); return null; } diff --git a/Server/src/main/java/core/game/interaction/city/RCGuildPortal.java b/Server/src/main/java/core/game/interaction/city/RCGuildPortal.java index 72dd4fd3c..b24822c32 100644 --- a/Server/src/main/java/core/game/interaction/city/RCGuildPortal.java +++ b/Server/src/main/java/core/game/interaction/city/RCGuildPortal.java @@ -1,6 +1,6 @@ package core.game.interaction.city; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -16,8 +16,8 @@ import core.plugin.Plugin; public class RCGuildPortal extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(38279).getHandlers().put("option:examine",this); - ObjectDefinition.forId(38279).getHandlers().put("option:enter",this); + SceneryDefinition.forId(38279).getHandlers().put("option:examine",this); + SceneryDefinition.forId(38279).getHandlers().put("option:enter",this); return null; } diff --git a/Server/src/main/java/core/game/interaction/city/ShiloVillagePlugin.java b/Server/src/main/java/core/game/interaction/city/ShiloVillagePlugin.java index ded81f237..7e7559fb3 100644 --- a/Server/src/main/java/core/game/interaction/city/ShiloVillagePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/ShiloVillagePlugin.java @@ -1,7 +1,7 @@ package core.game.interaction.city; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.plugin.Initializable; import core.game.content.dialogue.DialoguePlugin; import core.game.interaction.OptionHandler; @@ -26,13 +26,13 @@ public final class ShiloVillagePlugin extends OptionHandler { public Plugin newInstance(Object arg) throws Throwable { NPCDefinition.forId(511).getHandlers().put("option:pay-fare", this); NPCDefinition.forId(510).getHandlers().put("option:pay-fare", this); - ObjectDefinition.forId(2230).getHandlers().put("option:board", this);// cart + SceneryDefinition.forId(2230).getHandlers().put("option:board", this);// cart // travel. - ObjectDefinition.forId(2230).getHandlers().put("option:pay-fare", this);// cart + SceneryDefinition.forId(2230).getHandlers().put("option:pay-fare", this);// cart // travel. - ObjectDefinition.forId(2265).getHandlers().put("option:board", this);// cart + SceneryDefinition.forId(2265).getHandlers().put("option:board", this);// cart // travel. - ObjectDefinition.forId(2265).getHandlers().put("option:pay-fare", this);// cart + SceneryDefinition.forId(2265).getHandlers().put("option:pay-fare", this);// cart // travel. PluginManager.definePlugin(new VillageCartDialogue()); return this; 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 23b784b7f..d35c8a363 100644 --- a/Server/src/main/java/core/game/interaction/city/SophanemPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/SophanemPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.city; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -22,8 +22,8 @@ public class SophanemPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(20277).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(20275).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(20277).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(20275).getHandlers().put("option:climb-down", this); return this; } 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 5618bb6f2..2bed35a9c 100644 --- a/Server/src/main/java/core/game/interaction/city/TaverlyDungeonPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/TaverlyDungeonPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.city; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -28,8 +28,8 @@ public final class TaverlyDungeonPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2143).getHandlers().put("option:open", this); - ObjectDefinition.forId(2144).getHandlers().put("option:open", this); + SceneryDefinition.forId(2143).getHandlers().put("option:open", this); + SceneryDefinition.forId(2144).getHandlers().put("option:open", this); return this; } 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 bab206236..d93f33949 100644 --- a/Server/src/main/java/core/game/interaction/city/TrollheimPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/TrollheimPlugin.java @@ -1,7 +1,7 @@ package core.game.interaction.city; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.content.activity.ActivityManager; import core.game.content.activity.ActivityPlugin; @@ -76,86 +76,86 @@ public final class TrollheimPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(3735).getHandlers().put("option:enter", this); - ObjectDefinition.forId(32738).getHandlers().put("option:exit", this); + SceneryDefinition.forId(3735).getHandlers().put("option:enter", this); + SceneryDefinition.forId(32738).getHandlers().put("option:exit", this); NPCDefinition.forId(1069).getHandlers().put("option:talk-to", this); - ObjectDefinition.forId(3742).getHandlers().put("option:read", this); - ObjectDefinition.forId(3774).getHandlers().put("option:leave", this); - ObjectDefinition.forId(3723).getHandlers().put("option:climb", this);// located + SceneryDefinition.forId(3742).getHandlers().put("option:read", this); + SceneryDefinition.forId(3774).getHandlers().put("option:leave", this); + SceneryDefinition.forId(3723).getHandlers().put("option:climb", this);// located // in // circle // area. - ObjectDefinition.forId(3722).getHandlers().put("option:climb", this);// located + SceneryDefinition.forId(3722).getHandlers().put("option:climb", this);// located // in // circle // area. - ObjectDefinition.forId(3748).getHandlers().put("option:climb", this); - ObjectDefinition.forId(3790).getHandlers().put("option:climb", this);// pos=Location.create(2858, + SceneryDefinition.forId(3748).getHandlers().put("option:climb", this); + SceneryDefinition.forId(3790).getHandlers().put("option:climb", this);// pos=Location.create(2858, // 3627, // 0) - ObjectDefinition.forId(3791).getHandlers().put("option:climb", this);// pos=Location.create(2858, + SceneryDefinition.forId(3791).getHandlers().put("option:climb", this);// pos=Location.create(2858, // 3627, // 0) - ObjectDefinition.forId(3782).getHandlers().put("option:open", this);// arena + SceneryDefinition.forId(3782).getHandlers().put("option:open", this);// arena // entrance - ObjectDefinition.forId(3783).getHandlers().put("option:open", this);// arena + SceneryDefinition.forId(3783).getHandlers().put("option:open", this);// arena // entrance - ObjectDefinition.forId(3762).getHandlers().put("option:open", this);// secret + SceneryDefinition.forId(3762).getHandlers().put("option:open", this);// secret // door. - ObjectDefinition.forId(4499).getHandlers().put("option:enter", this);// entrance + SceneryDefinition.forId(4499).getHandlers().put("option:enter", this);// entrance // near // golden // apple. - ObjectDefinition.forId(4500).getHandlers().put("option:enter", this);// entrance + SceneryDefinition.forId(4500).getHandlers().put("option:enter", this);// entrance // near // golden // apple. - ObjectDefinition.forId(9303).getHandlers().put("option:climb", this);// lvl + SceneryDefinition.forId(9303).getHandlers().put("option:climb", this);// lvl // 41. - ObjectDefinition.forId(3782).getHandlers().put("option:open", this);// arena + SceneryDefinition.forId(3782).getHandlers().put("option:open", this);// arena // entrance. - ObjectDefinition.forId(3783).getHandlers().put("option:open", this);// arena + SceneryDefinition.forId(3783).getHandlers().put("option:open", this);// arena // entrance. - ObjectDefinition.forId(3785).getHandlers().put("option:open", this);// arena + SceneryDefinition.forId(3785).getHandlers().put("option:open", this);// arena // exit. - ObjectDefinition.forId(3786).getHandlers().put("option:open", this);// arena + SceneryDefinition.forId(3786).getHandlers().put("option:open", this);// arena // exit. - ObjectDefinition.forId(3757).getHandlers().put("option:enter", this);// arena + SceneryDefinition.forId(3757).getHandlers().put("option:enter", this);// arena // cave // entrance. - ObjectDefinition.forId(3758).getHandlers().put("option:exit", this);// arena + SceneryDefinition.forId(3758).getHandlers().put("option:exit", this);// arena // cave // exit. - ObjectDefinition.forId(9327).getHandlers().put("option:climb", this);// lvl + SceneryDefinition.forId(9327).getHandlers().put("option:climb", this);// lvl // 64 - ObjectDefinition.forId(9304).getHandlers().put("option:climb", this); + SceneryDefinition.forId(9304).getHandlers().put("option:climb", this); ;// lvl // 43 - ObjectDefinition.forId(3803).getHandlers().put("option:climb", this); + SceneryDefinition.forId(3803).getHandlers().put("option:climb", this); ;// lvl // 43 // near // trollheim // top. - ObjectDefinition.forId(3804).getHandlers().put("option:climb", this); + SceneryDefinition.forId(3804).getHandlers().put("option:climb", this); ;// lvl // 43 // near // trollheim // top. - ObjectDefinition.forId(9306).getHandlers().put("option:climb", this);// lvl + SceneryDefinition.forId(9306).getHandlers().put("option:climb", this);// lvl // 47 - ObjectDefinition.forId(9305).getHandlers().put("option:climb", this);// lvl + SceneryDefinition.forId(9305).getHandlers().put("option:climb", this);// lvl // 44 - ObjectDefinition.forId(3759).getHandlers().put("option:enter", this);// top + SceneryDefinition.forId(3759).getHandlers().put("option:enter", this);// top // cave. - ObjectDefinition.forId(3771).getHandlers().put("option:enter", this);// stronghold + SceneryDefinition.forId(3771).getHandlers().put("option:enter", this);// stronghold // to // herb // patch - ObjectDefinition.forId(18834).getHandlers().put("option:climb-up", this);// stronghold + SceneryDefinition.forId(18834).getHandlers().put("option:climb-up", this);// stronghold // ladder - ObjectDefinition.forId(18833).getHandlers().put("option:climb-down", this);// stronghold + SceneryDefinition.forId(18833).getHandlers().put("option:climb-down", this);// stronghold // ladder PluginManager.definePlugin(new SabaDialogue()); PluginManager.definePlugin(new WoundedSoldier()); 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 0e91d1c98..aa0f284e2 100644 --- a/Server/src/main/java/core/game/interaction/city/TzhaarCityPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/TzhaarCityPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.city; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.activity.ActivityManager; import core.game.content.dialogue.DialoguePlugin; import core.game.interaction.OptionHandler; @@ -27,12 +27,12 @@ public final class TzhaarCityPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(31284).getHandlers().put("option:enter", this);// karamja + SceneryDefinition.forId(31284).getHandlers().put("option:enter", this);// karamja // cave. - ObjectDefinition.forId(9359).getHandlers().put("option:enter", this);// tzhaar + SceneryDefinition.forId(9359).getHandlers().put("option:enter", this);// tzhaar // exit - ObjectDefinition.forId(9356).getHandlers().put("option:enter", this); - ObjectDefinition.forId(9369).getHandlers().put("option:pass", this); + SceneryDefinition.forId(9356).getHandlers().put("option:enter", this); + SceneryDefinition.forId(9369).getHandlers().put("option:pass", this); new TzhaarDialogue().init(); return this; } 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 d87bede8e..571075c02 100644 --- a/Server/src/main/java/core/game/interaction/city/VarrockNodePlugin.java +++ b/Server/src/main/java/core/game/interaction/city/VarrockNodePlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.city; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.content.dialogue.DialoguePlugin; import core.game.content.dialogue.FacialExpression; @@ -39,19 +39,19 @@ public final class VarrockNodePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(24357).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(5581).getHandlers().put("option:take-axe", this); - ObjectDefinition.forId(36974).getHandlers().put("option:take-axe", this); - ObjectDefinition.forId(24427).getHandlers().put("option:walk-up", this); - ObjectDefinition.forId(24428).getHandlers().put("option:walk-down", this); - ObjectDefinition.forId(1749).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(23636).getHandlers().put("option:read", this); - ObjectDefinition.forId(24389).getHandlers().put("option:knock-at", this); - ObjectDefinition.forId(9662).getHandlers().put("option:take", this); - ObjectDefinition.forId(17974).getHandlers().put("option:climb-up", this); - 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); + SceneryDefinition.forId(24357).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(5581).getHandlers().put("option:take-axe", this); + SceneryDefinition.forId(36974).getHandlers().put("option:take-axe", this); + SceneryDefinition.forId(24427).getHandlers().put("option:walk-up", this); + SceneryDefinition.forId(24428).getHandlers().put("option:walk-down", this); + SceneryDefinition.forId(1749).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(23636).getHandlers().put("option:read", this); + SceneryDefinition.forId(24389).getHandlers().put("option:knock-at", this); + SceneryDefinition.forId(9662).getHandlers().put("option:take", this); + SceneryDefinition.forId(17974).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(29534).getHandlers().put("option:enter", this); + SceneryDefinition.forId(17985).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(24366).getHandlers().put("option:climb-up", this); SceneryBuilder.add(new Scenery(17974, new Location(3204, 9911), 10, 0)); new KnockatDoorDialogue().init(); return this; 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 f559f6426..687212634 100644 --- a/Server/src/main/java/core/game/interaction/city/WildernessPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/WildernessPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.city; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; @@ -26,12 +26,12 @@ public final class WildernessPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { new KBDPlugin().newInstance(arg); - ObjectDefinition.forId(37749).getHandlers().put("option:go-through", this); - ObjectDefinition.forId(37928).getHandlers().put("option:go-through", this); - ObjectDefinition.forId(37929).getHandlers().put("option:go-through", this); - ObjectDefinition.forId(38811).getHandlers().put("option:go-through", this); - ObjectDefinition.forId(39191).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(39188).getHandlers().put("option:open", this); + SceneryDefinition.forId(37749).getHandlers().put("option:go-through", this); + SceneryDefinition.forId(37928).getHandlers().put("option:go-through", this); + SceneryDefinition.forId(37929).getHandlers().put("option:go-through", this); + SceneryDefinition.forId(38811).getHandlers().put("option:go-through", this); + SceneryDefinition.forId(39191).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(39188).getHandlers().put("option:open", this); return this; } @@ -77,10 +77,10 @@ public final class WildernessPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(1765).getHandlers().put("option:climb-down", this);// ladder - ObjectDefinition.forId(1766).getHandlers().put("option:climb-up", this);// ladder - ObjectDefinition.forId(1816).getHandlers().put("option:pull", this);// kbd - ObjectDefinition.forId(1817).getHandlers().put("option:pull", this);// kbd + SceneryDefinition.forId(1765).getHandlers().put("option:climb-down", this);// ladder + SceneryDefinition.forId(1766).getHandlers().put("option:climb-up", this);// ladder + SceneryDefinition.forId(1816).getHandlers().put("option:pull", this);// kbd + SceneryDefinition.forId(1817).getHandlers().put("option:pull", this);// kbd return this; } 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 b3305e2d6..b45862c80 100644 --- a/Server/src/main/java/core/game/interaction/city/WizardTowerPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/WizardTowerPlugin.java @@ -2,7 +2,7 @@ package core.game.interaction.city; import api.ContentAPI; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.content.dialogue.DialoguePlugin; import core.game.content.global.Skillcape; @@ -16,7 +16,6 @@ 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.entity.player.link.RunScript; import core.game.node.entity.player.link.SpellBookManager.SpellBook; import core.game.node.entity.player.link.diary.DiaryType; import core.game.node.entity.player.link.quest.Quest; @@ -62,12 +61,12 @@ public final class WizardTowerPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(12540).getHandlers().put("option:search", this); - ObjectDefinition.forId(12539).getHandlers().put("option:search", this); - ObjectDefinition.forId(2147).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(32015).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(12540).getHandlers().put("option:search", this); + SceneryDefinition.forId(12539).getHandlers().put("option:search", this); + SceneryDefinition.forId(2147).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(32015).getHandlers().put("option:climb-up", this); NPCDefinition.forId(300).getHandlers().put("option:teleport", this); - ObjectDefinition.forId(11993).getHandlers().put("option:open", this); + SceneryDefinition.forId(11993).getHandlers().put("option:open", this); PluginManager.definePlugin(new WizardtowerWizardNPC()); PluginManager.definePlugin(new WizardTowerDialogue()); PluginManager.definePlugin(new WizardMisgogDialogue()); @@ -105,7 +104,7 @@ public final class WizardTowerPlugin extends OptionHandler { return true; } if (!Location.create(3103, 9576, 0).equals(((Scenery) node).getLocation())) { - return ObjectDefinition.getOptionHandler(2147, "climb-up").handle(player, node, option); + return SceneryDefinition.getOptionHandler(2147, "climb-up").handle(player, node, option); } player.getProperties().setTeleportLocation(GROUND_FLOOR); break; 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 f38df04f3..531836bbc 100644 --- a/Server/src/main/java/core/game/interaction/city/ZanarisPlugin.java +++ b/Server/src/main/java/core/game/interaction/city/ZanarisPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.city; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.plugin.Initializable; import core.game.content.dialogue.DialogueInterpreter; import core.game.content.dialogue.DialoguePlugin; @@ -25,9 +25,9 @@ public final class ZanarisPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { PluginManager.definePlugin(new MagicDoorDialogue()); - ObjectDefinition.forId(12094).getHandlers().put("option:use", this); - ObjectDefinition.forId(12045).getHandlers().put("option:open", this); - ObjectDefinition.forId(12047).getHandlers().put("option:open", this); + SceneryDefinition.forId(12094).getHandlers().put("option:use", this); + SceneryDefinition.forId(12045).getHandlers().put("option:open", this); + SceneryDefinition.forId(12047).getHandlers().put("option:open", this); return this; } diff --git a/Server/src/main/java/core/game/interaction/city/lumbridge/CowFieldSign.java b/Server/src/main/java/core/game/interaction/city/lumbridge/CowFieldSign.java index 7040ef143..377a1bece 100644 --- a/Server/src/main/java/core/game/interaction/city/lumbridge/CowFieldSign.java +++ b/Server/src/main/java/core/game/interaction/city/lumbridge/CowFieldSign.java @@ -1,6 +1,6 @@ package core.game.interaction.city.lumbridge; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.dialogue.DialoguePlugin; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -19,7 +19,7 @@ public class CowFieldSign extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable{ new SignDialogue().init(); - ObjectDefinition.forId(31297).getHandlers().put("option:read",this); + SceneryDefinition.forId(31297).getHandlers().put("option:read",this); return this; } @Override 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 97e69eb2f..85810a801 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 @@ -1,6 +1,6 @@ package core.game.interaction.city.lumbridge; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -19,17 +19,17 @@ import core.plugin.Plugin; public class FredChest extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable{ - ObjectDefinition.forId(37009).getHandlers().put("option:open",this); - ObjectDefinition.forId(37010).getHandlers().put("option:shut",this); - ObjectDefinition.forId(37010).getHandlers().put("option:search",this); + SceneryDefinition.forId(37009).getHandlers().put("option:open",this); + SceneryDefinition.forId(37010).getHandlers().put("option:shut",this); + SceneryDefinition.forId(37010).getHandlers().put("option:search",this); return this; } @Override public boolean handle(Player player, Node node, String option){ if(option.equals("open")){ - SceneryBuilder.replace(node.asObject(),new Scenery(37010,node.asObject().getLocation(),node.asObject().getRotation())); + SceneryBuilder.replace(node.asScenery(),new Scenery(37010,node.asScenery().getLocation(),node.asScenery().getRotation())); } else if (option.equals("shut")){ - SceneryBuilder.replace(node.asObject(),new Scenery(37009,node.asObject().getLocation(),node.asObject().getRotation())); + SceneryBuilder.replace(node.asScenery(),new Scenery(37009,node.asScenery().getLocation(),node.asScenery().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/city/lumbridge/GnomeCopterSign.java b/Server/src/main/java/core/game/interaction/city/lumbridge/GnomeCopterSign.java index f0c113aeb..bbaec9ed6 100644 --- a/Server/src/main/java/core/game/interaction/city/lumbridge/GnomeCopterSign.java +++ b/Server/src/main/java/core/game/interaction/city/lumbridge/GnomeCopterSign.java @@ -1,6 +1,6 @@ package core.game.interaction.city.lumbridge; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.plugin.Initializable; import core.game.content.dialogue.DialoguePlugin; import core.game.interaction.OptionHandler; @@ -14,7 +14,7 @@ public class GnomeCopterSign extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { new SignDialogue().init(); - ObjectDefinition.forId(30037).getHandlers().put("option:read",this); + SceneryDefinition.forId(30037).getHandlers().put("option:read",this); return this; } diff --git a/Server/src/main/java/core/game/interaction/inter/OrbViewingInterface.java b/Server/src/main/java/core/game/interaction/inter/OrbViewingInterface.java index e37833850..6c2e78715 100644 --- a/Server/src/main/java/core/game/interaction/inter/OrbViewingInterface.java +++ b/Server/src/main/java/core/game/interaction/inter/OrbViewingInterface.java @@ -1,7 +1,7 @@ package core.game.interaction.inter; import rs09.ServerConstants; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.CloseEvent; import core.game.component.Component; import core.game.component.ComponentDefinition; @@ -57,11 +57,11 @@ public final class OrbViewingInterface extends ComponentPlugin { PluginManager.definePlugin(new OptionHandler() { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(9391).getHandlers().put("option:look-into", this); - ObjectDefinition.forId(28194).getHandlers().put("option:look-into", this); - ObjectDefinition.forId(28209).getHandlers().put("option:view", this); - ObjectDefinition.forId(28210).getHandlers().put("option:view", this); - ObjectDefinition.forId(28211).getHandlers().put("option:view", this); + SceneryDefinition.forId(9391).getHandlers().put("option:look-into", this); + SceneryDefinition.forId(28194).getHandlers().put("option:look-into", this); + SceneryDefinition.forId(28209).getHandlers().put("option:view", this); + SceneryDefinition.forId(28210).getHandlers().put("option:view", this); + SceneryDefinition.forId(28211).getHandlers().put("option:view", this); return this; } diff --git a/Server/src/main/java/core/game/interaction/item/FishbowlPlugin.java b/Server/src/main/java/core/game/interaction/item/FishbowlPlugin.java index 1529694a8..cba9a7206 100644 --- a/Server/src/main/java/core/game/interaction/item/FishbowlPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/FishbowlPlugin.java @@ -2,7 +2,7 @@ package core.game.interaction.item; import core.Util; import core.cache.def.impl.ItemDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import org.rs09.consts.Items; import core.game.interaction.NodeUsageEvent; import core.game.interaction.OptionHandler; @@ -219,7 +219,7 @@ public class FishbowlPlugin extends OptionHandler { public static final class AquariumPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(10091).getHandlers().put("option:fish-in", this); + SceneryDefinition.forId(10091).getHandlers().put("option:fish-in", this); PluginManager.definePlugin(new TinyNetHandler()); return this; } diff --git a/Server/src/main/java/core/game/interaction/item/withobject/IncubatorPlugin.java b/Server/src/main/java/core/game/interaction/item/withobject/IncubatorPlugin.java index 68560d078..233518142 100644 --- a/Server/src/main/java/core/game/interaction/item/withobject/IncubatorPlugin.java +++ b/Server/src/main/java/core/game/interaction/item/withobject/IncubatorPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.item.withobject; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.NodeUsageEvent; import core.game.interaction.OptionHandler; import core.game.interaction.UseWithHandler; @@ -25,8 +25,8 @@ public class IncubatorPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { PluginManager.definePlugin(new IncubatorEggHandler()); - ObjectDefinition.forId(28359).getHandlers().put("option:take-egg", this); - ObjectDefinition.forId(28359).getHandlers().put("option:inspect", this); + SceneryDefinition.forId(28359).getHandlers().put("option:take-egg", this); + SceneryDefinition.forId(28359).getHandlers().put("option:inspect", this); return this; } 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 d37763a7a..a2d5c2fb5 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 @@ -1,6 +1,6 @@ package core.game.interaction.item.withobject; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.smithing.SmithingBuilder; import core.game.node.entity.skill.smithing.smelting.Bar; @@ -49,7 +49,7 @@ public final class SmithingPlugin extends UseWithHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(42027).getHandlers().put("option:smith", this); + SceneryDefinition.forId(42027).getHandlers().put("option:smith", this); return this; } 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 04590e094..9cae233b0 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 @@ -48,7 +48,7 @@ public final class WaterSourcePlugin extends UseWithHandler { @Override public boolean handle(NodeUsageEvent event) { final WaterRecipient recipient = WaterRecipient.forItem(event.getUsedItem()); - recipient.handle(event.getUsedWith().asObject(), event.getPlayer()); + recipient.handle(event.getUsedWith().asScenery(), event.getPlayer()); return true; } 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 63cc74d76..021840af1 100644 --- a/Server/src/main/java/core/game/interaction/npc/BurthorpeOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/npc/BurthorpeOptionPlugin.java @@ -1,7 +1,7 @@ package core.game.interaction.npc; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -46,18 +46,18 @@ public final class BurthorpeOptionPlugin extends OptionHandler { // soldiers NPCDefinition.forId(1062).getHandlers().put("option:talk-to", this);// other // sergant - ObjectDefinition.forId(7257).getHandlers().put("option:enter", this);// thieving + SceneryDefinition.forId(7257).getHandlers().put("option:enter", this);// thieving // guide // trapdoor. - ObjectDefinition.forId(7258).getHandlers().put("option:enter", this);// thieving + SceneryDefinition.forId(7258).getHandlers().put("option:enter", this);// thieving // guide // passegeway. NPCDefinition.forId(1073).getHandlers().put("option:talk-to", this); NPCDefinition.forId(1074).getHandlers().put("option:talk-to", this); NPCDefinition.forId(1076).getHandlers().put("option:talk-to", this); NPCDefinition.forId(1077).getHandlers().put("option:talk-to", this); - ObjectDefinition.forId(4624).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(4627).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(4624).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(4627).getHandlers().put("option:climb-down", this); return this; } 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 7e73ec5c1..ea914a132 100644 --- a/Server/src/main/java/core/game/interaction/npc/SpiritKyattOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/npc/SpiritKyattOptionPlugin.java @@ -1,7 +1,7 @@ package core.game.interaction.npc; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -23,11 +23,11 @@ public final class SpiritKyattOptionPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { NPCDefinition.forId(7365).getHandlers().put("option:interact", this); - ObjectDefinition.forId(28741).getHandlers().put("option:open", this); - ObjectDefinition.forId(28743).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(28743).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(14910).getHandlers().put("option:take", this); - ObjectDefinition.forId(14912).getHandlers().put("option:take", this); + SceneryDefinition.forId(28741).getHandlers().put("option:open", this); + SceneryDefinition.forId(28743).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(28743).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(14910).getHandlers().put("option:take", this); + SceneryDefinition.forId(14912).getHandlers().put("option:take", this); return this; } 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 034977cdf..69d92e357 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 @@ -1,7 +1,7 @@ package core.game.interaction.npc.sorceress_app; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -49,7 +49,7 @@ public class SorceressApprenticePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { NPCDefinition.forId(5532).getHandlers().put("option:teleport", this); - ObjectDefinition.forId(21781).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(21781).getHandlers().put("option:climb-up", this); new SorceressStairs().newInstance(arg); PluginManager.definePlugin(new SorceressApprenticeDialogue()); return this; @@ -64,7 +64,7 @@ public class SorceressApprenticePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(35645).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(35645).getHandlers().put("option:climb-down", this); return this; } 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 8650574d4..91bd92c88 100644 --- a/Server/src/main/java/core/game/interaction/object/BankingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/BankingPlugin.java @@ -2,7 +2,7 @@ package core.game.interaction.object; import api.ContentAPI; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.CloseEvent; import core.game.component.Component; import core.game.component.ComponentDefinition; @@ -47,11 +47,11 @@ public final class BankingPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.setOptionHandler("use-quickly", this); - ObjectDefinition.setOptionHandler("use", this); - ObjectDefinition.setOptionHandler("bank", this); - ObjectDefinition.setOptionHandler("collect", this); - ObjectDefinition.setOptionHandler("deposit", this); + SceneryDefinition.setOptionHandler("use-quickly", this); + SceneryDefinition.setOptionHandler("use", this); + SceneryDefinition.setOptionHandler("bank", this); + SceneryDefinition.setOptionHandler("collect", this); + SceneryDefinition.setOptionHandler("deposit", this); new BankingInterface().newInstance(arg); new BankDepositInterface().newInstance(arg); new BankNPCPlugin().newInstance(arg); diff --git a/Server/src/main/java/core/game/interaction/object/BarrowsBoatPlugin.java b/Server/src/main/java/core/game/interaction/object/BarrowsBoatPlugin.java index 1419c2e32..a4c7ed9a0 100644 --- a/Server/src/main/java/core/game/interaction/object/BarrowsBoatPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/BarrowsBoatPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -20,8 +20,8 @@ public class BarrowsBoatPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(6970).getHandlers().put("option:board", this); - ObjectDefinition.forId(6969).getHandlers().put("option:board", this); + SceneryDefinition.forId(6970).getHandlers().put("option:board", this); + SceneryDefinition.forId(6969).getHandlers().put("option:board", this); return this; } 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 344ff50ef..66a0c1a89 100644 --- a/Server/src/main/java/core/game/interaction/object/BarrowsTunnelShortcut.java +++ b/Server/src/main/java/core/game/interaction/object/BarrowsTunnelShortcut.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.ClimbActionHandler; import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; @@ -20,15 +20,15 @@ public class BarrowsTunnelShortcut extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(5055).getHandlers().put("option:open", this); - ObjectDefinition.forId(5054).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(5052).getHandlers().put("option:search", this); - ObjectDefinition.forId(30261).getHandlers().put("option:open", this); - ObjectDefinition.forId(30262).getHandlers().put("option:open", this); - ObjectDefinition.forId(30265).getHandlers().put("option:open", this); - ObjectDefinition.forId(5005).getHandlers().put("option:climb up", this); - ObjectDefinition.forId(5005).getHandlers().put("option:climb down", this); - ObjectDefinition.forId(5002).getHandlers().put("option:walk-here", this); + SceneryDefinition.forId(5055).getHandlers().put("option:open", this); + SceneryDefinition.forId(5054).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(5052).getHandlers().put("option:search", this); + SceneryDefinition.forId(30261).getHandlers().put("option:open", this); + SceneryDefinition.forId(30262).getHandlers().put("option:open", this); + SceneryDefinition.forId(30265).getHandlers().put("option:open", this); + SceneryDefinition.forId(5005).getHandlers().put("option:climb up", this); + SceneryDefinition.forId(5005).getHandlers().put("option:climb down", this); + SceneryDefinition.forId(5002).getHandlers().put("option:walk-here", this); return this; } diff --git a/Server/src/main/java/core/game/interaction/object/BeehivePlugin.java b/Server/src/main/java/core/game/interaction/object/BeehivePlugin.java index b2a2d0f15..b2edb87a7 100644 --- a/Server/src/main/java/core/game/interaction/object/BeehivePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/BeehivePlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import org.rs09.consts.Items; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -59,8 +59,8 @@ public class BeehivePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(68).getHandlers().put("option:take-from", this); - ObjectDefinition.forId(68).getHandlers().put("option:take-honey", this); + SceneryDefinition.forId(68).getHandlers().put("option:take-from", this); + SceneryDefinition.forId(68).getHandlers().put("option:take-honey", this); return this; } 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 090e2a7cb..a5c2f5580 100644 --- a/Server/src/main/java/core/game/interaction/object/BrassKeyDoorPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/BrassKeyDoorPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -31,7 +31,7 @@ public final class BrassKeyDoorPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(1804).getHandlers().put("option:open", this); + SceneryDefinition.forId(1804).getHandlers().put("option:open", this); return this; } diff --git a/Server/src/main/java/core/game/interaction/object/BrokenCartBypass.java b/Server/src/main/java/core/game/interaction/object/BrokenCartBypass.java index 1d1471872..127b32b70 100644 --- a/Server/src/main/java/core/game/interaction/object/BrokenCartBypass.java +++ b/Server/src/main/java/core/game/interaction/object/BrokenCartBypass.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -20,7 +20,7 @@ import core.plugin.Plugin; @Initializable public class BrokenCartBypass extends OptionHandler { public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2216).getHandlers().put("option:look-at",this); + SceneryDefinition.forId(2216).getHandlers().put("option:look-at",this); return this; } diff --git a/Server/src/main/java/core/game/interaction/object/BuyCrateOptionPlugin.java b/Server/src/main/java/core/game/interaction/object/BuyCrateOptionPlugin.java index a29d954d2..b5535e752 100644 --- a/Server/src/main/java/core/game/interaction/object/BuyCrateOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/BuyCrateOptionPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -24,7 +24,7 @@ public final class BuyCrateOptionPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(6839).getHandlers().put("option:buy", this); + SceneryDefinition.forId(6839).getHandlers().put("option:buy", this); return this; } 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 d2b86c982..6ff0dacb7 100644 --- a/Server/src/main/java/core/game/interaction/object/ChampionsArenaPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ChampionsArenaPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; @@ -19,7 +19,7 @@ public final class ChampionsArenaPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(10556).getHandlers().put("option:open", this); + SceneryDefinition.forId(10556).getHandlers().put("option:open", this); return this; } 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 487cdc538..be987496e 100644 --- a/Server/src/main/java/core/game/interaction/object/ChampionsGuildDoor.java +++ b/Server/src/main/java/core/game/interaction/object/ChampionsGuildDoor.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -38,7 +38,7 @@ public final class ChampionsGuildDoor extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(1805).getHandlers().put("option:open", this); + SceneryDefinition.forId(1805).getHandlers().put("option:open", this); return this; } 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 4e753f64c..bdeedbc84 100644 --- a/Server/src/main/java/core/game/interaction/object/ChefGuildDoorPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ChefGuildDoorPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import org.rs09.consts.Items; import core.game.content.global.action.DoorActionHandler; import core.game.node.item.Item; @@ -65,8 +65,8 @@ public final class ChefGuildDoorPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2712).getHandlers().put("option:open", this); - ObjectDefinition.forId(26810).getHandlers().put("option:open", this); + SceneryDefinition.forId(2712).getHandlers().put("option:open", this); + SceneryDefinition.forId(26810).getHandlers().put("option:open", this); return this; } 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 557f40616..578bcb362 100644 --- a/Server/src/main/java/core/game/interaction/object/CowMilkingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/CowMilkingPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.NodeUsageEvent; import core.game.interaction.OptionHandler; import core.game.interaction.UseWithHandler; @@ -80,9 +80,9 @@ public final class CowMilkingPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(8689).getHandlers().put("option:milk", this); - ObjectDefinition.forId(12111).getHandlers().put("option:milk", this); - ObjectDefinition.setOptionHandler("steal-cowbell", this); + SceneryDefinition.forId(8689).getHandlers().put("option:milk", this); + SceneryDefinition.forId(12111).getHandlers().put("option:milk", this); + SceneryDefinition.setOptionHandler("steal-cowbell", this); PluginManager.definePlugin(new BucketHandler()); return this; } diff --git a/Server/src/main/java/core/game/interaction/object/CrystalChestPlugin.java b/Server/src/main/java/core/game/interaction/object/CrystalChestPlugin.java index cd7d6509e..5684a18b5 100644 --- a/Server/src/main/java/core/game/interaction/object/CrystalChestPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/CrystalChestPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.NodeUsageEvent; import core.game.interaction.OptionHandler; import core.game.interaction.UseWithHandler; @@ -39,7 +39,7 @@ public final class CrystalChestPlugin extends UseWithHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(172).getHandlers().put("option:open", this); + SceneryDefinition.forId(172).getHandlers().put("option:open", this); return this; } diff --git a/Server/src/main/java/core/game/interaction/object/CrystalKeyObjectPlugin.java b/Server/src/main/java/core/game/interaction/object/CrystalKeyObjectPlugin.java index a6bb3b50f..99dc9a38b 100644 --- a/Server/src/main/java/core/game/interaction/object/CrystalKeyObjectPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/CrystalKeyObjectPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -10,7 +10,7 @@ public class CrystalKeyObjectPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.setOptionHandler("open", this); + SceneryDefinition.setOptionHandler("open", this); return this; } 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 2a9b84e28..32314daa3 100644 --- a/Server/src/main/java/core/game/interaction/object/CulinomancerChestPliugin.java +++ b/Server/src/main/java/core/game/interaction/object/CulinomancerChestPliugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -21,9 +21,9 @@ public final class CulinomancerChestPliugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - 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); + SceneryDefinition.forId(12309).getHandlers().put("option:bank", this); + SceneryDefinition.forId(12309).getHandlers().put("option:buy-items", this); + SceneryDefinition.forId(12309).getHandlers().put("option:buy-food", this); 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/DoogleLeafPlugin.java b/Server/src/main/java/core/game/interaction/object/DoogleLeafPlugin.java index b2e80b855..296fd8e41 100644 --- a/Server/src/main/java/core/game/interaction/object/DoogleLeafPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/DoogleLeafPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -23,7 +23,7 @@ public class DoogleLeafPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(31155).getHandlers().put("option:pick-leaf", this); + SceneryDefinition.forId(31155).getHandlers().put("option:pick-leaf", this); 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 c71017a64..ced526848 100644 --- a/Server/src/main/java/core/game/interaction/object/DoorManagingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/DoorManagingPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -22,9 +22,9 @@ public final class DoorManagingPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.setOptionHandler("open", this); - ObjectDefinition.setOptionHandler("close", this); - ObjectDefinition.setOptionHandler("shut", this); + SceneryDefinition.setOptionHandler("open", this); + SceneryDefinition.setOptionHandler("close", this); + SceneryDefinition.setOptionHandler("shut", this); return this; } @@ -58,7 +58,7 @@ public final class DoorManagingPlugin extends OptionHandler { player.getProperties().setTeleportLocation(destination); return true; } - if (node.asObject().getId() == 25341) {// Mithril door + if (node.asScenery().getId() == 25341) {// Mithril door return false; } if (!name.contains("door") && !name.contains("gate") && !name.contains("fence") && !name.contains("wall") && !name.contains("exit") && !name.contains("entrance")) { 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 0db153ddf..eedc6f991 100644 --- a/Server/src/main/java/core/game/interaction/object/DropPartyLeverOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/DropPartyLeverOptionPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -24,7 +24,7 @@ public final class DropPartyLeverOptionPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(26194).getHandlers().put("option:pull", this); + SceneryDefinition.forId(26194).getHandlers().put("option:pull", this); return this; } diff --git a/Server/src/main/java/core/game/interaction/object/DummyAttackPlugin.java b/Server/src/main/java/core/game/interaction/object/DummyAttackPlugin.java index 4b30fdd0e..c6cdf566f 100644 --- a/Server/src/main/java/core/game/interaction/object/DummyAttackPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/DummyAttackPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.node.entity.skill.Skills; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -19,19 +19,19 @@ public final class DummyAttackPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2038).getHandlers().put("option:attack", this); - ObjectDefinition.forId(15624).getHandlers().put("option:attack", this); - ObjectDefinition.forId(15625).getHandlers().put("option:attack", this); - ObjectDefinition.forId(15626).getHandlers().put("option:attack", this); - ObjectDefinition.forId(15627).getHandlers().put("option:attack", this); - ObjectDefinition.forId(15628).getHandlers().put("option:attack", this); - ObjectDefinition.forId(15629).getHandlers().put("option:attack", this); - ObjectDefinition.forId(15630).getHandlers().put("option:attack", this); - ObjectDefinition.forId(18238).getHandlers().put("option:attack", this); - ObjectDefinition.forId(25648).getHandlers().put("option:attack", this); - ObjectDefinition.forId(28912).getHandlers().put("option:attack", this); - ObjectDefinition.forId(823).getHandlers().put("option:attack", this); - ObjectDefinition.forId(23921).getHandlers().put("option:attack", this); + SceneryDefinition.forId(2038).getHandlers().put("option:attack", this); + SceneryDefinition.forId(15624).getHandlers().put("option:attack", this); + SceneryDefinition.forId(15625).getHandlers().put("option:attack", this); + SceneryDefinition.forId(15626).getHandlers().put("option:attack", this); + SceneryDefinition.forId(15627).getHandlers().put("option:attack", this); + SceneryDefinition.forId(15628).getHandlers().put("option:attack", this); + SceneryDefinition.forId(15629).getHandlers().put("option:attack", this); + SceneryDefinition.forId(15630).getHandlers().put("option:attack", this); + SceneryDefinition.forId(18238).getHandlers().put("option:attack", this); + SceneryDefinition.forId(25648).getHandlers().put("option:attack", this); + SceneryDefinition.forId(28912).getHandlers().put("option:attack", this); + SceneryDefinition.forId(823).getHandlers().put("option:attack", this); + SceneryDefinition.forId(23921).getHandlers().put("option:attack", this); return this; } 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 5963741d6..b7692f3d0 100644 --- a/Server/src/main/java/core/game/interaction/object/ErnestTheChickenPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ErnestTheChickenPlugin.java @@ -3,7 +3,7 @@ package core.game.interaction.object; import java.awt.Point; import java.util.Arrays; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.DoorActionHandler; import core.game.node.entity.skill.agility.AgilityHandler; import core.game.interaction.OptionHandler; @@ -41,11 +41,11 @@ public final class ErnestTheChickenPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(11450).getHandlers().put("option:open", this); + SceneryDefinition.forId(11450).getHandlers().put("option:open", this); for (Lever lever : Lever.values()) { for (int i : lever.getObjectIds()) { - ObjectDefinition.forId(i).getHandlers().put("option:pull", this); - ObjectDefinition.forId(i).getHandlers().put("option:inspect", this); + SceneryDefinition.forId(i).getHandlers().put("option:pull", this); + SceneryDefinition.forId(i).getHandlers().put("option:inspect", this); } } /** doors */ 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 1baf9ddf6..df18bdf0c 100644 --- a/Server/src/main/java/core/game/interaction/object/FieldPickingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/FieldPickingPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.container.impl.EquipmentContainer; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -34,7 +34,7 @@ public final class FieldPickingPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { for(PickingPlant p : PickingPlant.values()){ - ObjectDefinition.forId(p.objectId).getHandlers().put("option:pick",this); + SceneryDefinition.forId(p.objectId).getHandlers().put("option:pick",this); } return this; } diff --git a/Server/src/main/java/core/game/interaction/object/FlourMakingPlugin.java b/Server/src/main/java/core/game/interaction/object/FlourMakingPlugin.java index 6bf10ce56..475edf6c3 100644 --- a/Server/src/main/java/core/game/interaction/object/FlourMakingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/FlourMakingPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.NodeUsageEvent; import core.game.interaction.OptionHandler; import core.game.interaction.UseWithHandler; @@ -44,15 +44,15 @@ public final class FlourMakingPlugin extends OptionHandler { public Plugin newInstance(Object arg) throws Throwable { int controls[] = new int[] { 2718, 2720, 2721, 24072, 24070 }; for (int i : controls) { - ObjectDefinition.forId(i).getHandlers().put("option:operate", this); + SceneryDefinition.forId(i).getHandlers().put("option:operate", this); } - ObjectDefinition.forId(36878).getHandlers().put("option:empty", this); - ObjectDefinition.forId(22420).getHandlers().put("option:empty", this); - ObjectDefinition.forId(5792).getHandlers().put("option:empty", this); - ObjectDefinition.forId(1782).getHandlers().put("option:empty", this); - ObjectDefinition.forId(1781).getHandlers().put("option:empty", this); - ObjectDefinition.forId(22421).getHandlers().put("option:empty", this); - ObjectDefinition.forId(24070).getHandlers().put("option:empty", this); + SceneryDefinition.forId(36878).getHandlers().put("option:empty", this); + SceneryDefinition.forId(22420).getHandlers().put("option:empty", this); + SceneryDefinition.forId(5792).getHandlers().put("option:empty", this); + SceneryDefinition.forId(1782).getHandlers().put("option:empty", this); + SceneryDefinition.forId(1781).getHandlers().put("option:empty", this); + SceneryDefinition.forId(22421).getHandlers().put("option:empty", this); + SceneryDefinition.forId(24070).getHandlers().put("option:empty", this); new GrainHopperPlugin().newInstance(arg); new FillPotHandler().newInstance(arg); return this; diff --git a/Server/src/main/java/core/game/interaction/object/GnomeSpiritTreePlugin.java b/Server/src/main/java/core/game/interaction/object/GnomeSpiritTreePlugin.java index bc3579e17..1f43896da 100644 --- a/Server/src/main/java/core/game/interaction/object/GnomeSpiritTreePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/GnomeSpiritTreePlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -17,12 +17,12 @@ public final class GnomeSpiritTreePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(1317).getHandlers().put("option:talk-to", this); - ObjectDefinition.forId(1317).getHandlers().put("option:teleport", this); - ObjectDefinition.forId(1293).getHandlers().put("option:talk-to", this); - ObjectDefinition.forId(1293).getHandlers().put("option:teleport", this); - ObjectDefinition.forId(1294).getHandlers().put("option:talk-to", this); - ObjectDefinition.forId(1294).getHandlers().put("option:teleport", this); + SceneryDefinition.forId(1317).getHandlers().put("option:talk-to", this); + SceneryDefinition.forId(1317).getHandlers().put("option:teleport", this); + SceneryDefinition.forId(1293).getHandlers().put("option:talk-to", this); + SceneryDefinition.forId(1293).getHandlers().put("option:teleport", this); + SceneryDefinition.forId(1294).getHandlers().put("option:talk-to", this); + SceneryDefinition.forId(1294).getHandlers().put("option:teleport", this); return this; } diff --git a/Server/src/main/java/core/game/interaction/object/GoblinVillagePopulationPlugin.java b/Server/src/main/java/core/game/interaction/object/GoblinVillagePopulationPlugin.java index 5e62493f0..63dbdaf14 100644 --- a/Server/src/main/java/core/game/interaction/object/GoblinVillagePopulationPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/GoblinVillagePopulationPlugin.java @@ -2,7 +2,7 @@ package core.game.interaction.object; import java.util.List; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; @@ -16,7 +16,7 @@ public class GoblinVillagePopulationPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(31301).getHandlers().put("option:read", this); + SceneryDefinition.forId(31301).getHandlers().put("option:read", this); return this; } diff --git a/Server/src/main/java/core/game/interaction/object/GrandExchangePlugin.java b/Server/src/main/java/core/game/interaction/object/GrandExchangePlugin.java index 63c33839d..f1fa68c4d 100644 --- a/Server/src/main/java/core/game/interaction/object/GrandExchangePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/GrandExchangePlugin.java @@ -1,7 +1,7 @@ package core.game.interaction.object; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.plugin.Initializable; import core.game.ge.GEGuidePrice; import core.game.ge.GrandExchangeDatabase; @@ -23,11 +23,11 @@ public final class GrandExchangePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(28089).getHandlers().put("option:use", this); - ObjectDefinition.forId(28089).getHandlers().put("option:exchange", this); - ObjectDefinition.forId(28089).getHandlers().put("option:collect", this); - ObjectDefinition.forId(28089).getHandlers().put("option:history", this); - ObjectDefinition.forId(28089).getHandlers().put("option:sets", this); + SceneryDefinition.forId(28089).getHandlers().put("option:use", this); + SceneryDefinition.forId(28089).getHandlers().put("option:exchange", this); + SceneryDefinition.forId(28089).getHandlers().put("option:collect", this); + SceneryDefinition.forId(28089).getHandlers().put("option:history", this); + SceneryDefinition.forId(28089).getHandlers().put("option:sets", this); for (int i : new int[] { 6528, 6529, 6530, 6531 }) { NPCDefinition.forId(i).getHandlers().put("option:exchange", this); NPCDefinition.forId(i).getHandlers().put("option:history", this); 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 5f85e3aa2..189b4bef8 100644 --- a/Server/src/main/java/core/game/interaction/object/GrandExchangeShortcut.java +++ b/Server/src/main/java/core/game/interaction/object/GrandExchangeShortcut.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.node.entity.player.link.diary.DiaryType; import core.plugin.Initializable; import core.game.node.entity.skill.Skills; @@ -40,8 +40,8 @@ public final class GrandExchangeShortcut extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(9311).getHandlers().put("option:climb-into", this); - ObjectDefinition.forId(9312).getHandlers().put("option:climb-into", this); + SceneryDefinition.forId(9311).getHandlers().put("option:climb-into", this); + SceneryDefinition.forId(9312).getHandlers().put("option:climb-into", this); return null; } diff --git a/Server/src/main/java/core/game/interaction/object/GuidorDoorPlugin.java b/Server/src/main/java/core/game/interaction/object/GuidorDoorPlugin.java index 85eabde3b..d50c07be8 100644 --- a/Server/src/main/java/core/game/interaction/object/GuidorDoorPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/GuidorDoorPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -23,7 +23,7 @@ public final class GuidorDoorPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2032).getHandlers().put("option:open", this); + SceneryDefinition.forId(2032).getHandlers().put("option:open", this); return this; } 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 89d116f76..d5c7871fc 100644 --- a/Server/src/main/java/core/game/interaction/object/HaystackPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/HaystackPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.plugin.Initializable; import core.game.content.dialogue.FacialExpression; import core.game.interaction.OptionHandler; @@ -32,18 +32,18 @@ public final class HaystackPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(298).getHandlers().put("option:search", this); - ObjectDefinition.forId(299).getHandlers().put("option:search", this); - ObjectDefinition.forId(300).getHandlers().put("option:search", this); - ObjectDefinition.forId(304).getHandlers().put("option:search", this); - ObjectDefinition.forId(36892).getHandlers().put("option:search", this); - ObjectDefinition.forId(36893).getHandlers().put("option:search", this); - ObjectDefinition.forId(36894).getHandlers().put("option:search", this); - ObjectDefinition.forId(36895).getHandlers().put("option:search", this); - ObjectDefinition.forId(36896).getHandlers().put("option:search", this); - ObjectDefinition.forId(36897).getHandlers().put("option:search", this); - ObjectDefinition.forId(36898).getHandlers().put("option:search", this); - ObjectDefinition.forId(36899).getHandlers().put("option:search", this); + SceneryDefinition.forId(298).getHandlers().put("option:search", this); + SceneryDefinition.forId(299).getHandlers().put("option:search", this); + SceneryDefinition.forId(300).getHandlers().put("option:search", this); + SceneryDefinition.forId(304).getHandlers().put("option:search", this); + SceneryDefinition.forId(36892).getHandlers().put("option:search", this); + SceneryDefinition.forId(36893).getHandlers().put("option:search", this); + SceneryDefinition.forId(36894).getHandlers().put("option:search", this); + SceneryDefinition.forId(36895).getHandlers().put("option:search", this); + SceneryDefinition.forId(36896).getHandlers().put("option:search", this); + SceneryDefinition.forId(36897).getHandlers().put("option:search", this); + SceneryDefinition.forId(36898).getHandlers().put("option:search", this); + SceneryDefinition.forId(36899).getHandlers().put("option:search", this); return this; } 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 1302147c2..1f65fe92c 100644 --- a/Server/src/main/java/core/game/interaction/object/JangerBerryPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/JangerBerryPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.plugin.Initializable; import core.game.node.entity.skill.agility.AgilityHandler; import core.game.interaction.NodeUsageEvent; @@ -31,7 +31,7 @@ public class JangerBerryPlugin extends OptionHandler { @Override public boolean handle(NodeUsageEvent event) { - Scenery object = event.getUsedWith().asObject(); + Scenery object = event.getUsedWith().asScenery(); if (object.isActive()) SceneryBuilder.replace(object, object.transform(2325)); event.getPlayer().getInventory().remove(event.getUsedItem()); @@ -39,8 +39,8 @@ public class JangerBerryPlugin extends OptionHandler { } }); - ObjectDefinition.forId(2325).getHandlers().put("option:swing-on", this); - ObjectDefinition.forId(2324).getHandlers().put("option:swing-on", this); + SceneryDefinition.forId(2325).getHandlers().put("option:swing-on", this); + SceneryDefinition.forId(2324).getHandlers().put("option:swing-on", this); return this; } @@ -51,7 +51,7 @@ public class JangerBerryPlugin extends OptionHandler { return true; } Location end = node.getId() == 2325 ? new Location(2505, 3087, 0) : new Location(2511, 3096, 0); - player.getPacketDispatch().sendSceneryAnimation(node.asObject(), Animation.create(497), true); + player.getPacketDispatch().sendSceneryAnimation(node.asScenery(), Animation.create(497), true); AgilityHandler.forceWalk(player, 0, player.getLocation(), end, Animation.create(751), 50, 22, "You skillfully swing across.", 1); 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 fc6787213..c2b90bbc9 100644 --- a/Server/src/main/java/core/game/interaction/object/KalphiteEntranceHandler.java +++ b/Server/src/main/java/core/game/interaction/object/KalphiteEntranceHandler.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.NodeUsageEvent; import core.game.interaction.OptionHandler; import core.game.interaction.UseWithHandler; @@ -44,10 +44,10 @@ public final class KalphiteEntranceHandler extends OptionHandler { }; UseWithHandler.addHandler(3827, UseWithHandler.OBJECT_TYPE, handler); UseWithHandler.addHandler(23609, UseWithHandler.OBJECT_TYPE, handler); - ObjectDefinition.forId(3828).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(3829).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(23610).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(3832).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(3828).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(3829).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(23610).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(3832).getHandlers().put("option:climb-up", this); return this; } 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 23abdcd6d..23dd000f6 100644 --- a/Server/src/main/java/core/game/interaction/object/KhardianInteractionPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/KhardianInteractionPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.plugin.Initializable; import core.game.node.entity.skill.Skills; import core.game.interaction.OptionHandler; @@ -49,7 +49,7 @@ public final class KhardianInteractionPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2670).getHandlers().put("option:cut", this); + SceneryDefinition.forId(2670).getHandlers().put("option:cut", this); return this; } 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 06d722b43..0eaee88fc 100644 --- a/Server/src/main/java/core/game/interaction/object/LadderManagingPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/LadderManagingPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -20,9 +20,9 @@ public final class LadderManagingPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.setOptionHandler("climb-up", this); - ObjectDefinition.setOptionHandler("climb-down", this); - ObjectDefinition.setOptionHandler("climb", this); + SceneryDefinition.setOptionHandler("climb-up", this); + SceneryDefinition.setOptionHandler("climb-down", this); + SceneryDefinition.setOptionHandler("climb", this); return this; } 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 f060d1b8e..a361da272 100644 --- a/Server/src/main/java/core/game/interaction/object/LavaMazePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/LavaMazePlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -19,8 +19,8 @@ public final class LavaMazePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(1767).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(1768).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(1767).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(1768).getHandlers().put("option:climb-up", this); return this; } diff --git a/Server/src/main/java/core/game/interaction/object/LookAtOptionPlugin.java b/Server/src/main/java/core/game/interaction/object/LookAtOptionPlugin.java index 906a13fbf..b016ca04d 100644 --- a/Server/src/main/java/core/game/interaction/object/LookAtOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/LookAtOptionPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -13,7 +13,7 @@ public class LookAtOptionPlugin extends OptionHandler { public Plugin newInstance(Object arg) throws Throwable { for (int i = 18877; i <= 18900; i++) { - ObjectDefinition.forId(i).getHandlers().put("option:look at", this); + SceneryDefinition.forId(i).getHandlers().put("option:look at", this); } return this; } diff --git a/Server/src/main/java/core/game/interaction/object/LumberYardCratePlugin.java b/Server/src/main/java/core/game/interaction/object/LumberYardCratePlugin.java index 2e6d43709..83d5a1ad3 100644 --- a/Server/src/main/java/core/game/interaction/object/LumberYardCratePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/LumberYardCratePlugin.java @@ -1,7 +1,7 @@ package core.game.interaction.object; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.impl.ForceMovement; @@ -76,8 +76,8 @@ public final class LumberYardCratePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { NPCDefinition.forId(767).getHandlers().put("option:search", this); - ObjectDefinition.forId(2620).getHandlers().put("option:search", this); - ObjectDefinition.forId(31149).getHandlers().put("option:squeeze-under", this); + SceneryDefinition.forId(2620).getHandlers().put("option:search", this); + SceneryDefinition.forId(31149).getHandlers().put("option:squeeze-under", this); return null; } 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 9d5471ff7..42956e250 100644 --- a/Server/src/main/java/core/game/interaction/object/LumbridgeBasementPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/LumbridgeBasementPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.dialogue.DialoguePlugin; import core.game.interaction.NodeUsageEvent; import core.game.interaction.OptionHandler; @@ -43,18 +43,18 @@ public class LumbridgeBasementPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(6899).getHandlers().put("option:squeeze-through", this); - ObjectDefinition.forId(6898).getHandlers().put("option:squeeze-through", this); - ObjectDefinition.forId(6905).getHandlers().put("option:squeeze-through", this); - ObjectDefinition.forId(6912).getHandlers().put("option:squeeze-through", this); - ObjectDefinition.forId(5949).getHandlers().put("option:jump-across", this); - ObjectDefinition.forId(6658).getHandlers().put("option:enter", this); - ObjectDefinition.forId(32944).getHandlers().put("option:enter", this); - ObjectDefinition.forId(40261).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(40262).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(40849).getHandlers().put("option:jump-down", this); - ObjectDefinition.forId(40260).getHandlers().put("option:climb-through", this); - ObjectDefinition.forId(41077).getHandlers().put("option:crawl-through", this); + SceneryDefinition.forId(6899).getHandlers().put("option:squeeze-through", this); + SceneryDefinition.forId(6898).getHandlers().put("option:squeeze-through", this); + SceneryDefinition.forId(6905).getHandlers().put("option:squeeze-through", this); + SceneryDefinition.forId(6912).getHandlers().put("option:squeeze-through", this); + SceneryDefinition.forId(5949).getHandlers().put("option:jump-across", this); + SceneryDefinition.forId(6658).getHandlers().put("option:enter", this); + SceneryDefinition.forId(32944).getHandlers().put("option:enter", this); + SceneryDefinition.forId(40261).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(40262).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(40849).getHandlers().put("option:jump-down", this); + SceneryDefinition.forId(40260).getHandlers().put("option:climb-through", this); + SceneryDefinition.forId(41077).getHandlers().put("option:crawl-through", this); PluginManager.definePlugins(new LightCreatureNPC(), new LightCreatureHandler(), new FishMongerDialogue()); SceneryBuilder.add(new Scenery(40260, Location.create(2526, 5828, 2), 2)); return this; 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 253e17bf0..c0aaeb545 100644 --- a/Server/src/main/java/core/game/interaction/object/LumbridgeSwampHolePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/LumbridgeSwampHolePlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; @@ -29,10 +29,10 @@ public final class LumbridgeSwampHolePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(10375).getHandlers().put("option:take", this); - ObjectDefinition.forId(5947).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(5946).getHandlers().put("option:climb", this); - ObjectDefinition.forId(15566).getHandlers().put("option:read", this); + SceneryDefinition.forId(10375).getHandlers().put("option:take", this); + SceneryDefinition.forId(5947).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(5946).getHandlers().put("option:climb", this); + SceneryDefinition.forId(15566).getHandlers().put("option:read", this); return this; } diff --git a/Server/src/main/java/core/game/interaction/object/ModeratorObject.java b/Server/src/main/java/core/game/interaction/object/ModeratorObject.java index aebada595..fc0908114 100644 --- a/Server/src/main/java/core/game/interaction/object/ModeratorObject.java +++ b/Server/src/main/java/core/game/interaction/object/ModeratorObject.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -21,8 +21,8 @@ public final class ModeratorObject extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(26806).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(26807).getHandlers().put("option:j-mod options", this); + SceneryDefinition.forId(26806).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(26807).getHandlers().put("option:j-mod options", this); return this; } diff --git a/Server/src/main/java/core/game/interaction/object/MossGiantRopePlugin.java b/Server/src/main/java/core/game/interaction/object/MossGiantRopePlugin.java index cea9ffac5..86b6faf0b 100644 --- a/Server/src/main/java/core/game/interaction/object/MossGiantRopePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/MossGiantRopePlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.agility.AgilityHandler; import core.game.interaction.OptionHandler; @@ -21,8 +21,8 @@ public class MossGiantRopePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2322).getHandlers().put("option:swing-on", this); - ObjectDefinition.forId(2323).getHandlers().put("option:swing-on", this); + SceneryDefinition.forId(2322).getHandlers().put("option:swing-on", this); + SceneryDefinition.forId(2323).getHandlers().put("option:swing-on", this); return this; } @@ -37,7 +37,7 @@ public class MossGiantRopePlugin extends OptionHandler { return true; } Location end = node.getId() == 2322 ? Location.create(2704, 3209, 0) : Location.create(2709, 3205, 0); - player.getPacketDispatch().sendSceneryAnimation(node.asObject(), Animation.create(497), true); + player.getPacketDispatch().sendSceneryAnimation(node.asScenery(), Animation.create(497), true); AgilityHandler.forceWalk(player, 0, player.getLocation(), end, Animation.create(751), 50, 22, "You skillfully swing across.", 1); player.getAchievementDiaryManager().finishTask(player, DiaryType.KARAMJA, 0, 1); return true; diff --git a/Server/src/main/java/core/game/interaction/object/MoyrtniaSwampPlugin.java b/Server/src/main/java/core/game/interaction/object/MoyrtniaSwampPlugin.java index 57c44d984..52daa4d34 100644 --- a/Server/src/main/java/core/game/interaction/object/MoyrtniaSwampPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/MoyrtniaSwampPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -17,7 +17,7 @@ public final class MoyrtniaSwampPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(3506).getHandlers().put("option:open", this); + SceneryDefinition.forId(3506).getHandlers().put("option:open", this); return this; } 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 b888e1960..47f237a90 100644 --- a/Server/src/main/java/core/game/interaction/object/MuseumGatePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/MuseumGatePlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -19,7 +19,7 @@ public final class MuseumGatePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(24536).getHandlers().put("option:open", this); + SceneryDefinition.forId(24536).getHandlers().put("option:open", this); return this; } 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 4975489fb..20416bd8c 100644 --- a/Server/src/main/java/core/game/interaction/object/PortsObjectPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/PortsObjectPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -72,113 +72,113 @@ public class PortsObjectPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2412).getHandlers().put("option:cross", this);// port + SceneryDefinition.forId(2412).getHandlers().put("option:cross", this);// port // sarim // - // entrana // boat. - ObjectDefinition.forId(2413).getHandlers().put("option:cross", this);// port + SceneryDefinition.forId(2413).getHandlers().put("option:cross", this);// port // sarim // - // entrana // boat. - ObjectDefinition.forId(17404).getHandlers().put("option:cross", this);// port + SceneryDefinition.forId(17404).getHandlers().put("option:cross", this);// port // sarim // - // charter // boat. - ObjectDefinition.forId(17405).getHandlers().put("option:cross", this);// port + SceneryDefinition.forId(17405).getHandlers().put("option:cross", this);// port // sarim // - // charter // boat. - ObjectDefinition.forId(2083).getHandlers().put("option:cross", this);// port + SceneryDefinition.forId(2083).getHandlers().put("option:cross", this);// port // sarim // - // regular // boat. - ObjectDefinition.forId(2084).getHandlers().put("option:cross", this);// port + SceneryDefinition.forId(2084).getHandlers().put("option:cross", this);// port // sarim // - // regular // boat. - ObjectDefinition.forId(14304).getHandlers().put("option:cross", this);// port + SceneryDefinition.forId(14304).getHandlers().put("option:cross", this);// port // sarim // - // regular // boat. - ObjectDefinition.forId(14305).getHandlers().put("option:cross", this);// port + SceneryDefinition.forId(14305).getHandlers().put("option:cross", this);// port // sarim // - // regular // boat. - ObjectDefinition.forId(2593).getHandlers().put("option:cross", this);// port + SceneryDefinition.forId(2593).getHandlers().put("option:cross", this);// port // sarim // - // lady // lumbridge. - ObjectDefinition.forId(2415).getHandlers().put("option:cross", this);// entrana + SceneryDefinition.forId(2415).getHandlers().put("option:cross", this);// entrana // off // boat. - ObjectDefinition.forId(2414).getHandlers().put("option:cross", this);// entrana + SceneryDefinition.forId(2414).getHandlers().put("option:cross", this);// entrana // on // boat. - ObjectDefinition.forId(2081).getHandlers().put("option:cross", this);// karamaja + SceneryDefinition.forId(2081).getHandlers().put("option:cross", this);// karamaja // boat // (on) - ObjectDefinition.forId(2082).getHandlers().put("option:cross", this);// karamaja + SceneryDefinition.forId(2082).getHandlers().put("option:cross", this);// karamaja // boat // (off) - ObjectDefinition.forId(17398).getHandlers().put("option:cross", this);// karamaja + SceneryDefinition.forId(17398).getHandlers().put("option:cross", this);// karamaja // boat // (on)(second) - ObjectDefinition.forId(17399).getHandlers().put("option:cross", this);// karamaja + SceneryDefinition.forId(17399).getHandlers().put("option:cross", this);// karamaja // boat // (off)(second) - ObjectDefinition.forId(17394).getHandlers().put("option:cross", this);// catherby + SceneryDefinition.forId(17394).getHandlers().put("option:cross", this);// catherby // boat // (on) - ObjectDefinition.forId(17395).getHandlers().put("option:cross", this);// catherby + SceneryDefinition.forId(17395).getHandlers().put("option:cross", this);// catherby // boat // (off) - ObjectDefinition.forId(69).getHandlers().put("option:cross", this);// catherby + SceneryDefinition.forId(69).getHandlers().put("option:cross", this);// catherby // boat // (on)(second) - ObjectDefinition.forId(17401).getHandlers().put("option:cross", this);// brimhaven + SceneryDefinition.forId(17401).getHandlers().put("option:cross", this);// brimhaven // (off) - ObjectDefinition.forId(17400).getHandlers().put("option:cross", this);// brimhaven + SceneryDefinition.forId(17400).getHandlers().put("option:cross", this);// brimhaven // (on) - ObjectDefinition.forId(2087).getHandlers().put("option:cross", this);// brimhaven + SceneryDefinition.forId(2087).getHandlers().put("option:cross", this);// brimhaven // (on)(second) - ObjectDefinition.forId(2088).getHandlers().put("option:cross", this);// brimhaven + SceneryDefinition.forId(2088).getHandlers().put("option:cross", this);// brimhaven // (off)(second) - ObjectDefinition.forId(2086).getHandlers().put("option:cross", this);// ardougne + SceneryDefinition.forId(2086).getHandlers().put("option:cross", this);// ardougne // (off) - ObjectDefinition.forId(2085).getHandlers().put("option:cross", this);// ardougne + SceneryDefinition.forId(2085).getHandlers().put("option:cross", this);// ardougne // (on) - ObjectDefinition.forId(17402).getHandlers().put("option:cross", this);// port + SceneryDefinition.forId(17402).getHandlers().put("option:cross", this);// port // khazard // (on) - ObjectDefinition.forId(17403).getHandlers().put("option:cross", this);// port + SceneryDefinition.forId(17403).getHandlers().put("option:cross", this);// port // khazard // (off) - ObjectDefinition.forId(17392).getHandlers().put("option:cross", this);// port + SceneryDefinition.forId(17392).getHandlers().put("option:cross", this);// port // phasmatys(on) - ObjectDefinition.forId(17393).getHandlers().put("option:cross", this);// port + SceneryDefinition.forId(17393).getHandlers().put("option:cross", this);// port // phasmatys(off) - ObjectDefinition.forId(11209).getHandlers().put("option:cross", this);// port + SceneryDefinition.forId(11209).getHandlers().put("option:cross", this);// port // phasmatys(other // boat) - ObjectDefinition.forId(14307).getHandlers().put("option:cross", this);// pest + SceneryDefinition.forId(14307).getHandlers().put("option:cross", this);// pest // control // ship. - ObjectDefinition.forId(14306).getHandlers().put("option:cross", this);// pest + SceneryDefinition.forId(14306).getHandlers().put("option:cross", this);// pest // control // ship. // lady lumby - ObjectDefinition.forId(2590).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(2592).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(2594).getHandlers().put("option:cross", this); + SceneryDefinition.forId(2590).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(2592).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(2594).getHandlers().put("option:cross", this); return this; } 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 ef058f481..47e17a152 100644 --- a/Server/src/main/java/core/game/interaction/object/PriestInPerilOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/PriestInPerilOptionPlugin.java @@ -1,7 +1,7 @@ package core.game.interaction.object; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; @@ -27,65 +27,65 @@ public class PriestInPerilOptionPlugin extends OptionHandler { */ @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(3444).getHandlers().put("option:open", this); + SceneryDefinition.forId(3444).getHandlers().put("option:open", this); /** the gate in the chamber near the dog. */ - ObjectDefinition.forId(3445).getHandlers().put("option:open", this); + SceneryDefinition.forId(3445).getHandlers().put("option:open", this); /** the gate in the temple to get to the other side. */ - ObjectDefinition.forId(30707).getHandlers().put("option:open", this); + SceneryDefinition.forId(30707).getHandlers().put("option:open", this); /** the "knock-at" door. */ - ObjectDefinition.forId(30707).getHandlers().put("option:knock-at", this); + SceneryDefinition.forId(30707).getHandlers().put("option:knock-at", this); /** the "knock-at" door. */ - ObjectDefinition.forId(30708).getHandlers().put("option:open", this); + SceneryDefinition.forId(30708).getHandlers().put("option:open", this); /** the "knock-at" door. */ - ObjectDefinition.forId(30708).getHandlers().put("option:knock-at", this); + SceneryDefinition.forId(30708).getHandlers().put("option:knock-at", this); /** the "knock-at" door. */ - ObjectDefinition.forId(30575).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(30575).getHandlers().put("option:climb-up", this); /** represents the ladder to climb back up. */ - ObjectDefinition.forId(30575).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(30575).getHandlers().put("option:climb-up", this); /** represents the ladder to climb back up. */ - ObjectDefinition.forId(30728).getHandlers().put("option:open", this); + SceneryDefinition.forId(30728).getHandlers().put("option:open", this); /** the coffin. */ - ObjectDefinition.forId(3463).getHandlers().put("option:open", this); + SceneryDefinition.forId(3463).getHandlers().put("option:open", this); /** the drezel door. */ - ObjectDefinition.forId(3463).getHandlers().put("option:talk-through", this); + SceneryDefinition.forId(3463).getHandlers().put("option:talk-through", this); /** talk-through. */ - ObjectDefinition.forId(3485).getHandlers().put("option:search", this); + SceneryDefinition.forId(3485).getHandlers().put("option:search", this); /** teh well. */ - ObjectDefinition.forId(3496).getHandlers().put("option:study", this); + SceneryDefinition.forId(3496).getHandlers().put("option:study", this); /** teh golden hammer */ - ObjectDefinition.forId(3496).getHandlers().put("option:take-from", this); + SceneryDefinition.forId(3496).getHandlers().put("option:take-from", this); /** the golden hammer. */ - ObjectDefinition.forId(3498).getHandlers().put("option:study", this); + SceneryDefinition.forId(3498).getHandlers().put("option:study", this); /** teh golden needle. */ - ObjectDefinition.forId(3498).getHandlers().put("option:take-from", this); + SceneryDefinition.forId(3498).getHandlers().put("option:take-from", this); /** the golden needle. */ - ObjectDefinition.forId(3495).getHandlers().put("option:study", this); + SceneryDefinition.forId(3495).getHandlers().put("option:study", this); /** teh golden pot. */ - ObjectDefinition.forId(3495).getHandlers().put("option:take-from", this); + SceneryDefinition.forId(3495).getHandlers().put("option:take-from", this); /** the golden pot. */ - ObjectDefinition.forId(3497).getHandlers().put("option:study", this); + SceneryDefinition.forId(3497).getHandlers().put("option:study", this); /** teh golden feather. */ - ObjectDefinition.forId(3497).getHandlers().put("option:take-from", this); + SceneryDefinition.forId(3497).getHandlers().put("option:take-from", this); /** the golden feather. */ - ObjectDefinition.forId(3494).getHandlers().put("option:study", this); + SceneryDefinition.forId(3494).getHandlers().put("option:study", this); /** teh golden candle. */ - ObjectDefinition.forId(3494).getHandlers().put("option:take-from", this); + SceneryDefinition.forId(3494).getHandlers().put("option:take-from", this); /** the golden candle. */ - ObjectDefinition.forId(3499).getHandlers().put("option:study", this); + SceneryDefinition.forId(3499).getHandlers().put("option:study", this); /** teh golden key/iron. */ - ObjectDefinition.forId(3499).getHandlers().put("option:take-from", this); + SceneryDefinition.forId(3499).getHandlers().put("option:take-from", this); /** the golden key/iron */ - ObjectDefinition.forId(3493).getHandlers().put("option:study", this); + SceneryDefinition.forId(3493).getHandlers().put("option:study", this); /** teh tinder box. */ - ObjectDefinition.forId(3493).getHandlers().put("option:take-from", this); + SceneryDefinition.forId(3493).getHandlers().put("option:take-from", this); /** the golden tinder box. */ - ObjectDefinition.forId(3443).getHandlers().put("option:pass-through", this); + SceneryDefinition.forId(3443).getHandlers().put("option:pass-through", this); /** the barrier. */ - ObjectDefinition.forId(30573).getHandlers().put("option:open", this); + SceneryDefinition.forId(30573).getHandlers().put("option:open", this); /** the door to get back. */ NPCDefinition.forId(7711).getHandlers().put("option:attack", this); /** represents the dog attack option. */ - ObjectDefinition.forId(30571).getHandlers().put("option:open", this); + SceneryDefinition.forId(30571).getHandlers().put("option:open", this); return this; } 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 6a64be881..80704ee7d 100644 --- a/Server/src/main/java/core/game/interaction/object/ProspectOrePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ProspectOrePlugin.java @@ -1,7 +1,7 @@ package core.game.interaction.object; import core.cache.def.impl.ItemDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.plugin.Initializable; import core.game.content.quest.tutorials.tutorialisland.TutorialSession; import core.game.content.quest.tutorials.tutorialisland.TutorialStage; @@ -75,7 +75,7 @@ public class ProspectOrePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.setOptionHandler("prospect", this); + SceneryDefinition.setOptionHandler("prospect", this); return this; } 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 7ff446403..758b342e1 100644 --- a/Server/src/main/java/core/game/interaction/object/PyreSitePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/PyreSitePlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.Entity; @@ -63,7 +63,7 @@ public final class PyreSitePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(25286).getHandlers().put("option:construct", this); + SceneryDefinition.forId(25286).getHandlers().put("option:construct", this); PluginManager.definePlugin(new FerociousBarbarianNPC()); return this; } @@ -99,7 +99,7 @@ public final class PyreSitePlugin extends OptionHandler { return true; } player.setAttribute("logType", type); - ritual(player, node.asObject()); + ritual(player, node.asScenery()); return true; } 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 62496d67f..1b8a077ef 100644 --- a/Server/src/main/java/core/game/interaction/object/ReadSignPostPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ReadSignPostPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.CloseEvent; import core.game.component.Component; import core.game.interaction.OptionHandler; @@ -92,29 +92,29 @@ public class ReadSignPostPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2366).getHandlers().put("option:read", this); - ObjectDefinition.forId(2367).getHandlers().put("option:read", this); - ObjectDefinition.forId(2368).getHandlers().put("option:read", this); - ObjectDefinition.forId(2369).getHandlers().put("option:read", this); - ObjectDefinition.forId(2370).getHandlers().put("option:read", this); - ObjectDefinition.forId(2371).getHandlers().put("option:read", this); - ObjectDefinition.forId(4132).getHandlers().put("option:read", this); - ObjectDefinition.forId(4133).getHandlers().put("option:read", this); - ObjectDefinition.forId(4134).getHandlers().put("option:read", this); - ObjectDefinition.forId(4135).getHandlers().put("option:read", this); - ObjectDefinition.forId(5164).getHandlers().put("option:read", this); - ObjectDefinition.forId(10090).getHandlers().put("option:read", this); - ObjectDefinition.forId(13873).getHandlers().put("option:read", this); - ObjectDefinition.forId(15522).getHandlers().put("option:read", this); - ObjectDefinition.forId(18493).getHandlers().put("option:read", this); - ObjectDefinition.forId(24263).getHandlers().put("option:read", this); - ObjectDefinition.forId(25397).getHandlers().put("option:read", this); - ObjectDefinition.forId(30039).getHandlers().put("option:read", this); - ObjectDefinition.forId(30040).getHandlers().put("option:read", this); - ObjectDefinition.forId(31296).getHandlers().put("option:read", this); - ObjectDefinition.forId(31298).getHandlers().put("option:read", this); - ObjectDefinition.forId(31299).getHandlers().put("option:read", this); - ObjectDefinition.forId(31300).getHandlers().put("option:read", this); + SceneryDefinition.forId(2366).getHandlers().put("option:read", this); + SceneryDefinition.forId(2367).getHandlers().put("option:read", this); + SceneryDefinition.forId(2368).getHandlers().put("option:read", this); + SceneryDefinition.forId(2369).getHandlers().put("option:read", this); + SceneryDefinition.forId(2370).getHandlers().put("option:read", this); + SceneryDefinition.forId(2371).getHandlers().put("option:read", this); + SceneryDefinition.forId(4132).getHandlers().put("option:read", this); + SceneryDefinition.forId(4133).getHandlers().put("option:read", this); + SceneryDefinition.forId(4134).getHandlers().put("option:read", this); + SceneryDefinition.forId(4135).getHandlers().put("option:read", this); + SceneryDefinition.forId(5164).getHandlers().put("option:read", this); + SceneryDefinition.forId(10090).getHandlers().put("option:read", this); + SceneryDefinition.forId(13873).getHandlers().put("option:read", this); + SceneryDefinition.forId(15522).getHandlers().put("option:read", this); + SceneryDefinition.forId(18493).getHandlers().put("option:read", this); + SceneryDefinition.forId(24263).getHandlers().put("option:read", this); + SceneryDefinition.forId(25397).getHandlers().put("option:read", this); + SceneryDefinition.forId(30039).getHandlers().put("option:read", this); + SceneryDefinition.forId(30040).getHandlers().put("option:read", this); + SceneryDefinition.forId(31296).getHandlers().put("option:read", this); + SceneryDefinition.forId(31298).getHandlers().put("option:read", this); + SceneryDefinition.forId(31299).getHandlers().put("option:read", this); + SceneryDefinition.forId(31300).getHandlers().put("option:read", this); // ObjectDefinition.forId(31301).getConfigurations().put("option:read", this);//goblin village return this; } 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 66dc80fcd..31a7ff280 100644 --- a/Server/src/main/java/core/game/interaction/object/RedberryBushPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/RedberryBushPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -35,9 +35,9 @@ public class RedberryBushPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(23628).getHandlers().put("option:pick-from", this); - ObjectDefinition.forId(23629).getHandlers().put("option:pick-from", this); - ObjectDefinition.forId(23630).getHandlers().put("option:pick-from", this); + SceneryDefinition.forId(23628).getHandlers().put("option:pick-from", this); + SceneryDefinition.forId(23629).getHandlers().put("option:pick-from", this); + SceneryDefinition.forId(23630).getHandlers().put("option:pick-from", this); return this; } 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 6f27059ef..05acef473 100644 --- a/Server/src/main/java/core/game/interaction/object/RomeoQuestPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/RomeoQuestPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -35,9 +35,9 @@ public class RomeoQuestPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(23625).getHandlers().put("option:pick-from", this); - ObjectDefinition.forId(23626).getHandlers().put("option:pick-from", this); - ObjectDefinition.forId(23627).getHandlers().put("option:pick-from", this); + SceneryDefinition.forId(23625).getHandlers().put("option:pick-from", this); + SceneryDefinition.forId(23626).getHandlers().put("option:pick-from", this); + SceneryDefinition.forId(23627).getHandlers().put("option:pick-from", this); return this; } 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 fc0a90e53..f99988861 100644 --- a/Server/src/main/java/core/game/interaction/object/RuneCraftingGuildObjects.java +++ b/Server/src/main/java/core/game/interaction/object/RuneCraftingGuildObjects.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -38,7 +38,7 @@ public class RuneCraftingGuildObjects extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(38279).getHandlers().put("option:enter", this); + SceneryDefinition.forId(38279).getHandlers().put("option:enter", this); return this; } } diff --git a/Server/src/main/java/core/game/interaction/object/SearchOptionPlugin.java b/Server/src/main/java/core/game/interaction/object/SearchOptionPlugin.java index a1f900179..ce5636bfd 100644 --- a/Server/src/main/java/core/game/interaction/object/SearchOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/SearchOptionPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -86,7 +86,7 @@ public class SearchOptionPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.setOptionHandler("search", this); + SceneryDefinition.setOptionHandler("search", this); return this; } } diff --git a/Server/src/main/java/core/game/interaction/object/SeersCageUnlockPlugin.java b/Server/src/main/java/core/game/interaction/object/SeersCageUnlockPlugin.java index 677c372cd..efbc82d61 100644 --- a/Server/src/main/java/core/game/interaction/object/SeersCageUnlockPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/SeersCageUnlockPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -23,7 +23,7 @@ public final class SeersCageUnlockPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(6836).getHandlers().put("option:unlock", this); + SceneryDefinition.forId(6836).getHandlers().put("option:unlock", this); return this; } 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 f4d0ff3ca..61dd5a65a 100644 --- a/Server/src/main/java/core/game/interaction/object/ShantayPassPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ShantayPassPlugin.java @@ -1,7 +1,7 @@ package core.game.interaction.object; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; @@ -33,16 +33,16 @@ public class ShantayPassPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { for (int i = 35542; i < 35545; i++) { - ObjectDefinition.forId(i).getHandlers().put("option:look-at", this); - ObjectDefinition.forId(i).getHandlers().put("option:go-through", this); - ObjectDefinition.forId(i).getHandlers().put("option:quick-pass", this); + SceneryDefinition.forId(i).getHandlers().put("option:look-at", this); + SceneryDefinition.forId(i).getHandlers().put("option:go-through", this); + SceneryDefinition.forId(i).getHandlers().put("option:quick-pass", this); } - ObjectDefinition.forId(35400).getHandlers().put("option:look-at", this); - ObjectDefinition.forId(35400).getHandlers().put("option:go-through", this); - ObjectDefinition.forId(35400).getHandlers().put("option:quick-pass", this); + SceneryDefinition.forId(35400).getHandlers().put("option:look-at", this); + SceneryDefinition.forId(35400).getHandlers().put("option:go-through", this); + SceneryDefinition.forId(35400).getHandlers().put("option:quick-pass", this); NPCDefinition.forId(838).getHandlers().put("option:bribe", this); - ObjectDefinition.forId(35401).getHandlers().put("option:open", this); - ObjectDefinition.forId(2693).getHandlers().put("option:open", this); + SceneryDefinition.forId(35401).getHandlers().put("option:open", this); + SceneryDefinition.forId(2693).getHandlers().put("option:open", this); new ShantayComponentPlugin().newInstance(arg); return this; } 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 62af33c3e..252afe650 100644 --- a/Server/src/main/java/core/game/interaction/object/SinclairFlourBarrelPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/SinclairFlourBarrelPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import org.rs09.consts.Items; import core.game.interaction.NodeUsageEvent; import core.game.interaction.OptionHandler; @@ -58,7 +58,7 @@ public final class SinclairFlourBarrelPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(26122).getHandlers().put("option:take from", this); + SceneryDefinition.forId(26122).getHandlers().put("option:take from", this); PluginManager.definePlugin(new FlourHandler()); return this; } @@ -77,7 +77,7 @@ public final class SinclairFlourBarrelPlugin extends OptionHandler { @Override public boolean handle(NodeUsageEvent event) { - return getFlour(event.getPlayer(), event.getUsedWith().asObject()); + return getFlour(event.getPlayer(), event.getUsedWith().asScenery()); } } } \ No newline at end of file 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 25a88bccf..5b037a3fd 100644 --- a/Server/src/main/java/core/game/interaction/object/SlashWebPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/SlashWebPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.container.Container; import core.game.container.impl.EquipmentContainer; import core.plugin.Initializable; @@ -50,10 +50,10 @@ public final class SlashWebPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { for (int objectId : IDS) { - ObjectDefinition.forId(objectId).getHandlers().put("option:slash", this); + SceneryDefinition.forId(objectId).getHandlers().put("option:slash", this); } - ObjectDefinition.forId(27266).getHandlers().put("option:pass", this); - ObjectDefinition.forId(29354).getHandlers().put("option:pass", this); + SceneryDefinition.forId(27266).getHandlers().put("option:pass", this); + SceneryDefinition.forId(29354).getHandlers().put("option:pass", this); return this; } diff --git a/Server/src/main/java/core/game/interaction/object/SlayerDangerSignPlugin.java b/Server/src/main/java/core/game/interaction/object/SlayerDangerSignPlugin.java index c8d6243a1..633d50bfc 100644 --- a/Server/src/main/java/core/game/interaction/object/SlayerDangerSignPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/SlayerDangerSignPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -15,7 +15,7 @@ public class SlayerDangerSignPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(5127).getHandlers().put("option:read", this); + SceneryDefinition.forId(5127).getHandlers().put("option:read", this); return this; } diff --git a/Server/src/main/java/core/game/interaction/object/SpinSpinningWheelPlugin.java b/Server/src/main/java/core/game/interaction/object/SpinSpinningWheelPlugin.java index d28d95ccb..8e1025ed9 100644 --- a/Server/src/main/java/core/game/interaction/object/SpinSpinningWheelPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/SpinSpinningWheelPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -24,16 +24,16 @@ public class SpinSpinningWheelPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2644).getHandlers().put("option:spin", this); - ObjectDefinition.forId(4309).getHandlers().put("option:spin", this); - ObjectDefinition.forId(8748).getHandlers().put("option:spin", this); - ObjectDefinition.forId(20365).getHandlers().put("option:spin", this); - ObjectDefinition.forId(21304).getHandlers().put("option:spin", this); - ObjectDefinition.forId(25824).getHandlers().put("option:spin", this); - ObjectDefinition.forId(26143).getHandlers().put("option:spin", this); - ObjectDefinition.forId(34497).getHandlers().put("option:spin", this); - ObjectDefinition.forId(36970).getHandlers().put("option:spin", this); - ObjectDefinition.forId(37476).getHandlers().put("option:spin", this); + SceneryDefinition.forId(2644).getHandlers().put("option:spin", this); + SceneryDefinition.forId(4309).getHandlers().put("option:spin", this); + SceneryDefinition.forId(8748).getHandlers().put("option:spin", this); + SceneryDefinition.forId(20365).getHandlers().put("option:spin", this); + SceneryDefinition.forId(21304).getHandlers().put("option:spin", this); + SceneryDefinition.forId(25824).getHandlers().put("option:spin", this); + SceneryDefinition.forId(26143).getHandlers().put("option:spin", this); + SceneryDefinition.forId(34497).getHandlers().put("option:spin", this); + SceneryDefinition.forId(36970).getHandlers().put("option:spin", this); + SceneryDefinition.forId(37476).getHandlers().put("option:spin", this); return this; } 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 6b0d73e4c..6ca480bad 100644 --- a/Server/src/main/java/core/game/interaction/object/ThievingGuidePlugin.java +++ b/Server/src/main/java/core/game/interaction/object/ThievingGuidePlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.combat.ImpactHandler.HitsplatType; @@ -67,10 +67,10 @@ public class ThievingGuidePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(7236).getHandlers().put("option:crack", this);// wall + SceneryDefinition.forId(7236).getHandlers().put("option:crack", this);// wall // safe. - ObjectDefinition.forId(7227).getHandlers().put("option:disarm", this);// trap - ObjectDefinition.forId(7256).getHandlers().put("option:open", this); + SceneryDefinition.forId(7227).getHandlers().put("option:disarm", this);// trap + SceneryDefinition.forId(7256).getHandlers().put("option:open", this); return this; } 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 e68d1207f..6381cf9e0 100644 --- a/Server/src/main/java/core/game/interaction/object/TollGateOptionPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/TollGateOptionPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -43,11 +43,11 @@ public class TollGateOptionPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(35551).getHandlers().put("option:open", this); - ObjectDefinition.forId(35551).getHandlers().put("option:pay-toll(10gp)", this); - ObjectDefinition.forId(35549).getHandlers().put("option:open", this); - ObjectDefinition.forId(35549).getHandlers().put("option:pay-toll(10gp)", this); - ObjectDefinition.forId(2882).getHandlers().put("option:pay-toll(10gp)", this); + SceneryDefinition.forId(35551).getHandlers().put("option:open", this); + SceneryDefinition.forId(35551).getHandlers().put("option:pay-toll(10gp)", this); + SceneryDefinition.forId(35549).getHandlers().put("option:open", this); + SceneryDefinition.forId(35549).getHandlers().put("option:pay-toll(10gp)", this); + SceneryDefinition.forId(2882).getHandlers().put("option:pay-toll(10gp)", this); return this; } 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 b723d80c0..aa18e2eec 100644 --- a/Server/src/main/java/core/game/interaction/object/VampireSlayerPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/VampireSlayerPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.npc.NPC; @@ -42,10 +42,10 @@ public final class VampireSlayerPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(33502).getHandlers().put("option:open", this); - ObjectDefinition.forId(2614).getHandlers().put("option:open", this); - ObjectDefinition.forId(32835).getHandlers().put("option:walk-down", this); - ObjectDefinition.forId(32836).getHandlers().put("option:walk-up", this); + SceneryDefinition.forId(33502).getHandlers().put("option:open", this); + SceneryDefinition.forId(2614).getHandlers().put("option:open", this); + SceneryDefinition.forId(32835).getHandlers().put("option:walk-down", this); + SceneryDefinition.forId(32836).getHandlers().put("option:walk-up", this); return this; } diff --git a/Server/src/main/java/core/game/interaction/object/WantedPoster.java b/Server/src/main/java/core/game/interaction/object/WantedPoster.java index 9d6fc7918..4325eebfa 100644 --- a/Server/src/main/java/core/game/interaction/object/WantedPoster.java +++ b/Server/src/main/java/core/game/interaction/object/WantedPoster.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -12,7 +12,7 @@ public class WantedPoster extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(40992).getHandlers().put("option:look-at", this); + SceneryDefinition.forId(40992).getHandlers().put("option:look-at", this); return this; } 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 70bd2c066..d300809dc 100644 --- a/Server/src/main/java/core/game/interaction/object/WildernessLeverPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/WildernessLeverPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.plugin.Initializable; import core.game.content.dialogue.DialogueInterpreter; import core.game.content.dialogue.DialoguePlugin; @@ -35,7 +35,7 @@ public final class WildernessLeverPlugin extends OptionHandler { public Plugin newInstance(Object arg) throws Throwable { for (LeverSets set : LeverSets.values()) { for (int id : set.getIds()) { - ObjectDefinition.forId(id).getHandlers().put("option:pull", this); + SceneryDefinition.forId(id).getHandlers().put("option:pull", this); } } PluginManager.definePlugin(new LeverDialogue()); 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 34c9e2ae8..82a481ea0 100644 --- a/Server/src/main/java/core/game/interaction/object/WildernessObeliskPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/WildernessObeliskPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -27,12 +27,12 @@ public final class WildernessObeliskPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(14829).getHandlers().put("option:activate", this); - ObjectDefinition.forId(14826).getHandlers().put("option:activate", this); - ObjectDefinition.forId(14827).getHandlers().put("option:activate", this); - ObjectDefinition.forId(14828).getHandlers().put("option:activate", this); - ObjectDefinition.forId(14830).getHandlers().put("option:activate", this); - ObjectDefinition.forId(14831).getHandlers().put("option:activate", this); + SceneryDefinition.forId(14829).getHandlers().put("option:activate", this); + SceneryDefinition.forId(14826).getHandlers().put("option:activate", this); + SceneryDefinition.forId(14827).getHandlers().put("option:activate", this); + SceneryDefinition.forId(14828).getHandlers().put("option:activate", this); + SceneryDefinition.forId(14830).getHandlers().put("option:activate", this); + SceneryDefinition.forId(14831).getHandlers().put("option:activate", this); return this; } diff --git a/Server/src/main/java/core/game/interaction/object/WitchsPotionPlugin.java b/Server/src/main/java/core/game/interaction/object/WitchsPotionPlugin.java index 680492978..fac668033 100644 --- a/Server/src/main/java/core/game/interaction/object/WitchsPotionPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/WitchsPotionPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -18,8 +18,8 @@ public final class WitchsPotionPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2024).getHandlers().put("option:drink from", this); - ObjectDefinition.forId(2024).getHandlers().put("option:Drink From", this); + SceneryDefinition.forId(2024).getHandlers().put("option:drink from", this); + SceneryDefinition.forId(2024).getHandlers().put("option:Drink From", this); return this; } 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 3ba18c13e..4ea80da36 100644 --- a/Server/src/main/java/core/game/interaction/object/WydinDoorPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/WydinDoorPlugin.java @@ -1,6 +1,6 @@ package core.game.interaction.object; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -21,7 +21,7 @@ public final class WydinDoorPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2069).getHandlers().put("option:open", this); + SceneryDefinition.forId(2069).getHandlers().put("option:open", this); return null; } diff --git a/Server/src/main/java/core/game/interaction/object/dmc/DwarfMultiCannonPlugin.java b/Server/src/main/java/core/game/interaction/object/dmc/DwarfMultiCannonPlugin.java index 7fae23995..9b7e1c4e6 100644 --- a/Server/src/main/java/core/game/interaction/object/dmc/DwarfMultiCannonPlugin.java +++ b/Server/src/main/java/core/game/interaction/object/dmc/DwarfMultiCannonPlugin.java @@ -1,7 +1,7 @@ package core.game.interaction.object.dmc; import core.cache.def.impl.ItemDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.NodeUsageEvent; import core.game.interaction.OptionHandler; import core.game.interaction.UseWithHandler; @@ -23,11 +23,11 @@ public final class DwarfMultiCannonPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { ItemDefinition.forId(6).getHandlers().put("option:set-up", this); - ObjectDefinition.forId(6).getHandlers().put("option:fire", this); - ObjectDefinition.forId(6).getHandlers().put("option:pick-up", this); - ObjectDefinition.forId(7).getHandlers().put("option:pick-up", this); - ObjectDefinition.forId(8).getHandlers().put("option:pick-up", this); - ObjectDefinition.forId(9).getHandlers().put("option:pick-up", this); + SceneryDefinition.forId(6).getHandlers().put("option:fire", this); + SceneryDefinition.forId(6).getHandlers().put("option:pick-up", this); + SceneryDefinition.forId(7).getHandlers().put("option:pick-up", this); + SceneryDefinition.forId(8).getHandlers().put("option:pick-up", this); + SceneryDefinition.forId(9).getHandlers().put("option:pick-up", this); UseWithHandler.addHandler(6, UseWithHandler.OBJECT_TYPE, new UseWithHandler(2) { @Override public Plugin newInstance(Object arg) throws Throwable { 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 d486db298..979a97496 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 @@ -1,6 +1,6 @@ package core.game.interaction.object.sorceress; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.plugin.Initializable; import core.game.content.dialogue.DialoguePlugin; @@ -70,11 +70,11 @@ public final class GardenObjectsPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.setOptionHandler("pick-fruit", this); - ObjectDefinition.setOptionHandler("drink-from", this); - ObjectDefinition.forId(21794).getHandlers().put("option:search", this); + SceneryDefinition.setOptionHandler("pick-fruit", this); + SceneryDefinition.setOptionHandler("drink-from", this); + SceneryDefinition.forId(21794).getHandlers().put("option:search", this); for (HerbDefinition h : HerbDefinition.values()) { - ObjectDefinition.forId(h.getId()).getHandlers().put("option:pick", this); + SceneryDefinition.forId(h.getId()).getHandlers().put("option:pick", this); } new SqirkJuicePlugin().newInstance(arg); new OsmanDialogue().init(); 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 fefc5d313..95c0281d9 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 @@ -1,6 +1,6 @@ package core.game.interaction.object.sorceress; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.DoorActionHandler; import core.game.node.entity.skill.Skills; import core.game.interaction.OptionHandler; @@ -30,10 +30,10 @@ public class SorceressGardenObject extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(21709).getHandlers().put("option:open", this); - ObjectDefinition.forId(21753).getHandlers().put("option:open", this); - ObjectDefinition.forId(21731).getHandlers().put("option:open", this); - ObjectDefinition.forId(21687).getHandlers().put("option:open", this); + SceneryDefinition.forId(21709).getHandlers().put("option:open", this); + SceneryDefinition.forId(21753).getHandlers().put("option:open", this); + SceneryDefinition.forId(21731).getHandlers().put("option:open", this); + SceneryDefinition.forId(21687).getHandlers().put("option:open", this); return this; } 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 dbea5520c..0a755ea24 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 @@ -1,6 +1,6 @@ package core.game.interaction.object.wildyditch; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.interaction.MovementPulse; import core.game.interaction.OptionHandler; @@ -21,7 +21,7 @@ public final class WildernessDitchPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(23271).getHandlers().put("option:cross", this); + SceneryDefinition.forId(23271).getHandlers().put("option:cross", this); PluginManager.definePlugin(new WildernessInterfacePlugin()); return this; } diff --git a/Server/src/main/java/core/game/node/Node.java b/Server/src/main/java/core/game/node/Node.java index 4f1650b69..33b4aabd0 100644 --- a/Server/src/main/java/core/game/node/Node.java +++ b/Server/src/main/java/core/game/node/Node.java @@ -91,7 +91,7 @@ public abstract class Node { * Casts the scenery. * @return the object. */ - public Scenery asObject() { + public Scenery asScenery() { return (Scenery) this; } diff --git a/Server/src/main/java/core/game/node/entity/npc/bosses/GiantMoleNPC.java b/Server/src/main/java/core/game/node/entity/npc/bosses/GiantMoleNPC.java index c0ba2b519..42f63420d 100644 --- a/Server/src/main/java/core/game/node/entity/npc/bosses/GiantMoleNPC.java +++ b/Server/src/main/java/core/game/node/entity/npc/bosses/GiantMoleNPC.java @@ -1,6 +1,6 @@ package core.game.node.entity.npc.bosses; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.component.ComponentDefinition; import core.game.component.ComponentPlugin; @@ -270,7 +270,7 @@ public final class GiantMoleNPC extends AbstractNPC { DigSpadeHandler.register(Location.create(2989, 3378, 0), action); DigSpadeHandler.register(Location.create(2984, 3387, 0), action); DigSpadeHandler.register(Location.create(2987, 3387, 0), action); - ObjectDefinition.forId(12230).getHandlers().put("option:climb", new OptionHandler() { + SceneryDefinition.forId(12230).getHandlers().put("option:climb", new OptionHandler() { @Override public Plugin newInstance(Object arg) throws Throwable { return this; 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 5c3a2fde9..7d1df6b77 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 @@ -1,6 +1,6 @@ package core.game.node.entity.npc.city.sophanem; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.plugin.Initializable; import core.game.node.entity.skill.Skills; import core.game.interaction.OptionHandler; @@ -29,7 +29,7 @@ public final class WallShortcut extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(6620).getHandlers().put("option:climb-through", this); + SceneryDefinition.forId(6620).getHandlers().put("option:climb-through", this); return null; } diff --git a/Server/src/main/java/core/game/node/entity/npc/city/varrock/VarrockBrokenCart.java b/Server/src/main/java/core/game/node/entity/npc/city/varrock/VarrockBrokenCart.java index b7ec7831b..a8eb3647a 100644 --- a/Server/src/main/java/core/game/node/entity/npc/city/varrock/VarrockBrokenCart.java +++ b/Server/src/main/java/core/game/node/entity/npc/city/varrock/VarrockBrokenCart.java @@ -1,6 +1,6 @@ package core.game.node.entity.npc.city.varrock; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -21,7 +21,7 @@ public class VarrockBrokenCart extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(23055).getHandlers().put("option:search", this); + SceneryDefinition.forId(23055).getHandlers().put("option:search", this); return this; } 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 75fd3c648..ef5696ca6 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 @@ -77,7 +77,7 @@ public class CompostMoundNPC extends Forager { owner.getPacketDispatch().sendMessage("This scroll can only be used on an empty compost bin."); return false; } - CompostBins cbin = CompostBins.forObject(special.getNode().asObject()); + CompostBins cbin = CompostBins.forObject(special.getNode().asScenery()); if(cbin == null){ return false; } 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 0ebe70f18..acd426b38 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 @@ -1,6 +1,6 @@ package core.game.node.entity.skill.agility; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -86,7 +86,7 @@ public abstract class AgilityShortcut extends OptionHandler { if (!checkRequirements(player)) { return true; } - run(player, node.asObject(), option, checkFail(player, node.asObject(), option)); + run(player, node.asScenery(), option, checkFail(player, node.asScenery(), option)); return true; } @@ -131,7 +131,7 @@ public abstract class AgilityShortcut extends OptionHandler { */ public void configure(AgilityShortcut shortcut) { for (int objectId : shortcut.ids) { - ObjectDefinition def = ObjectDefinition.forId(objectId); + SceneryDefinition def = SceneryDefinition.forId(objectId); for (String option : shortcut.options) { def.getHandlers().put("option:" + option, shortcut); } 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 406cb812c..71aa75198 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 @@ -1,6 +1,6 @@ package core.game.node.entity.skill.agility.brimhaven; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.plugin.Initializable; import core.game.node.entity.skill.Skills; import core.game.node.entity.skill.agility.AgilityHandler; @@ -334,19 +334,19 @@ public final class BrimhavenCourse extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(3566).getHandlers().put("option:swing-on", this); - ObjectDefinition.forId(3578).getHandlers().put("option:jump-on", this); - ObjectDefinition.forId(3565).getHandlers().put("option:climb-over", this); - ObjectDefinition.forId(3553).getHandlers().put("option:walk-on", this); - ObjectDefinition.forId(3557).getHandlers().put("option:walk-on", this); - ObjectDefinition.forId(3570).getHandlers().put("option:walk-on", this); - ObjectDefinition.forId(3571).getHandlers().put("option:walk-on", this); - ObjectDefinition.forId(3572).getHandlers().put("option:walk-on", this); - ObjectDefinition.forId(3559).getHandlers().put("option:walk-across", this); - ObjectDefinition.forId(3561).getHandlers().put("option:walk-across", this); - ObjectDefinition.forId(3564).getHandlers().put("option:swing-across", this); - ObjectDefinition.forId(3551).getHandlers().put("option:walk-on", this); - ObjectDefinition.forId(3583).getHandlers().put("option:climb-across", this); + SceneryDefinition.forId(3566).getHandlers().put("option:swing-on", this); + SceneryDefinition.forId(3578).getHandlers().put("option:jump-on", this); + SceneryDefinition.forId(3565).getHandlers().put("option:climb-over", this); + SceneryDefinition.forId(3553).getHandlers().put("option:walk-on", this); + SceneryDefinition.forId(3557).getHandlers().put("option:walk-on", this); + SceneryDefinition.forId(3570).getHandlers().put("option:walk-on", this); + SceneryDefinition.forId(3571).getHandlers().put("option:walk-on", this); + SceneryDefinition.forId(3572).getHandlers().put("option:walk-on", this); + SceneryDefinition.forId(3559).getHandlers().put("option:walk-across", this); + SceneryDefinition.forId(3561).getHandlers().put("option:walk-across", this); + SceneryDefinition.forId(3564).getHandlers().put("option:swing-across", this); + SceneryDefinition.forId(3551).getHandlers().put("option:walk-on", this); + SceneryDefinition.forId(3583).getHandlers().put("option:climb-across", this); return this; } 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 61faa4d70..308241cd6 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 @@ -1,7 +1,7 @@ package core.game.node.entity.skill.agility.pyramid; import core.cache.def.impl.VarbitDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.ClimbActionHandler; import core.plugin.Initializable; import core.game.node.entity.skill.Skills; @@ -68,30 +68,30 @@ public final class AgilityPyramidCourse extends AgilityCourse { @Override public void configure() { - ObjectDefinition.forId(16535).getHandlers().put("option:climb", this); - ObjectDefinition.forId(16536).getHandlers().put("option:climb", this); - ObjectDefinition.forId(10851).getHandlers().put("option:climb", this); - ObjectDefinition.forId(10855).getHandlers().put("option:enter", this); - ObjectDefinition.forId(10856).getHandlers().put("option:enter", this); - ObjectDefinition.forId(10860).getHandlers().put("option:cross", this); - ObjectDefinition.forId(10861).getHandlers().put("option:cross", this); - ObjectDefinition.forId(10862).getHandlers().put("option:cross", this); - ObjectDefinition.forId(10863).getHandlers().put("option:cross", this); - ObjectDefinition.forId(10864).getHandlers().put("option:cross", this); - ObjectDefinition.forId(10868).getHandlers().put("option:cross", this); - ObjectDefinition.forId(10867).getHandlers().put("option:cross", this); - ObjectDefinition.forId(10882).getHandlers().put("option:cross", this); - ObjectDefinition.forId(10883).getHandlers().put("option:cross", this); - ObjectDefinition.forId(10884).getHandlers().put("option:cross", this); - ObjectDefinition.forId(10885).getHandlers().put("option:cross", this); - ObjectDefinition.forId(10886).getHandlers().put("option:cross", this); - ObjectDefinition.forId(10887).getHandlers().put("option:cross", this); - ObjectDefinition.forId(10888).getHandlers().put("option:cross", this); - ObjectDefinition.forId(10889).getHandlers().put("option:cross", this); - ObjectDefinition.forId(10859).getHandlers().put("option:jump", this); - ObjectDefinition.forId(10857).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(10858).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(10865).getHandlers().put("option:climb-over", this); + SceneryDefinition.forId(16535).getHandlers().put("option:climb", this); + SceneryDefinition.forId(16536).getHandlers().put("option:climb", this); + SceneryDefinition.forId(10851).getHandlers().put("option:climb", this); + SceneryDefinition.forId(10855).getHandlers().put("option:enter", this); + SceneryDefinition.forId(10856).getHandlers().put("option:enter", this); + SceneryDefinition.forId(10860).getHandlers().put("option:cross", this); + SceneryDefinition.forId(10861).getHandlers().put("option:cross", this); + SceneryDefinition.forId(10862).getHandlers().put("option:cross", this); + SceneryDefinition.forId(10863).getHandlers().put("option:cross", this); + SceneryDefinition.forId(10864).getHandlers().put("option:cross", this); + SceneryDefinition.forId(10868).getHandlers().put("option:cross", this); + SceneryDefinition.forId(10867).getHandlers().put("option:cross", this); + SceneryDefinition.forId(10882).getHandlers().put("option:cross", this); + SceneryDefinition.forId(10883).getHandlers().put("option:cross", this); + SceneryDefinition.forId(10884).getHandlers().put("option:cross", this); + SceneryDefinition.forId(10885).getHandlers().put("option:cross", this); + SceneryDefinition.forId(10886).getHandlers().put("option:cross", this); + SceneryDefinition.forId(10887).getHandlers().put("option:cross", this); + SceneryDefinition.forId(10888).getHandlers().put("option:cross", this); + SceneryDefinition.forId(10889).getHandlers().put("option:cross", this); + SceneryDefinition.forId(10859).getHandlers().put("option:jump", this); + SceneryDefinition.forId(10857).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(10858).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(10865).getHandlers().put("option:climb-over", this); RollingBlock.BlockSets.values(); PluginManager.definePlugin(new MovingBlockNPC()); PluginManager.definePlugin(new AgilityPyramidZone()); @@ -497,7 +497,7 @@ public final class AgilityPyramidCourse extends AgilityCourse { * @param value the value. */ public static void addConfig(final Player player, final int objectId, final int value, boolean save) { - final VarbitDefinition definition = VarbitDefinition.forObjectID(ObjectDefinition.forId(objectId).getVarbitID()); + final VarbitDefinition definition = VarbitDefinition.forObjectID(SceneryDefinition.forId(objectId).getVarbitID()); final int oldVal = (definition.getValue(player) << definition.getBitShift()); final int newVal = (value << definition.getBitShift()); player.getConfigManager().set(CONFIG_ID, (player.getConfigManager().get(CONFIG_ID) - oldVal) + newVal, save); diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/FaladorGrapplePlugin.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/FaladorGrapplePlugin.java index 88e7d90e3..a12ded1d0 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/FaladorGrapplePlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/FaladorGrapplePlugin.java @@ -1,6 +1,6 @@ package core.game.node.entity.skill.agility.shortcuts; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import org.rs09.consts.Items; import core.game.interaction.OptionHandler; @@ -57,10 +57,10 @@ public final class FaladorGrapplePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(17049).getHandlers().put("option:grapple", this); - ObjectDefinition.forId(17050).getHandlers().put("option:grapple", this); - ObjectDefinition.forId(17051).getHandlers().put("option:jump", this); - ObjectDefinition.forId(17052).getHandlers().put("option:jump", this); + SceneryDefinition.forId(17049).getHandlers().put("option:grapple", this); + SceneryDefinition.forId(17050).getHandlers().put("option:grapple", this); + SceneryDefinition.forId(17051).getHandlers().put("option:jump", this); + SceneryDefinition.forId(17052).getHandlers().put("option:jump", this); return this; } @@ -73,14 +73,14 @@ public final class FaladorGrapplePlugin extends OptionHandler { case "jump": ForceMovement.run(player, current, - node.asObject().getId() == 17051 + node.asScenery().getId() == 17051 ? Location.create(3033, 3390, 0) : Location.create(3032, 3388, 0), new Animation(7268), 10); break; case "grapple": - destination = node.asObject().getId() == 17049 + destination = node.asScenery().getId() == 17049 ? Location.create(3033, 3389, 1) : Location.create(3032, 3391, 1); @@ -139,7 +139,7 @@ public final class FaladorGrapplePlugin extends OptionHandler { @Override public Location getDestination(final Node moving, final Node destination) { - return destination.asObject().getId() == 17050 ? Location.create(3032, 3388, 0) : null; + return destination.asScenery().getId() == 17050 ? Location.create(3032, 3388, 0) : null; } } 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 0fd8a2a53..515912757 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 @@ -1,6 +1,6 @@ package core.game.node.entity.skill.agility.shortcuts; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import org.rs09.consts.Items; import core.game.interaction.OptionHandler; @@ -49,7 +49,7 @@ public class KaramjaGrapple extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(17074).getHandlers().put("option:grapple", this); + SceneryDefinition.forId(17074).getHandlers().put("option:grapple", this); // island tree 17074 +1 rope loop, +2 grappled one way, +3 grappled other way // north tree 17056 +1 rope loop, +2 grappled // south tree 17059 +1 rope loop, +2 grappled 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 92e059c6a..0906bcdbc 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 @@ -16,7 +16,7 @@ public class RopeSwing extends UseWithHandler { public boolean handle(NodeUsageEvent event) { System.out.println("Trying to handle."); if(event.getUsedWith() instanceof Scenery){ - Scenery object = event.getUsedWith().asObject(); + Scenery object = event.getUsedWith().asScenery(); int objId = object.getId(); assert event.getUsedItem() != null; 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 67fd920f4..4fad95805 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 @@ -1,6 +1,6 @@ package core.game.node.entity.skill.agility.shortcuts; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.plugin.Initializable; import core.plugin.Plugin; import core.game.node.entity.skill.agility.AgilityShortcut; @@ -73,6 +73,6 @@ public class StrangeFloorShortcut extends AgilityShortcut { @Override public void configure(AgilityShortcut shortcut) { - ObjectDefinition.forId(getIds()[0]).getHandlers().put("option:jump-over",this); + SceneryDefinition.forId(getIds()[0]).getHandlers().put("option:jump-over",this); } } 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 214e6dbc8..00a079cd2 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 @@ -106,7 +106,7 @@ public class TunnelShortcut extends AgilityShortcut { @Override public Location getDestination(Node node, Node n) { if (n.getId() == 14922) { - return n.getLocation().transform(getObjectDirection(n.asObject().getDirection()), 1); + return n.getLocation().transform(getObjectDirection(n.asScenery().getDirection()), 1); } return getStart(n.getLocation(), n.getDirection()); } 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 41aa79f83..4e69e31e9 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 @@ -1,6 +1,6 @@ package core.game.node.entity.skill.agility.shortcuts; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import org.rs09.consts.Items; import core.game.interaction.OptionHandler; @@ -49,7 +49,7 @@ public class WaterOrbGrapple extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(17062).getHandlers().put("option:grapple", this); + SceneryDefinition.forId(17062).getHandlers().put("option:grapple", this); return this; } diff --git a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/YanilleGrapple.java b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/YanilleGrapple.java index fe48f9383..164dc4da5 100644 --- a/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/YanilleGrapple.java +++ b/Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/YanilleGrapple.java @@ -1,6 +1,6 @@ package core.game.node.entity.skill.agility.shortcuts; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -44,8 +44,8 @@ public class YanilleGrapple extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(17047).getHandlers().put("option:grapple", this); - ObjectDefinition.forId(17048).getHandlers().put("option:jump", this); + SceneryDefinition.forId(17047).getHandlers().put("option:grapple", this); + SceneryDefinition.forId(17048).getHandlers().put("option:jump", this); return this; } 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 287e4c580..d9b648347 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 @@ -1,7 +1,7 @@ package core.game.node.entity.skill.construction; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.content.dialogue.DialogueInterpreter; import core.game.content.dialogue.DialoguePlugin; @@ -25,8 +25,8 @@ public final class BuildOptionPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.setOptionHandler("build", this); - ObjectDefinition.setOptionHandler("remove", this); + SceneryDefinition.setOptionHandler("build", this); + SceneryDefinition.setOptionHandler("remove", this); PluginManager.definePlugin(new RemoveDialogue()); return this; } 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 f2c38f85c..a1578fc0c 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 @@ -2,13 +2,12 @@ package core.game.node.entity.skill.construction; import api.ContentAPI; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.dialogue.DialogueInterpreter; 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.entity.player.link.RunScript; import core.game.node.object.Scenery; import core.plugin.Initializable; import core.plugin.Plugin; @@ -29,17 +28,17 @@ public final class PortalOptionPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { for (HouseLocation hl : HouseLocation.values()) { - ObjectDefinition.forId(hl.getPortalId()).getHandlers().put("option:enter", this); + SceneryDefinition.forId(hl.getPortalId()).getHandlers().put("option:enter", this); } - ObjectDefinition.forId(13405).getHandlers().put("option:lock", this); - ObjectDefinition.forId(13405).getHandlers().put("option:enter", this); + SceneryDefinition.forId(13405).getHandlers().put("option:lock", this); + SceneryDefinition.forId(13405).getHandlers().put("option:enter", this); PluginManager.definePlugin(new PortalDialogue()); return this; } @Override public boolean handle(Player player, Node node, String option) { - Scenery object = node.asObject(); + Scenery object = node.asScenery(); 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/RoomBuilder.java b/Server/src/main/java/core/game/node/entity/skill/construction/RoomBuilder.java index d089dadf4..e3b07327d 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 @@ -1,6 +1,6 @@ package core.game.node.entity.skill.construction; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.node.entity.player.Player; import core.game.node.item.Item; @@ -56,7 +56,7 @@ public final class RoomBuilder { } else { items[1 + ((i - 4) * 2)] = new Item(decoration.getInterfaceItem()); } - player.getPacketDispatch().sendString(ObjectDefinition.forId(decoration.getObjectId()).getName(), 396, 97 + offset); + player.getPacketDispatch().sendString(SceneryDefinition.forId(decoration.getObjectId()).getName(), 396, 97 + offset); boolean hasRequirements = true; for (int j = 0; j < 4; j++) { if (j >= decoration.getItems().length) { 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 498319ff6..3b4978d88 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 @@ -1,6 +1,6 @@ package core.game.node.entity.skill.construction.decoration; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.node.entity.skill.construction.Decoration; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -53,7 +53,7 @@ public final class ChairBenchPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { for (Object[] data : CHAIRS) { - ObjectDefinition.forId(((Decoration) data[0]).getObjectId()).getHandlers().put("option:sit-on", this); + SceneryDefinition.forId(((Decoration) data[0]).getObjectId()).getHandlers().put("option:sit-on", this); } return this; } 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 002b3d595..83487d3cb 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 @@ -1,7 +1,7 @@ package core.game.node.entity.skill.construction.decoration; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.plugin.Initializable; import core.game.node.entity.skill.Skills; import core.game.interaction.OptionHandler; @@ -30,9 +30,9 @@ public final class FireplacePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(13609).getHandlers().put("option:light", this); - ObjectDefinition.forId(13611).getHandlers().put("option:light", this); - ObjectDefinition.forId(13613).getHandlers().put("option:light", this); + SceneryDefinition.forId(13609).getHandlers().put("option:light", this); + SceneryDefinition.forId(13611).getHandlers().put("option:light", this); + SceneryDefinition.forId(13613).getHandlers().put("option:light", this); return this; } @@ -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 Scenery obj = (Scenery) node.asObject(); + final Scenery obj = (Scenery) node.asScenery(); player.lock(2); player.animate(ANIMATION); GameWorld.getPulser().submit(new Pulse(2, player) { 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 b4241e379..be7f2c6ad 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/StaircasePlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/StaircasePlugin.java @@ -1,6 +1,6 @@ package core.game.node.entity.skill.construction.decoration; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.dialogue.DialogueInterpreter; import core.game.content.dialogue.DialoguePlugin; import core.game.interaction.OptionHandler; @@ -34,25 +34,25 @@ public final class StaircasePlugin extends OptionHandler { PluginManager.definePlugin(new BuildDialogue()); PluginManager.definePlugin(new ClimbPohLadder()); for (int i = 13497; i < 13507; i++) { - ObjectDefinition.forId(i).getHandlers().put("option:climb", this); - ObjectDefinition.forId(i).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(i).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(i).getHandlers().put("option:remove-room", this); + SceneryDefinition.forId(i).getHandlers().put("option:climb", this); + SceneryDefinition.forId(i).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(i).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(i).getHandlers().put("option:remove-room", this); } - ObjectDefinition.forId(13409).getHandlers().put("option:enter", this); - ObjectDefinition.forId(13409).getHandlers().put("option:remove-room", this); + SceneryDefinition.forId(13409).getHandlers().put("option:enter", this); + SceneryDefinition.forId(13409).getHandlers().put("option:remove-room", this); for (int id = 13328; id < 13331; id++) { - ObjectDefinition.forId(id).getHandlers().put("option:climb", this); - ObjectDefinition.forId(id).getHandlers().put("option:remove-room", this); + SceneryDefinition.forId(id).getHandlers().put("option:climb", this); + SceneryDefinition.forId(id).getHandlers().put("option:remove-room", this); } for (int id = 13675; id <= 13680; id++) { if (id < 13678) { - ObjectDefinition.forId(id).getHandlers().put("option:open", this); + SceneryDefinition.forId(id).getHandlers().put("option:open", this); } else { - ObjectDefinition.forId(id).getHandlers().put("option:go-down", this); - ObjectDefinition.forId(id).getHandlers().put("option:close", this); + SceneryDefinition.forId(id).getHandlers().put("option:go-down", this); + SceneryDefinition.forId(id).getHandlers().put("option:close", this); } - ObjectDefinition.forId(id).getHandlers().put("option:remove-room", this); + SceneryDefinition.forId(id).getHandlers().put("option:remove-room", this); } return this; } 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 24b2a4da0..9fbb07004 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 @@ -1,7 +1,7 @@ package core.game.node.entity.skill.construction.decoration.bedroom; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -22,15 +22,15 @@ public class ClockPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(13169).getHandlers().put("option:read", this); - ObjectDefinition.forId(13170).getHandlers().put("option:read", this); - ObjectDefinition.forId(13171).getHandlers().put("option:read", this); + SceneryDefinition.forId(13169).getHandlers().put("option:read", this); + SceneryDefinition.forId(13170).getHandlers().put("option:read", this); + SceneryDefinition.forId(13171).getHandlers().put("option:read", this); return this; } @Override public boolean handle(Player player, Node node, String option) { - Scenery object = node.asObject(); + Scenery object = node.asScenery(); 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 3b22c235e..57a7dced9 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 @@ -1,7 +1,7 @@ package core.game.node.entity.skill.construction.decoration.chapel; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.Bones; import core.game.node.entity.skill.Skills; import core.game.interaction.NodeUsageEvent; @@ -58,7 +58,7 @@ public class BoneOfferPlugin extends UseWithHandler { Player player = event.getPlayer(); Scenery left = null; Scenery right = null; - if (event.getUsedWith().asObject().getRotation() % 2 == 0) { + if (event.getUsedWith().asScenery().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()); } else { @@ -67,7 +67,7 @@ public class BoneOfferPlugin extends UseWithHandler { } Bones b = Bones.forId(event.getUsedItem().getId()); if (b != null) { - worship(player, event.getUsedWith().asObject(), left, right, b); + worship(player, event.getUsedWith().asScenery(), left, right, b); } return true; } @@ -114,7 +114,7 @@ public class BoneOfferPlugin extends UseWithHandler { * @param obj the object. */ private boolean isLit(Scenery obj) { - return obj != null && obj.getId() != 15271 && ObjectDefinition.forId(obj.getId()).getOptions() != null && !ObjectDefinition.forId(obj.getId()).hasAction("Light"); + return obj != null && obj.getId() != 15271 && SceneryDefinition.forId(obj.getId()).getOptions() != null && !SceneryDefinition.forId(obj.getId()).hasAction("Light"); } /** diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/combatroom/CombatRing.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/combatroom/CombatRing.java index ae557447c..8720a88b8 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/combatroom/CombatRing.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/combatroom/CombatRing.java @@ -1,7 +1,7 @@ package core.game.node.entity.skill.construction.decoration.combatroom; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -18,9 +18,9 @@ public final class CombatRing extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(13129).getHandlers().put("option:climb-over", this); //Boxing ring - ObjectDefinition.forId(13133).getHandlers().put("option:climb-over", this); //Fencing ring - ObjectDefinition.forId(13137).getHandlers().put("option:climb-over", this); //Combat ring + SceneryDefinition.forId(13129).getHandlers().put("option:climb-over", this); //Boxing ring + SceneryDefinition.forId(13133).getHandlers().put("option:climb-over", this); //Fencing ring + SceneryDefinition.forId(13137).getHandlers().put("option:climb-over", this); //Combat ring return this; } diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/LarderPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/LarderPlugin.java index 2577ceec1..2d8b3f44e 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/LarderPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/LarderPlugin.java @@ -1,7 +1,7 @@ package core.game.node.entity.skill.construction.decoration.kitchen; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.plugin.Initializable; import core.game.content.dialogue.DialoguePlugin; import core.game.interaction.OptionHandler; @@ -21,9 +21,9 @@ public final class LarderPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { PluginManager.definePlugin(new LarderDialogue()); - ObjectDefinition.forId(13565).getHandlers().put("option:search", this); - ObjectDefinition.forId(13566).getHandlers().put("option:search", this); - ObjectDefinition.forId(13567).getHandlers().put("option:search", this); + SceneryDefinition.forId(13565).getHandlers().put("option:search", this); + SceneryDefinition.forId(13566).getHandlers().put("option:search", this); + SceneryDefinition.forId(13567).getHandlers().put("option:search", this); return this; } diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/ShelfPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/ShelfPlugin.java index 4bb56838c..604deec36 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/ShelfPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/kitchen/ShelfPlugin.java @@ -1,7 +1,7 @@ package core.game.node.entity.skill.construction.decoration.kitchen; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.dialogue.DialoguePlugin; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -22,7 +22,7 @@ public final class ShelfPlugin extends OptionHandler { public Plugin newInstance(Object arg) throws Throwable { PluginManager.definePlugin(new ShelfDialogue()); for (int i = 13545; i < 13552; i++) { - ObjectDefinition.forId(i).getHandlers().put("option:search", this); + SceneryDefinition.forId(i).getHandlers().put("option:search", this); } return this; } 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 bb3cb82c7..ad079ebf1 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 @@ -1,7 +1,7 @@ package core.game.node.entity.skill.construction.decoration.portalchamber; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.dialogue.DialogueInterpreter; import core.game.content.dialogue.DialoguePlugin; import core.game.interaction.OptionHandler; @@ -105,12 +105,12 @@ public class PortalChamberPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(13639).getHandlers().put("option:direct-portal", this); - ObjectDefinition.forId(13639).getHandlers().put("option:scry", this); - ObjectDefinition.forId(13640).getHandlers().put("option:direct-portal", this); - ObjectDefinition.forId(13641).getHandlers().put("option:direct-portal", this); + SceneryDefinition.forId(13639).getHandlers().put("option:direct-portal", this); + SceneryDefinition.forId(13639).getHandlers().put("option:scry", this); + SceneryDefinition.forId(13640).getHandlers().put("option:direct-portal", this); + SceneryDefinition.forId(13641).getHandlers().put("option:direct-portal", this); for (int i = 13615; i <= 13635; i++) { - ObjectDefinition.forId(i).getHandlers().put("option:enter", this); + SceneryDefinition.forId(i).getHandlers().put("option:enter", this); } PluginManager.definePlugin(new DirectPortalDialogue()); return this; @@ -118,7 +118,7 @@ public class PortalChamberPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - Scenery object = node.asObject(); + Scenery object = node.asScenery(); switch (option) { case "direct-portal": if (!player.getHouseManager().isBuildingMode()) { diff --git a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/questhall/MountedGloryPlugin.java b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/questhall/MountedGloryPlugin.java index 018b326ea..d3b787564 100644 --- a/Server/src/main/java/core/game/node/entity/skill/construction/decoration/questhall/MountedGloryPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/construction/decoration/questhall/MountedGloryPlugin.java @@ -1,7 +1,7 @@ package core.game.node.entity.skill.construction.decoration.questhall; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.dialogue.DialogueAction; import core.game.content.dialogue.DialogueInterpreter; import core.game.interaction.OptionHandler; @@ -34,7 +34,7 @@ public class MountedGloryPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(13523).getHandlers().put("option:rub", this); + SceneryDefinition.forId(13523).getHandlers().put("option:rub", this); return this; } 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 2f82c6126..c4a76b3e5 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 @@ -2,7 +2,7 @@ package core.game.node.entity.skill.construction.decoration.workshop; import core.cache.def.impl.ItemDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.dialogue.DialogueInterpreter; import core.game.content.dialogue.DialoguePlugin; import core.game.node.entity.skill.Skills; @@ -73,17 +73,17 @@ public class ClockmakersBenchPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(13709).getHandlers().put("option:craft", this); - ObjectDefinition.forId(13710).getHandlers().put("option:craft", this); - ObjectDefinition.forId(13711).getHandlers().put("option:craft", this); - ObjectDefinition.forId(13712).getHandlers().put("option:craft", this); + SceneryDefinition.forId(13709).getHandlers().put("option:craft", this); + SceneryDefinition.forId(13710).getHandlers().put("option:craft", this); + SceneryDefinition.forId(13711).getHandlers().put("option:craft", this); + SceneryDefinition.forId(13712).getHandlers().put("option:craft", this); PluginManager.definePlugin(new ClockmakerBenchDialogue()); return this; } @Override public boolean handle(Player player, Node node, String option) { - player.getDialogueInterpreter().open(DialogueInterpreter.getDialogueKey("con:clockbench"), node.asObject()); + player.getDialogueInterpreter().open(DialogueInterpreter.getDialogueKey("con:clockbench"), node.asScenery()); return true; } 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 e86f6305b..adf36c31e 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 @@ -2,7 +2,7 @@ package core.game.node.entity.skill.construction.decoration.workshop; import core.cache.def.impl.ItemDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.plugin.Initializable; import core.game.content.dialogue.DialogueInterpreter; import core.game.content.dialogue.DialoguePlugin; @@ -78,7 +78,7 @@ public class ToolsPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { for (ToolStore t : ToolStore.values()) { - ObjectDefinition.forId(t.objectId).getHandlers().put("option:search", this); + SceneryDefinition.forId(t.objectId).getHandlers().put("option:search", this); } PluginManager.definePlugin(new ToolDialogue()); return this; @@ -86,7 +86,7 @@ public class ToolsPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { - Scenery object = node.asObject(); + Scenery object = node.asScenery(); 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 48321cf91..f3537f36b 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 @@ -26,9 +26,9 @@ class CookingRewrite : InteractionListener() { override fun defineListeners() { - onUseWith(OBJECT,RAW_FOODS, *COOKING_OBJs){player, used, with -> + onUseWith(SCENERY,RAW_FOODS, *COOKING_OBJs){ player, used, with -> val item = used.asItem() - val obj = with.asObject() + val obj = with.asScenery() val range = obj.name.toLowerCase().contains("range") when (item.id) { RAW_BEEF_2132 -> if (range) { diff --git a/Server/src/main/java/core/game/node/entity/skill/cooking/FireOptionPotteryPlugin.java b/Server/src/main/java/core/game/node/entity/skill/cooking/FireOptionPotteryPlugin.java index ccab1e4df..8a6c6971b 100644 --- a/Server/src/main/java/core/game/node/entity/skill/cooking/FireOptionPotteryPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/cooking/FireOptionPotteryPlugin.java @@ -1,6 +1,6 @@ package core.game.node.entity.skill.cooking; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -17,10 +17,10 @@ public final class FireOptionPotteryPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(2643).getHandlers().put("option:fire", this); - ObjectDefinition.forId(4308).getHandlers().put("option:fire", this); - ObjectDefinition.forId(11601).getHandlers().put("option:fire", this); - ObjectDefinition.forId(34802).getHandlers().put("option:fire", this); + SceneryDefinition.forId(2643).getHandlers().put("option:fire", this); + SceneryDefinition.forId(4308).getHandlers().put("option:fire", this); + SceneryDefinition.forId(11601).getHandlers().put("option:fire", this); + SceneryDefinition.forId(34802).getHandlers().put("option:fire", this); return this; } diff --git a/Server/src/main/java/core/game/node/entity/skill/crafting/PotteryPlugin.java b/Server/src/main/java/core/game/node/entity/skill/crafting/PotteryPlugin.java index 79df4ae97..ac4af460b 100644 --- a/Server/src/main/java/core/game/node/entity/skill/crafting/PotteryPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/crafting/PotteryPlugin.java @@ -1,6 +1,6 @@ package core.game.node.entity.skill.crafting; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.plugin.Initializable; import rs09.game.content.dialogue.SkillDialogueHandler; import rs09.game.content.dialogue.SkillDialogueHandler.SkillDialogue; @@ -95,7 +95,7 @@ public final class PotteryPlugin extends UseWithHandler { @Override public Plugin newInstance(Object arg) throws Throwable { for (int id : OVENS) { - ObjectDefinition.forId(id).getHandlers().put("option:fire", this); + SceneryDefinition.forId(id).getHandlers().put("option:fire", this); } new FireUseHandler().newInstance(arg); return this; 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 d2f3e383a..b25fee8e2 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 @@ -1,6 +1,6 @@ package core.game.node.entity.skill.crafting; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.node.entity.player.link.diary.DiaryType; import core.game.world.map.Location; import core.plugin.Initializable; @@ -27,7 +27,7 @@ public final class WeaveOptionPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.setOptionHandler("weave", this); + SceneryDefinition.setOptionHandler("weave", this); return this; } 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 ae0191c36..429464291 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 @@ -188,7 +188,7 @@ public class WoodcuttingSkillPulse extends Pulse { if (node.getCharge() < 1) { node.setCharge(1000); if (resource.isFarming()) { - FarmingPatch fPatch = FarmingPatch.forObject(node.asObject()); + FarmingPatch fPatch = FarmingPatch.forObject(node.asScenery()); if(fPatch != null) { Patch patch = fPatch.getPatchFor(player); patch.setCurrentState(patch.getCurrentState() + 1); 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 db5e8be4c..b1daa96ff 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 @@ -119,7 +119,7 @@ public final class DeadfallSetting extends TrapSetting { @Override public Scenery buildObject(Player player, Node node) { - return node.asObject().transform(getObjectForNode(node)); + return node.asScenery().transform(getObjectForNode(node)); } @Override 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 e7f208c1d..b6137bad5 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 @@ -3,7 +3,7 @@ package core.game.node.entity.skill.hunter; import core.cache.def.Definition; import core.cache.def.impl.ItemDefinition; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.plugin.Initializable; import core.game.node.entity.skill.hunter.NetTrapSetting.NetTrap; import core.game.node.entity.skill.hunter.bnet.BNetNode; @@ -38,36 +38,36 @@ public final class HunterPlugin extends OptionHandler { Definition definition = null; for (Traps trap : Traps.values()) { for (int nodeId : trap.getSettings().getNodeIds()) { - definition = trap.getSettings().isObjectTrap() ? ObjectDefinition.forId(nodeId) : ItemDefinition.forId(nodeId); + definition = trap.getSettings().isObjectTrap() ? SceneryDefinition.forId(nodeId) : ItemDefinition.forId(nodeId); definition.getHandlers().put("option:" + trap.getSettings().getOption(), this); } if (trap.getSettings().getFailId() != -1) { - definition = ObjectDefinition.forId(trap.getSettings().getFailId()); + definition = SceneryDefinition.forId(trap.getSettings().getFailId()); definition.getHandlers().put("option:dismantle", this); definition.getHandlers().put("option:deactivate", this); } for (int objectId : trap.getSettings().getObjectIds()) { - definition = ObjectDefinition.forId(objectId); + definition = SceneryDefinition.forId(objectId); definition.getHandlers().put("option:deactivate", this); definition.getHandlers().put("option:dismantle", this); definition.getHandlers().put("option:investigate", this); } for (TrapNode node : trap.getNodes()) { for (int objectId : node.getObjectIds()) { - definition = ObjectDefinition.forId(objectId); + definition = SceneryDefinition.forId(objectId); definition.getHandlers().put("option:check", this); definition.getHandlers().put("option:retrieve", this); } } } for (NetTrap trap : NetTrap.values()) { - ObjectDefinition.forId(trap.getBent()).getHandlers().put("option:dismantle", this); - ObjectDefinition.forId(trap.getFailed()).getHandlers().put("option:dismantle", this); - ObjectDefinition.forId(trap.getNet()).getHandlers().put("option:dismantle", this); - ObjectDefinition.forId(trap.getCaught()).getHandlers().put("option:check", this); - ObjectDefinition.forId(trap.getBent()).getHandlers().put("option:investigate", this); - ObjectDefinition.forId(trap.getFailed()).getHandlers().put("option:investigate", this); - ObjectDefinition.forId(trap.getNet()).getHandlers().put("option:investigate", this); + SceneryDefinition.forId(trap.getBent()).getHandlers().put("option:dismantle", this); + SceneryDefinition.forId(trap.getFailed()).getHandlers().put("option:dismantle", this); + SceneryDefinition.forId(trap.getNet()).getHandlers().put("option:dismantle", this); + SceneryDefinition.forId(trap.getCaught()).getHandlers().put("option:check", this); + SceneryDefinition.forId(trap.getBent()).getHandlers().put("option:investigate", this); + SceneryDefinition.forId(trap.getFailed()).getHandlers().put("option:investigate", this); + SceneryDefinition.forId(trap.getNet()).getHandlers().put("option:investigate", this); } PluginManager.definePlugin(new HunterNPC()); PluginManager.definePlugin(new HunterNetPlugin()); 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 a7751004e..d528d6df2 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 @@ -91,7 +91,7 @@ public final class TrapCreatePulse extends SkillPulse { if (!trap.getSettings().isObjectTrap()) { player.moveStep(); } else { - SceneryBuilder.remove(node.asObject()); + SceneryBuilder.remove(node.asScenery()); } object = SceneryBuilder.add(object); player.getHunterManager().register(trap, node, object); 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 b206cafe4..48181f4cc 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 @@ -1,7 +1,7 @@ package core.game.node.entity.skill.hunter; import core.cache.def.impl.ItemDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.node.Node; import core.game.node.entity.npc.NPC; import core.game.node.entity.player.Player; @@ -483,7 +483,7 @@ public class TrapSetting { */ public String getName() { if (isObjectTrap()) { - return ObjectDefinition.forId(nodeIds[0]).getName().toLowerCase(); + return SceneryDefinition.forId(nodeIds[0]).getName().toLowerCase(); } return ItemDefinition.forId(nodeIds[0]).getName().toLowerCase(); } diff --git a/Server/src/main/java/core/game/node/entity/skill/prayer/PrayerAltarPlugin.java b/Server/src/main/java/core/game/node/entity/skill/prayer/PrayerAltarPlugin.java index ece634902..b74a00daa 100644 --- a/Server/src/main/java/core/game/node/entity/skill/prayer/PrayerAltarPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/prayer/PrayerAltarPlugin.java @@ -1,6 +1,6 @@ package core.game.node.entity.skill.prayer; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.node.entity.player.link.prayer.PrayerType; import core.plugin.Initializable; @@ -25,9 +25,9 @@ public class PrayerAltarPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.setOptionHandler("pray-at", this); - ObjectDefinition.setOptionHandler("pray", this); - ObjectDefinition.forId(61).getHandlers().put("option:check", this); + SceneryDefinition.setOptionHandler("pray-at", this); + SceneryDefinition.setOptionHandler("pray", this); + SceneryDefinition.forId(61).getHandlers().put("option:check", this); return this; } 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 2d38d7cff..0418e904f 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 @@ -2,7 +2,7 @@ package core.game.node.entity.skill.runecrafting; import core.cache.def.impl.ItemDefinition; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.content.global.action.ClimbActionHandler; import core.game.interaction.OptionHandler; @@ -41,14 +41,14 @@ public class RunecraftingPlugin extends OptionHandler { PluginManager.definePlugin(new EnchantTiaraPlugin()); PluginManager.definePlugin(new MysteriousRuinPlugin()); PluginManager.definePlugin(new CombinationRunePlugin()); - ObjectDefinition.forId(2492).getHandlers().put("option:use", this); + SceneryDefinition.forId(2492).getHandlers().put("option:use", this); NPCDefinition.forId(553).getHandlers().put("option:teleport", this); NPCDefinition.forId(2328).getHandlers().put("option:teleport", this); - ObjectDefinition.forId(26849).getHandlers().put("option:climb", this); - ObjectDefinition.forId(26850).getHandlers().put("option:climb", this); - ObjectDefinition.forId(268).getHandlers().put("option:climb", this); - ObjectDefinition.forId(26844).getHandlers().put("option:squeeze-through", this); - ObjectDefinition.forId(26845).getHandlers().put("option:squeeze-through", this); + SceneryDefinition.forId(26849).getHandlers().put("option:climb", this); + SceneryDefinition.forId(26850).getHandlers().put("option:climb", this); + SceneryDefinition.forId(268).getHandlers().put("option:climb", this); + SceneryDefinition.forId(26844).getHandlers().put("option:squeeze-through", this); + SceneryDefinition.forId(26845).getHandlers().put("option:squeeze-through", this); return this; } @@ -130,12 +130,12 @@ public class RunecraftingPlugin extends OptionHandler { */ private void addNodes() { for (Altar altar : Altar.values()) { - ObjectDefinition.forId(altar.getObject()).getHandlers().put("option:craft-rune", this); - ObjectDefinition.forId(altar.getPortal()).getHandlers().put("option:use", this); + SceneryDefinition.forId(altar.getObject()).getHandlers().put("option:craft-rune", this); + SceneryDefinition.forId(altar.getPortal()).getHandlers().put("option:use", this); } for (MysteriousRuin ruin : MysteriousRuin.values()) { for (int i : ruin.getObject()) { - ObjectDefinition.forId(i).getHandlers().put("option:enter", this); + SceneryDefinition.forId(i).getHandlers().put("option:enter", this); } } for (Talisman talisman : Talisman.values()) { diff --git a/Server/src/main/java/core/game/node/entity/skill/runecrafting/TiaraPlugin.java b/Server/src/main/java/core/game/node/entity/skill/runecrafting/TiaraPlugin.java index f27845bb1..53585a4bf 100644 --- a/Server/src/main/java/core/game/node/entity/skill/runecrafting/TiaraPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/runecrafting/TiaraPlugin.java @@ -2,7 +2,7 @@ package core.game.node.entity.skill.runecrafting; import core.cache.def.impl.VarbitDefinition; import core.cache.def.impl.ItemDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.node.entity.player.Player; import core.game.node.item.Item; import core.plugin.Plugin; @@ -42,7 +42,7 @@ public final class TiaraPlugin implements Plugin { break; } MysteriousRuin ruin = MysteriousRuin.forTalisman(Tiara.forItem(item).getTalisman()); - player.getConfigManager().set(CONFIG, 1 << VarbitDefinition.forObjectID(ObjectDefinition.forId(ruin.getObject()[0]).getVarbitID()).getBitShift(), true); + player.getConfigManager().set(CONFIG, 1 << VarbitDefinition.forObjectID(SceneryDefinition.forId(ruin.getObject()[0]).getVarbitID()).getBitShift(), true); break; case "unequip": final Item other = args.length == 2 ? null : (Item) args[2]; @@ -54,7 +54,7 @@ public final class TiaraPlugin implements Plugin { Tiara tiara = Tiara.forItem(other); if (tiara != null) { MysteriousRuin r = MysteriousRuin.forTalisman(tiara.getTalisman()); - player.getConfigManager().set(CONFIG, 1 << VarbitDefinition.forObjectID(ObjectDefinition.forId(r.getObject()[0]).getVarbitID()).getBitShift(), true); + player.getConfigManager().set(CONFIG, 1 << VarbitDefinition.forObjectID(SceneryDefinition.forId(r.getObject()[0]).getVarbitID()).getBitShift(), true); break; } } 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 3c14bd93e..d90ee90f2 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 @@ -1,7 +1,7 @@ package core.game.node.entity.skill.runecrafting.abyss; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.node.entity.skill.gather.SkillingTool; import core.game.node.entity.skill.runecrafting.Altar; import core.game.interaction.OptionHandler; @@ -29,12 +29,12 @@ public final class AbyssPlugin extends OptionHandler { public Plugin newInstance(Object arg) throws Throwable { for (AbbysalObstacle obstacle : AbbysalObstacle.values()) { for (int i : obstacle.getObjects()) { - ObjectDefinition.forId(i).getHandlers().put("option:" + obstacle.getOption(), this); + SceneryDefinition.forId(i).getHandlers().put("option:" + obstacle.getOption(), this); } } PluginManager.definePlugin(new AbyssalNPC()); PluginManager.definePlugin(new DarkMageDialogue()); - ObjectDefinition.setOptionHandler("exit-through", this); + SceneryDefinition.setOptionHandler("exit-through", this); PluginManager.definePlugin(new ZamorakMageDialogue()); NPCDefinition.forId(2259).getHandlers().put("option:teleport", this); NPCDefinition.forId(2262).getHandlers().put("option:repair-pouches", this); 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 11541ea6d..f1f060336 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 @@ -1,6 +1,6 @@ package core.game.node.entity.skill.slayer; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.NodeUsageEvent; import core.game.interaction.OptionHandler; import core.game.interaction.UseWithHandler; @@ -42,8 +42,8 @@ public final class FishingExplosivePlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { for (int id : IDS) { - ObjectDefinition.forId(id).getHandlers().put("option:lure", this); - ObjectDefinition.forId(id).getHandlers().put("option:bait", this); + SceneryDefinition.forId(id).getHandlers().put("option:lure", this); + SceneryDefinition.forId(id).getHandlers().put("option:bait", this); } new FishingExplosiveHandler().newInstance(arg); new MogreNPC().newInstance(arg); diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerPlugin.java b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerPlugin.java index c545fbcc6..c09bee668 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/SlayerPlugin.java @@ -1,6 +1,6 @@ package core.game.node.entity.skill.slayer; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.ClimbActionHandler; import core.game.content.global.action.DigAction; import core.game.content.global.action.DigSpadeHandler; @@ -25,15 +25,15 @@ public class SlayerPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(8783).getHandlers().put("option:open", this); - ObjectDefinition.forId(8785).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(23158).getHandlers().put("option:exit", this); - ObjectDefinition.forId(23157).getHandlers().put("option:exit", this); - ObjectDefinition.forId(15767).getHandlers().put("option:enter", this); - ObjectDefinition.forId(15811).getHandlers().put("option:exit", this); - ObjectDefinition.forId(15812).getHandlers().put("option:exit", this); - ObjectDefinition.forId(96).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(35121).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(8783).getHandlers().put("option:open", this); + SceneryDefinition.forId(8785).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(23158).getHandlers().put("option:exit", this); + SceneryDefinition.forId(23157).getHandlers().put("option:exit", this); + SceneryDefinition.forId(15767).getHandlers().put("option:enter", this); + SceneryDefinition.forId(15811).getHandlers().put("option:exit", this); + SceneryDefinition.forId(15812).getHandlers().put("option:exit", this); + SceneryDefinition.forId(96).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(35121).getHandlers().put("option:climb-down", this); for (Location loc : BRYNE_DIGS) { DigSpadeHandler.register(loc, new DigAction() { @Override 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 b903209bc..a49c9d9d0 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 @@ -1,6 +1,6 @@ package core.game.node.entity.skill.slayer; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.DoorActionHandler; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -36,9 +36,9 @@ public final class SlayerTowerPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(4490).getHandlers().put("option:open", this); - ObjectDefinition.forId(4487).getHandlers().put("option:open", this); - ObjectDefinition.forId(4492).getHandlers().put("option:close", this); + SceneryDefinition.forId(4490).getHandlers().put("option:open", this); + SceneryDefinition.forId(4487).getHandlers().put("option:open", this); + SceneryDefinition.forId(4492).getHandlers().put("option:close", this); return this; } 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 347939349..fb0e87776 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 @@ -1,7 +1,7 @@ package core.game.node.entity.skill.slayer.dungeon; import api.ContentAPI; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.CloseEvent; import core.game.component.Component; import core.plugin.Initializable; @@ -62,7 +62,7 @@ public final class AncientCavern extends MapZone implements Plugin { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(25274).getHandlers().put("option:dive in", this); + SceneryDefinition.forId(25274).getHandlers().put("option:dive in", this); return this; } diff --git a/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/SmokeDungeon.java b/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/SmokeDungeon.java index 1ce1e9b25..2d57086c0 100644 --- a/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/SmokeDungeon.java +++ b/Server/src/main/java/core/game/node/entity/skill/slayer/dungeon/SmokeDungeon.java @@ -1,6 +1,6 @@ package core.game.node.entity.skill.slayer.dungeon; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.node.entity.skill.slayer.Equipment; import core.game.interaction.OptionHandler; @@ -75,8 +75,8 @@ public final class SmokeDungeon extends MapZone implements Plugin { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(36002).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(6439).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(36002).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(6439).getHandlers().put("option:climb-up", this); return this; } 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 38b7ff206..dab204861 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 @@ -1,6 +1,6 @@ package core.game.node.entity.skill.smithing; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.quest.tutorials.tutorialisland.TutorialSession; import core.game.content.quest.tutorials.tutorialisland.TutorialStage; import core.game.node.entity.skill.Skills; @@ -42,10 +42,10 @@ public final class FurnaceOptionPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.setOptionHandler("smelt", this); - ObjectDefinition.setOptionHandler("smelt-ore", this); - ObjectDefinition.forId(3044).getHandlers().put("option:use", this); - ObjectDefinition.forId(21303).getHandlers().put("option:use", this); + SceneryDefinition.setOptionHandler("smelt", this); + SceneryDefinition.setOptionHandler("smelt-ore", this); + SceneryDefinition.forId(3044).getHandlers().put("option:use", this); + SceneryDefinition.forId(21303).getHandlers().put("option:use", this); new SmeltUseWithHandler().newInstance(arg); return this; } diff --git a/Server/src/main/java/core/game/node/entity/skill/summoning/ObeliskOptionPlugin.java b/Server/src/main/java/core/game/node/entity/skill/summoning/ObeliskOptionPlugin.java index ad92bf519..775cec942 100644 --- a/Server/src/main/java/core/game/node/entity/skill/summoning/ObeliskOptionPlugin.java +++ b/Server/src/main/java/core/game/node/entity/skill/summoning/ObeliskOptionPlugin.java @@ -1,6 +1,6 @@ package core.game.node.entity.skill.summoning; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.plugin.Initializable; import core.game.node.entity.skill.Skills; import core.game.interaction.OptionHandler; @@ -39,8 +39,8 @@ public final class ObeliskOptionPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.setOptionHandler("infuse-pouch", this); - ObjectDefinition.setOptionHandler("renew-points", this); + SceneryDefinition.setOptionHandler("infuse-pouch", this); + SceneryDefinition.setOptionHandler("renew-points", this); return this; } 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 2c52ec3f6..81a30ac11 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 @@ -1,6 +1,6 @@ package core.game.node.entity.skill.summoning; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.component.Component; import core.game.content.activity.ActivityManager; import core.game.content.activity.ActivityPlugin; @@ -64,13 +64,13 @@ public final class SummoningTrainingRoom extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.forId(28675).getHandlers().put("option:open", this); - ObjectDefinition.forId(28676).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(28653).getHandlers().put("option:climb-down", this); - ObjectDefinition.forId(28572).getHandlers().put("option:climb-up", this); - ObjectDefinition.forId(28676).getHandlers().put("option:close", this); - ObjectDefinition.forId(28714).getHandlers().put("option:climb", this); - ObjectDefinition.forId(28586).getHandlers().put("option:search", this); + SceneryDefinition.forId(28675).getHandlers().put("option:open", this); + SceneryDefinition.forId(28676).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(28653).getHandlers().put("option:climb-down", this); + SceneryDefinition.forId(28572).getHandlers().put("option:climb-up", this); + SceneryDefinition.forId(28676).getHandlers().put("option:close", this); + SceneryDefinition.forId(28714).getHandlers().put("option:climb", this); + SceneryDefinition.forId(28586).getHandlers().put("option:search", this); ActivityManager.register(new FluffyCutscene()); return this; } 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 ffbd88fee..1ba80400d 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 @@ -1,6 +1,6 @@ package core.game.node.entity.skill.thieving; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.content.global.action.DoorActionHandler; import core.plugin.Initializable; import core.game.node.entity.skill.Skills; @@ -39,8 +39,8 @@ public class PickableDoorHandler extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { for (int i : DOORS) { - ObjectDefinition.forId(i).getHandlers().put("option:pick-lock", this); - ObjectDefinition.forId(i).getHandlers().put("option:open", this); + SceneryDefinition.forId(i).getHandlers().put("option:pick-lock", this); + SceneryDefinition.forId(i).getHandlers().put("option:open", this); } pickableDoors.add(new PickableDoor(new Location[]{Location.create(2672, 3308, 0)}, 1, 3.8)); pickableDoors.add(new PickableDoor(new Location[]{Location.create(2672, 3301, 0)}, 14, 15)); 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 ee82c875d..7c5d2db15 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 @@ -1,6 +1,6 @@ package core.game.node.entity.skill.thieving; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.node.entity.skill.Skills; import core.game.interaction.OptionHandler; import core.game.node.Node; @@ -31,7 +31,7 @@ public final class ThievableChestPlugin extends OptionHandler { for (Chest chest : Chest.values()) { for (int id : chest.getObjectIds()) { - ObjectDefinition def = ObjectDefinition.forId(id); + SceneryDefinition def = SceneryDefinition.forId(id); def.getHandlers().put("option:open", this); def.getHandlers().put("option:search for traps", this); } 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 a62326d19..aa385e2af 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 @@ -1,6 +1,6 @@ package core.game.node.entity.skill.thieving; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.OptionHandler; import core.game.node.Node; import core.game.node.entity.player.Player; @@ -18,8 +18,8 @@ public class ThievingOptionPlugin extends OptionHandler { @Override public Plugin newInstance(Object arg) throws Throwable { - ObjectDefinition.setOptionHandler("steal-from", this); - ObjectDefinition.setOptionHandler("steal from", this); + SceneryDefinition.setOptionHandler("steal-from", this); + SceneryDefinition.setOptionHandler("steal from", this); return this; } diff --git a/Server/src/main/java/core/game/node/object/Scenery.java b/Server/src/main/java/core/game/node/object/Scenery.java index 32c2cc61b..d85b51415 100644 --- a/Server/src/main/java/core/game/node/object/Scenery.java +++ b/Server/src/main/java/core/game/node/object/Scenery.java @@ -1,7 +1,7 @@ package core.game.node.object; import core.cache.def.impl.VarbitDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.game.interaction.DestinationFlag; import core.game.interaction.Interaction; import core.game.node.Node; @@ -35,7 +35,7 @@ public class Scenery extends Node { /** * The object's definition. */ - private final ObjectDefinition definition; + private final SceneryDefinition definition; /** * The restore pulse. @@ -132,7 +132,7 @@ public class Scenery extends Node { * @param rotation The rotation. */ public Scenery(int id, Location location, int type, int rotation) { - super(ObjectDefinition.forId(id).getName(), location); + super(SceneryDefinition.forId(id).getName(), location); if (rotation < 0) { rotation += 4; } @@ -146,7 +146,7 @@ public class Scenery extends Node { this.id = id; this.location = location; this.type = type; - this.definition = ObjectDefinition.forId(id); + this.definition = SceneryDefinition.forId(id); super.size = definition.sizeX; if (definition.childrenIds != null && definition.childrenIds.length > 0) { this.childs = new Scenery[definition.childrenIds.length]; @@ -201,7 +201,7 @@ public class Scenery extends Node { */ public Scenery getChild(Player player) { if (childs != null) { - ObjectDefinition def = definition.getChildObject(player); + SceneryDefinition def = definition.getChildObject(player); for (Scenery child : childs) { if (child.getId() == def.getId()) { return child; @@ -217,7 +217,7 @@ public class Scenery extends Node { * @param index The child object. */ public void setChildIndex(Player player, int index) { - ObjectDefinition def = getDefinition(); + SceneryDefinition def = getDefinition(); if (childs == null && wrapper != null) { def = wrapper.getDefinition(); } @@ -321,7 +321,7 @@ public class Scenery extends Node { * Gets the definition. * @return The definition. */ - public ObjectDefinition getDefinition() { + public SceneryDefinition getDefinition() { return definition; } 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 10f1c3ae2..85ffd8ebc 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 @@ -1,6 +1,6 @@ package core.game.world.map.build; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.cache.misc.buffer.ByteBufferUtils; import core.game.node.object.Scenery; import core.game.world.map.Location; @@ -87,7 +87,7 @@ public final class LandscapeParser { */ public static void flagScenery(RegionPlane plane, int localX, int localY, Scenery object, boolean landscape, boolean storeObjects) { Region.load(plane.getRegion()); - ObjectDefinition def = object.getDefinition(); + SceneryDefinition def = object.getDefinition(); int sizeX; int sizeY; if (object.getRotation() % 2 == 0) { @@ -177,7 +177,7 @@ public final class LandscapeParser { current.setActive(false); object.setActive(false); plane.remove(localX, localY, object.getId()); - ObjectDefinition def = object.getDefinition(); + SceneryDefinition def = object.getDefinition(); int sizeX; int sizeY; if (object.getRotation() % 2 == 0) { diff --git a/Server/src/main/java/core/net/packet/in/ExaminePacket.java b/Server/src/main/java/core/net/packet/in/ExaminePacket.java index 076e8befd..b37e310f9 100644 --- a/Server/src/main/java/core/net/packet/in/ExaminePacket.java +++ b/Server/src/main/java/core/net/packet/in/ExaminePacket.java @@ -3,7 +3,7 @@ package core.net.packet.in; import core.cache.Cache; import core.cache.def.impl.ItemDefinition; import core.cache.def.impl.NPCDefinition; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.cache.def.impl.VarbitDefinition; import core.game.node.entity.player.Player; import core.net.packet.IncomingPacket; @@ -26,7 +26,7 @@ public final class ExaminePacket implements IncomingPacket { if (id < 0 || id > Cache.getObjectDefinitionsSize()) { break; } - ObjectDefinition d = ObjectDefinition.forId(id); + SceneryDefinition d = SceneryDefinition.forId(id); name = d.getExamine(); //String coords = id + ", " + player.getLocation().getX() + ", " + player.getLocation().getY() + ", " + player.getLocation().getZ(); player.debug("Object id: " + id + ", models: " + (d.getModelIds() != null ? Arrays.toString(d.getModelIds()) : null) + ", anim: " + d.animationId + ", config: " + (d.getVarbitID() != -1 ? d.getVarbitID() + " (file)" : d.getConfigId()) + "."); 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 a15c8ff55..492b3fd38 100644 --- a/Server/src/main/java/core/net/packet/in/InteractionPacket.java +++ b/Server/src/main/java/core/net/packet/in/InteractionPacket.java @@ -1,6 +1,6 @@ package core.net.packet.in; -import core.cache.def.impl.ObjectDefinition; +import core.cache.def.impl.SceneryDefinition; import core.cache.def.impl.VarbitDefinition; import core.game.content.quest.PluginInteractionManager; import core.game.interaction.Interaction; @@ -264,7 +264,7 @@ public final class InteractionPacket implements IncomingPacket { } player.debug(object + ", original=" + objectId + ", option=" + option.getName() + ""); player.debug("dir=" + object.getDirection()); - VarbitDefinition def = VarbitDefinition.forObjectID(ObjectDefinition.forId(objectId).getVarbitID()); + VarbitDefinition def = VarbitDefinition.forObjectID(SceneryDefinition.forId(objectId).getVarbitID()); player.debug("Varp ID=" + def.getConfigId() + " Offset=" + def.getBitShift() + " Size=" + def.getBitSize()); if (option.getHandler() != null) { player.debug("Object handler: " + option.getHandler().getClass().getSimpleName()); diff --git a/Server/src/main/kotlin/api/ContentAPI.kt b/Server/src/main/kotlin/api/ContentAPI.kt index 1c54f0737..b23c9509f 100644 --- a/Server/src/main/kotlin/api/ContentAPI.kt +++ b/Server/src/main/kotlin/api/ContentAPI.kt @@ -26,6 +26,7 @@ import core.game.world.map.RegionManager import core.game.world.map.path.Pathfinder import core.game.world.update.flag.context.Animation import core.game.world.update.flag.context.Graphics +import core.tools.RandomFunction import rs09.game.content.dialogue.DialogueFile import rs09.game.system.SystemLogger import rs09.game.world.GameWorld @@ -961,4 +962,14 @@ object ContentAPI { forceWalk(entity, entity.location.transform(diffX,diffY,0), "DUMB") } + + /** + * Submits an individual or "weak" pulse to a specific entity's pulse manager. Pulses submitted this way can be overridden by other pulses. + * @param entity the entity to submit the pulse to + * @param pulse the pulse to submit + */ + @JvmStatic + fun submitIndividualPulse(entity: Entity, pulse: Pulse){ + entity.pulseManager.run(pulse) + } } \ No newline at end of file diff --git a/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/CoalMiner.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/CoalMiner.kt index 1d3a533ed..2f86bb669 100644 --- a/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/CoalMiner.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/CoalMiner.kt @@ -13,9 +13,6 @@ import rs09.game.ai.skillingbot.SkillingBotAssembler import rs09.game.interaction.InteractionListener import rs09.game.interaction.InteractionListeners import api.ContentAPI -import kotlinx.coroutines.delay -import kotlinx.coroutines.runBlocking -import java.util.logging.Handler @PlayerCompatible @ScriptName("Falador Coal Miner") @@ -59,7 +56,7 @@ class CoalMiner : Script() { scriptAPI.walkTo(mine.randomLoc) } else { val rock = scriptAPI.getNearestNode("rocks",true) - rock?.let { InteractionListeners.run(rock.id, InteractionListener.OBJECT,"mine",bot,rock) } + rock?.let { InteractionListeners.run(rock.id, InteractionListener.SCENERY,"mine",bot,rock) } } overlay!!.setAmount(ContentAPI.amountInInventory(bot, Items.COAL_453) + coalAmount) } diff --git a/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/DraynorWillows.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/DraynorWillows.kt index c7051f8e3..f91f224a1 100644 --- a/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/DraynorWillows.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/DraynorWillows.kt @@ -43,7 +43,7 @@ class DraynorWillows : Script(){ val willowtree = scriptAPI.getNearestNode("willow", true) bot.interfaceManager.close() willowtree?.let { InteractionListeners.run(willowtree.id, - InteractionListener.OBJECT,"Chop down",bot,willowtree) } + InteractionListener.SCENERY,"Chop down",bot,willowtree) } if (bot.inventory.isFull) state = State.BANKING } diff --git a/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/SeersMagicTrees.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/SeersMagicTrees.kt index 313ad1561..bf0f084cd 100644 --- a/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/SeersMagicTrees.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/SeersMagicTrees.kt @@ -40,7 +40,7 @@ class SeersMagicTrees : Script(){ State.CHOPPING -> { val tree = scriptAPI.getNearestNode(1306,true) bot.interfaceManager.close() - tree?.let { InteractionListeners.run(tree.id, InteractionListener.OBJECT,"Chop down",bot,tree) } + tree?.let { InteractionListeners.run(tree.id, InteractionListener.SCENERY,"Chop down",bot,tree) } if(bot.inventory.isFull){ state = State.FIND_BANK } diff --git a/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/VarrockEssenceMiner.kt b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/VarrockEssenceMiner.kt index 5054b98e0..e263a17df 100644 --- a/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/VarrockEssenceMiner.kt +++ b/Server/src/main/kotlin/rs09/game/ai/general/scriptrepository/VarrockEssenceMiner.kt @@ -50,7 +50,7 @@ class VarrockEssenceMiner : Script(){ State.MINING -> { val essence = scriptAPI.getNearestNode(2491,true) - essence?.let { InteractionListeners.run(essence.id, InteractionListener.OBJECT,"mine",bot,essence) } + essence?.let { InteractionListeners.run(essence.id, InteractionListener.SCENERY,"mine",bot,essence) } if(bot.inventory.isFull) state = State.TO_BANK } diff --git a/Server/src/main/kotlin/rs09/game/content/activity/allfiredup/AFUBeaconHandler.kt b/Server/src/main/kotlin/rs09/game/content/activity/allfiredup/AFUBeaconHandler.kt index f282419f6..4f9b76d29 100644 --- a/Server/src/main/kotlin/rs09/game/content/activity/allfiredup/AFUBeaconHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/allfiredup/AFUBeaconHandler.kt @@ -22,7 +22,7 @@ private val LIGHT_ANIM = Animation(7307) class AFUBeaconListeners : InteractionListener(){ override fun defineListeners() { - on(OBJECT,"add-logs","light"){player,node -> + on(SCENERY,"add-logs","light"){ player, node -> val beacon = AFUBeacon.forLocation(node.location) val questComplete = player.questRepository.isComplete("All Fired Up") val questStage = player.questRepository.getStage("All Fired Up") diff --git a/Server/src/main/kotlin/rs09/game/content/activity/allfiredup/AFURepairClimbHandler.kt b/Server/src/main/kotlin/rs09/game/content/activity/allfiredup/AFURepairClimbHandler.kt index 147d5d5f5..322c2c8a4 100644 --- a/Server/src/main/kotlin/rs09/game/content/activity/allfiredup/AFURepairClimbHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/allfiredup/AFURepairClimbHandler.kt @@ -23,14 +23,14 @@ class AFURepairClimbHandler : InteractionListener() { override fun defineListeners() { - on(repairIDs,OBJECT,"repair"){player,_ -> + on(repairIDs,SCENERY,"repair"){ player, _ -> var rco: RepairClimbObject = RepairClimbObject.GWD for(ent in RepairClimbObject.values()) if(ent.destinationDown?.withinDistance(player.location,2) == true || ent.destinationUp?.withinDistance(player.location,2) == true) rco = ent repair(player,rco) return@on true } - on(climbIDs,OBJECT,"climb"){player,node -> + on(climbIDs,SCENERY,"climb"){ player, node -> var rco: RepairClimbObject = RepairClimbObject.GWD for(ent in RepairClimbObject.values()) if(ent.destinationDown?.withinDistance(player.location,2) == true || ent.destinationUp?.withinDistance(player.location,2) == true) rco = ent climb(player,rco,node.location) diff --git a/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerInteractionHandler.kt b/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerInteractionHandler.kt index 4b6af5915..11362f06e 100644 --- a/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerInteractionHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/activity/fishingtrawler/FishingTrawlerInteractionHandler.kt @@ -34,7 +34,7 @@ class FishingTrawlerInteractionHandler : InteractionListener() { override fun defineListeners() { - on(ENTRANCE_PLANK,OBJECT,"cross"){player,_ -> + on(ENTRANCE_PLANK,SCENERY,"cross"){ player, _ -> if(player.skills.getLevel(Skills.FISHING) < 15){ player.dialogueInterpreter.sendDialogue("You need to be at least level 15 fishing to play.") return@on true @@ -44,7 +44,7 @@ class FishingTrawlerInteractionHandler : InteractionListener() { return@on true } - on(EXIT_PLANK,OBJECT,"cross"){player,_ -> + on(EXIT_PLANK,SCENERY,"cross"){ player, _ -> player.properties.teleportLocation = Location.create(2676, 3170, 0) (ActivityManager.getActivity("fishing trawler") as FishingTrawlerActivity).removePlayer(player) val session: FishingTrawlerSession? = player.getAttribute("ft-session",null) @@ -53,7 +53,7 @@ class FishingTrawlerInteractionHandler : InteractionListener() { return@on true } - on(HOLE,OBJECT,"fill"){player,node -> + on(HOLE,SCENERY,"fill"){ player, node -> val session: FishingTrawlerSession? = player.getAttribute("ft-session",null) session ?: return@on false player.lock() @@ -62,7 +62,7 @@ class FishingTrawlerInteractionHandler : InteractionListener() { override fun pulse(): Boolean { when(counter++){ 0 -> player.animator.animate(Animation(827)).also { player.lock() } - 1 -> session.repairHole(player,node.asObject()).also { player.incrementAttribute("/save:$STATS_BASE:$FISHING_TRAWLER_LEAKS_PATCHED"); player.unlock() } + 1 -> session.repairHole(player,node.asScenery()).also { player.incrementAttribute("/save:$STATS_BASE:$FISHING_TRAWLER_LEAKS_PATCHED"); player.unlock() } 2 -> return true } return false @@ -71,12 +71,12 @@ class FishingTrawlerInteractionHandler : InteractionListener() { return@on true } - on(NETIDs,OBJECT,"inspect"){player,_ -> + on(NETIDs,SCENERY,"inspect"){ player, _ -> player.dialogueInterpreter.open(18237583) return@on true } - on(REWARD_NET,OBJECT,"inspect"){player,_ -> + on(REWARD_NET,SCENERY,"inspect"){ player, _ -> val session: FishingTrawlerSession? = player.getAttribute("ft-session",null) if(session == null || session.boatSank){ player.dialogueInterpreter.sendDialogues(player, FacialExpression.GUILTY,"I'd better not go stealing other people's fish.") @@ -86,7 +86,7 @@ class FishingTrawlerInteractionHandler : InteractionListener() { return@on true } - on(BARREL_IDS,OBJECT,"climb-on"){player,_ -> + on(BARREL_IDS,SCENERY,"climb-on"){ player, _ -> player.properties.teleportLocation = Location.create(2672, 3222, 0) player.dialogueInterpreter.sendDialogue("You climb onto the floating barrel and begin to kick your way to the","shore.","You make it to the shore tired and weary.") player.logoutPlugins.clear() diff --git a/Server/src/main/kotlin/rs09/game/content/ame/events/drilldemon/DrillDemonListeners.kt b/Server/src/main/kotlin/rs09/game/content/ame/events/drilldemon/DrillDemonListeners.kt index 8b75a5368..e73300052 100644 --- a/Server/src/main/kotlin/rs09/game/content/ame/events/drilldemon/DrillDemonListeners.kt +++ b/Server/src/main/kotlin/rs09/game/content/ame/events/drilldemon/DrillDemonListeners.kt @@ -9,7 +9,7 @@ class DrillDemonListeners : InteractionListener() { val MATS = intArrayOf(10076,10077,10078,10079) override fun defineListeners() { - on(MATS,OBJECT,"use"){player, node -> + on(MATS,SCENERY,"use"){ player, node -> val correctTask = player.getAttribute(DrillDemonUtils.DD_KEY_TASK,-1) if(correctTask == -1){ player.sendMessage("You can't do that right now.") diff --git a/Server/src/main/kotlin/rs09/game/content/ame/events/supriseexam/SupriseExamListeners.kt b/Server/src/main/kotlin/rs09/game/content/ame/events/supriseexam/SupriseExamListeners.kt index 5faec7dfe..88a7cd7c0 100644 --- a/Server/src/main/kotlin/rs09/game/content/ame/events/supriseexam/SupriseExamListeners.kt +++ b/Server/src/main/kotlin/rs09/game/content/ame/events/supriseexam/SupriseExamListeners.kt @@ -21,7 +21,7 @@ class SupriseExamListeners : InteractionListener() { return@on true } - on(SurpriseExamUtils.SE_DOORS,OBJECT,"open"){player, node -> + on(SurpriseExamUtils.SE_DOORS,SCENERY,"open"){ player, node -> val correctDoor = player.getAttribute(SurpriseExamUtils.SE_DOOR_KEY,-1) if(correctDoor == -1){ diff --git a/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarOptionHandler.kt b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarOptionHandler.kt index 643e2e110..8b8fc6cee 100644 --- a/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarOptionHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/global/worldevents/shootingstar/ShootingStarOptionHandler.kt @@ -12,13 +12,13 @@ class ShootingStarOptionHandler : InteractionListener() { val SHOOTING_STARS = ShootingStarType.values().map(ShootingStarType::objectId).toIntArray() override fun defineListeners() { - on(SHOOTING_STARS,OBJECT,"mine"){player, _ -> + on(SHOOTING_STARS,SCENERY,"mine"){ player, _ -> val star = (WorldEvents.get("shooting-stars") as ShootingStarEvent).star star.mine(player) return@on true } - on(SHOOTING_STARS,OBJECT,"prospect"){player, _ -> + on(SHOOTING_STARS,SCENERY,"prospect"){ player, _ -> val star = (WorldEvents.get("shooting-stars") as ShootingStarEvent).star star.prospect(player) return@on true 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 a7293a1c9..8b27b9a74 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 @@ -47,7 +47,7 @@ class TFTInteractionListeners : InteractionListener(){ return@onUseWith true } - onUseWith(OBJECT,FISH_ALTAR,*FISH){ player, _, fish -> + onUseWith(SCENERY,FISH_ALTAR,*FISH){ player, _, fish -> if(player.inventory.contains(LYRE,1)) { Pulser.submit(spiritPulse(player, fish.id)) } else { @@ -104,7 +104,7 @@ class TFTInteractionListeners : InteractionListener(){ return@on true } - on(PIPE,OBJECT,"put-inside"){player, _ -> + on(PIPE,SCENERY,"put-inside"){ player, _ -> val bombItem = Item(LIT_BOMB) if(player.inventory.containsItem(bombItem)){ player.sendMessage("You stuff the lit object into the pipe.") @@ -116,7 +116,7 @@ class TFTInteractionListeners : InteractionListener(){ return@on true } - on(PORTALIDs,OBJECT,"use"){player,portal -> + on(PORTALIDs,SCENERY,"use"){ player, portal -> val toLocation = when(portal.id){ 2273 -> destRoom(2639, 10012, 2645, 10018).getCenter() @@ -132,7 +132,7 @@ class TFTInteractionListeners : InteractionListener(){ return@on true; } - on(SWENSEN_LADDER,OBJECT,"climb"){player,_ -> + on(SWENSEN_LADDER,SCENERY,"climb"){ player, _ -> if(player.getAttribute("fremtrials:swensen-accepted",false) == false){ player.dialogueInterpreter?.sendDialogues(1283,FacialExpression.ANGRY,"Where do you think you're going?") return@on true @@ -140,7 +140,7 @@ class TFTInteractionListeners : InteractionListener(){ return@on true } - on(SWAYING_TREE,OBJECT,"chop down"){player,_ -> + on(SWAYING_TREE,SCENERY,"chop down"){ player, _ -> SkillingTool.getHatchet(player)?.let { Pulser.submit(ChoppingPulse(player)).also { return@on true } } player.sendMessage("You need an axe which you have the woodcutting level to use to do this.") 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 d709baa1c..c8d4fa6ac 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 @@ -13,7 +13,7 @@ class DramenTreeListener : InteractionListener() { override fun defineListeners() { - on(DRAMEN_TREE,OBJECT,"chop down"){player,node -> + on(DRAMEN_TREE,SCENERY,"chop down"){ player, node -> val quest = player.questRepository.getQuest("Lost City") if (SkillingTool.getHatchet(player) == null) { player.getPacketDispatch().sendMessage("You do not have an axe which you have the level to use.") diff --git a/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/CaveRockHandler.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/CaveRockHandler.kt index c886a9b12..deb567a76 100644 --- a/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/CaveRockHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/CaveRockHandler.kt @@ -1,6 +1,6 @@ package rs09.game.content.quest.members.thelosttribe -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.component.Component import core.game.interaction.OptionHandler import core.game.node.Node @@ -19,7 +19,7 @@ import org.rs09.consts.Components class CaveRockHandler : OptionHandler() { override fun newInstance(arg: Any?): Plugin { for(i in 6921..6924){ - ObjectDefinition.forId(i).handlers["option:look-at"] = this + SceneryDefinition.forId(i).handlers["option:look-at"] = this } return this } diff --git a/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/LostTribeOptionHandler.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/LostTribeOptionHandler.kt index c4427e829..9975fcf24 100644 --- a/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/LostTribeOptionHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/LostTribeOptionHandler.kt @@ -2,7 +2,7 @@ package rs09.game.content.quest.members.thelosttribe import core.cache.def.impl.ItemDefinition import core.cache.def.impl.NPCDefinition -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.component.Component import core.game.content.dialogue.FacialExpression import core.game.interaction.OptionHandler @@ -23,12 +23,12 @@ class LostTribeOptionHandler : OptionHandler(){ override fun newInstance(arg: Any?): Plugin { ItemDefinition.forId(5008).handlers["option:look-at"] = this ItemDefinition.forId(5009).handlers["option:read"] = this - ObjectDefinition.forId(6916).handlers["option:search"] = this - ObjectDefinition.forId(6911).handlers["option:search"] = this + SceneryDefinition.forId(6916).handlers["option:search"] = this + SceneryDefinition.forId(6911).handlers["option:search"] = this NPCDefinition.forId(2084).handlers["option:follow"] = this NPCDefinition.forId(2086).handlers["option:follow"] = this - ObjectDefinition.forId(32952).handlers["option:open"] = this - ObjectDefinition.forId(32953).handlers["option:open"] = this + SceneryDefinition.forId(32952).handlers["option:open"] = this + SceneryDefinition.forId(32953).handlers["option:open"] = this return this } diff --git a/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/SigmundChestHandler.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/SigmundChestHandler.kt index 56193e57d..95cfc4e0f 100644 --- a/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/SigmundChestHandler.kt +++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thelosttribe/SigmundChestHandler.kt @@ -1,6 +1,6 @@ package rs09.game.content.quest.members.thelosttribe -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.interaction.OptionHandler import core.game.node.Node import core.game.node.entity.player.Player @@ -17,7 +17,7 @@ import org.rs09.consts.Items */ class SigmundChestHandler : OptionHandler() { override fun newInstance(arg: Any?): Plugin { - ObjectDefinition.forId(6910).handlers["option:open"] = this + SceneryDefinition.forId(6910).handlers["option:open"] = this return this } diff --git a/Server/src/main/kotlin/rs09/game/content/zone/keldagrim/KeldagrimPlugin.kt b/Server/src/main/kotlin/rs09/game/content/zone/keldagrim/KeldagrimPlugin.kt index 34eea1b6f..62fb99d16 100644 --- a/Server/src/main/kotlin/rs09/game/content/zone/keldagrim/KeldagrimPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/content/zone/keldagrim/KeldagrimPlugin.kt @@ -1,6 +1,6 @@ package rs09.game.content.zone.keldagrim -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.content.dialogue.DialoguePlugin import core.game.interaction.OptionHandler import core.game.node.Node @@ -59,12 +59,12 @@ class KeldagrimOptionHandlers : OptionHandler() { } override fun newInstance(arg: Any?): Plugin { - ObjectDefinition.forId(5973).handlers["option:go-through"] = this - ObjectDefinition.forId(5998).handlers["option:go-through"] = this - ObjectDefinition.forId(9084).handlers["option:climb-down"] = this - ObjectDefinition.forId(9138).handlers["option:climb-up"] = this - ObjectDefinition.forId(28094).handlers["option:open"] = this - ObjectDefinition.forId(5014).handlers["option:enter"] = this + SceneryDefinition.forId(5973).handlers["option:go-through"] = this + SceneryDefinition.forId(5998).handlers["option:go-through"] = this + SceneryDefinition.forId(9084).handlers["option:climb-down"] = this + SceneryDefinition.forId(9138).handlers["option:climb-up"] = this + SceneryDefinition.forId(28094).handlers["option:open"] = this + SceneryDefinition.forId(5014).handlers["option:enter"] = this return this } } diff --git a/Server/src/main/kotlin/rs09/game/content/zone/phasmatys/bonegrinder/BoneGrinderListener.kt b/Server/src/main/kotlin/rs09/game/content/zone/phasmatys/bonegrinder/BoneGrinderListener.kt index 6f9abfd4a..d4cdbe233 100644 --- a/Server/src/main/kotlin/rs09/game/content/zone/phasmatys/bonegrinder/BoneGrinderListener.kt +++ b/Server/src/main/kotlin/rs09/game/content/zone/phasmatys/bonegrinder/BoneGrinderListener.kt @@ -29,35 +29,35 @@ class BoneGrinderListener : InteractionListener() { /** * Handle the bone loader/hopper fill option */ - on(LOADER,OBJECT,"fill"){player, _ -> + on(LOADER,SCENERY,"fill"){ player, _ -> handleFill(player) } /** * Handle the wheel's wind option */ - on(BONE_GRINDER,OBJECT,"wind"){player,_ -> + on(BONE_GRINDER,SCENERY,"wind"){ player, _ -> handleWind(player) } /** * Handle the wheel's status option */ - on(BONE_GRINDER,OBJECT,"status"){player,_ -> + on(BONE_GRINDER,SCENERY,"status"){ player, _ -> handleStatus(player) } /** * Handle the bin's empty option */ - on(BIN,OBJECT,"empty"){player,_ -> + on(BIN,SCENERY,"empty"){ player, _ -> handleEmpty(player) } /** * Handle Bone -> Hopper */ - onUseWith(OBJECT,LOADER,*boneIDs){ player, _, _ -> + onUseWith(SCENERY,LOADER,*boneIDs){ player, _, _ -> handleFill(player) return@onUseWith true } diff --git a/Server/src/main/kotlin/rs09/game/interaction/InteractionListener.kt b/Server/src/main/kotlin/rs09/game/interaction/InteractionListener.kt index e3bdaeaeb..1b9edc614 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/InteractionListener.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/InteractionListener.kt @@ -7,7 +7,7 @@ import core.game.world.map.Location abstract class InteractionListener : Listener{ companion object { val ITEM = 0 - val OBJECT = 1 + val SCENERY = 1 val NPC = 2 } fun on(id: Int, type: Int, vararg option: String,handler: (player: Player, node: Node) -> Boolean){ diff --git a/Server/src/main/kotlin/rs09/game/interaction/inter/SilverInterface.kt b/Server/src/main/kotlin/rs09/game/interaction/inter/SilverInterface.kt index f7d94f37e..dd86e0f0b 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/inter/SilverInterface.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/inter/SilverInterface.kt @@ -10,7 +10,6 @@ import org.rs09.consts.Components import org.rs09.consts.Items import rs09.game.interaction.InteractionListener import rs09.game.interaction.InterfaceListener -import rs09.game.system.SystemLogger class SilverInterface : InterfaceListener() { @@ -93,7 +92,7 @@ class SilverInterface : InterfaceListener() { class SilverBarUseWith : InteractionListener() { val FURNACES = intArrayOf(2966, 3044, 3294, 4304, 6189, 11009, 11010, 11666, 12100, 12809, 18497, 18525, 18526, 21879, 22721, 26814, 28433, 28434, 30021, 30510, 36956, 37651) override fun defineListeners() { - onUseWith(OBJECT, Items.SILVER_BAR_2355, *FURNACES){ player, _, _ -> + onUseWith(SCENERY, Items.SILVER_BAR_2355, *FURNACES){ player, _, _ -> ContentAPI.openInterface(player, Components.CRAFTING_SILVER_CASTING_438) return@onUseWith true } diff --git a/Server/src/main/kotlin/rs09/game/interaction/item/withnpc/HatEasterEgg.kt b/Server/src/main/kotlin/rs09/game/interaction/item/withnpc/HatEasterEgg.kt index 6da48c400..d503b6aac 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/item/withnpc/HatEasterEgg.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/item/withnpc/HatEasterEgg.kt @@ -16,7 +16,7 @@ class HatEasterEgg : InteractionListener(){ val NEW_HAT = 14650 override fun defineListeners() { - onUseWith(OBJECT,WIZ_HAT,MACHINE){player, used, with -> + onUseWith(SCENERY,WIZ_HAT,MACHINE){ player, used, with -> player.dialogueInterpreter.open(HatDialogue(), NPC(872)) return@onUseWith true } diff --git a/Server/src/main/kotlin/rs09/game/interaction/item/withobject/CoalTrucksHandler.kt b/Server/src/main/kotlin/rs09/game/interaction/item/withobject/CoalTrucksHandler.kt index 456542056..dfa6ab643 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/item/withobject/CoalTrucksHandler.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/item/withobject/CoalTrucksHandler.kt @@ -19,7 +19,7 @@ class CoalTruckInteractionListeners : InteractionListener() { val COAL = Items.COAL_453 override fun defineListeners() { - on(SEERS_VILLAGE_COAL_TRUCK_2114, OBJECT, "remove-coal") { player, node -> + on(SEERS_VILLAGE_COAL_TRUCK_2114, SCENERY, "remove-coal") { player, node -> var coalInTruck = player.getAttribute("coal-truck-inventory", 0) var freeSpace = player.inventory.freeSlots() @@ -48,13 +48,13 @@ class CoalTruckInteractionListeners : InteractionListener() { return@on true } - on(SEERS_VILLAGE_COAL_TRUCK_2114, OBJECT, "investigate") { player, node -> + on(SEERS_VILLAGE_COAL_TRUCK_2114, SCENERY, "investigate") { player, node -> var coalInTruck = player.getAttribute("coal-truck-inventory", 0) player.dialogueInterpreter.sendDialogue("There is currently $coalInTruck coal in the truck.", "The truck has space for " + (120 - coalInTruck) + " more coal.") return@on true } - onUseWith(OBJECT,COAL,COAL_TRUCK_2114){ player, _, _ -> + onUseWith(SCENERY,COAL,COAL_TRUCK_2114){ player, _, _ -> var coalInTruck = player.getAttribute("coal-truck-inventory", 0) var coalInInventory = player.inventory.getAmount(Items.COAL_453) diff --git a/Server/src/main/kotlin/rs09/game/interaction/object/DemonTauntHandler.kt b/Server/src/main/kotlin/rs09/game/interaction/object/DemonTauntHandler.kt index 9776e512d..0c763906c 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/object/DemonTauntHandler.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/DemonTauntHandler.kt @@ -3,7 +3,6 @@ package rs09.game.interaction.`object` import api.ContentAPI import core.game.node.entity.player.link.diary.DiaryType import core.game.node.entity.player.link.emote.Emotes -import core.game.world.map.RegionManager import org.rs09.consts.NPCs import rs09.game.interaction.InteractionListener @@ -15,7 +14,7 @@ private const val BARS = 37668 class DemonTauntHandler : InteractionListener(){ override fun defineListeners() { - on(BARS,OBJECT,"taunt-through"){player,_ -> + on(BARS,SCENERY,"taunt-through"){ player, _ -> ContentAPI.sendMessage(player, "You taunt the demon, making it growl.") val demon = ContentAPI.findLocalNPC(player, NPCs.LESSER_DEMON_82) ?: return@on true ContentAPI.sendChat(demon, "Graaagh!") diff --git a/Server/src/main/kotlin/rs09/game/interaction/object/EnchantedValleyListeners.kt b/Server/src/main/kotlin/rs09/game/interaction/object/EnchantedValleyListeners.kt index 8e18ff9bf..fb5986b4d 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/object/EnchantedValleyListeners.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/EnchantedValleyListeners.kt @@ -12,7 +12,7 @@ class EnchantedValleyListeners : InteractionListener() { val TREE_SPIRIT_IDS = intArrayOf(NPCs.TREE_SPIRIT_438,NPCs.TREE_SPIRIT_439,NPCs.TREE_SPIRIT_440,NPCs.TREE_SPIRIT_441,NPCs.TREE_SPIRIT_442,NPCs.TREE_SPIRIT_443) override fun defineListeners() { - on(ENCHANTED_V_TREE,OBJECT,"chop-down"){player, node -> + on(ENCHANTED_V_TREE,SCENERY,"chop-down"){ player, node -> val tool: SkillingTool? = SkillingTool.getHatchet(player) tool ?: player.sendMessage("You lack an axe which you have the Woodcutting level to use.").also { return@on true } diff --git a/Server/src/main/kotlin/rs09/game/interaction/object/FairyRingPlugin.kt b/Server/src/main/kotlin/rs09/game/interaction/object/FairyRingPlugin.kt index 61c539a40..2706f2a45 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/object/FairyRingPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/FairyRingPlugin.kt @@ -19,7 +19,7 @@ class FairyRingPlugin : InteractionListener() { override fun defineListeners() { - on(RINGS,OBJECT,"use"){player,_ -> + on(RINGS,SCENERY,"use"){ player, _ -> if (!player.equipment.contains(772, 1) && !player.equipment.contains(9084, 1)) { player.sendMessage("The fairy ring only works for those who wield fairy magic.") return@on true @@ -28,7 +28,7 @@ class FairyRingPlugin : InteractionListener() { return@on true } - on(MAIN_RING,OBJECT,"use"){player,_ -> + on(MAIN_RING,SCENERY,"use"){ player, _ -> if (!player.equipment.contains(772, 1) && !player.equipment.contains(9084, 1)) { player.sendMessage("The fairy ring only works for those who wield fairy magic.") 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 016bd378a..f13affedd 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/object/GutanothChestPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/GutanothChestPlugin.kt @@ -18,7 +18,7 @@ class GutanothChestInteractionHandler : InteractionListener(){ override fun defineListeners() { - on(CHEST,OBJECT,"open"){player,node -> + on(CHEST,SCENERY,"open"){ player, node -> val delay = player.getAttribute("gutanoth-chest-delay", 0L) GameWorld.Pulser.submit(ChestPulse(player,System.currentTimeMillis() > delay, node as Scenery)) return@on 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 00d975f7d..17fafe76c 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/object/JungleBushHandler.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/JungleBushHandler.kt @@ -22,8 +22,8 @@ class JungleBushHandler : InteractionListener(){ override fun defineListeners() { - on(ids,OBJECT,"chop-down"){player,node -> - val toChop = node.asObject() + on(ids,SCENERY,"chop-down"){ player, node -> + val toChop = node.asScenery() if(checkRequirement(player)){ GameWorld.Pulser.submit(object : Pulse(0){ var ticks = 0 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 96b95c24d..6eb5476bd 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/object/MuddyChestHandler.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/MuddyChestHandler.kt @@ -18,12 +18,12 @@ class MuddyChestHandler : InteractionListener() { override fun defineListeners() { - on(CHEST,OBJECT,"open"){player,node -> + on(CHEST,SCENERY,"open"){ player, node -> val key = Item(Items.MUDDY_KEY_991) if(player.inventory.containsItem(key)){ player.inventory.remove(key) player.animator.animate(Animation(536)) - SceneryBuilder.replace(node.asObject(), Scenery(171, node.location, node.asObject().rotation),3) + SceneryBuilder.replace(node.asScenery(), Scenery(171, node.location, node.asScenery().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 e1a6c86b4..dd7e9b0f9 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/object/TarBarrelListener.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/TarBarrelListener.kt @@ -23,7 +23,7 @@ class TarBarrelListener : InteractionListener() { override fun defineListeners() { - on(FULL_TAR_BARREL_16860,OBJECT,"take-from") { player, node -> + on(FULL_TAR_BARREL_16860,SCENERY,"take-from") { player, node -> val incrementAmount = RandomFunction.random(83, 1000) if (player.inventory.isFull) { @@ -31,14 +31,14 @@ class TarBarrelListener : InteractionListener() { return@on true } - if (node.asObject().charge >= 0) { - node.asObject().charge = node.asObject().charge - incrementAmount + if (node.asScenery().charge >= 0) { + node.asScenery().charge = node.asScenery().charge - incrementAmount player.inventory.add(Item(Items.SWAMP_TAR_1939)) - if (node.asObject().charge <= 0) { + if (node.asScenery().charge <= 0) { player.sendMessage(EMPTY_BARREL_STRING) - SceneryBuilder.replace(node.asObject(), node.asObject().transform(EMPTY_TAR_BARREL_16688), 38) - node.asObject().charge = 1000 + SceneryBuilder.replace(node.asScenery(), node.asScenery().transform(EMPTY_TAR_BARREL_16688), 38) + node.asScenery().charge = 1000 } } diff --git a/Server/src/main/kotlin/rs09/game/interaction/object/canoestation/CanoeStationListener.kt b/Server/src/main/kotlin/rs09/game/interaction/object/canoestation/CanoeStationListener.kt index 0724e1433..259ccb37d 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/object/canoestation/CanoeStationListener.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/object/canoestation/CanoeStationListener.kt @@ -19,18 +19,18 @@ class CanoeStationListener : InteractionListener() { private val FLOAT = Animation(3304) override fun defineDestinationOverrides() { - setDest(OBJECT,STATION_IDs,"chop-down"){node -> + setDest(SCENERY,STATION_IDs,"chop-down"){ node -> return@setDest CanoeUtils.getChopLocation(node.location) } - setDest(OBJECT,STATION_IDs,"shape-canoe","float canoe","float log","float waka"){node -> + setDest(SCENERY,STATION_IDs,"shape-canoe","float canoe","float log","float waka"){ node -> return@setDest CanoeUtils.getCraftFloatLocation(node.location) } } override fun defineListeners() { - on(STATION_IDs,OBJECT,"chop-down"){player, node -> + on(STATION_IDs,SCENERY,"chop-down"){ player, node -> val axe: SkillingTool? = SkillingTool.getHatchet(player) - val varbit = node.asObject().definition.configFile + val varbit = node.asScenery().definition.configFile if(varbit.getValue(player) != 0){ player.varpManager.setVarbit(varbit,0) } @@ -52,7 +52,7 @@ class CanoeStationListener : InteractionListener() { override fun pulse(): Boolean { player.animator.stop() player.varpManager.setVarbit(varbit,STAGE_LOG_CHOPPED) - player.packetDispatch.sendSceneryAnimation(node.asObject().getChild(player), FALL, false) + player.packetDispatch.sendSceneryAnimation(node.asScenery().getChild(player), FALL, false) player.unlock() return true } @@ -60,8 +60,8 @@ class CanoeStationListener : InteractionListener() { return@on true } - on(STATION_IDs,OBJECT,"shape-canoe"){player, node -> - val varbit = node.asObject().definition.configFile + on(STATION_IDs,SCENERY,"shape-canoe"){ player, node -> + val varbit = node.asScenery().definition.configFile if(varbit.getValue(player) != STAGE_LOG_CHOPPED){ player.varpManager.setVarbit(varbit,0) return@on true @@ -72,8 +72,8 @@ class CanoeStationListener : InteractionListener() { return@on true } - on(STATION_IDs,OBJECT,"float canoe","float log","float waka"){player, node -> - val varbit = node.asObject().definition.configFile + on(STATION_IDs,SCENERY,"float canoe","float log","float waka"){ player, node -> + val varbit = node.asScenery().definition.configFile val canoe = CanoeUtils.getCanoeFromVarbit(player,varbit) player.animator.animate(PUSH) player.lock() @@ -81,7 +81,7 @@ class CanoeStationListener : InteractionListener() { player.pulseManager.run(object : Pulse(){ override fun pulse(): Boolean { player.varpManager.setVarbit(varbit,CanoeUtils.getCraftValue(canoe,true)) - player.packetDispatch.sendSceneryAnimation(node.asObject(), FLOAT, false) + player.packetDispatch.sendSceneryAnimation(node.asScenery(), FLOAT, false) player.unlock() return true } @@ -89,7 +89,7 @@ class CanoeStationListener : InteractionListener() { return@on true } - on(STATION_IDs,OBJECT,"paddle log","paddle canoe"){player, node -> + on(STATION_IDs,SCENERY,"paddle log","paddle canoe"){ player, node -> player.interfaceManager.open(Component(Components.CANOE_STATIONS_MAP_53)) return@on true } diff --git a/Server/src/main/kotlin/rs09/game/interaction/region/IsafdarListeners.kt b/Server/src/main/kotlin/rs09/game/interaction/region/IsafdarListeners.kt index 0f003ed71..18cd96443 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/region/IsafdarListeners.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/region/IsafdarListeners.kt @@ -17,12 +17,12 @@ class IsafdarListeners : InteractionListener() { val inside = Location.create(2314, 9624, 0) override fun defineListeners() { - on(CAVE_ENTRANCE,OBJECT,"enter"){player,node -> + on(CAVE_ENTRANCE,SCENERY,"enter"){ player, node -> player.teleport(inside) return@on true } - on(CAVE_EXIT,OBJECT,"exit"){player,node -> + on(CAVE_EXIT,SCENERY,"exit"){ player, node -> player.teleport(outside) return@on true } diff --git a/Server/src/main/kotlin/rs09/game/interaction/region/MorytaniaListeners.kt b/Server/src/main/kotlin/rs09/game/interaction/region/MorytaniaListeners.kt index c5ff76c93..8d301b34e 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/region/MorytaniaListeners.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/region/MorytaniaListeners.kt @@ -23,17 +23,17 @@ class MorytaniaListeners : InteractionListener() { private val JUMP_ANIM = Animation(1603) override fun defineListeners() { - on(GROTTO_ENTRANCE,OBJECT,"enter"){player,node -> + on(GROTTO_ENTRANCE,SCENERY,"enter"){ player, node -> player.teleport(inside) return@on true } - on(GROTTO_EXIT,OBJECT,"exit"){player,node -> + on(GROTTO_EXIT,SCENERY,"exit"){ player, node -> player.teleport(outside) return@on true } - on(GROTTO_BRIDGE,OBJECT,"jump"){player,node -> + on(GROTTO_BRIDGE,SCENERY,"jump"){ player, node -> if (player.location.y == 3328) { ForceMovement.run(player, node.location, node.location.transform(0, 3, 0), RUNNING_ANIM, JUMP_ANIM, Direction.NORTH, 15).endAnimation = Animation.RESET } else if (player.location.y == 3332){ diff --git a/Server/src/main/kotlin/rs09/game/interaction/region/RellekkaListeners.kt b/Server/src/main/kotlin/rs09/game/interaction/region/RellekkaListeners.kt index 8a5a64d7d..1edfc93a6 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/region/RellekkaListeners.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/region/RellekkaListeners.kt @@ -23,7 +23,7 @@ class RellekkaListeners : InteractionListener() { val STAIRS = intArrayOf(19690,19691) override fun defineListeners() { - on(STAIRS,OBJECT,"ascend","descend"){player,node -> + on(STAIRS,SCENERY,"ascend","descend"){ player, node -> if(player.location.y < 3802){ player.properties.teleportLocation = when(player.location.x){ 2715 -> DOWN1A diff --git a/Server/src/main/kotlin/rs09/game/interaction/region/dungeons/brimhaven/BrimhavenDungeonListeners.kt b/Server/src/main/kotlin/rs09/game/interaction/region/dungeons/brimhaven/BrimhavenDungeonListeners.kt index 118da7675..311f0705f 100644 --- a/Server/src/main/kotlin/rs09/game/interaction/region/dungeons/brimhaven/BrimhavenDungeonListeners.kt +++ b/Server/src/main/kotlin/rs09/game/interaction/region/dungeons/brimhaven/BrimhavenDungeonListeners.kt @@ -17,23 +17,23 @@ class BrimhavenDungeonListeners : InteractionListener() { val LOGS = intArrayOf(5088,5090) override fun defineListeners() { - on(EXIT,OBJECT,"leave"){player, _ -> + on(EXIT,SCENERY,"leave"){ player, _ -> player.properties.teleportLocation = Location.create(2745, 3152, 0) return@on true } - on(STAIRS,OBJECT,"walk-up","walk-down"){player, node -> - BrimhavenUtils.handleStairs(node.asObject(),player) + on(STAIRS,SCENERY,"walk-up","walk-down"){ player, node -> + BrimhavenUtils.handleStairs(node.asScenery(),player) return@on true } - on(STEPPING_STONES,OBJECT,"jump-from"){player, node -> - BrimhavenUtils.handleSteppingStones(player,node.asObject()) + on(STEPPING_STONES,SCENERY,"jump-from"){ player, node -> + BrimhavenUtils.handleSteppingStones(player,node.asScenery()) return@on true } - on(VINES,OBJECT,"chop-down"){player, node -> - BrimhavenUtils.handleVines(player,node.asObject()) + on(VINES,SCENERY,"chop-down"){ player, node -> + BrimhavenUtils.handleVines(player,node.asScenery()) return@on true } @@ -42,7 +42,7 @@ class BrimhavenDungeonListeners : InteractionListener() { return@on true } - on(LOGS,OBJECT,"walk-across"){player, node -> + on(LOGS,SCENERY,"walk-across"){ player, node -> if (player.skills.getLevel(Skills.AGILITY) < 30) { player.packetDispatch.sendMessage("You need an agility level of 30 to cross this.") 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 4c48430ae..5c9869e88 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 @@ -89,8 +89,8 @@ object BrimhavenUtils { player.animate(tool.animation) player.pulseManager.run(object : Pulse(3, player) { override fun pulse(): Boolean { - if (SceneryBuilder.replace(node.asObject(), node.asObject().transform(0), 2)) { - val destination = getVineDestination(player,node.asObject()) + if (SceneryBuilder.replace(node.asScenery(), node.asScenery().transform(0), 2)) { + val destination = getVineDestination(player,node.asScenery()) player.lock(3) player.walkingQueue.reset() // Chop the vines to gain deeper access to Brimhaven Dungeon 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 cecb56974..64711c12f 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 @@ -2,7 +2,7 @@ package rs09.game.node.entity.skill.agility import core.cache.def.impl.ItemDefinition import core.cache.def.impl.NPCDefinition -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.content.dialogue.DialoguePlugin import core.game.content.global.action.ClimbActionHandler import core.game.content.global.action.DoorActionHandler @@ -160,13 +160,13 @@ class BarbarianOutpostCourse } override fun configure() { - ObjectDefinition.forId(2115).handlers["option:open"] = this - ObjectDefinition.forId(2116).handlers["option:open"] = this - ObjectDefinition.forId(2282).handlers["option:swing-on"] = this - ObjectDefinition.forId(2294).handlers["option:walk-across"] = this - ObjectDefinition.forId(20211).handlers["option:climb-over"] = this - ObjectDefinition.forId(2302).handlers["option:walk-across"] = this - ObjectDefinition.forId(1948).handlers["option:climb-over"] = this + SceneryDefinition.forId(2115).handlers["option:open"] = this + SceneryDefinition.forId(2116).handlers["option:open"] = this + SceneryDefinition.forId(2282).handlers["option:swing-on"] = this + SceneryDefinition.forId(2294).handlers["option:walk-across"] = this + SceneryDefinition.forId(20211).handlers["option:climb-over"] = this + SceneryDefinition.forId(2302).handlers["option:walk-across"] = this + SceneryDefinition.forId(1948).handlers["option:climb-over"] = this ItemDefinition.forId(455).handlers["option:read"] = this NPCDefinition.forId(385).handlers["option:pick-up"] = this PluginManager.definePlugin(BarbarianGuardDialogue()) 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 6c1c065dc..dfe185d3b 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 @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.agility -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.node.Node import core.game.node.`object`.Scenery import core.game.node.entity.npc.NPC @@ -130,16 +130,16 @@ class GnomeStrongholdCourse npc!!.init() npc.walkRadius = 3 } - ObjectDefinition.forId(2295).handlers["option:walk-across"] = this - ObjectDefinition.forId(2285).handlers["option:climb-over"] = this - ObjectDefinition.forId(35970).handlers["option:climb"] = this - ObjectDefinition.forId(2312).handlers["option:walk-on"] = this - ObjectDefinition.forId(4059).handlers["option:walk-on"] = this - ObjectDefinition.forId(2314).handlers["option:climb-down"] = this - ObjectDefinition.forId(2315).handlers["option:climb-down"] = this - ObjectDefinition.forId(2286).handlers["option:climb-over"] = this - ObjectDefinition.forId(4058).handlers["option:squeeze-through"] = this - ObjectDefinition.forId(154).handlers["option:squeeze-through"] = this + SceneryDefinition.forId(2295).handlers["option:walk-across"] = this + SceneryDefinition.forId(2285).handlers["option:climb-over"] = this + SceneryDefinition.forId(35970).handlers["option:climb"] = this + SceneryDefinition.forId(2312).handlers["option:walk-on"] = this + SceneryDefinition.forId(4059).handlers["option:walk-on"] = this + SceneryDefinition.forId(2314).handlers["option:climb-down"] = this + SceneryDefinition.forId(2315).handlers["option:climb-down"] = this + SceneryDefinition.forId(2286).handlers["option:climb-over"] = this + SceneryDefinition.forId(4058).handlers["option:squeeze-through"] = this + SceneryDefinition.forId(154).handlers["option:squeeze-through"] = this } override fun createInstance(player: Player): AgilityCourse { diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/WildernessCourse.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/WildernessCourse.kt index 2ddb3bd7d..7c88eb8c9 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 @@ -1,7 +1,7 @@ package rs09.game.node.entity.skill.agility import api.ContentAPI -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.content.global.action.DoorActionHandler import core.game.node.Node import core.game.node.`object`.Scenery @@ -10,8 +10,6 @@ import core.game.node.entity.player.link.TeleportManager import core.game.node.entity.skill.Skills import core.game.node.entity.skill.agility.AgilityCourse import core.game.node.entity.skill.agility.AgilityHandler -import core.game.system.task.LocationLogoutTask -import core.game.system.task.LogoutTask import core.game.system.task.Pulse import core.game.world.map.Location import core.game.world.map.RegionManager @@ -248,14 +246,14 @@ class WildernessCourse } override fun configure() { - ObjectDefinition.forId(2309).handlers["option:open"] = this - ObjectDefinition.forId(2308).handlers["option:open"] = this - ObjectDefinition.forId(2307).handlers["option:open"] = this - ObjectDefinition.forId(2288).handlers["option:squeeze-through"] = this - ObjectDefinition.forId(2283).handlers["option:swing-on"] = this - ObjectDefinition.forId(37704).handlers["option:cross"] = this - ObjectDefinition.forId(2297).handlers["option:walk-across"] = this - ObjectDefinition.forId(2328).handlers["option:climb"] = this + SceneryDefinition.forId(2309).handlers["option:open"] = this + SceneryDefinition.forId(2308).handlers["option:open"] = this + SceneryDefinition.forId(2307).handlers["option:open"] = this + SceneryDefinition.forId(2288).handlers["option:squeeze-through"] = this + SceneryDefinition.forId(2283).handlers["option:swing-on"] = this + SceneryDefinition.forId(37704).handlers["option:cross"] = this + SceneryDefinition.forId(2297).handlers["option:walk-across"] = this + SceneryDefinition.forId(2328).handlers["option:climb"] = this } override fun createInstance(player: Player): AgilityCourse { diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/SteppingStoneShortcut.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/SteppingStoneShortcut.kt index 7fe7f6bc8..ce61a356b 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/SteppingStoneShortcut.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/agility/shortcuts/SteppingStoneShortcut.kt @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.agility.shortcuts -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.interaction.OptionHandler import core.game.node.Node import core.game.node.entity.impl.ForceMovement @@ -63,7 +63,7 @@ class SteppingStoneShortcut : OptionHandler() { fun configure(objects: IntArray, pointA: Location, pointB: Location, option: String, levelReq: Int){ val instance = SteppingStoneInstance(pointA,pointB, option, levelReq) objects.forEach { - ObjectDefinition.forId(it).handlers["option:$option"] = this + SceneryDefinition.forId(it).handlers["option:$option"] = this } stones.put(pointA,instance) stones.put(pointB, instance) 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 805933101..f4e426b42 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 @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.construction.decoration -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.content.global.action.DoorActionHandler import core.game.interaction.OptionHandler import core.game.node.Node @@ -21,18 +21,18 @@ class ConstructionDoorPlugin : OptionHandler() { @Throws(Throwable::class) override fun newInstance(arg: Any?): Plugin { for (style in HousingStyle.values()) { - ObjectDefinition.forId(style.doorId).handlers["option:open"] = this - ObjectDefinition.forId(style.secondDoorId).handlers["option:open"] = this + SceneryDefinition.forId(style.doorId).handlers["option:open"] = this + SceneryDefinition.forId(style.secondDoorId).handlers["option:open"] = this } for (deco in BuildHotspot.DUNGEON_DOOR_LEFT.decorations) { - ObjectDefinition.forId(deco.objectId).handlers["option:open"] = this - ObjectDefinition.forId(deco.objectId).handlers["option:pick-lock"] = this - ObjectDefinition.forId(deco.objectId).handlers["option:force"] = this + SceneryDefinition.forId(deco.objectId).handlers["option:open"] = this + SceneryDefinition.forId(deco.objectId).handlers["option:pick-lock"] = this + SceneryDefinition.forId(deco.objectId).handlers["option:force"] = this } for (deco in BuildHotspot.DUNGEON_DOOR_RIGHT.decorations) { - ObjectDefinition.forId(deco.objectId).handlers["option:open"] = this - ObjectDefinition.forId(deco.objectId).handlers["option:pick-lock"] = this - ObjectDefinition.forId(deco.objectId).handlers["option:force"] = this + SceneryDefinition.forId(deco.objectId).handlers["option:open"] = this + SceneryDefinition.forId(deco.objectId).handlers["option:pick-lock"] = this + SceneryDefinition.forId(deco.objectId).handlers["option:force"] = this } return this } diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/bedroom/ShavingStandHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/bedroom/ShavingStandHandler.kt index 5801b86e9..dbd8a649f 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/bedroom/ShavingStandHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/bedroom/ShavingStandHandler.kt @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.construction.decoration.bedroom -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.component.Component import core.game.interaction.OptionHandler import core.game.node.Node @@ -11,9 +11,9 @@ import core.plugin.Plugin @Initializable class ShavingStandHandler : OptionHandler() { override fun newInstance(arg: Any?): Plugin { - ObjectDefinition.forId(13162).handlers["option:preen"] = this - ObjectDefinition.forId(13163).handlers["option:preen"] = this - ObjectDefinition.forId(13168).handlers["option:preen"] = this + SceneryDefinition.forId(13162).handlers["option:preen"] = this + SceneryDefinition.forId(13163).handlers["option:preen"] = this + SceneryDefinition.forId(13168).handlers["option:preen"] = this return this } diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/bedroom/WardrobeHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/bedroom/WardrobeHandler.kt index 133f2f20d..84e5f7146 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/bedroom/WardrobeHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/bedroom/WardrobeHandler.kt @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.construction.decoration.bedroom -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.component.Component import core.game.interaction.OptionHandler import core.game.node.Node @@ -11,9 +11,9 @@ import core.plugin.Plugin @Initializable class WardrobeHandler : OptionHandler() { override fun newInstance(arg: Any?): Plugin { - ObjectDefinition.forId(13155).handlers["option:change-clothes"] = this - ObjectDefinition.forId(13156).handlers["option:change-clothes"] = this - ObjectDefinition.forId(13161).handlers["option:change-clothes"] = this + SceneryDefinition.forId(13155).handlers["option:change-clothes"] = this + SceneryDefinition.forId(13156).handlers["option:change-clothes"] = this + SceneryDefinition.forId(13161).handlers["option:change-clothes"] = this return this } 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 998499707..9c4230aa1 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 @@ -16,7 +16,7 @@ class BurnerListener : InteractionListener() { val IDs = intArrayOf(13202,13203,13204,13205,13206,13207,13208,13209,13210,13211,13212,13213) override fun defineListeners() { - on(IDs,OBJECT,"light"){player,node -> + on(IDs,SCENERY,"light"){ player, node -> if (player.ironmanManager.checkRestriction() && !player.houseManager.isInHouse(player)) { return@on true } @@ -32,8 +32,8 @@ class BurnerListener : InteractionListener() { player.animate(Animation.create(3687)) player.sendMessage("You burn some marrentill in the incense burner.") SceneryBuilder.replace( - node.asObject(), - Scenery(node.asObject().id + 1, node.location), + node.asScenery(), + Scenery(node.asScenery().id + 1, node.location), RandomFunction.random(100, 175) ) } diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/costume/ToyBoxPlugin.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/costume/ToyBoxPlugin.kt index bd12485c5..5c1d7818e 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/costume/ToyBoxPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/costume/ToyBoxPlugin.kt @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.construction.decoration.costume -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.interaction.OptionHandler import core.game.interaction.item.toys.DiangoReclaimInterface import core.game.node.Node @@ -18,7 +18,7 @@ import core.plugin.Plugin class ToyBoxPlugin : OptionHandler() { @Throws(Throwable::class) override fun newInstance(arg: Any?): Plugin { - ObjectDefinition.forId(18802).handlers["option:open"] = this + SceneryDefinition.forId(18802).handlers["option:open"] = this return this } diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/study/LecternPlugin.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/study/LecternPlugin.kt index 2b3361a92..6fe7252d2 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/study/LecternPlugin.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/construction/decoration/study/LecternPlugin.kt @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.construction.decoration.study -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.component.Component import core.game.component.ComponentDefinition import core.game.component.ComponentPlugin @@ -118,14 +118,14 @@ class LecternPlugin : OptionHandler() { @Throws(Throwable::class) override fun newInstance(arg: Any?): Plugin? { for (i in 13642..13648) { - ObjectDefinition.forId(i).handlers["option:study"] = this + SceneryDefinition.forId(i).handlers["option:study"] = this } definePlugin(TeleTabInterface()) return this } override fun handle(player: Player, node: Node, option: String): Boolean { - val id = node.asObject().id + val id = node.asScenery().id player.setAttribute("ttb:objectid", id) GameWorld.Pulser.submit(object : Pulse(){ var counter = 0 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 5e199ad02..8ceeec5bc 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 @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.construction.decoration.study -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.component.Component import core.game.interaction.OptionHandler import core.game.node.Node @@ -20,9 +20,9 @@ import java.util.concurrent.TimeUnit class TelescopePlugin : OptionHandler() { @Throws(Throwable::class) override fun newInstance(arg: Any?): Plugin? { - ObjectDefinition.forId(13656).handlers["option:observe"] = this - ObjectDefinition.forId(13657).handlers["option:observe"] = this - ObjectDefinition.forId(13658).handlers["option:observe"] = this + SceneryDefinition.forId(13656).handlers["option:observe"] = this + SceneryDefinition.forId(13657).handlers["option:observe"] = this + SceneryDefinition.forId(13658).handlers["option:observe"] = this return this } @@ -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 Scenery + val obj = node?.asScenery() 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/farming/CompostBinOptionHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBinOptionHandler.kt index 340d636cb..3523a64c2 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBinOptionHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CompostBinOptionHandler.kt @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.farming -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.interaction.OptionHandler import core.game.node.Node import core.game.node.entity.player.Player @@ -11,8 +11,8 @@ import core.plugin.Plugin class CompostBinOptionHandler : OptionHandler() { override fun newInstance(arg: Any?): Plugin { for(i in 7836..7839) - ObjectDefinition.forId(i).childrenIds.forEach { - val def = ObjectDefinition.forId(it) + SceneryDefinition.forId(i).childrenIds.forEach { + val def = SceneryDefinition.forId(it) def.handlers["option:open"] = this def.handlers["option:close"] = this def.handlers["option:take-tomato"] = this @@ -23,7 +23,7 @@ class CompostBinOptionHandler : OptionHandler() { override fun handle(player: Player?, node: Node?, option: String?): Boolean { player ?: return false node ?: return false - val cBin = CompostBins.forObject(node.asObject()) ?: return false + val cBin = CompostBins.forObject(node.asScenery()) ?: return false val bin = cBin.getBinForPlayer(player) when(option){ 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 6f64ad034..ed995f9f6 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 @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.farming -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.cache.def.impl.VarbitDefinition import core.game.node.`object`.Scenery import core.game.node.entity.player.Player @@ -23,7 +23,7 @@ enum class CompostBins(val varpIndex: Int, val varpOffest: Int) { @JvmStatic fun forObjectID(id: Int): CompostBins?{ - val objDef = ObjectDefinition.forId(id) + val objDef = SceneryDefinition.forId(id) val def = VarbitDefinition.forObjectID(objDef.varbitID) return bins[def.configId shl def.bitShift] } diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CropHarvester.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CropHarvester.kt index eba468f2e..3698bd93d 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CropHarvester.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/CropHarvester.kt @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.farming -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.interaction.OptionHandler import core.game.node.Node import core.game.node.entity.player.Player @@ -18,15 +18,15 @@ class CropHarvester : OptionHandler() { val spadeAnim = Animation(830) override fun newInstance(arg: Any?): Plugin { - ObjectDefinition.setOptionHandler("harvest",this) - ObjectDefinition.setOptionHandler("pick",this) + SceneryDefinition.setOptionHandler("harvest",this) + SceneryDefinition.setOptionHandler("pick",this) return this } override fun handle(player: Player?, node: Node?, option: String?): Boolean { player ?: return false node ?: return false - val fPatch = FarmingPatch.forObject(node.asObject()) + val fPatch = FarmingPatch.forObject(node.asScenery()) fPatch ?: return false val patch = fPatch.getPatchFor(player) val plantable = patch.plantable 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 f5a57245e..ac4c1b321 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 @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.farming -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.cache.def.impl.VarbitDefinition import core.game.node.`object`.Scenery import core.game.node.entity.player.Player @@ -74,7 +74,7 @@ enum class FarmingPatch(val varpIndex: Int, val varpOffset: Int, val type: Patch @JvmStatic fun forObjectID(id: Int): FarmingPatch?{ - val objDef = ObjectDefinition.forId(id) + val objDef = SceneryDefinition.forId(id) val def = VarbitDefinition.forObjectID(objDef.varbitID) return patches[def.configId shl def.bitShift] } diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FruitAndBerryPicker.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FruitAndBerryPicker.kt index 06b5df210..69b2b21ae 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FruitAndBerryPicker.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/FruitAndBerryPicker.kt @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.farming -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.interaction.OptionHandler import core.game.node.Node import core.game.node.entity.player.Player @@ -15,14 +15,14 @@ import java.util.concurrent.TimeUnit @Initializable class FruitAndBerryPicker : OptionHandler() { override fun newInstance(arg: Any?): Plugin { - ObjectDefinition.setOptionHandler("pick-coconut",this) - ObjectDefinition.setOptionHandler("pick-banana",this) - ObjectDefinition.setOptionHandler("pick-apple",this) - ObjectDefinition.setOptionHandler("pick-orange",this) - ObjectDefinition.setOptionHandler("pick-pineapple",this) - ObjectDefinition.setOptionHandler("pick-papaya",this) - ObjectDefinition.setOptionHandler("pick-leaf",this) - ObjectDefinition.setOptionHandler("pick-from",this) + SceneryDefinition.setOptionHandler("pick-coconut",this) + SceneryDefinition.setOptionHandler("pick-banana",this) + SceneryDefinition.setOptionHandler("pick-apple",this) + SceneryDefinition.setOptionHandler("pick-orange",this) + SceneryDefinition.setOptionHandler("pick-pineapple",this) + SceneryDefinition.setOptionHandler("pick-papaya",this) + SceneryDefinition.setOptionHandler("pick-leaf",this) + SceneryDefinition.setOptionHandler("pick-from",this) return this } @@ -30,7 +30,7 @@ class FruitAndBerryPicker : OptionHandler() { player ?: return false node ?: return false - val fPatch = FarmingPatch.forObject(node.asObject()) + val fPatch = FarmingPatch.forObject(node.asScenery()) fPatch ?: return false val patch = fPatch.getPatchFor(player) diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/HealthChecker.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/HealthChecker.kt index f9f838065..f65466443 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/HealthChecker.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/HealthChecker.kt @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.farming -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.interaction.OptionHandler import core.game.node.Node import core.game.node.entity.player.Player @@ -13,14 +13,14 @@ import java.util.concurrent.TimeUnit @Initializable class HealthChecker : OptionHandler(){ override fun newInstance(arg: Any?): Plugin { - ObjectDefinition.setOptionHandler("check-health",this) + SceneryDefinition.setOptionHandler("check-health",this) return this } override fun handle(player: Player?, node: Node?, option: String?): Boolean { player ?: return false node ?: return false - val fPatch = FarmingPatch.forObject(node.asObject()) + val fPatch = FarmingPatch.forObject(node.asScenery()) fPatch ?: return false val patch = fPatch.getPatchFor(player) val type = patch.patch.type diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/InspectionHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/InspectionHandler.kt index 046de700b..9e77a6891 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/InspectionHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/InspectionHandler.kt @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.farming -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.interaction.OptionHandler import core.game.node.Node import core.game.node.entity.player.Player @@ -10,14 +10,14 @@ import core.plugin.Plugin @Initializable class InspectionHandler : OptionHandler() { override fun newInstance(arg: Any?): Plugin { - ObjectDefinition.setOptionHandler("inspect",this) + SceneryDefinition.setOptionHandler("inspect",this) return this } override fun handle(player: Player?, node: Node?, option: String?): Boolean { node ?: return false player ?: return false - val patch = FarmingPatch.forObject(node.asObject()) + val patch = FarmingPatch.forObject(node.asScenery()) if(patch == null){ player.sendMessage("This is an improperly handled inspect option. Report this please.") } else { diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/UseWithBinHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/UseWithBinHandler.kt index c8c14777e..c45cdc3b5 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/UseWithBinHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/UseWithBinHandler.kt @@ -37,7 +37,7 @@ object UseWithBinHandler { event ?: return false val player = event.player val used = event.used.id - val cBin = CompostBins.forObject(event.usedWith.asObject()) ?: return false + val cBin = CompostBins.forObject(event.usedWith.asScenery()) ?: return false val bin = cBin.getBinForPlayer(player) when(used){ diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/UseWithPatchHandler.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/UseWithPatchHandler.kt index 7b2e86ed5..be2ae30ab 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/UseWithPatchHandler.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/farming/UseWithPatchHandler.kt @@ -37,7 +37,7 @@ object UseWithPatchHandler{ event ?: return false val player = event.player val usedItem = event.usedItem - val patch = FarmingPatch.forObject(event.usedWith.asObject()) + val patch = FarmingPatch.forObject(event.usedWith.asScenery()) patch ?: return false player.faceLocation(event.usedWith.location) diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/GatheringSkillOptionListeners.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/GatheringSkillOptionListeners.kt index acb63daba..706cad747 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/GatheringSkillOptionListeners.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/GatheringSkillOptionListeners.kt @@ -16,17 +16,17 @@ class GatheringSkillOptionListeners : InteractionListener() { val ETCETERIA_REGION = 10300 override fun defineListeners() { - on(OBJECT,"chop-down","chop down","cut down"){player,node -> + on(SCENERY,"chop-down","chop down","cut down"){ player, node -> if(player.location.regionId == ETCETERIA_REGION){ player.dialogueInterpreter.open(KjallakOnChopDialogue(), NPC(NPCs.CARPENTER_KJALLAK_3916)) return@on true } - player.pulseManager.run(WoodcuttingSkillPulse(player, node.asObject())) + player.pulseManager.run(WoodcuttingSkillPulse(player, node.asScenery())) return@on true } - on(OBJECT,"mine"){player,node -> - player.pulseManager.run(MiningSkillPulse(player, node.asObject())) + on(SCENERY,"mine"){ player, node -> + player.pulseManager.run(MiningSkillPulse(player, node.asScenery())) return@on true } diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/fishing/barbfishing/BarbFishInteractionListeners.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/fishing/barbfishing/BarbFishInteractionListeners.kt index 23709d494..9892ac65d 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/fishing/barbfishing/BarbFishInteractionListeners.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/gather/fishing/barbfishing/BarbFishInteractionListeners.kt @@ -6,7 +6,7 @@ import rs09.game.interaction.InteractionListener class BarbFishInteractionListeners : InteractionListener() { override fun defineListeners() { - on(25268,OBJECT,"search"){player,_ -> + on(25268,SCENERY,"search"){ player, _ -> if(player.getAttribute("barbtraining:fishing",false) == true){ if(!player.inventory.containsItem(Item(11323))){ player.inventory.add(Item(11323)) diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/CommonKebbitEast.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/CommonKebbitEast.kt index 09d6d90a8..ae484988b 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/CommonKebbitEast.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/CommonKebbitEast.kt @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.hunter.tracking -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.node.item.Item import core.game.world.map.Location import core.game.world.update.flag.context.Animation @@ -45,29 +45,29 @@ class CommonKebbitEast : HunterTracking() { if(!linkingTrails.contains(initialMap.values.random()[0])){ addExtraTrails() } - ObjectDefinition.forId(19439).handlers["option:inspect"] = this - ObjectDefinition.forId(19440).handlers["option:inspect"] = this - ObjectDefinition.forId(19360).handlers["option:inspect"] = this - ObjectDefinition.forId(19361).handlers["option:inspect"] = this - ObjectDefinition.forId(19362).handlers["option:inspect"] = this - ObjectDefinition.forId(19363).handlers["option:inspect"] = this - ObjectDefinition.forId(19364).handlers["option:inspect"] = this - ObjectDefinition.forId(19365).handlers["option:inspect"] = this - ObjectDefinition.forId(19356).handlers["option:inspect"] = this - ObjectDefinition.forId(19357).handlers["option:inspect"] = this - ObjectDefinition.forId(19358).handlers["option:inspect"] = this - ObjectDefinition.forId(19359).handlers["option:inspect"] = this - ObjectDefinition.forId(19375).handlers["option:inspect"] = this - ObjectDefinition.forId(19376).handlers["option:inspect"] = this - ObjectDefinition.forId(19377).handlers["option:inspect"] = this - ObjectDefinition.forId(19378).handlers["option:inspect"] = this - ObjectDefinition.forId(19379).handlers["option:inspect"] = this - ObjectDefinition.forId(19372).handlers["option:inspect"] = this - ObjectDefinition.forId(19380).handlers["option:inspect"] = this - ObjectDefinition.forId(19374).handlers["option:inspect"] = this - ObjectDefinition.forId(19373).handlers["option:inspect"] = this - ObjectDefinition.forId(19428).handlers["option:search"] = this - ObjectDefinition.forId(19428).handlers["option:attack"] = this + SceneryDefinition.forId(19439).handlers["option:inspect"] = this + SceneryDefinition.forId(19440).handlers["option:inspect"] = this + SceneryDefinition.forId(19360).handlers["option:inspect"] = this + SceneryDefinition.forId(19361).handlers["option:inspect"] = this + SceneryDefinition.forId(19362).handlers["option:inspect"] = this + SceneryDefinition.forId(19363).handlers["option:inspect"] = this + SceneryDefinition.forId(19364).handlers["option:inspect"] = this + SceneryDefinition.forId(19365).handlers["option:inspect"] = this + SceneryDefinition.forId(19356).handlers["option:inspect"] = this + SceneryDefinition.forId(19357).handlers["option:inspect"] = this + SceneryDefinition.forId(19358).handlers["option:inspect"] = this + SceneryDefinition.forId(19359).handlers["option:inspect"] = this + SceneryDefinition.forId(19375).handlers["option:inspect"] = this + SceneryDefinition.forId(19376).handlers["option:inspect"] = this + SceneryDefinition.forId(19377).handlers["option:inspect"] = this + SceneryDefinition.forId(19378).handlers["option:inspect"] = this + SceneryDefinition.forId(19379).handlers["option:inspect"] = this + SceneryDefinition.forId(19372).handlers["option:inspect"] = this + SceneryDefinition.forId(19380).handlers["option:inspect"] = this + SceneryDefinition.forId(19374).handlers["option:inspect"] = this + SceneryDefinition.forId(19373).handlers["option:inspect"] = this + SceneryDefinition.forId(19428).handlers["option:search"] = this + SceneryDefinition.forId(19428).handlers["option:attack"] = this return this } 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 6ad505c83..b2f134e92 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 @@ -237,7 +237,7 @@ abstract class HunterTracking : OptionHandler(){ player.dialogueInterpreter.sendDialogue("You need a hunter level of $requiredLevel to track these.") return true } - generateTrail(node.asObject(),player) + generateTrail(node.asScenery(),player) updateTrail(player) } else { if(currentTrail.triggerObjectLocation.equals(node.location) || (currentIndex == trail.lastIndex && currentTrail.endLocation.equals(node.location))){ diff --git a/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/PolarKebbitHunting.kt b/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/PolarKebbitHunting.kt index 1f1ad918f..bea33f3f1 100644 --- a/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/PolarKebbitHunting.kt +++ b/Server/src/main/kotlin/rs09/game/node/entity/skill/hunter/tracking/PolarKebbitHunting.kt @@ -1,6 +1,6 @@ package rs09.game.node.entity.skill.hunter.tracking -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.node.item.Item import core.game.world.map.Location import core.game.world.update.flag.context.Animation @@ -49,20 +49,20 @@ class PolarKebbitHunting : HunterTracking() { override fun newInstance(arg: Any?): Plugin { addExtraTrails() - ObjectDefinition.forId(19640).handlers["option:inspect"] = this - ObjectDefinition.forId(19641).handlers["option:inspect"] = this - ObjectDefinition.forId(19435).handlers["option:inspect"] = this - ObjectDefinition.forId(36689).handlers["option:inspect"] = this - ObjectDefinition.forId(36690).handlers["option:inspect"] = this - ObjectDefinition.forId(19421).handlers["option:inspect"] = this - ObjectDefinition.forId(19424).handlers["option:inspect"] = this - ObjectDefinition.forId(19426).handlers["option:inspect"] = this - ObjectDefinition.forId(19419).handlers["option:inspect"] = this - ObjectDefinition.forId(19420).handlers["option:inspect"] = this - ObjectDefinition.forId(19423).handlers["option:inspect"] = this - ObjectDefinition.forId(36688).handlers["option:inspect"] = this - ObjectDefinition.forId(19435).handlers["option:search"] = this - ObjectDefinition.forId(19435).handlers["option:attack"] = this + SceneryDefinition.forId(19640).handlers["option:inspect"] = this + SceneryDefinition.forId(19641).handlers["option:inspect"] = this + SceneryDefinition.forId(19435).handlers["option:inspect"] = this + SceneryDefinition.forId(36689).handlers["option:inspect"] = this + SceneryDefinition.forId(36690).handlers["option:inspect"] = this + SceneryDefinition.forId(19421).handlers["option:inspect"] = this + SceneryDefinition.forId(19424).handlers["option:inspect"] = this + SceneryDefinition.forId(19426).handlers["option:inspect"] = this + SceneryDefinition.forId(19419).handlers["option:inspect"] = this + SceneryDefinition.forId(19420).handlers["option:inspect"] = this + SceneryDefinition.forId(19423).handlers["option:inspect"] = this + SceneryDefinition.forId(36688).handlers["option:inspect"] = this + SceneryDefinition.forId(19435).handlers["option:search"] = this + SceneryDefinition.forId(19435).handlers["option:attack"] = this return this } } \ No newline at end of file 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 783e86836..1a4a95b63 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 @@ -123,7 +123,7 @@ class LunarListeners : SpellListener("lunar") { onCast(Lunar.CURE_PLANT,OBJECT){player,node -> requires(player,66, arrayOf(Item(Items.ASTRAL_RUNE_9075), Item(Items.EARTH_RUNE_557,8))) - curePlant(player,node!!.asObject()) + curePlant(player,node!!.asScenery()) } onCast(Lunar.NPC_CONTACT,NONE){player,node -> diff --git a/Server/src/main/kotlin/rs09/game/system/command/oldsys/SimpleDumpingCommands.kt b/Server/src/main/kotlin/rs09/game/system/command/oldsys/SimpleDumpingCommands.kt index 240576992..5f5df5cfe 100644 --- a/Server/src/main/kotlin/rs09/game/system/command/oldsys/SimpleDumpingCommands.kt +++ b/Server/src/main/kotlin/rs09/game/system/command/oldsys/SimpleDumpingCommands.kt @@ -2,7 +2,7 @@ package rs09.game.system.command.oldsys import core.cache.def.impl.ItemDefinition import core.cache.def.impl.NPCDefinition -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.node.entity.player.Player import core.game.system.command.CommandSet import core.plugin.Initializable @@ -39,7 +39,7 @@ class SimpleDumpingCommands : CommandPlugin() { "item" -> for (i in ItemDefinition.getDefinitions().values){ writer.writeLn("${i.name}(${i.id}) - ${i.examine}") } - "object" -> for(i in ObjectDefinition.getDefinitions().values){ + "object" -> for(i in SceneryDefinition.getDefinitions().values){ writer.writeLn("${i.name}(${i.id}) - ${i.examine}") } "npc" -> for(i in NPCDefinition.getDefinitions().values){ @@ -70,7 +70,7 @@ class SimpleDumpingCommands : CommandPlugin() { writer.writeLn("${i.examine}") writer.writeLn("") } - "object" -> for(i in ObjectDefinition.getDefinitions().values){ + "object" -> for(i in SceneryDefinition.getDefinitions().values){ writer.writeLn("") writer.writeLn("${i.name}") writer.writeLn("${i.id}") 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 1172e3613..6b52cafb8 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 @@ -14,7 +14,7 @@ object RottenPotatoUseWithHandler{ @JvmStatic fun handle(node: Node, player: Player){ if(node is Scenery){ - val go = node.asObject() + val go = node.asScenery() } if(node is NPC){ 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 8e2607f2e..94dc2bf74 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 @@ -3,13 +3,12 @@ package rs09.game.system.command.sets import api.ContentAPI import core.cache.def.impl.ItemDefinition import core.cache.def.impl.NPCDefinition -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.cache.def.impl.VarbitDefinition import core.game.component.Component import core.game.ge.OfferState import core.game.node.`object`.Scenery import core.game.node.entity.player.info.Rights -import core.game.node.entity.player.link.RunScript import core.game.node.entity.skill.Skills import core.game.node.item.Item import core.game.system.communication.CommunicationInfo @@ -333,7 +332,7 @@ class MiscCommandSet : CommandSet(Command.Privilege.ADMIN){ reject(player,"Syntax: ::getobjectvarp objectid") } val objectID = args[1].toInt() - notify(player, "${VarbitDefinition.forObjectID(ObjectDefinition.forId(objectID).varbitID).configId}") + notify(player, "${VarbitDefinition.forObjectID(SceneryDefinition.forId(objectID).varbitID).configId}") } define("togglexp",Command.Privilege.STANDARD){ player, args -> diff --git a/Server/src/main/kotlin/rs09/game/system/config/ObjectConfigParser.kt b/Server/src/main/kotlin/rs09/game/system/config/ObjectConfigParser.kt index 40c5372e9..77a7a9a33 100644 --- a/Server/src/main/kotlin/rs09/game/system/config/ObjectConfigParser.kt +++ b/Server/src/main/kotlin/rs09/game/system/config/ObjectConfigParser.kt @@ -1,7 +1,7 @@ package rs09.game.system.config import rs09.ServerConstants -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import rs09.game.system.SystemLogger import org.json.simple.JSONArray import org.json.simple.JSONObject @@ -19,7 +19,7 @@ class ObjectConfigParser { val e = config as JSONObject val ids = e["ids"].toString().split(",").map { it.toInt() } for (id in ids) { - val def = ObjectDefinition.forId(id) + val def = SceneryDefinition.forId(id) val configs = def.handlers e.map { if (it.value.toString().isNotEmpty() && it.value.toString() != "null") { diff --git a/Server/src/main/kotlin/rs09/game/world/GameWorld.kt b/Server/src/main/kotlin/rs09/game/world/GameWorld.kt index 7bd821755..ba4d60c62 100644 --- a/Server/src/main/kotlin/rs09/game/world/GameWorld.kt +++ b/Server/src/main/kotlin/rs09/game/world/GameWorld.kt @@ -2,7 +2,7 @@ package rs09.game.world import core.cache.Cache import core.cache.ServerStore -import core.cache.def.impl.ObjectDefinition +import core.cache.def.impl.SceneryDefinition import core.game.ge.GrandExchangeDatabase import core.game.node.entity.npc.drop.RareDropTable import core.game.node.entity.player.Player @@ -150,7 +150,7 @@ object GameWorld { if (run) { SystemManager.flag(if (settings?.isDevMode == true) SystemState.PRIVATE else SystemState.ACTIVE) } - ObjectDefinition.getDefinitions().values.forEach(Consumer { obj: ObjectDefinition -> obj.examine }) + SceneryDefinition.getDefinitions().values.forEach(Consumer { obj: SceneryDefinition -> obj.examine }) System.gc() PlayerScripts.init() StateRepository.init()