Kotlin/Java split

This commit is contained in:
Ceikry
2021-03-12 00:16:27 -06:00
parent 76c7b16108
commit 7569a62c21
1201 changed files with 2817 additions and 3187 deletions
+1 -1
View File
@@ -5,7 +5,7 @@ import core.game.node.entity.player.Player;
import core.game.node.entity.player.info.ClientInfo;
import core.game.node.entity.player.info.login.Response;
import core.game.system.task.Pulse;
import core.game.world.GameWorld;
import rs09.game.world.GameWorld;
import core.net.producer.HSEventProducer;
import core.net.producer.LoginEventProducer;
@@ -1,6 +1,6 @@
package core.net.amsc;
import core.game.system.SystemLogger;
import rs09.game.system.SystemLogger;
import core.net.IoEventHandler;
import core.net.IoSession;
@@ -3,14 +3,10 @@ package core.net.amsc;
import core.game.node.entity.player.Player;
import core.game.node.entity.player.info.PlayerDetails;
import core.game.node.entity.player.info.Rights;
import core.game.node.entity.player.info.login.LoginParser;
import core.game.node.entity.player.info.login.Response;
import core.game.system.SystemLogger;
import core.game.system.SystemManager;
import core.game.system.SystemState;
import core.game.system.communication.*;
import core.game.world.GameWorld;
import core.game.world.repository.Repository;
import core.net.packet.IoBuffer;
import core.net.packet.PacketHeader;
import core.net.packet.PacketRepository;
@@ -20,6 +16,10 @@ import core.net.packet.context.MessageContext;
import core.net.packet.out.CommunicationMessage;
import core.net.packet.out.ContactPackets;
import core.net.packet.out.UpdateClanChat;
import rs09.game.node.entity.player.info.login.LoginParser;
import rs09.game.system.SystemLogger;
import rs09.game.world.GameWorld;
import rs09.game.world.repository.Repository;
import java.nio.ByteBuffer;
@@ -1,7 +1,7 @@
package core.net.amsc;
import core.game.node.entity.player.Player;
import core.game.world.repository.Repository;
import rs09.game.world.repository.Repository;
import core.net.packet.PacketRepository;
import core.net.packet.context.ContactContext;
import core.net.packet.out.ContactPackets;
@@ -1,15 +1,15 @@
package core.net.amsc;
import core.game.node.entity.player.info.Rights;
import core.game.node.entity.player.info.login.LoginParser;
import core.game.node.entity.player.info.login.Response;
import core.game.system.SystemLogger;
import core.game.system.task.TaskExecutor;
import core.game.world.GameWorld;
import core.net.EventProducer;
import core.net.IoSession;
import core.net.NioReactor;
import core.net.producer.MSHSEventProducer;
import rs09.game.node.entity.player.info.login.LoginParser;
import rs09.game.system.SystemLogger;
import rs09.game.world.GameWorld;
import java.io.IOException;
import java.net.InetAddress;
@@ -1,7 +1,7 @@
package core.net.event;
import core.game.system.SystemLogger;
import core.game.world.GameWorld;
import rs09.game.system.SystemLogger;
import rs09.game.world.GameWorld;
import core.net.IoReadEvent;
import core.net.IoSession;
import core.net.packet.IncomingPacket;
@@ -1,6 +1,6 @@
package core.net.event;
import core.game.system.SystemLogger;
import rs09.game.system.SystemLogger;
import core.net.IoReadEvent;
import core.net.IoSession;
import core.net.amsc.MSPacketRepository;
@@ -1,7 +1,7 @@
package core.net.event;
import core.game.system.SystemLogger;
import core.game.world.GameWorld;
import rs09.game.system.SystemLogger;
import rs09.game.world.GameWorld;
import core.net.IoReadEvent;
import core.net.IoSession;
import core.net.amsc.ManagementServerState;
@@ -1,7 +1,7 @@
package core.net.event;
import core.cache.misc.buffer.ByteBufferUtils;
import core.game.world.GameWorld;
import rs09.game.world.GameWorld;
import core.net.Constants;
import core.net.IoSession;
import core.net.IoWriteEvent;
@@ -1,7 +1,7 @@
package core.net.lobby;
import core.game.world.GameWorld;
import core.game.world.repository.Repository;
import rs09.game.world.GameWorld;
import rs09.game.world.repository.Repository;
/**
* Represents a world's definition.
@@ -1,6 +1,6 @@
package core.net.lobby;
import core.game.world.GameWorld;
import rs09.game.world.GameWorld;
import core.net.IoSession;
import core.net.packet.IoBuffer;
@@ -1,9 +1,11 @@
package core.net.packet;
import core.game.system.SystemLogger;
import core.net.packet.in.*;
import core.net.packet.out.*;
import core.net.packet.out.GrandExchangePacket;
import core.net.packet.out.*;
import rs09.game.system.SystemLogger;
import rs09.net.packet.in.ItemOnGroundItemPacket;
import rs09.net.packet.in.QuickChatPacketHandler;
import java.util.HashMap;
import java.util.Map;
@@ -1,7 +1,7 @@
package core.net.packet.context;
import core.game.node.entity.player.Player;
import core.game.system.SystemLogger;
import rs09.game.system.SystemLogger;
import core.net.packet.Context;
/**
@@ -10,7 +10,7 @@ import core.game.node.entity.player.info.login.LoginConfiguration;
import core.game.node.entity.player.link.request.assist.AssistSession;
import core.game.node.item.Item;
import core.game.system.task.Pulse;
import core.game.world.GameWorld;
import rs09.game.world.GameWorld;
import core.net.packet.IncomingPacket;
import core.net.packet.IoBuffer;
@@ -3,7 +3,7 @@ package core.net.packet.in;
import core.game.node.entity.player.Player;
import core.game.system.monitor.PlayerMonitor;
import core.game.system.task.Pulse;
import core.game.world.GameWorld;
import rs09.game.world.GameWorld;
import core.game.world.update.flag.context.ChatMessage;
import core.game.world.update.flag.player.ChatFlag;
import core.net.amsc.MSPacketRepository;
@@ -4,7 +4,7 @@ import core.game.node.entity.player.Player;
import core.game.system.communication.ClanRank;
import core.game.system.communication.ClanRepository;
import core.game.system.communication.CommunicationInfo;
import core.game.world.repository.Repository;
import rs09.game.world.repository.Repository;
import core.net.amsc.MSPacketRepository;
import core.net.amsc.WorldCommunicator;
import core.net.packet.IncomingPacket;
@@ -1,9 +1,9 @@
package core.net.packet.in;
import core.game.node.entity.player.Player;
import core.game.system.command.CommandSystem;
import rs09.game.system.command.CommandSystem;
import core.game.system.monitor.PlayerMonitor;
import core.game.world.GameWorld;
import rs09.game.world.GameWorld;
import core.net.packet.IncomingPacket;
import core.net.packet.IoBuffer;
@@ -1,7 +1,7 @@
package core.net.packet.in;
import core.game.node.entity.player.Player;
import core.game.system.SystemLogger;
import rs09.game.system.SystemLogger;
import core.net.packet.IncomingPacket;
import core.net.packet.IoBuffer;
@@ -4,7 +4,7 @@ import core.game.node.entity.player.Player;
import core.game.node.entity.player.info.Rights;
import core.net.packet.IncomingPacket;
import core.net.packet.IoBuffer;
import plugin.ai.general.GeneralBotCreator;
import rs09.game.ai.general.GeneralBotCreator;
/**
* Handles the idle packet handler.
@@ -1,29 +1,30 @@
package core.net.packet.in;
import core.ServerConstants;
import core.cache.def.impl.ObjectDefinition;
import core.cache.def.impl.VarbitDefinition;
import core.game.interaction.*;
import core.game.content.quest.PluginInteractionManager;
import core.game.interaction.Interaction;
import core.game.interaction.MovementPulse;
import core.game.interaction.Option;
import core.game.interaction.SpecialGroundItems;
import core.game.node.Node;
import core.game.node.entity.npc.NPC;
import core.game.node.entity.player.Player;
import core.game.system.SystemLogger;
import core.game.system.task.Pulse;
import plugin.ai.AIPlayer;
import core.game.node.item.GroundItem;
import core.game.node.item.GroundItemManager;
import core.game.node.object.GameObject;
import core.game.world.map.Location;
import core.game.world.map.RegionManager;
import core.game.world.repository.Repository;
import core.net.packet.IncomingPacket;
import core.net.packet.IoBuffer;
import core.net.packet.PacketRepository;
import core.net.packet.context.PlayerContext;
import core.net.packet.out.ClearMinimapFlag;
import core.game.content.quest.PluginInteractionManager;
import rs09.ServerConstants;
import rs09.game.ai.AIPlayer;
import rs09.game.interaction.Listeners;
import rs09.game.world.repository.Repository;
import java.util.Arrays;
import java.util.List;
/**
@@ -1,20 +1,20 @@
package core.net.packet.in;
import core.ServerConstants;
import rs09.ServerConstants;
import core.game.node.entity.skill.magic.MagicSpell;
import core.game.node.entity.skill.summoning.familiar.FamiliarSpecial;
import core.game.interaction.MovementPulse;
import core.game.node.entity.combat.CombatSwingHandler;
import rs09.game.node.entity.combat.CombatSwingHandler;
import core.game.node.entity.npc.NPC;
import core.game.node.entity.player.Player;
import core.game.node.entity.player.link.SpellBookManager;
import core.game.node.item.GroundItemManager;
import core.game.node.item.Item;
import core.game.node.object.GameObject;
import core.game.world.GameWorld;
import rs09.game.world.GameWorld;
import core.game.world.map.Location;
import core.game.world.map.RegionManager;
import core.game.world.repository.Repository;
import rs09.game.world.repository.Repository;
import core.net.packet.IncomingPacket;
import core.net.packet.IoBuffer;
import core.net.packet.PacketRepository;
@@ -1,25 +1,29 @@
package core.net.packet.in;
import core.game.interaction.*;
import core.game.content.quest.PluginInteractionManager;
import core.game.interaction.DestinationFlag;
import core.game.interaction.MovementPulse;
import core.game.interaction.NodeUsageEvent;
import core.game.interaction.UseWithHandler;
import core.game.node.entity.npc.NPC;
import core.game.node.entity.player.Player;
import core.game.node.entity.skill.farming.CompostBins;
import core.game.node.entity.skill.farming.FarmingPatch;
import core.game.node.entity.skill.farming.UseWithBinHandler;
import core.game.node.entity.skill.farming.UseWithPatchHandler;
import core.game.node.item.Item;
import core.game.node.object.GameObject;
import core.game.system.SystemLogger;
import core.game.world.map.RegionManager;
import core.game.world.repository.Repository;
import core.net.packet.IncomingPacket;
import core.net.packet.IoBuffer;
import core.net.packet.PacketRepository;
import core.net.packet.context.PlayerContext;
import core.net.packet.out.ClearMinimapFlag;
import core.tools.Items;
import core.game.system.command.rottenpotato.RottenPotatoUseWithHandler;
import core.game.content.quest.PluginInteractionManager;
import rs09.game.interaction.ItemOnBankBooth;
import rs09.game.node.entity.skill.farming.CompostBins;
import rs09.game.node.entity.skill.farming.FarmingPatch;
import rs09.game.node.entity.skill.farming.UseWithBinHandler;
import rs09.game.node.entity.skill.farming.UseWithPatchHandler;
import rs09.game.system.SystemLogger;
import rs09.game.system.command.rottenpotato.RottenPotatoUseWithHandler;
import rs09.game.world.repository.Repository;
import rs09.tools.Items;
/**
* The incoming item reward packet.
@@ -1,6 +1,6 @@
package core.net.packet.in;
import core.ServerConstants;
import rs09.ServerConstants;
import core.game.content.global.report.AbuseReport;
import core.game.content.global.report.Rule;
import core.game.node.entity.player.Player;
@@ -3,7 +3,7 @@ package core.net.packet.in;
import core.game.interaction.MovementPulse;
import core.game.node.entity.Entity;
import core.game.node.entity.player.Player;
import plugin.ai.AIPlayer;
import rs09.game.ai.AIPlayer;
import core.game.world.map.Location;
import core.net.packet.IncomingPacket;
import core.net.packet.IoBuffer;
@@ -1,7 +1,6 @@
package core.net.packet.out;
import core.game.node.entity.player.Player;
import core.game.system.config.XteaParser;
import core.game.world.map.Region;
import core.game.world.map.RegionChunk;
import core.game.world.map.RegionManager;
@@ -10,6 +9,7 @@ import core.net.packet.IoBuffer;
import core.net.packet.OutgoingPacket;
import core.net.packet.PacketHeader;
import core.net.packet.context.DynamicSceneContext;
import rs09.game.system.config.XteaParser;
import java.util.ArrayList;
import java.util.List;
@@ -7,7 +7,7 @@ import core.net.packet.OutgoingPacket;
import core.net.packet.PacketHeader;
import core.net.packet.context.MessageContext;
import core.tools.StringUtils;
import plugin.ai.AIPlayer;
import rs09.game.ai.AIPlayer;
import java.util.Random;
@@ -1,11 +1,11 @@
package core.net.packet.out;
import core.game.node.entity.player.Player;
import core.game.system.config.XteaParser;
import core.net.packet.IoBuffer;
import core.net.packet.OutgoingPacket;
import core.net.packet.PacketHeader;
import core.net.packet.context.SceneGraphContext;
import rs09.game.system.config.XteaParser;
/**
* The update scene graph outgoing packet.
@@ -4,8 +4,8 @@ import core.net.EventProducer;
import core.net.IoReadEvent;
import core.net.IoSession;
import core.net.IoWriteEvent;
import core.net.event.LoginReadEvent;
import core.net.event.LoginWriteEvent;
import rs09.net.event.LoginReadEvent;
import java.nio.ByteBuffer;
@@ -1,26 +1,22 @@
package core.net.registry;
import java.nio.ByteBuffer;
import java.sql.Connection;
import java.sql.Date;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import core.ServerConstants;
import core.cache.misc.buffer.ByteBufferUtils;
import core.game.node.entity.player.info.portal.PlayerSQLManager;
import core.game.system.SystemLogger;
import core.game.system.SystemManager;
import core.game.system.mysql.SQLEntryHandler;
import core.game.system.mysql.SQLManager;
import core.game.system.task.TaskExecutor;
import core.game.world.GameWorld;
import core.net.Constants;
import core.net.IoSession;
import core.net.event.LoginReadEvent;
import rs09.ServerConstants;
import rs09.game.system.SystemLogger;
import rs09.game.world.GameWorld;
import rs09.net.event.LoginReadEvent;
import java.nio.ByteBuffer;
import java.sql.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* Handles the registry of new accounts.