yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ugh

Browse Source
This commit is contained in:
Ceikry
2021-03-12 21:07:55 -06:00
parent 52777a6b3c
commit 058f5b3044
207 changed files with 449 additions and 24973 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/component/InterfaceType.java
+10 -10
View File
@@ -1,7 +1,7 @@
package core.game.component;
import static rs09.tools.Interfaces.*;
import org.rs09.consts.Components;
/**
* Represents an interface type.
@@ -13,47 +13,47 @@ public enum InterfaceType {
/**
* Default interface.
*/
DEFAULT(TOPLEVEL_548, TOPLEVEL_FULLSCREEN_746, 11, 6),
DEFAULT(Components.TOPLEVEL_548, Components.TOPLEVEL_FULLSCREEN_746, 11, 6),
/**
* Walkable interface.
*/
OVERLAY(TOPLEVEL_548, TOPLEVEL_FULLSCREEN_746, 4, 5),
OVERLAY(Components.TOPLEVEL_548, Components.TOPLEVEL_FULLSCREEN_746, 4, 5),
/**
* A tab interface.
*/
TAB(TOPLEVEL_548, TOPLEVEL_FULLSCREEN_746, 83, 93),
TAB(Components.TOPLEVEL_548, Components.TOPLEVEL_FULLSCREEN_746, 83, 93),
/**
* The only tab to be shown (when this type is opened).
*/
SINGLE_TAB(TOPLEVEL_548, TOPLEVEL_FULLSCREEN_746, 80, 76),
SINGLE_TAB(Components.TOPLEVEL_548, Components.TOPLEVEL_FULLSCREEN_746, 80, 76),
/**
* Chatbox dialogue interface.
*/
DIALOGUE(CHATTOP_752, CHATTOP_752, 12, 12),
DIALOGUE(Components.CHATTOP_752, Components.CHATTOP_752, 12, 12),
/**
* A window pane.
*/
WINDOW_PANE(TOPLEVEL_548, TOPLEVEL_FULLSCREEN_746, 0, 0),
WINDOW_PANE(Components.TOPLEVEL_548, Components.TOPLEVEL_FULLSCREEN_746, 0, 0),
/**
* Client script chatbox interface.
*/
CS_CHATBOX(CHATTOP_752, CHATTOP_752, 6, 6),
CS_CHATBOX(Components.CHATTOP_752, Components.CHATTOP_752, 6, 6),
/**
* Chatbox interface.
*/
CHATBOX(CHATTOP_752, CHATTOP_752, 8, 8),
CHATBOX(Components.CHATTOP_752, Components.CHATTOP_752, 8, 8),
/**
* Wilderness overlay
*/
WILDERNESS_OVERLAY(TOPLEVEL_548, TOPLEVEL_FULLSCREEN_746, 11, 3);
WILDERNESS_OVERLAY(Components.TOPLEVEL_548, Components.TOPLEVEL_FULLSCREEN_746, 11, 3);
/**
* The fixed window pane id.
Server/src/main/java/core/game/content/activity/guild/RangingGuildPlugin.java
+1 -1
View File
@@ -8,7 +8,7 @@ import core.game.component.ComponentDefinition;
import core.game.component.ComponentPlugin;
import core.game.container.impl.EquipmentContainer;
import core.plugin.Initializable;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.Entity;
import core.game.node.entity.npc.AbstractNPC;
import core.game.node.entity.player.link.diary.DiaryType;
Server/src/main/java/core/game/content/activity/mta/AlchemySpell.java
+1 -1
View File
@@ -2,7 +2,7 @@ package core.game.content.activity.mta;
import core.game.node.entity.player.link.diary.DiaryType;
import core.game.world.map.zone.ZoneBorders;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.skill.magic.MagicSpell;
import core.game.node.entity.skill.magic.Runes;
import core.game.node.Node;
Server/src/main/java/core/game/content/ame/events/lostpirate/CapnHandEvent.java
+1 -1
View File
@@ -2,7 +2,7 @@ package core.game.content.ame.events.lostpirate;
import java.nio.ByteBuffer;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.content.ame.AntiMacroDialogue;
import core.game.content.ame.AntiMacroEvent;
import core.game.content.dialogue.DialoguePlugin;
Server/src/main/java/core/game/content/ame/events/rickturpentine/RickTurpentineEvent.java
+1 -1
View File
@@ -13,7 +13,7 @@ import core.game.world.map.Location;
import rs09.plugin.PluginManager;
import core.plugin.Initializable;
import core.tools.RandomFunction;
import rs09.tools.Items;
import org.rs09.consts.Items;
/**
* Handles the rick turpentine anti macro event.
Server/src/main/java/core/game/content/consumable/Consumables.java
+1 -1
View File
@@ -1,6 +1,6 @@
package core.game.content.consumable;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.player.link.diary.DiaryType;
import core.game.node.entity.state.EntityState;
import core.game.world.update.flag.context.Animation;
Server/src/main/java/core/game/content/dialogue/BrotherJeredDialogue.java
+1 -1
View File
@@ -2,7 +2,7 @@ package core.game.content.dialogue;
import core.game.content.global.Skillcape;
import core.game.node.item.Item;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.skill.Skills;
import core.game.node.entity.npc.NPC;
import core.plugin.Initializable;
Server/src/main/java/core/game/content/dialogue/CaptainShanksDialogue.java
+1 -1
View File
@@ -1,7 +1,7 @@
package core.game.content.dialogue;
import core.plugin.Initializable;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.content.global.travel.ship.Ships;
import core.game.node.entity.npc.NPC;
import core.game.node.entity.player.Player;
Server/src/main/java/core/game/content/dialogue/DairyChurnDialogue.java
+1 -1
View File
@@ -2,7 +2,7 @@ package core.game.content.dialogue;
import core.game.component.Component;
import core.plugin.Initializable;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.skill.cooking.dairy.DairyChurnPulse;
import core.game.node.entity.skill.cooking.dairy.DairyProduct;
import core.game.node.entity.player.Player;
Server/src/main/java/core/game/content/dialogue/EblisDialogue.java
+1 -1
View File
@@ -4,7 +4,7 @@ import core.game.node.entity.npc.NPC;
import core.game.node.item.Item;
import core.plugin.Initializable;
import core.game.node.entity.player.Player;
import rs09.tools.Items;
import org.rs09.consts.Items;
/**
* Handles Eblis's dialogue.
Server/src/main/java/core/game/content/dialogue/GalahadDialogue.java
+1 -1
View File
@@ -1,7 +1,7 @@
package core.game.content.dialogue;
import core.plugin.Initializable;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.npc.NPC;
import core.game.node.entity.player.Player;
import core.game.node.entity.player.link.diary.DiaryType;
Server/src/main/java/core/game/content/dialogue/HarryDialogue.java
+1 -1
View File
@@ -1,6 +1,6 @@
package core.game.content.dialogue;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.npc.NPC;
import core.game.node.item.Item;
import core.plugin.Initializable;
Server/src/main/java/core/game/content/dialogue/InformationclerkMuseumDialogue.java
+1 -1
View File
@@ -5,7 +5,7 @@ import core.game.node.entity.player.Player;
import core.game.node.item.Item;
import core.plugin.Initializable;
import rs09.game.world.GameWorld;
import rs09.tools.Items;
import org.rs09.consts.Items;
/**
* Represents the information clerk museum dialogue plugin
Server/src/main/java/core/game/content/dialogue/JiminuaDialogue.java
+1 -1
View File
@@ -1,7 +1,7 @@
package core.game.content.dialogue;
import core.plugin.Initializable;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.interaction.NodeUsageEvent;
import core.game.interaction.UseWithHandler;
import core.game.node.entity.npc.NPC;
Server/src/main/java/core/game/content/dialogue/ManDialoguePlugin.java
+1 -1
View File
@@ -1,7 +1,7 @@
package core.game.content.dialogue;
import core.plugin.Initializable;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.npc.NPC;
import core.game.node.entity.player.Player;
import core.game.node.entity.player.link.diary.DiaryType;
Server/src/main/java/core/game/content/dialogue/RomilyWeaklaxDialogue.java
+1 -1
View File
@@ -1,6 +1,6 @@
package core.game.content.dialogue;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.interaction.NodeUsageEvent;
import core.game.interaction.UseWithHandler;
import core.game.node.entity.npc.NPC;
Server/src/main/java/core/game/content/dialogue/RugMerchantDialogue.java
+1 -1
View File
@@ -15,7 +15,7 @@ import core.game.world.map.Location;
import core.game.world.update.flag.context.Animation;
import core.plugin.Plugin;
import rs09.plugin.PluginManager;
import rs09.tools.Items;
import org.rs09.consts.Items;
import static rs09.tools.stringtools.StringToolsKt.colorize;
Server/src/main/java/core/game/content/dialogue/SeamanDialoguePlugin.java
+1 -1
View File
@@ -2,7 +2,7 @@ package core.game.content.dialogue;
import core.game.container.impl.EquipmentContainer;
import core.plugin.Initializable;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.content.global.travel.ship.Ships;
import core.game.node.entity.npc.NPC;
import core.game.node.entity.player.Player;
Server/src/main/java/core/game/content/dialogue/SeravelDialogue.java
+1 -1
View File
@@ -4,7 +4,7 @@ import core.game.node.entity.npc.NPC;
import core.game.node.entity.player.Player;
import core.game.node.item.Item;
import core.plugin.Initializable;
import rs09.tools.Items;
import org.rs09.consts.Items;
@Initializable
public class SeravelDialogue extends DialoguePlugin {
Server/src/main/java/core/game/content/dialogue/SirReniteeDialogue.java
+1 -1
View File
@@ -2,7 +2,7 @@ package core.game.content.dialogue;
import core.Util;
import core.plugin.Initializable;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.npc.NPC;
import core.game.node.entity.player.Player;
import core.game.node.entity.player.link.diary.DiaryType;
Server/src/main/java/core/game/content/dialogue/StankersDialogue.java
+1 -1
View File
@@ -1,6 +1,6 @@
package core.game.content.dialogue;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.npc.NPC;
import core.game.node.entity.player.Player;
import core.game.node.entity.player.link.diary.AchievementDiary;
Server/src/main/java/core/game/content/global/BirdNest.java
+1 -1
View File
@@ -1,6 +1,6 @@
package core.game.content.global;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.npc.drop.NPCDropTables;
import core.game.node.entity.player.Player;
import core.game.node.item.ChanceItem;
Server/src/main/java/core/game/content/global/LightSource.java
+11 -12
View File
@@ -2,10 +2,9 @@ package core.game.content.global;
import core.game.node.entity.player.Player;
import core.game.node.item.Item;
import org.rs09.consts.Components;
import static rs09.tools.Interfaces.DARKNESS_LIGHT_97;
import static rs09.tools.Interfaces.DARKNESS_MEDIUM_98;
import static rs09.tools.Items.*;
import static org.rs09.consts.Items.*;
/**
@@ -14,16 +13,16 @@ import static rs09.tools.Items.*;
* @author Emperor
*/
public enum LightSource {
CANDLE(1, new Item(CANDLE_36, 1), new Item(LIT_CANDLE_33, 1), true, DARKNESS_MEDIUM_98),
BLACK_CANDLE(1, new Item(BLACK_CANDLE_38, 1), new Item(LIT_BLACK_CANDLE_32, 1), true, DARKNESS_MEDIUM_98),
TORCH(1, new Item(UNLIT_TORCH_596, 1), new Item(LIT_TORCH_594, 1), true, DARKNESS_MEDIUM_98),
CANDLE_LANTERN(4, new Item(CANDLE_LANTERN_4527, 1), new Item(CANDLE_LANTERN_4531, 1), false, DARKNESS_MEDIUM_98),
OIL_LAMP(12, new Item(OIL_LAMP_4522, 1), new Item(OIL_LAMP_4524, 1), true, DARKNESS_LIGHT_97),
OIL_LANTERN(26, new Item(OIL_LANTERN_4535, 1), new Item(OIL_LANTERN_4539, 1), false, DARKNESS_LIGHT_97),
CANDLE(1, new Item(CANDLE_36, 1), new Item(LIT_CANDLE_33, 1), true, Components.DARKNESS_MEDIUM_98),
BLACK_CANDLE(1, new Item(BLACK_CANDLE_38, 1), new Item(LIT_BLACK_CANDLE_32, 1), true, Components.DARKNESS_MEDIUM_98),
TORCH(1, new Item(UNLIT_TORCH_596, 1), new Item(LIT_TORCH_594, 1), true, Components.DARKNESS_MEDIUM_98),
CANDLE_LANTERN(4, new Item(CANDLE_LANTERN_4527, 1), new Item(CANDLE_LANTERN_4531, 1), false, Components.DARKNESS_MEDIUM_98),
OIL_LAMP(12, new Item(OIL_LAMP_4522, 1), new Item(OIL_LAMP_4524, 1), true, Components.DARKNESS_LIGHT_97),
OIL_LANTERN(26, new Item(OIL_LANTERN_4535, 1), new Item(OIL_LANTERN_4539, 1), false, Components.DARKNESS_LIGHT_97),
BULLSEYE_LANTERN(49, new Item(BULLSEYE_LANTERN_4548, 1), new Item(BULLSEYE_LANTERN_4550, 1), false, -1),
SAPPHIRE_LANTERN(49, new Item(SAPPHIRE_LANTERN_4701, 1), new Item(SAPPHIRE_LANTERN_4702, 1), false, -1),
EMERALD_LANTERN(49, new Item(EMERALD_LANTERN_9064, 1), new Item(EMERALD_LANTERN_9065, 1), false, -1),
MINING_HELMET(65, new Item(MINING_HELMET_5014, 1), new Item(MINING_HELMET_5013, 1), false, DARKNESS_LIGHT_97);
MINING_HELMET(65, new Item(MINING_HELMET_5014, 1), new Item(MINING_HELMET_5013, 1), false, Components.DARKNESS_LIGHT_97);
/**
* Represents the level required.
@@ -130,9 +129,9 @@ public enum LightSource {
*/
public int getStrength() {
switch (interfaceId) {
case DARKNESS_LIGHT_97:
case Components.DARKNESS_LIGHT_97:
return 1;
case DARKNESS_MEDIUM_98:
case Components.DARKNESS_MEDIUM_98:
return 2;
case -1:
return 3;
Server/src/main/java/core/game/content/global/action/ClimbActionHandler.java
+1 -1
View File
@@ -1,7 +1,7 @@
package core.game.content.global.action;
import core.game.container.impl.EquipmentContainer;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.player.link.diary.DiaryType;
import rs09.game.system.SystemLogger;
import core.game.content.dialogue.DialoguePlugin;
Server/src/main/java/core/game/content/global/shop/Shop.java
+1 -1
View File
@@ -3,7 +3,7 @@ package core.game.content.global.shop;
import core.cache.def.impl.ItemDefinition;
import core.game.container.Container;
import core.game.container.ContainerType;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.player.Player;
import core.game.node.entity.player.link.diary.DiaryType;
import core.game.node.item.Item;
Server/src/main/java/core/game/content/quest/free/shieldofarrav/ReldoDialogue.java
+1 -1
View File
@@ -1,6 +1,6 @@
package core.game.content.quest.free.shieldofarrav;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.content.dialogue.DialoguePlugin;
import core.game.node.entity.npc.NPC;
import core.game.node.entity.player.Player;
Server/src/main/java/core/game/content/quest/members/asoulsbane/ASoulsBanePlugin.java
+1 -1
View File
@@ -1,7 +1,7 @@
package core.game.content.quest.members.asoulsbane;
import core.cache.def.impl.ObjectDefinition;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.interaction.MovementPulse;
import core.game.interaction.NodeUsageEvent;
import core.game.interaction.OptionHandler;
Server/src/main/java/core/game/content/quest/members/dwarfcannon/CannonBallPlugin.java
+1 -1
View File
@@ -1,6 +1,6 @@
package core.game.content.quest.members.dwarfcannon;
import rs09.tools.Items;
import org.rs09.consts.Items;
import rs09.game.content.dialogue.SkillDialogueHandler;
import rs09.game.content.dialogue.SkillDialogueHandler.SkillDialogue;
import core.game.node.entity.skill.SkillPulse;
Server/src/main/java/core/game/content/quest/members/fishingcontest/GarlicPipeInteraction.java
+1 -1
View File
@@ -9,7 +9,7 @@ import core.game.node.object.GameObject;
import core.game.world.map.Location;
import core.plugin.Initializable;
import core.plugin.Plugin;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.content.quest.PluginInteraction;
import core.game.content.quest.PluginInteractionManager;
Server/src/main/java/core/game/content/quest/members/merlinscrystal/KingArthurDialogue.java
+1 -1
View File
@@ -1,6 +1,6 @@
package core.game.content.quest.members.merlinscrystal;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.player.link.diary.DiaryType;
import core.game.node.item.Item;
import core.game.content.dialogue.DialoguePlugin;
Server/src/main/java/core/game/content/quest/members/merlinscrystal/TheLadyOfTheLake.java
+1 -1
View File
@@ -1,7 +1,7 @@
package core.game.content.quest.members.merlinscrystal;
import core.game.container.impl.EquipmentContainer;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.player.link.diary.DiaryType;
import core.game.content.dialogue.DialoguePlugin;
import core.game.node.entity.npc.NPC;
Server/src/main/java/core/game/content/quest/members/sheepherder/SheepHerder.java
+1 -1
View File
@@ -7,7 +7,7 @@ import core.game.node.item.Item;
import core.game.world.map.Direction;
import core.game.world.map.Location;
import core.plugin.Initializable;
import rs09.tools.Items;
import org.rs09.consts.Items;
import java.util.HashMap;
Server/src/main/java/core/game/content/quest/members/whatliesbelow/WhatLiesBelow.java
+1 -1
View File
@@ -1,7 +1,7 @@
package core.game.content.quest.members.whatliesbelow;
import core.plugin.Initializable;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.skill.Skills;
import core.game.node.entity.player.Player;
import core.game.node.entity.player.link.quest.Quest;
Server/src/main/java/core/game/interaction/city/KaramajaOptionPlugin.java
+1 -1
View File
@@ -4,7 +4,7 @@ import core.cache.def.impl.NPCDefinition;
import core.cache.def.impl.ObjectDefinition;
import core.game.component.Component;
import core.plugin.Initializable;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.system.task.Pulse;
import rs09.game.world.GameWorld;
import core.game.content.dialogue.FacialExpression;
Server/src/main/java/core/game/interaction/inter/MysticStaffEnchantingPlugin.java
+1 -1
View File
@@ -3,7 +3,7 @@ package core.game.interaction.inter;
import core.game.component.Component;
import core.game.component.ComponentDefinition;
import core.game.component.ComponentPlugin;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.player.Player;
import core.game.node.item.Item;
import core.plugin.Plugin;
Server/src/main/java/core/game/interaction/item/FishbowlPlugin.java
+1 -1
View File
@@ -3,7 +3,7 @@ package core.game.interaction.item;
import core.Util;
import core.cache.def.impl.ItemDefinition;
import core.cache.def.impl.ObjectDefinition;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.interaction.NodeUsageEvent;
import core.game.interaction.OptionHandler;
import core.game.interaction.UseWithHandler;
Server/src/main/java/core/game/interaction/item/withitem/CapeDyeingPlugin.java
+1 -1
View File
@@ -1,7 +1,7 @@
/*
package core.game.interaction.item.withitem;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.content.global.Dyes;
import core.game.content.global.action.SpecialLadders;
import core.game.interaction.NodeUsageEvent;
Server/src/main/java/core/game/interaction/item/withitem/FishfoodPlugin.java
+1 -1
View File
@@ -1,6 +1,6 @@
package core.game.interaction.item.withitem;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.interaction.NodeUsageEvent;
import core.game.interaction.UseWithHandler;
import core.game.node.entity.player.Player;
Server/src/main/java/core/game/interaction/item/withitem/FruitCuttingPlugin.java
+1 -1
View File
@@ -2,7 +2,7 @@ package core.game.interaction.item.withitem;
import core.game.component.Component;
import core.plugin.Initializable;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.content.dialogue.DialoguePlugin;
import core.game.interaction.NodeUsageEvent;
import core.game.interaction.UseWithHandler;
Server/src/main/java/core/game/interaction/item/withitem/SoftclayPlugin.java
+1 -1
View File
@@ -2,7 +2,7 @@ package core.game.interaction.item.withitem;
import core.game.node.entity.player.link.diary.DiaryType;
import core.plugin.Initializable;
import rs09.tools.Items;
import org.rs09.consts.Items;
import rs09.game.content.dialogue.SkillDialogueHandler;
import rs09.game.content.dialogue.SkillDialogueHandler.SkillDialogue;
import core.game.interaction.NodeUsageEvent;
Server/src/main/java/core/game/interaction/item/withnpc/ForestersArmsCiderPlugin.java
+1 -1
View File
@@ -1,6 +1,6 @@
package core.game.interaction.item.withnpc;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.interaction.NodeUsageEvent;
import core.game.interaction.UseWithHandler;
import core.game.node.entity.npc.NPC;
Server/src/main/java/core/game/interaction/item/withnpc/KingArthurPoisonChalicePlugin.java
+1 -1
View File
@@ -1,6 +1,6 @@
package core.game.interaction.item.withnpc;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.interaction.NodeUsageEvent;
import core.game.interaction.UseWithHandler;
import core.game.node.entity.npc.NPC;
Server/src/main/java/core/game/interaction/item/withobject/HairdresserCheesePlugin.java
+1 -1
View File
@@ -1,7 +1,7 @@
package core.game.interaction.item.withobject;
import core.plugin.Initializable;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.interaction.NodeUsageEvent;
import core.game.interaction.UseWithHandler;
import core.game.node.entity.player.Player;
Server/src/main/java/core/game/interaction/item/withobject/WaterSourcePlugin.java
+1 -1
View File
@@ -1,7 +1,7 @@
package core.game.interaction.item.withobject;
import core.plugin.Initializable;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.interaction.NodeUsageEvent;
import core.game.interaction.UseWithHandler;
import core.game.node.entity.player.Player;
Server/src/main/java/core/game/interaction/npc/SecurityGuardPlugin.java
+1 -1
View File
@@ -9,7 +9,7 @@ import core.game.node.item.Item;
import core.plugin.Initializable;
import core.plugin.Plugin;
import rs09.plugin.PluginManager;
import rs09.tools.Items;
import org.rs09.consts.Items;
@Initializable
public final class SecurityGuardPlugin extends OptionHandler {
Server/src/main/java/core/game/interaction/object/BeehivePlugin.java
+1 -1
View File
@@ -1,7 +1,7 @@
package core.game.interaction.object;
import core.cache.def.impl.ObjectDefinition;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.interaction.OptionHandler;
import core.game.node.Node;
import core.game.node.entity.combat.ImpactHandler;
Server/src/main/java/core/game/interaction/object/ChefGuildDoorPlugin.java
+1 -1
View File
@@ -1,7 +1,7 @@
package core.game.interaction.object;
import core.cache.def.impl.ObjectDefinition;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.content.global.action.DoorActionHandler;
import core.game.node.item.Item;
import core.game.node.entity.skill.Skills;
Server/src/main/java/core/game/interaction/object/SinclairFlourBarrelPlugin.java
+1 -1
View File
@@ -1,7 +1,7 @@
package core.game.interaction.object;
import core.cache.def.impl.ObjectDefinition;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.interaction.NodeUsageEvent;
import core.game.interaction.OptionHandler;
import core.game.interaction.UseWithHandler;
Server/src/main/java/core/game/interaction/object/SlashWebPlugin.java
+1 -1
View File
@@ -4,7 +4,7 @@ import core.cache.def.impl.ObjectDefinition;
import core.game.container.Container;
import core.game.container.impl.EquipmentContainer;
import core.plugin.Initializable;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.interaction.OptionHandler;
import core.game.node.Node;
import core.game.node.entity.combat.equipment.WeaponInterface;
Server/src/main/java/core/game/node/entity/combat/equipment/WeaponInterface.java
+43 -44
View File
@@ -9,7 +9,6 @@ import core.game.node.entity.impl.Animator.Priority;
import core.game.node.entity.player.Player;
import core.game.node.entity.player.link.SpellBookManager;
import core.game.node.item.Item;
import rs09.game.system.config.ItemConfigParser;
import core.game.world.update.flag.context.Animation;
import core.net.packet.PacketRepository;
import core.net.packet.context.InterfaceConfigContext;
@@ -18,8 +17,8 @@ import core.net.packet.context.StringContext;
import core.net.packet.out.Interface;
import core.net.packet.out.InterfaceConfig;
import core.net.packet.out.StringPacket;
import static rs09.tools.Interfaces.*;
import org.rs09.consts.Components;
import rs09.game.system.config.ItemConfigParser;
/**
@@ -163,7 +162,7 @@ public final class WeaponInterface extends Component {
* Opens the interface.
*/
private void open() {
ComponentDefinition definition = ComponentDefinition.forId(WEAPON_FISTS_SEL_92);
ComponentDefinition definition = ComponentDefinition.forId(Components.WEAPON_FISTS_SEL_92);
boolean resizable = player.getInterfaceManager().isResizable();
PacketRepository.send(Interface.class, new InterfaceContext(player, definition.getWindowPaneId(resizable), definition.getChildId(resizable), id, definition.isWalkable()));
int slot = ensureStyleIndex(player, player.getSettings().getAttackStyleIndex());
@@ -209,14 +208,14 @@ public final class WeaponInterface extends Component {
* @return the config.
*/
private int getConfig(int buttons, int interfaceId){
if(interfaceId == WEAPON_STAFF_SEL_90){
if(interfaceId == Components.WEAPON_STAFF_SEL_90){
return 87;//Return Config
}
if(interfaceId != WEAPON_WHIP_SEL_93 &&
interfaceId != WEAPON_WARHAMMER_SEL_76 &&
interfaceId != WEAPON_XBOW_SEL_79 &&
interfaceId != WEAPON_HALBERD_SEL_84 &&
interfaceId != WEAPON_THROWN_SEL_91)
if(interfaceId != Components.WEAPON_WHIP_SEL_93 &&
interfaceId != Components.WEAPON_WARHAMMER_SEL_76 &&
interfaceId != Components.WEAPON_XBOW_SEL_79 &&
interfaceId != Components.WEAPON_HALBERD_SEL_84 &&
interfaceId != Components.WEAPON_THROWN_SEL_91)
{
switch(buttons){
case 3:
@@ -284,7 +283,7 @@ public final class WeaponInterface extends Component {
if (current != WeaponInterfaces.STAFF) {
slot--;
}
if (current == WeaponInterfaces.WARHAMMER_MAUL || (current.attackStyles.length > 2 && current.attackStyles[2].bonusType == BONUS_RANGE && current.getInterfaceId() != WEAPON_THROWN_SEL_91)) {
if (current == WeaponInterfaces.WARHAMMER_MAUL || (current.attackStyles.length > 2 && current.attackStyles[2].bonusType == BONUS_RANGE && current.getInterfaceId() != Components.WEAPON_THROWN_SEL_91)) {
slot = button == 4 ? 1 : button == 3 ? 2 : 0;
} else if (current == WeaponInterfaces.CLAWS) {
slot = button == 5 ? 1 : button == 3 ? 3 : slot;
@@ -331,7 +330,7 @@ public final class WeaponInterface extends Component {
* @return The component id for the autocast select tab.
*/
public int getAutospellId(int spellId) {
boolean modern = player.getSpellBookManager().getSpellBook() == MAGIC_192;
boolean modern = player.getSpellBookManager().getSpellBook() == Components.MAGIC_192;
int[] data = modern ? MODERN_SPELL_IDS : ANCIENT_SPELL_IDS;
if (modern && player.getEquipment().getNew(3).getName().equalsIgnoreCase("Slayer's staff")) {
data = SLAYER_STAFF_SPELL_IDS;
@@ -353,7 +352,7 @@ public final class WeaponInterface extends Component {
* @param adjustAttackStyle If the attack style should be adjusted.
*/
public void selectAutoSpell(int buttonId, boolean adjustAttackStyle) {
boolean modern = player.getSpellBookManager().getSpellBook() == MAGIC_192;
boolean modern = player.getSpellBookManager().getSpellBook() == Components.MAGIC_192;
int[] data = modern ? MODERN_SPELL_IDS : ANCIENT_SPELL_IDS;
if (modern && player.getEquipment().getNew(3).getName().equalsIgnoreCase("Slayer's staff")) {
data = SLAYER_STAFF_SPELL_IDS;
@@ -369,8 +368,8 @@ public final class WeaponInterface extends Component {
if (current != null) {
for (int index = 0; index < data.length; index++) {
if (data[index] == current.getSpellId()) {
player.getPacketDispatch().sendInterfaceConfig(WEAPON_STAFF_SEL_90, configStart + (2 * index), true);
player.getPacketDispatch().sendInterfaceConfig(WEAPON_STAFF_SEL_90, 100 + configStart + (2 * index), true);
player.getPacketDispatch().sendInterfaceConfig(Components.WEAPON_STAFF_SEL_90, configStart + (2 * index), true);
player.getPacketDispatch().sendInterfaceConfig(Components.WEAPON_STAFF_SEL_90, 100 + configStart + (2 * index), true);
}
}
}
@@ -383,8 +382,8 @@ public final class WeaponInterface extends Component {
return;
}
boolean defensive = player.getSettings().getAttackStyleIndex() == 3;
player.getPacketDispatch().sendInterfaceConfig(WEAPON_STAFF_SEL_90, 183, defensive);
player.getPacketDispatch().sendInterfaceConfig(WEAPON_STAFF_SEL_90, 83, !defensive);
player.getPacketDispatch().sendInterfaceConfig(Components.WEAPON_STAFF_SEL_90, 183, defensive);
player.getPacketDispatch().sendInterfaceConfig(Components.WEAPON_STAFF_SEL_90, 83, !defensive);
current = (CombatSpell) (modern ? SpellBookManager.SpellBook.MODERN.getSpell(data[buttonId]) : SpellBookManager.SpellBook.ANCIENT.getSpell(data[buttonId]));
player.getProperties().setAutocastSpell(current);
int configId = configStart + (2 * buttonId);
@@ -418,7 +417,7 @@ public final class WeaponInterface extends Component {
if (configId >= 85 || configId <= 65) {
return;
} else {
player.getPacketDispatch().sendInterfaceConfig(WEAPON_STAFF_SEL_90, (defensive ? 100 : 0) + configId, false);
player.getPacketDispatch().sendInterfaceConfig(Components.WEAPON_STAFF_SEL_90, (defensive ? 100 : 0) + configId, false);
}
} else {
configId += defensive ? 100 : 0;
@@ -436,7 +435,7 @@ public final class WeaponInterface extends Component {
configId = defensive ? 274 : 262;
break;
}
player.getPacketDispatch().sendInterfaceConfig(WEAPON_STAFF_SEL_90, configId, false);
player.getPacketDispatch().sendInterfaceConfig(Components.WEAPON_STAFF_SEL_90, configId, false);
}
}
@@ -484,7 +483,7 @@ public final class WeaponInterface extends Component {
return false;
}
boolean ancientStaff = player.getEquipment().getNew(3).getName().contains("ncient staff") || player.getEquipment().getNew(3).getName().contains("uriel's staff");;
if ((player.getSpellBookManager().getSpellBook() == MAGIC_192 && ancientStaff) || (player.getSpellBookManager().getSpellBook() == MAGIC_ZAROS_193 && !ancientStaff)) {
if ((player.getSpellBookManager().getSpellBook() == Components.MAGIC_192 && ancientStaff) || (player.getSpellBookManager().getSpellBook() == Components.MAGIC_ZAROS_193 && !ancientStaff)) {
if (message) {
player.getPacketDispatch().sendMessage("You can only autocast ancient magicks with an Ancient or Zuriel's staff.");
}
@@ -557,124 +556,124 @@ public final class WeaponInterface extends Component {
/**
* The unarmed weapon interface (ordinal=0)
*/
UNARMED(WEAPON_FISTS_SEL_92, new AttackStyle(STYLE_ACCURATE, BONUS_CRUSH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_CRUSH)),
UNARMED(Components.WEAPON_FISTS_SEL_92, new AttackStyle(STYLE_ACCURATE, BONUS_CRUSH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_CRUSH)),
/**
* The staff weapon interface (ordinal=1)
*/
STAFF(WEAPON_STAFF_SEL_90, new AttackStyle(STYLE_ACCURATE, BONUS_CRUSH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE_CAST, BONUS_MAGIC), new AttackStyle(STYLE_CAST, BONUS_MAGIC)),
STAFF(Components.WEAPON_STAFF_SEL_90, new AttackStyle(STYLE_ACCURATE, BONUS_CRUSH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE_CAST, BONUS_MAGIC), new AttackStyle(STYLE_CAST, BONUS_MAGIC)),
/**
* The (battle) axe weapon interface (ordinal=2)
*/
AXE(WEAPON_BAXE_SEL_75, new AttackStyle(STYLE_ACCURATE, BONUS_SLASH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_SLASH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_SLASH)),
AXE(Components.WEAPON_BAXE_SEL_75, new AttackStyle(STYLE_ACCURATE, BONUS_SLASH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_SLASH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_SLASH)),
/**
* The scepter weapon interface (ordinal=3)
*/
SCEPTER(WEAPON_SCEPTER_SEL_85, new AttackStyle(STYLE_ACCURATE, BONUS_CRUSH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_CRUSH)),
SCEPTER(Components.WEAPON_SCEPTER_SEL_85, new AttackStyle(STYLE_ACCURATE, BONUS_CRUSH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_CRUSH)),
/**
* The pickaxe weapon interface (ordinal=4)
*/
PICKAXE(WEAPON_PICKAXE_SEL_83, new AttackStyle(STYLE_ACCURATE, BONUS_STAB), new AttackStyle(STYLE_AGGRESSIVE, BONUS_STAB), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_STAB)),
PICKAXE(Components.WEAPON_PICKAXE_SEL_83, new AttackStyle(STYLE_ACCURATE, BONUS_STAB), new AttackStyle(STYLE_AGGRESSIVE, BONUS_STAB), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_STAB)),
/**
* The sword/dagger weapon interface (ordinal=5)
*/
SWORD_DAGGER(WEAPON_DAGGER_SEL_89, new AttackStyle(STYLE_ACCURATE, BONUS_STAB), new AttackStyle(STYLE_AGGRESSIVE, BONUS_STAB), new AttackStyle(STYLE_AGGRESSIVE, BONUS_SLASH), new AttackStyle(STYLE_DEFENSIVE, BONUS_STAB)),
SWORD_DAGGER(Components.WEAPON_DAGGER_SEL_89, new AttackStyle(STYLE_ACCURATE, BONUS_STAB), new AttackStyle(STYLE_AGGRESSIVE, BONUS_STAB), new AttackStyle(STYLE_AGGRESSIVE, BONUS_SLASH), new AttackStyle(STYLE_DEFENSIVE, BONUS_STAB)),
/**
* The scimitar/silverlight/silver sickle/... weapon interface
* (ordinal=6)
*/
SCIMITAR(WEAPON_SCIMITAR_SEL_81, new AttackStyle(STYLE_ACCURATE, BONUS_SLASH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_SLASH), new AttackStyle(STYLE_CONTROLLED, BONUS_STAB), new AttackStyle(STYLE_DEFENSIVE, BONUS_SLASH)),
SCIMITAR(Components.WEAPON_SCIMITAR_SEL_81, new AttackStyle(STYLE_ACCURATE, BONUS_SLASH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_SLASH), new AttackStyle(STYLE_CONTROLLED, BONUS_STAB), new AttackStyle(STYLE_DEFENSIVE, BONUS_SLASH)),
/**
* The 2-h sword weapon interface (ordinal=7)
*/
TWO_H_SWORD(WEAPON_2H_SWORD_SEL_82, new AttackStyle(STYLE_ACCURATE, BONUS_SLASH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_SLASH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_SLASH)),
TWO_H_SWORD(Components.WEAPON_2H_SWORD_SEL_82, new AttackStyle(STYLE_ACCURATE, BONUS_SLASH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_SLASH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_SLASH)),
/**
* The mace weapon interface (ordinal=8)
*/
MACE(WEAPON_MACE_SEL_88, new AttackStyle(STYLE_ACCURATE, BONUS_CRUSH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_CONTROLLED, BONUS_STAB), new AttackStyle(STYLE_DEFENSIVE, BONUS_CRUSH)),
MACE(Components.WEAPON_MACE_SEL_88, new AttackStyle(STYLE_ACCURATE, BONUS_CRUSH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_CONTROLLED, BONUS_STAB), new AttackStyle(STYLE_DEFENSIVE, BONUS_CRUSH)),
/**
* The claws weapon interface (ordinal=9)
*/
CLAWS(WEAPON_CLAWS_SEL_78, new AttackStyle(STYLE_ACCURATE, BONUS_SLASH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_SLASH), new AttackStyle(STYLE_CONTROLLED, BONUS_STAB), new AttackStyle(STYLE_DEFENSIVE, BONUS_SLASH)),
CLAWS(Components.WEAPON_CLAWS_SEL_78, new AttackStyle(STYLE_ACCURATE, BONUS_SLASH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_SLASH), new AttackStyle(STYLE_CONTROLLED, BONUS_STAB), new AttackStyle(STYLE_DEFENSIVE, BONUS_SLASH)),
/**
* The warhammer/maul weapon interface (ordinal=10)
*/
WARHAMMER_MAUL(WEAPON_WARHAMMER_SEL_76, new AttackStyle(STYLE_ACCURATE, BONUS_CRUSH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_CRUSH)),
WARHAMMER_MAUL(Components.WEAPON_WARHAMMER_SEL_76, new AttackStyle(STYLE_ACCURATE, BONUS_CRUSH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_CRUSH)),
/**
* The abyssal whip weapon interface (ordinal=11)
*/
WHIP(WEAPON_WHIP_SEL_93, new AttackStyle(STYLE_ACCURATE, BONUS_SLASH), new AttackStyle(STYLE_CONTROLLED, BONUS_SLASH), new AttackStyle(STYLE_DEFENSIVE, BONUS_SLASH)),
WHIP(Components.WEAPON_WHIP_SEL_93, new AttackStyle(STYLE_ACCURATE, BONUS_SLASH), new AttackStyle(STYLE_CONTROLLED, BONUS_SLASH), new AttackStyle(STYLE_DEFENSIVE, BONUS_SLASH)),
/**
* The flowers weapon interface (ordinal=12)
*/
FLOWERS(WEAPON_WARHAMMER_SEL_76, new AttackStyle(STYLE_ACCURATE, BONUS_CRUSH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_CRUSH)),
FLOWERS(Components.WEAPON_WARHAMMER_SEL_76, new AttackStyle(STYLE_ACCURATE, BONUS_CRUSH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_CRUSH)),
/**
* The mud pie weapon interface (ordinal=13)
*/
MUD_PIE(WEAPON_THROWN_SEL_91, new AttackStyle(STYLE_RANGE_ACCURATE, BONUS_RANGE), new AttackStyle(STYLE_RAPID, BONUS_RANGE), new AttackStyle(STYLE_LONG_RANGE, BONUS_RANGE)),
MUD_PIE(Components.WEAPON_THROWN_SEL_91, new AttackStyle(STYLE_RANGE_ACCURATE, BONUS_RANGE), new AttackStyle(STYLE_RAPID, BONUS_RANGE), new AttackStyle(STYLE_LONG_RANGE, BONUS_RANGE)),
/**
* The spear weapon interface (ordinal=14)
*/
SPEAR(WEAPON_SPEAR_SEL_87, new AttackStyle(STYLE_CONTROLLED, BONUS_STAB), new AttackStyle(STYLE_CONTROLLED, BONUS_SLASH), new AttackStyle(STYLE_CONTROLLED, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_STAB)),
SPEAR(Components.WEAPON_SPEAR_SEL_87, new AttackStyle(STYLE_CONTROLLED, BONUS_STAB), new AttackStyle(STYLE_CONTROLLED, BONUS_SLASH), new AttackStyle(STYLE_CONTROLLED, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_STAB)),
/**
* The halberd weapon interface (ordinal=15)
*/
HALBERD(WEAPON_HALBERD_SEL_84, new AttackStyle(STYLE_CONTROLLED, BONUS_STAB), new AttackStyle(STYLE_AGGRESSIVE, BONUS_SLASH), new AttackStyle(STYLE_DEFENSIVE, BONUS_STAB)),
HALBERD(Components.WEAPON_HALBERD_SEL_84, new AttackStyle(STYLE_CONTROLLED, BONUS_STAB), new AttackStyle(STYLE_AGGRESSIVE, BONUS_SLASH), new AttackStyle(STYLE_DEFENSIVE, BONUS_STAB)),
/**
* The bow weapon interface (ordinal=16)
*/
BOW(WEAPON_BOW_SEL_77, new AttackStyle(STYLE_RANGE_ACCURATE, BONUS_RANGE), new AttackStyle(STYLE_RAPID, BONUS_RANGE), new AttackStyle(STYLE_LONG_RANGE, BONUS_RANGE)),
BOW(Components.WEAPON_BOW_SEL_77, new AttackStyle(STYLE_RANGE_ACCURATE, BONUS_RANGE), new AttackStyle(STYLE_RAPID, BONUS_RANGE), new AttackStyle(STYLE_LONG_RANGE, BONUS_RANGE)),
/**
* The crossbow weapon interface (ordinal=17)
*/
CROSSBOW(WEAPON_XBOW_SEL_79, new AttackStyle(STYLE_RANGE_ACCURATE, BONUS_RANGE), new AttackStyle(STYLE_RAPID, BONUS_RANGE), new AttackStyle(STYLE_LONG_RANGE, BONUS_RANGE)),
CROSSBOW(Components.WEAPON_XBOW_SEL_79, new AttackStyle(STYLE_RANGE_ACCURATE, BONUS_RANGE), new AttackStyle(STYLE_RAPID, BONUS_RANGE), new AttackStyle(STYLE_LONG_RANGE, BONUS_RANGE)),
/**
* The thrown weapons weapon interface (ordinal=18)
*/
THROWN_WEAPONS(WEAPON_THROWN_SEL_91, new AttackStyle(STYLE_RANGE_ACCURATE, BONUS_RANGE), new AttackStyle(STYLE_RAPID, BONUS_RANGE), new AttackStyle(STYLE_LONG_RANGE, BONUS_RANGE)),
THROWN_WEAPONS(Components.WEAPON_THROWN_SEL_91, new AttackStyle(STYLE_RANGE_ACCURATE, BONUS_RANGE), new AttackStyle(STYLE_RAPID, BONUS_RANGE), new AttackStyle(STYLE_LONG_RANGE, BONUS_RANGE)),
/**
* The thrown weapons weapon interface (ordinal=19)
*/
CHINCHOMPA(WEAPON_CHINCHOMPA_SEL_473, new AttackStyle(STYLE_RANGE_ACCURATE, BONUS_RANGE), new AttackStyle(STYLE_RAPID, BONUS_RANGE), new AttackStyle(STYLE_LONG_RANGE, BONUS_RANGE)),
CHINCHOMPA(Components.WEAPON_CHINCHOMPA_SEL_473, new AttackStyle(STYLE_RANGE_ACCURATE, BONUS_RANGE), new AttackStyle(STYLE_RAPID, BONUS_RANGE), new AttackStyle(STYLE_LONG_RANGE, BONUS_RANGE)),
/**
* The fixed device weapon interface (ordinal=20)
*/
FIXED_DEVICE(WEAPON_FIXED_DEVICE_SEL_80, new AttackStyle(STYLE_RANGE_ACCURATE, BONUS_RANGE), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH)),
FIXED_DEVICE(Components.WEAPON_FIXED_DEVICE_SEL_80, new AttackStyle(STYLE_RANGE_ACCURATE, BONUS_RANGE), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH)),
/**
* The salamander weapon interface (ordinal=21)
*/
SALAMANDER(WEAPON_SALAMANDER_SEL_474, new AttackStyle(STYLE_AGGRESSIVE, BONUS_SLASH), new AttackStyle(STYLE_RANGE_ACCURATE, BONUS_RANGE), new AttackStyle(STYLE_DEFENSIVE_CAST, BONUS_MAGIC)),
SALAMANDER(Components.WEAPON_SALAMANDER_SEL_474, new AttackStyle(STYLE_AGGRESSIVE, BONUS_SLASH), new AttackStyle(STYLE_RANGE_ACCURATE, BONUS_RANGE), new AttackStyle(STYLE_DEFENSIVE_CAST, BONUS_MAGIC)),
/**
* The scythe weapon interface (ordinal=22)
*/
SCYTHE(WEAPON_SCYTHE_SEL_86, new AttackStyle(STYLE_ACCURATE, BONUS_SLASH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_STAB), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_SLASH)),
SCYTHE(Components.WEAPON_SCYTHE_SEL_86, new AttackStyle(STYLE_ACCURATE, BONUS_SLASH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_STAB), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_SLASH)),
/**
* The ivandis flail weapon interface (ordinal=23) TODO: Find correct
* interface id!
*/
IVANDIS_FLAIL(WEAPON_SCEPTER_SEL_85, new AttackStyle(STYLE_ACCURATE, BONUS_CRUSH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_CRUSH));
IVANDIS_FLAIL(Components.WEAPON_SCEPTER_SEL_85, new AttackStyle(STYLE_ACCURATE, BONUS_CRUSH), new AttackStyle(STYLE_AGGRESSIVE, BONUS_CRUSH), new AttackStyle(STYLE_DEFENSIVE, BONUS_CRUSH));
/**
* The interface id.
Server/src/main/java/core/game/node/entity/npc/drop/SharedTables.java
+1 -1
View File
@@ -1,6 +1,6 @@
package core.game.node.entity.npc.drop;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.item.WeightedChanceItem;
public enum SharedTables {
Server/src/main/java/core/game/node/entity/npc/familiar/FruitBatNPC.java
+1 -1
View File
@@ -13,7 +13,7 @@ import core.game.world.update.flag.context.Animation;
import core.game.world.update.flag.context.Graphics;
import core.plugin.Initializable;
import core.tools.RandomFunction;
import rs09.tools.Items;
import org.rs09.consts.Items;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
Server/src/main/java/core/game/node/entity/player/link/InterfaceManager.java
+49 -50
View File
@@ -11,10 +11,9 @@ import core.net.packet.context.WindowsPaneContext;
import core.net.packet.out.CloseInterface;
import core.net.packet.out.Interface;
import core.net.packet.out.WindowsPane;
import org.rs09.consts.Components;
import rs09.game.system.SystemLogger;
import rs09.tools.Components;
import static rs09.tools.Interfaces.*;
/**
@@ -27,20 +26,20 @@ public final class InterfaceManager {
/**
* The default windows pane.
*/
public static final int WINDOWS_PANE = TOPLEVEL_548;
public static final int WINDOWS_PANE = Components.TOPLEVEL_548;
/**
* The default chat box interface.
*/
public static final int DEFAULT_CHATBOX = CHATDEFAULT_137;
public static final int DEFAULT_CHATBOX = Components.CHATDEFAULT_137;
/**
* The default tabs.
*/
public static final int[] DEFAULT_TABS = { WEAPON_FISTS_SEL_92, STATS_320, QUESTJOURNAL_V2_274,
INVENTORY_149, WORNITEMS_387, PRAYER_271, MAGIC_192, LORE_STATS_SIDE_662,
FRIENDS2_550, IGNORE2_551, CLANJOIN_589, OPTIONS_261, EMOTES_464,
MUSIC_V3_187, LOGOUT_182 };
public static final int[] DEFAULT_TABS = { Components.WEAPON_FISTS_SEL_92, Components.STATS_320, Components.QUESTJOURNAL_V2_274,
Components.INVENTORY_149, Components.WORNITEMS_387, Components.PRAYER_271, Components.MAGIC_192, Components.LORE_STATS_SIDE_662,
Components.FRIENDS2_550, Components.IGNORE2_551, Components.CLANJOIN_589, Components.OPTIONS_261, Components.EMOTES_464,
Components.MUSIC_V3_187, Components.LOGOUT_182 };
/**
* The player.
@@ -204,7 +203,7 @@ public final class InterfaceManager {
*/
public boolean isWalkable() {
if (opened != null) {
if (opened.getId() == OBJDIALOG_389) {
if (opened.getId() == Components.OBJDIALOG_389) {
return false;
}
if (opened.getDefinition().isWalkable()) {
@@ -409,22 +408,22 @@ public final class InterfaceManager {
}
//sendTab(16, 747); // Summoning bar
openTab(0, inter); // Attack
openTab(1, new Component(STATS_320)); // Skills
openTab(2, new Component(QUESTJOURNAL_V2_274)); // Quest
openTab(3, new Component(INVENTORY_149)); // inventory
openTab(4, new Component(WORNITEMS_387)); // Equipment
openTab(5, new Component(PRAYER_271)); // Prayer
openTab(1, new Component(Components.STATS_320)); // Skills
openTab(2, new Component(Components.QUESTJOURNAL_V2_274)); // Quest
openTab(3, new Component(Components.INVENTORY_149)); // inventory
openTab(4, new Component(Components.WORNITEMS_387)); // Equipment
openTab(5, new Component(Components.PRAYER_271)); // Prayer
openTab(6, new Component(player.getSpellBookManager().getSpellBook())); // Magic
if (player.getFamiliarManager().hasFamiliar()) {
openTab(7, new Component(LORE_STATS_SIDE_662)); // summoning.
openTab(7, new Component(Components.LORE_STATS_SIDE_662)); // summoning.
}
openTab(8, new Component(FRIENDS2_550)); // Friends
openTab(9, new Component(IGNORE2_551)); // Ignores
openTab(10, new Component(CLANJOIN_589)); // Clan chat
openTab(11, new Component(OPTIONS_261)); // Settings
openTab(12, new Component(EMOTES_464)); // Emotes
openTab(13, new Component(MUSIC_V3_187)); // Music
openTab(14, new Component(LOGOUT_182)); // Logout
openTab(8, new Component(Components.FRIENDS2_550)); // Friends
openTab(9, new Component(Components.IGNORE2_551)); // Ignores
openTab(10, new Component(Components.CLANJOIN_589)); // Clan chat
openTab(11, new Component(Components.OPTIONS_261)); // Settings
openTab(12, new Component(Components.EMOTES_464)); // Emotes
openTab(13, new Component(Components.MUSIC_V3_187)); // Music
openTab(14, new Component(Components.LOGOUT_182)); // Logout
if (player.getProperties().getAutocastSpell() != null) {
inter.selectAutoSpell(inter.getAutospellId(player.getProperties().getAutocastSpell().getSpellId()), true);
}
@@ -435,15 +434,15 @@ public final class InterfaceManager {
*/
public void openInfoBars() {
//Hp orb
PacketRepository.send(Interface.class, new InterfaceContext(player, getWindowPaneId(), isResizable() ? 13 : 70, TOPSTAT_HITPOINTS_748, true));
PacketRepository.send(Interface.class, new InterfaceContext(player, getWindowPaneId(), isResizable() ? 13 : 70, Components.TOPSTAT_HITPOINTS_748, true));
//Prayer orb
PacketRepository.send(Interface.class, new InterfaceContext(player, getWindowPaneId(), isResizable() ? 14 : 71, TOPSTAT_PRAYER_749, true));
PacketRepository.send(Interface.class, new InterfaceContext(player, getWindowPaneId(), isResizable() ? 14 : 71, Components.TOPSTAT_PRAYER_749, true));
//Energy orb
PacketRepository.send(Interface.class, new InterfaceContext(player, getWindowPaneId(), isResizable() ? 15 : 72, TOPSTAT_RUN_750, true));
PacketRepository.send(Interface.class, new InterfaceContext(player, getWindowPaneId(), isResizable() ? 15 : 72, Components.TOPSTAT_RUN_750, true));
//Summoning bar
PacketRepository.send(Interface.class, new InterfaceContext(player, getWindowPaneId(), isResizable() ? 16 : 73, TOPSTAT_LORE_747, true));
PacketRepository.send(Interface.class, new InterfaceContext(player, getWindowPaneId(), isResizable() ? 16 : 73, Components.TOPSTAT_LORE_747, true));
//Split PM
PacketRepository.send(Interface.class, new InterfaceContext(player, getWindowPaneId(), isResizable() ? 71 : 10, PMCHAT_754, true));
PacketRepository.send(Interface.class, new InterfaceContext(player, getWindowPaneId(), isResizable() ? 71 : 10, Components.PMCHAT_754, true));
}
/**
@@ -454,21 +453,21 @@ public final class InterfaceManager {
if (inter != null) {
close(inter); // Attack
}
close(new Component(STATS_320)); // Skills
close(new Component(QUESTJOURNAL_V2_274)); // Quest
close(new Component(AREA_TASK_259)); // Diary
close(new Component(INVENTORY_149)); // inventory
close(new Component(WORNITEMS_387)); // Equipment
close(new Component(PRAYER_271)); // Prayer
close(new Component(Components.STATS_320)); // Skills
close(new Component(Components.QUESTJOURNAL_V2_274)); // Quest
close(new Component(Components.AREA_TASK_259)); // Diary
close(new Component(Components.INVENTORY_149)); // inventory
close(new Component(Components.WORNITEMS_387)); // Equipment
close(new Component(Components.PRAYER_271)); // Prayer
close(new Component(player.getSpellBookManager().getSpellBook()));
close(new Component(LORE_STATS_SIDE_662)); // summoning.
close(new Component(FRIENDS2_550)); // Friends
close(new Component(IGNORE2_551)); // Ignores
close(new Component(CLANJOIN_589)); // Clan chat
close(new Component(OPTIONS_261)); // Settings
close(new Component(EMOTES_464)); // Emotes
close(new Component(MUSIC_V3_187)); // Music
close(new Component(LOGOUT_182)); // Logout
close(new Component(Components.LORE_STATS_SIDE_662)); // summoning.
close(new Component(Components.FRIENDS2_550)); // Friends
close(new Component(Components.IGNORE2_551)); // Ignores
close(new Component(Components.CLANJOIN_589)); // Clan chat
close(new Component(Components.OPTIONS_261)); // Settings
close(new Component(Components.EMOTES_464)); // Emotes
close(new Component(Components.MUSIC_V3_187)); // Music
close(new Component(Components.LOGOUT_182)); // Logout
}
/**
@@ -477,7 +476,7 @@ public final class InterfaceManager {
* @param component The component.
*/
public void openTab(int slot, Component component) {
if (component.getId() == WEAPON_FISTS_SEL_92 && !(component instanceof WeaponInterface)) {
if (component.getId() == Components.WEAPON_FISTS_SEL_92 && !(component instanceof WeaponInterface)) {
throw new IllegalStateException("Attack tab can only be instanced as " + WeaponInterface.class.getCanonicalName() + "!");
}
if (component.getDefinition().getTabIndex() != slot) {
@@ -519,9 +518,9 @@ public final class InterfaceManager {
public void openChatbox(Component component) {
if (component.getId() == DEFAULT_CHATBOX) {
if (chatbox == null || (chatbox.getId() != DEFAULT_CHATBOX && chatbox.getDefinition().getType() == InterfaceType.CHATBOX)) {
PacketRepository.send(Interface.class, new InterfaceContext(player, getWindowPaneId(), isResizable() ? 23 : 14, FILTERBUTTONS_751, true));
PacketRepository.send(Interface.class, new InterfaceContext(player, getWindowPaneId(), isResizable() ? 70 : 75, CHATTOP_752, true));
PacketRepository.send(Interface.class, new InterfaceContext(player, InterfaceType.CHATBOX.getFixedPaneId(), InterfaceType.CHATBOX.getFixedChildId(), CHATDEFAULT_137, true));
PacketRepository.send(Interface.class, new InterfaceContext(player, getWindowPaneId(), isResizable() ? 23 : 14, Components.FILTERBUTTONS_751, true));
PacketRepository.send(Interface.class, new InterfaceContext(player, getWindowPaneId(), isResizable() ? 70 : 75, Components.CHATTOP_752, true));
PacketRepository.send(Interface.class, new InterfaceContext(player, InterfaceType.CHATBOX.getFixedPaneId(), InterfaceType.CHATBOX.getFixedChildId(), Components.CHATDEFAULT_137, true));
}
chatbox = component;
player.getConfigManager().set(334, 1);
@@ -545,11 +544,11 @@ public final class InterfaceManager {
public void switchWindowMode(int windowMode) {
if (windowMode != player.getSession().getClientInfo().getWindowMode()) {
player.getSession().getClientInfo().setWindowMode(windowMode);
openWindowsPane(new Component(isResizable() ? TOPLEVEL_FULLSCREEN_746 : TOPLEVEL_548));
openWindowsPane(new Component(isResizable() ? Components.TOPLEVEL_FULLSCREEN_746 : Components.TOPLEVEL_548));
openDefaultTabs();
openInfoBars();
PacketRepository.send(Interface.class, new InterfaceContext(player, getWindowPaneId(), isResizable() ? 23 : 14, FILTERBUTTONS_751, true));
PacketRepository.send(Interface.class, new InterfaceContext(player, getWindowPaneId(), isResizable() ? 70 : 75, CHATTOP_752, true));
PacketRepository.send(Interface.class, new InterfaceContext(player, getWindowPaneId(), isResizable() ? 23 : 14, Components.FILTERBUTTONS_751, true));
PacketRepository.send(Interface.class, new InterfaceContext(player, getWindowPaneId(), isResizable() ? 70 : 75, Components.CHATTOP_752, true));
}
}
@@ -579,7 +578,7 @@ public final class InterfaceManager {
return c;
}
}
if (componentId == FILTERBUTTONS_751 || componentId == TOPSTAT_RUN_750 || componentId == TOPSTAT_LORE_747) {
if (componentId == Components.FILTERBUTTONS_751 || componentId == Components.TOPSTAT_RUN_750 || componentId == Components.TOPSTAT_LORE_747) {
//Chatbox settings, run orb & summoning orb.
return new Component(componentId);
}
@@ -774,7 +773,7 @@ public final class InterfaceManager {
*/
public int getWindowPaneId() {
if (windowsPane == null) {
return Components.toplevel_548;
return Components.TOPLEVEL_548;
}
return windowsPane.getId();
}
Server/src/main/java/core/game/node/entity/player/link/diary/DiaryType.java
+1 -1
View File
@@ -1,6 +1,6 @@
package core.game.node.entity.player.link.diary;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.item.Item;
/**
Server/src/main/java/core/game/node/entity/player/link/emote/Emotes.java
+1 -1
View File
@@ -5,7 +5,7 @@ import core.game.node.entity.player.info.Rights;
import core.game.world.map.Direction;
import core.game.world.map.Location;
import core.game.world.map.RegionManager;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.content.quest.tutorials.tutorialisland.TutorialSession;
import core.game.content.quest.tutorials.tutorialisland.TutorialStage;
import core.game.node.entity.player.Player;
Server/src/main/java/core/game/node/entity/skill/Skills.java
+1 -1
View File
@@ -19,7 +19,7 @@ import rs09.game.node.entity.skill.skillcapeperks.SkillcapePerks;
import rs09.game.world.GameWorld;
import rs09.game.world.repository.Repository;
import rs09.plugin.CorePluginTypes.XPGainPlugins;
import rs09.tools.Items;
import org.rs09.consts.Items;
import java.nio.ByteBuffer;
Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/FaladorGrapplePlugin.java
+1 -1
View File
@@ -2,7 +2,7 @@ package core.game.node.entity.skill.agility.shortcuts;
import core.cache.def.impl.ObjectDefinition;
import core.game.component.Component;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.interaction.OptionHandler;
import core.game.node.Node;
import core.game.node.entity.impl.ForceMovement;
Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/KaramjaGrapple.java
+1 -1
View File
@@ -2,7 +2,7 @@ package core.game.node.entity.skill.agility.shortcuts;
import core.cache.def.impl.ObjectDefinition;
import core.game.component.Component;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.interaction.OptionHandler;
import core.game.node.Node;
import core.game.node.entity.player.Player;
Server/src/main/java/core/game/node/entity/skill/agility/shortcuts/WaterOrbGrapple.java
+1 -1
View File
@@ -2,7 +2,7 @@ package core.game.node.entity.skill.agility.shortcuts;
import core.cache.def.impl.ObjectDefinition;
import core.game.component.Component;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.interaction.OptionHandler;
import core.game.node.Node;
import core.game.node.entity.player.Player;
Server/src/main/java/core/game/node/entity/skill/construction/CrestType.java
+1 -1
View File
@@ -1,7 +1,7 @@
package core.game.node.entity.skill.construction;
import core.game.node.entity.player.Player;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.skill.Skills;
/**
Server/src/main/java/core/game/node/entity/skill/cooking/CookableItems.java
+1 -1
View File
@@ -1,6 +1,6 @@
package core.game.node.entity.skill.cooking;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.item.Item;
import java.util.HashMap;
Server/src/main/java/core/game/node/entity/skill/cooking/CookingRewrite.java
+1 -1
View File
@@ -7,7 +7,7 @@ import core.game.node.item.Item;
import core.game.node.object.GameObject;
import core.plugin.Initializable;
import core.plugin.Plugin;
import rs09.tools.Items;
import org.rs09.consts.Items;
//author: Ceik
@Initializable
Server/src/main/java/core/game/node/entity/skill/cooking/StandardCookingPulse.java
+1 -1
View File
@@ -1,7 +1,7 @@
package core.game.node.entity.skill.cooking;
import core.game.container.impl.EquipmentContainer;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.world.map.Location;
import core.game.content.quest.tutorials.tutorialisland.TutorialSession;
import core.game.content.quest.tutorials.tutorialisland.TutorialStage;
Server/src/main/java/core/game/node/entity/skill/cooking/recipe/OomlieWrap.java
+1 -1
View File
@@ -1,6 +1,6 @@
package core.game.node.entity.skill.cooking.recipe;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.skill.Skills;
import core.game.interaction.NodeUsageEvent;
import core.game.node.entity.player.Player;
Server/src/main/java/core/game/node/entity/skill/fletching/Fletching.java
+11 -11
View File
@@ -163,17 +163,17 @@ public class Fletching {
}
}
public enum GemBolts {
OPAL(877, rs09.tools.Items.OPAL_1609, 45, 879, 11, 1.5),
PEARL(9140, rs09.tools.Items.OYSTER_PEARL_411, 46, 880, 41, 3.2),
PEARLS(9140, rs09.tools.Items.OYSTER_PEARLS_413, 46, 880, 41, 3.2),
JADE(9139, rs09.tools.Items.JADE_1611, 9187, 9335, 26, 2.4),
RED_TOPAZ(9141, rs09.tools.Items.RED_TOPAZ_1613, 9188, 9336, 48, 3.9),
SAPPHIRE(9142, rs09.tools.Items.SAPPHIRE_1607, 9189, 9337, 56, 4),
EMERALD(9142, rs09.tools.Items.EMERALD_1605, 9190, 9338, 58, 5.5),
RUBY(9143, rs09.tools.Items.RUBY_1603, 9191, 9339, 63, 6.3),
DIAMOND(9143, rs09.tools.Items.DIAMOND_1601, 9192, 9340, 65, 7),
DRAGONSTONE(9144, rs09.tools.Items.DRAGONSTONE_1615, 9193, 9341, 71, 8.2),
ONYX(9144, rs09.tools.Items.ONYX_6573, 9194, 9342, 73, 9.4);
OPAL(877, org.rs09.consts.Items.OPAL_1609, 45, 879, 11, 1.5),
PEARL(9140, org.rs09.consts.Items.OYSTER_PEARL_411, 46, 880, 41, 3.2),
PEARLS(9140, org.rs09.consts.Items.OYSTER_PEARLS_413, 46, 880, 41, 3.2),
JADE(9139, org.rs09.consts.Items.JADE_1611, 9187, 9335, 26, 2.4),
RED_TOPAZ(9141, org.rs09.consts.Items.RED_TOPAZ_1613, 9188, 9336, 48, 3.9),
SAPPHIRE(9142, org.rs09.consts.Items.SAPPHIRE_1607, 9189, 9337, 56, 4),
EMERALD(9142, org.rs09.consts.Items.EMERALD_1605, 9190, 9338, 58, 5.5),
RUBY(9143, org.rs09.consts.Items.RUBY_1603, 9191, 9339, 63, 6.3),
DIAMOND(9143, org.rs09.consts.Items.DIAMOND_1601, 9192, 9340, 65, 7),
DRAGONSTONE(9144, org.rs09.consts.Items.DRAGONSTONE_1615, 9193, 9341, 71, 8.2),
ONYX(9144, org.rs09.consts.Items.ONYX_6573, 9194, 9342, 73, 9.4);
public int gem,tip,base,product,level;
public double experience;
Server/src/main/java/core/game/node/entity/skill/fletching/GemBoltPlugin.java
+1 -1
View File
@@ -13,7 +13,7 @@ import core.plugin.Plugin;
import rs09.game.content.dialogue.SkillDialogueHandler;
import rs09.game.content.dialogue.SkillDialogueHandler.SkillDialogue;
import rs09.game.node.entity.skill.fletching.items.gem.GemBoltCutPulse;
import rs09.tools.Items;
import org.rs09.consts.Items;
/**
* Represents the gem bolt creating plugin.
Server/src/main/java/core/game/node/entity/skill/fletching/items/arrow/HeadlessArrowPulse.java
+1 -1
View File
@@ -1,6 +1,6 @@
package core.game.node.entity.skill.fletching.items.arrow;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.skill.SkillPulse;
import core.game.node.entity.skill.Skills;
import core.game.node.entity.player.Player;
Server/src/main/java/core/game/node/entity/skill/fletching/items/bolts/BoltPulse.java
+1 -1
View File
@@ -1,6 +1,6 @@
package core.game.node.entity.skill.fletching.items.bolts;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.entity.skill.SkillPulse;
import core.game.node.entity.skill.Skills;
import core.game.node.entity.skill.fletching.Fletching;
Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java
+1 -1
View File
@@ -23,7 +23,7 @@ import core.tools.RandomFunction;
import rs09.game.node.entity.skill.farming.FarmingPatch;
import rs09.game.node.entity.skill.farming.Patch;
import rs09.game.node.entity.skill.skillcapeperks.SkillcapePerks;
import rs09.tools.Items;
import org.rs09.consts.Items;
import static rs09.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_BASE;
import static rs09.game.node.entity.player.info.stats.StatAttributeKeysKt.STATS_LOGS;
Server/src/main/java/core/game/node/entity/skill/herblore/GrindingItem.java
+1 -1
View File
@@ -1,6 +1,6 @@
package core.game.node.entity.skill.herblore;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.node.item.Item;
/**
Server/src/main/java/core/game/node/entity/skill/magic/Runes.java
+1 -1
View File
@@ -2,7 +2,7 @@ package core.game.node.entity.skill.magic;
import core.game.node.entity.combat.equipment.SpellType;
import core.game.node.item.Item;
import rs09.tools.Items;
import org.rs09.consts.Items;
/**
* Represents the <b>Constants</b> of runes.
Server/src/main/java/core/game/node/entity/skill/smithing/smelting/SmeltingPulse.java
+1 -1
View File
@@ -1,7 +1,7 @@
package core.game.node.entity.skill.smithing.smelting;
import core.game.container.impl.EquipmentContainer;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.game.world.map.Location;
import core.game.node.entity.skill.SkillPulse;
import core.game.node.entity.skill.Skills;
Server/src/main/java/core/net/packet/in/ItemActionPacket.java
+1 -1
View File
@@ -23,7 +23,7 @@ import rs09.game.node.entity.skill.farming.UseWithPatchHandler;
import rs09.game.system.SystemLogger;
import rs09.game.system.command.rottenpotato.RottenPotatoUseWithHandler;
import rs09.game.world.repository.Repository;
import rs09.tools.Items;
import org.rs09.consts.Items;
/**
* The incoming item reward packet.
Server/src/main/java/plugin/drops/mystery_box/MysteryBoxDropper.java
+1 -1
View File
@@ -4,7 +4,7 @@ import core.game.node.item.Item;
import core.plugin.Initializable;
import core.plugin.Plugin;
import core.plugin.PluginManifest;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.tools.RandomFunction;
import plugin.drops.DropPlugin;
import plugin.drops.DropPlugins;
Server/src/main/java/plugin/drops/mystery_box/MysteryBoxPlugin.java
+1 -1
View File
@@ -8,7 +8,7 @@ import core.game.node.item.Item;
import core.game.node.item.WeightedChanceItem;
import core.plugin.Plugin;
import core.plugin.PluginManifest;
import rs09.tools.Items;
import org.rs09.consts.Items;
import core.tools.RandomFunction;
import core.plugin.Initializable;
import core.tools.StringUtils;