2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-03 00:31:51 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Def cleanup (#585)

Browse Source 
* Object definition cleanup

* Update ShopAssistant.java

* stackables

* notables

* unused files

* more junk

* almost done

* working

* moving old methods to deprecated

* update

* fixed pickpocket typos

* Update Pickpocket.java

* Remove redundant method. Fix stall stealing

* Documentation for deprecated methods

* WIP commit partial removal. Has test and dump classes

* Final cleanup

* Move definitions from data folder to cfg

* Temporarily moving definition loaders to GameEngine

This is until loading can be done asynchronously.

* Correct indentation.
This commit is contained in:
MatthewBishop
2023-02-05 17:30:29 -05:00
committed by GitHub
parent b2212d357e
commit eab153ee3f
98 changed files with 21771 additions and 285672 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Scape Server/src/main/java/com/rs2/game/players/Trading.java
+12 -9
View File
@@ -2,13 +2,16 @@ package com.rs2.game.players;
import java.time.temporal.ValueRange;
import java.util.concurrent.CopyOnWriteArrayList;
import org.apollo.cache.def.ItemDefinition;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
import com.rs2.game.content.minigames.castlewars.CastleWars;
import com.rs2.game.items.DeprecatedItems;
import com.rs2.game.items.GameItem;
import com.rs2.game.items.ItemData;
import com.rs2.game.items.ItemAssistant;
import com.rs2.game.items.ItemConstants;
import com.rs2.util.GameLogger;
import com.rs2.util.Misc;
@@ -148,7 +151,7 @@ public class Trading {
}
player.tradeConfirmed = false;
o.tradeConfirmed = false;
if (!ItemData.itemStackable[itemID]) {
if (!ItemDefinition.lookup(itemID).isStackable()) {
for (int a = 0; a < amount; a++) {
for (GameItem item : offeredItems) {
if (item.id == itemID) {
@@ -272,7 +275,7 @@ public class Trading {
}
player.tradeConfirmed = false;
o.tradeConfirmed = false;
if (!ItemData.itemStackable[itemID] && !ItemData.itemIsNote[itemID]) {
if (!ItemDefinition.lookup(itemID).isStackable() && !ItemDefinition.lookup(itemID).isNote()) {
for (int a = 0; a < amount && a < 28; a++) {
if (player.getItemAssistant().playerHasItem(itemID, 1)) {
offeredItems.add(new GameItem(itemID, 1));
@@ -304,7 +307,7 @@ public class Trading {
declineTrade();
return false;
}
if (ItemData.itemStackable[itemID] || ItemData.itemIsNote[itemID]) {
if (ItemDefinition.lookup(itemID).isStackable() || ItemDefinition.lookup(itemID).isNote()) {
boolean inTrade = false;
for (GameItem item : offeredItems) {
if (item.id == itemID) {
@@ -447,10 +450,10 @@ public class Trading {
}
if (Count == 0) {
SendTrade = ItemAssistant.getItemName(item.id);
SendTrade = DeprecatedItems.getItemName(item.id);
} else {
SendTrade = SendTrade + "\\n"
+ ItemAssistant.getItemName(item.id);
+ DeprecatedItems.getItemName(item.id);
}
if (item.stackable) {
@@ -479,10 +482,10 @@ public class Trading {
}
if (Count == 0) {
SendTrade = ItemAssistant.getItemName(item.id);
SendTrade = DeprecatedItems.getItemName(item.id);
} else {
SendTrade = SendTrade + "\\n"
+ ItemAssistant.getItemName(item.id);
+ DeprecatedItems.getItemName(item.id);
}
if (item.stackable) {
SendTrade = SendTrade + " x " + SendAmount;
@@ -502,7 +505,7 @@ public class Trading {
}
try {
for (GameItem item : o.getTrading().offeredItems) {
String itemName = ItemAssistant.getItemName(item.id);
String itemName = DeprecatedItems.getItemName(item.id);
if (item.id > 0) {
player.getItemAssistant().addItem(item.id, item.amount);
if (player.getPlayerAssistant().isPlayer()) {