diff --git a/2006Redone Client/src/ClientSettings.java b/2006Redone Client/src/ClientSettings.java index c80061a5..cf7886aa 100644 --- a/2006Redone Client/src/ClientSettings.java +++ b/2006Redone Client/src/ClientSettings.java @@ -18,7 +18,8 @@ public class ClientSettings { /** * The Servers Ip */ - public final static String SERVER_IP = "35.226.247.68"; + //public final static String SERVER_IP = "35.226.247.68"; + public final static String SERVER_IP = "127.0.0.1"; /** * The Npc Bits for the Server */ diff --git a/2006Redone Server/data/characters/irdb.txt b/2006Redone Server/data/characters/irdb.txt index e8b32a84..3eb0bd35 100644 --- a/2006Redone Server/data/characters/irdb.txt +++ b/2006Redone Server/data/characters/irdb.txt @@ -4,8 +4,8 @@ character-password = pwjojo [CHARACTER] character-height = 0 -character-posx = 3235 -character-posy = 3219 +character-posx = 3237 +character-posy = 3217 character-rights = 0 hasStarter = false bankPin1 = 0 @@ -37,7 +37,7 @@ village = false lastThieve = 0 homeTele = 0 strongHold = false -character-energy = 50 +character-energy = 55 crystal-bow-shots = 0 splitChat = false canSpeak = true @@ -70,7 +70,7 @@ membership = false questPoints = 0 bananas = 0 magic-book = 0 -special-amount = 1.5 +special-amount = 2.5 musicOn = false needsNewTask = false luthas = false @@ -177,10 +177,8 @@ character-item = 7 1266 1 character-item = 8 1206 1 character-item = 9 1278 1 character-item = 10 1172 1 -character-item = 11 842 1 character-item = 12 883 25 character-item = 13 557 25 -character-item = 14 559 15 character-item = 15 556 6 character-item = 16 558 4 character-item = 17 560 2 diff --git a/2006Redone Server/src/redone/net/ActionSender.java b/2006Redone Server/src/redone/net/ActionSender.java index ac4f6e36..0eee438a 100644 --- a/2006Redone Server/src/redone/net/ActionSender.java +++ b/2006Redone Server/src/redone/net/ActionSender.java @@ -2,12 +2,19 @@ package redone.net; import java.text.DecimalFormat; +import redone.game.items.GroundItem; +import redone.game.items.ItemAssistant; import redone.game.players.Client; import redone.game.players.Player; import redone.game.players.PlayerHandler; +import redone.util.GameLogger; import redone.util.Misc; +import redone.world.ItemHandler; import redone.world.clip.Region; +import static redone.Server.itemHandler; +import static redone.world.ItemHandler.HIDE_TICKS; + public class ActionSender { private final Client player; @@ -580,6 +587,39 @@ public class ActionSender { return this; } + public void createGroundItem(Client player, int itemId, int itemX, int itemY, int itemAmount, int playerId) { + if (itemId > 0) { + if (itemId >= 2412 && itemId <= 2414) { + player.getActionSender().sendMessage("The cape vanishes as it touches the ground."); + return; + } + + if (!redone.game.items.Item.itemStackable[itemId] && itemAmount > 0) { + for (int j = 0; j < itemAmount; j++) { + player.getActionSender().createGroundItem(itemId, itemX, itemY, 1); + GroundItem item = new GroundItem(itemId, itemX, itemY, player.getH(), 1, player.playerId, HIDE_TICKS, PlayerHandler.players[playerId].playerName); + itemHandler.addItem(item); + String itemName = ItemAssistant.getItemName(itemId).toLowerCase(); + if (!player.isDead && itemId != 526) { + if (player.getPlayerAssistant().isPlayer()) { + GameLogger.writeLog(player.playerName, "dropitem", player.playerName + " dropped " + itemAmount + " " + itemName + " absX: " + player.absX + " absY: " + player.absY + ""); + } + } + } + } else { + player.getActionSender().createGroundItem(itemId, itemX, itemY, itemAmount); + GroundItem item = new GroundItem(itemId, itemX, itemY, player.getH(), itemAmount, player.playerId, HIDE_TICKS, PlayerHandler.players[playerId].playerName); + itemHandler.addItem(item); + String itemName = ItemAssistant.getItemName(itemId).toLowerCase(); + if (!player.isDead && itemId != 526) { + if (player.getPlayerAssistant().isPlayer()) { + GameLogger.writeLog(player.playerName, "dropitem", player.playerName + " dropped " + itemAmount + " " + itemName + " absX: " + player.absX + " absY: " + player.absY + ""); + } + } + } + } + } + public ActionSender createGroundItem(int itemID, int itemX, int itemY, int itemAmount) { player.getOutStream().createFrame(85); player.getOutStream().writeByteC(itemY - 8 * player.mapRegionY); diff --git a/2006Redone_file_server/org/apollo/jagcached/Constants.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/Constants.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/Constants.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/Constants.class diff --git a/2006Redone_file_server/org/apollo/jagcached/FileServer.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/FileServer.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/FileServer.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/FileServer.class diff --git a/2006Redone_file_server/org/apollo/jagcached/dispatch/ChannelRequest.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/dispatch/ChannelRequest.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/dispatch/ChannelRequest.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/dispatch/ChannelRequest.class diff --git a/2006Redone_file_server/org/apollo/jagcached/dispatch/HttpRequestWorker.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/dispatch/HttpRequestWorker.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/dispatch/HttpRequestWorker.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/dispatch/HttpRequestWorker.class diff --git a/2006Redone_file_server/org/apollo/jagcached/dispatch/JagGrabRequestWorker.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/dispatch/JagGrabRequestWorker.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/dispatch/JagGrabRequestWorker.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/dispatch/JagGrabRequestWorker.class diff --git a/2006Redone_file_server/org/apollo/jagcached/dispatch/OnDemandRequestWorker.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/dispatch/OnDemandRequestWorker.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/dispatch/OnDemandRequestWorker.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/dispatch/OnDemandRequestWorker.class diff --git a/2006Redone_file_server/org/apollo/jagcached/dispatch/RequestDispatcher.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/dispatch/RequestDispatcher.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/dispatch/RequestDispatcher.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/dispatch/RequestDispatcher.class diff --git a/2006Redone_file_server/org/apollo/jagcached/dispatch/RequestWorker.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/dispatch/RequestWorker.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/dispatch/RequestWorker.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/dispatch/RequestWorker.class diff --git a/2006Redone_file_server/org/apollo/jagcached/dispatch/RequestWorkerPool.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/dispatch/RequestWorkerPool.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/dispatch/RequestWorkerPool.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/dispatch/RequestWorkerPool.class diff --git a/2006Redone_file_server/org/apollo/jagcached/fs/FileDescriptor.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/fs/FileDescriptor.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/fs/FileDescriptor.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/fs/FileDescriptor.class diff --git a/2006Redone_file_server/org/apollo/jagcached/fs/FileSystemConstants.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/fs/FileSystemConstants.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/fs/FileSystemConstants.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/fs/FileSystemConstants.class diff --git a/2006Redone_file_server/org/apollo/jagcached/fs/Index.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/fs/Index.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/fs/Index.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/fs/Index.class diff --git a/2006Redone_file_server/org/apollo/jagcached/fs/IndexedFileSystem.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/fs/IndexedFileSystem.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/fs/IndexedFileSystem.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/fs/IndexedFileSystem.class diff --git a/2006Redone_file_server/org/apollo/jagcached/net/FileServerHandler.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/FileServerHandler.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/net/FileServerHandler.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/FileServerHandler.class diff --git a/2006Redone_file_server/org/apollo/jagcached/net/HttpPipelineFactory.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/HttpPipelineFactory.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/net/HttpPipelineFactory.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/HttpPipelineFactory.class diff --git a/2006Redone_file_server/org/apollo/jagcached/net/JagGrabPipelineFactory.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/JagGrabPipelineFactory.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/net/JagGrabPipelineFactory.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/JagGrabPipelineFactory.class diff --git a/2006Redone_file_server/org/apollo/jagcached/net/NetworkConstants.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/NetworkConstants.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/net/NetworkConstants.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/NetworkConstants.class diff --git a/2006Redone_file_server/org/apollo/jagcached/net/OnDemandPipelineFactory.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/OnDemandPipelineFactory.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/net/OnDemandPipelineFactory.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/OnDemandPipelineFactory.class diff --git a/2006Redone_file_server/org/apollo/jagcached/net/jaggrab/JagGrabRequest.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/jaggrab/JagGrabRequest.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/net/jaggrab/JagGrabRequest.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/jaggrab/JagGrabRequest.class diff --git a/2006Redone_file_server/org/apollo/jagcached/net/jaggrab/JagGrabRequestDecoder.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/jaggrab/JagGrabRequestDecoder.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/net/jaggrab/JagGrabRequestDecoder.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/jaggrab/JagGrabRequestDecoder.class diff --git a/2006Redone_file_server/org/apollo/jagcached/net/jaggrab/JagGrabResponse.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/jaggrab/JagGrabResponse.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/net/jaggrab/JagGrabResponse.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/jaggrab/JagGrabResponse.class diff --git a/2006Redone_file_server/org/apollo/jagcached/net/jaggrab/JagGrabResponseEncoder.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/jaggrab/JagGrabResponseEncoder.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/net/jaggrab/JagGrabResponseEncoder.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/jaggrab/JagGrabResponseEncoder.class diff --git a/2006Redone_file_server/org/apollo/jagcached/net/ondemand/OnDemandRequest$Priority.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/ondemand/OnDemandRequest$Priority.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/net/ondemand/OnDemandRequest$Priority.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/ondemand/OnDemandRequest$Priority.class diff --git a/2006Redone_file_server/org/apollo/jagcached/net/ondemand/OnDemandRequest.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/ondemand/OnDemandRequest.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/net/ondemand/OnDemandRequest.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/ondemand/OnDemandRequest.class diff --git a/2006Redone_file_server/org/apollo/jagcached/net/ondemand/OnDemandRequestDecoder.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/ondemand/OnDemandRequestDecoder.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/net/ondemand/OnDemandRequestDecoder.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/ondemand/OnDemandRequestDecoder.class diff --git a/2006Redone_file_server/org/apollo/jagcached/net/ondemand/OnDemandResponse.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/ondemand/OnDemandResponse.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/net/ondemand/OnDemandResponse.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/ondemand/OnDemandResponse.class diff --git a/2006Redone_file_server/org/apollo/jagcached/net/ondemand/OnDemandResponseEncoder.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/ondemand/OnDemandResponseEncoder.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/net/ondemand/OnDemandResponseEncoder.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/ondemand/OnDemandResponseEncoder.class diff --git a/2006Redone_file_server/org/apollo/jagcached/net/service/ServiceRequest.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/service/ServiceRequest.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/net/service/ServiceRequest.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/service/ServiceRequest.class diff --git a/2006Redone_file_server/org/apollo/jagcached/net/service/ServiceRequestDecoder.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/service/ServiceRequestDecoder.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/net/service/ServiceRequestDecoder.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/service/ServiceRequestDecoder.class diff --git a/2006Redone_file_server/org/apollo/jagcached/net/service/ServiceResponse.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/service/ServiceResponse.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/net/service/ServiceResponse.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/service/ServiceResponse.class diff --git a/2006Redone_file_server/org/apollo/jagcached/net/service/ServiceResponseEncoder.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/service/ServiceResponseEncoder.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/net/service/ServiceResponseEncoder.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/net/service/ServiceResponseEncoder.class diff --git a/2006Redone_file_server/org/apollo/jagcached/resource/CombinedResourceProvider.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/resource/CombinedResourceProvider.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/resource/CombinedResourceProvider.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/resource/CombinedResourceProvider.class diff --git a/2006Redone_file_server/org/apollo/jagcached/resource/HypertextResourceProvider.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/resource/HypertextResourceProvider.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/resource/HypertextResourceProvider.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/resource/HypertextResourceProvider.class diff --git a/2006Redone_file_server/org/apollo/jagcached/resource/ResourceProvider.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/resource/ResourceProvider.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/resource/ResourceProvider.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/resource/ResourceProvider.class diff --git a/2006Redone_file_server/org/apollo/jagcached/resource/VirtualResourceProvider.class b/2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/resource/VirtualResourceProvider.class similarity index 100% rename from 2006Redone_file_server/org/apollo/jagcached/resource/VirtualResourceProvider.class rename to 2006Redone file_server/2006Redone_file_server/org/apollo/jagcached/resource/VirtualResourceProvider.class diff --git a/2006Redone file_server/META-INF/2006Redone_file_server.kotlin_module b/2006Redone file_server/META-INF/2006Redone_file_server.kotlin_module new file mode 100644 index 00000000..8fb60192 Binary files /dev/null and b/2006Redone file_server/META-INF/2006Redone_file_server.kotlin_module differ diff --git a/2006Redone file_server/runFileServer.sh b/2006Redone file_server/runFileServer.sh index 9fb354fe..7b3b6cde 100755 --- a/2006Redone file_server/runFileServer.sh +++ b/2006Redone file_server/runFileServer.sh @@ -1 +1 @@ -rm -rf org/ ; cp -r ../2006Redone_file_server/* . ; java -cp ".:./assets/*" org.apollo.jagcached.FileServer +rm -rf org/ ; cp -r ../out/production/2006Redone_file_server/* . ; java -cp ".:./assets/*" org.apollo.jagcached.FileServer diff --git a/2006Redone_Server/redone/net/ActionSender.class b/2006Redone_Server/redone/net/ActionSender.class index d04f0a63..6b1a7024 100644 Binary files a/2006Redone_Server/redone/net/ActionSender.class and b/2006Redone_Server/redone/net/ActionSender.class differ diff --git a/2006Redone_Server/redone/net/packets/impl/Commands.class b/2006Redone_Server/redone/net/packets/impl/Commands.class index d7a88467..51b8e5c7 100644 Binary files a/2006Redone_Server/redone/net/packets/impl/Commands.class and b/2006Redone_Server/redone/net/packets/impl/Commands.class differ diff --git a/2006Redone_file_server/META-INF/2006Redone_file_server.kotlin_module b/2006Redone_file_server/META-INF/2006Redone_file_server.kotlin_module new file mode 100644 index 00000000..8fb60192 Binary files /dev/null and b/2006Redone_file_server/META-INF/2006Redone_file_server.kotlin_module differ diff --git a/production/2006Redone_Client/ClientSettings.class b/production/2006Redone_Client/ClientSettings.class index 5f8d4551..f98e8c38 100644 Binary files a/production/2006Redone_Client/ClientSettings.class and b/production/2006Redone_Client/ClientSettings.class differ diff --git a/production/2006Redone_Client/Game.class b/production/2006Redone_Client/Game.class index 66d0a483..045ae638 100644 Binary files a/production/2006Redone_Client/Game.class and b/production/2006Redone_Client/Game.class differ