Cleanup part 1 (#213)

* Clean up part 1 - Removed lots of dead code - Removed unncessary files not in use - Cleaned up small bits of code - Removed a few warnings - Server.java ---> GameEngine.java - Constants.java ---> GameConstants.java * Cape Dye Rewrote cape dying * Packaging - redone ----> com.rebotted * PacketSender/clean up - ActionSender ---> PacketSender - Moved many more packets to packetsender - Cleaned up more dead code * Merge Client/Player - Merged Client.java with Player.java (both were doing same thing so redundant to have both) - Removed some more dead code - Tidy a few small things up * Quests/more clean up - Removed more dead code - Made quests static in order to clean them up a bit * More cleanup - Removed some more of the dead quest code - Correcting naming of some of the shop variables
2026-07-04 16:49:04 +00:00 · 2019-11-25 11:08:56 -06:00
parent 3d1ae1b288
commit d876a923b9
379 changed files with 80684 additions and 83170 deletions
@@ -0,0 +1,115 @@
+package com.rebotted.net.packets.impl;
+
+import com.rebotted.GameEngine;
+import com.rebotted.event.CycleEvent;
+import com.rebotted.event.CycleEventContainer;
+import com.rebotted.event.CycleEventHandler;
+import com.rebotted.game.content.combat.magic.MagicData;
+import com.rebotted.game.items.Item;
+import com.rebotted.game.players.Player;
+import com.rebotted.net.packets.PacketType;
+
+/**
+ * Magic on floor items
+ **/
+
+public class MagicOnFloorItems implements PacketType {
+
+	@Override
+	public void processPacket(final Player c, int packetType, int packetSize) {
+		final int itemY = c.getInStream().readSignedWordBigEndian();
+		int itemId = c.getInStream().readUnsignedWord();
+		final int itemX = c.getInStream().readSignedWordBigEndian();
+		c.getInStream().readUnsignedWordA();
+
+		if (!GameEngine.itemHandler.itemExists(itemId, itemX, itemY)) {
+			c.stopMovement();
+			return;
+		}
+		c.usingMagic = true;
+		c.endCurrentTask();
+		if (!c.getCombatAssistant().checkMagicReqs(51)) {
+			c.stopMovement();
+			return;
+		}
+
+		if ((c.getItemAssistant().freeSlots() >= 1 || c.getItemAssistant()
+				.playerHasItem(itemId, 1))
+				&& Item.itemStackable[itemId]
+				|| c.getItemAssistant().freeSlots() > 0
+				&& !Item.itemStackable[itemId]) {
+			if (c.goodDistance(c.getX(), c.getY(), itemX, itemY, 12)) {
+				c.walkingToItem = true;
+				int offY = (c.getX() - itemX) * -1;
+				int offX = (c.getY() - itemY) * -1;
+				c.teleGrabX = itemX;
+				c.teleGrabY = itemY;
+				c.teleGrabItem = itemId;
+				c.turnPlayerTo(itemX, itemY);
+				c.teleGrabDelay = System.currentTimeMillis();
+				c.startAnimation(MagicData.MAGIC_SPELLS[51][2]);
+				c.gfx100(MagicData.MAGIC_SPELLS[51][3]);
+				c.getPlayerAssistant().createPlayersStillGfx(144, itemX, itemY,
+						0, 72);
+				c.getPlayerAssistant().createPlayersProjectile(c.getX(),
+						c.getY(), offX, offY, 50, 70,
+						MagicData.MAGIC_SPELLS[51][4], 50, 10, 0, 50);
+				c.getPlayerAssistant().addSkillXP(
+						MagicData.MAGIC_SPELLS[51][7], 6);
+				c.getPlayerAssistant().refreshSkill(6);
+				c.stopMovement();
+				   CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() {
+			            @Override
+			            public void execute(CycleEventContainer container) {
+						if (!c.walkingToItem) {
+							stop();
+						}
+						if (System.currentTimeMillis() - c.teleGrabDelay > 1550
+								&& c.usingMagic) {
+							if (GameEngine.itemHandler.itemExists(c.teleGrabItem,
+									c.teleGrabX, c.teleGrabY)
+									&& c.goodDistance(c.getX(), c.getY(),
+											itemX, itemY, 12)) {
+								GameEngine.itemHandler.removeGroundItem(c,
+										c.teleGrabItem, c.teleGrabX,
+										c.teleGrabY, true);
+								c.usingMagic = false;
+								container.stop();
+							}
+						}
+					}
+
+					@Override
+					public void stop() {
+						c.walkingToItem = false;
+					}
+				}, 1);
+			}
+		} else {
+			c.getPacketSender().sendMessage(
+					"You don't have enough space in your inventory.");
+			c.stopMovement();
+		}
+
+		if (c.goodDistance(c.getX(), c.getY(), itemX, itemY, 12)) {
+			int offY = (c.getX() - itemX) * -1;
+			int offX = (c.getY() - itemY) * -1;
+			c.teleGrabX = itemX;
+			c.teleGrabY = itemY;
+			c.teleGrabItem = itemId;
+			c.turnPlayerTo(itemX, itemY);
+			c.teleGrabDelay = System.currentTimeMillis();
+			c.startAnimation(MagicData.MAGIC_SPELLS[51][2]);
+			c.gfx100(MagicData.MAGIC_SPELLS[51][3]);
+			c.getPlayerAssistant().createPlayersStillGfx(144, itemX, itemY, 0,
+					72);
+			c.getPlayerAssistant().createPlayersProjectile(c.getX(), c.getY(),
+					offX, offY, 50, 70, MagicData.MAGIC_SPELLS[51][4], 50, 10,
+					0, 50);
+			c.getPlayerAssistant().addSkillXP(MagicData.MAGIC_SPELLS[51][7], 6);
+			c.getPlayerAssistant().refreshSkill(6);
+			c.stopMovement();
+		}
+	}
+
+}