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

Various Changes (#614)

Browse Source 
* Clean Old Log Files

* Various Changes

* Moved minutes.log to log folder
* Made SERVER_LOG_DIR constant
* Moved FILE_SYSTEM_DIR to GameConstants & Deleted org.apollo.jagcached.Constants
* Removed unused minutes.log from data/data
* Removed Duplicate RSAKeyGen
* Moved RSAKeyGen from com.rs2.net.rsa to com.rs2.util.rsa

* Removed data/net.xml & Created Moved NetworkConstants.java

* Add HTTP & Jaggrab Port's to ConfigLoader

* IntelliJ Reformat ConfigLoader.java

* Fix Mistake

* Attempt #2

* Woops, wrong port
This commit is contained in:
Josh Shippam
2023-02-09 01:05:06 +00:00
committed by GitHub
parent 88a9562e03
commit 55ca851d07
201 changed files with 1264 additions and 12570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Scape Server/src/main/java/com/rs2/game/items/Inventory.java
-1
View File
@@ -2,7 +2,6 @@ package com.rs2.game.items;
import org.apollo.cache.def.ItemDefinition;
import com.rs2.GameConstants;
import com.rs2.GameEngine;
import com.rs2.game.players.Player;
2006Scape Server/src/main/java/com/rs2/game/items/ItemAssistant.java
+23 -23
View File
@@ -1,8 +1,8 @@
package com.rs2.game.items;
import com.rs2.Constants;
import org.apollo.cache.def.ItemDefinition;
import com.rs2.GameConstants;
import com.rs2.GameEngine;
import com.rs2.game.content.minigames.castlewars.CastleWars;
import com.rs2.game.content.skills.runecrafting.Tiaras;
@@ -494,11 +494,11 @@ public class ItemAssistant {
if (player.playerItems[i] == item + 1 && ItemDefinition.lookup(item).isStackable()
&& player.playerItems[i] > 0) {
player.playerItems[i] = item + 1;
if (player.playerItemsN[i] + amount < GameConstants.MAXITEM_AMOUNT
if (player.playerItemsN[i] + amount < Constants.MAXITEM_AMOUNT
&& player.playerItemsN[i] + amount > -1) {
player.playerItemsN[i] += amount;
} else {
player.playerItemsN[i] = GameConstants.MAXITEM_AMOUNT;
player.playerItemsN[i] = Constants.MAXITEM_AMOUNT;
}
if (player.getOutStream() != null && player != null) {
player.getOutStream().createFrameVarSizeWord(34);
@@ -522,14 +522,14 @@ public class ItemAssistant {
for (int i = 0; i < player.playerItems.length; i++) {
if (player.playerItems[i] <= 0) {
player.playerItems[i] = item + 1;
if (amount < GameConstants.MAXITEM_AMOUNT && amount > -1) {
if (amount < Constants.MAXITEM_AMOUNT && amount > -1) {
player.playerItemsN[i] = 1;
if (amount > 1) {
addItem(item, amount - 1);
return true;
}
} else {
player.playerItemsN[i] = GameConstants.MAXITEM_AMOUNT;
player.playerItemsN[i] = Constants.MAXITEM_AMOUNT;
}
resetItems(3214);
i = 30;
@@ -1340,7 +1340,7 @@ public class ItemAssistant {
return false;
}
if (GameConstants.ITEM_REQUIREMENTS) {
if (Constants.ITEM_REQUIREMENTS) {
// Check if slot is armor
if (targetSlot == ItemConstants.FEET
|| targetSlot == ItemConstants.LEGS
@@ -1349,32 +1349,32 @@ public class ItemAssistant {
|| targetSlot == ItemConstants.HAT
|| targetSlot == ItemConstants.HANDS) {
if (player.defenceLevelReq > 0) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.DEFENCE]) < player.defenceLevelReq) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[Constants.DEFENCE]) < player.defenceLevelReq) {
player.getPacketSender().sendMessage("You need a defence level of " + player.defenceLevelReq + " to wear this item.");
canWearItem = false;
}
}
if (player.rangeLevelReq > 0) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.RANGED]) < player.rangeLevelReq) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[Constants.RANGED]) < player.rangeLevelReq) {
player.getPacketSender().sendMessage("You need a range level of " + player.rangeLevelReq + " to wear this item.");
canWearItem = false;
}
}
if (player.magicLevelReq > 0) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.MAGIC]) < player.magicLevelReq) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[Constants.MAGIC]) < player.magicLevelReq) {
player.getPacketSender().sendMessage("You need a magic level of " + player.magicLevelReq + " to wear this item.");
canWearItem = false;
}
}
}
if (player.slayerLevelReq > 0) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.SLAYER]) < player.slayerLevelReq) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[Constants.SLAYER]) < player.slayerLevelReq) {
player.getPacketSender().sendMessage("You need a slayer level of " + player.slayerLevelReq + " to wear this item.");
canWearItem = false;
}
}
if (player.agilityLevelReq > 0) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.AGILITY]) < player.agilityLevelReq) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[Constants.AGILITY]) < player.agilityLevelReq) {
player.getPacketSender().sendMessage("You need a agility level of " + player.agilityLevelReq + " to wear this item.");
canWearItem = false;
}
@@ -1382,19 +1382,19 @@ public class ItemAssistant {
// Weapon
if (targetSlot == ItemConstants.WEAPON) {
if (player.attackLevelReq > 0) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.ATTACK]) < player.attackLevelReq) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[Constants.ATTACK]) < player.attackLevelReq) {
player.getPacketSender().sendMessage("You need an attack level of " + player.attackLevelReq + " to wield this weapon.");
canWearItem = false;
}
}
if (player.rangeLevelReq > 0) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.RANGED]) < player.rangeLevelReq) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[Constants.RANGED]) < player.rangeLevelReq) {
player.getPacketSender().sendMessage("You need a range level of " + player.rangeLevelReq + " to wield this weapon.");
canWearItem = false;
}
}
if (player.magicLevelReq > 0) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[GameConstants.MAGIC]) < player.magicLevelReq) {
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[Constants.MAGIC]) < player.magicLevelReq) {
player.getPacketSender().sendMessage("You need a magic level of " + player.magicLevelReq + " to wield this weapon.");
canWearItem = false;
}
@@ -1713,7 +1713,7 @@ public class ItemAssistant {
}
public void resetBank() {
player.getPacketSender().sendString("The Bank of " + GameConstants.SERVER_NAME, 5383, true);
player.getPacketSender().sendString("The Bank of " + Constants.SERVER_NAME, 5383, true);
if (player.getOutStream() != null) {
player.getOutStream().createFrameVarSizeWord(53);
player.getOutStream().writeWord(5382); // bank
@@ -1731,8 +1731,8 @@ public class ItemAssistant {
if (player.bankItemsN[i] < 1) {
player.bankItems[i] = 0;
}
if (player.bankItems[i] > GameConstants.ITEM_LIMIT || player.bankItems[i] < 0) {
player.bankItems[i] = GameConstants.ITEM_LIMIT;
if (player.bankItems[i] > Constants.ITEM_LIMIT || player.bankItems[i] < 0) {
player.bankItems[i] = Constants.ITEM_LIMIT;
}
if (player.getOutStream() != null) {
player.getOutStream().writeWordBigEndianA(player.bankItems[i]);
@@ -1767,8 +1767,8 @@ public class ItemAssistant {
player.getOutStream().writeByte(player.playerItemsN[i]);
}
}
if (player.playerItems[i] > GameConstants.ITEM_LIMIT || player.playerItems[i] < 0) {
player.playerItems[i] = GameConstants.ITEM_LIMIT;
if (player.playerItems[i] > Constants.ITEM_LIMIT || player.playerItems[i] < 0) {
player.playerItems[i] = Constants.ITEM_LIMIT;
}
if (player.getOutStream() != null) {
player.getOutStream().writeWordBigEndianA(player.playerItems[i]);
@@ -1838,7 +1838,7 @@ public class ItemAssistant {
if (player.playerItemsN[fromSlot] < amount) {
amount = player.playerItemsN[fromSlot];
}
if (player.bankItemsN[toBankSlot] + amount <= GameConstants.MAXITEM_AMOUNT
if (player.bankItemsN[toBankSlot] + amount <= Constants.MAXITEM_AMOUNT
&& player.bankItemsN[toBankSlot] + amount > -1) {
player.bankItemsN[toBankSlot] += amount;
} else {
@@ -1850,7 +1850,7 @@ public class ItemAssistant {
resetBank();
return true;
} else if (alreadyInBank) {
if (player.bankItemsN[toBankSlot] + amount <= GameConstants.MAXITEM_AMOUNT
if (player.bankItemsN[toBankSlot] + amount <= Constants.MAXITEM_AMOUNT
&& player.bankItemsN[toBankSlot] + amount > -1) {
player.bankItemsN[toBankSlot] += amount;
} else {
@@ -1965,7 +1965,7 @@ public class ItemAssistant {
if (player.playerItemsN[fromSlot] < amount) {
amount = player.playerItemsN[fromSlot];
}
if (player.bankItemsN[toBankSlot] + amount <= GameConstants.MAXITEM_AMOUNT && player.bankItemsN[toBankSlot] + amount > -1) {
if (player.bankItemsN[toBankSlot] + amount <= Constants.MAXITEM_AMOUNT && player.bankItemsN[toBankSlot] + amount > -1) {
player.bankItemsN[toBankSlot] += amount;
} else {
return false;
@@ -1975,7 +1975,7 @@ public class ItemAssistant {
resetBank();
return true;
} else if (alreadyInBank) {
if (player.bankItemsN[toBankSlot] + amount <= GameConstants.MAXITEM_AMOUNT && player.bankItemsN[toBankSlot] + amount > -1) {
if (player.bankItemsN[toBankSlot] + amount <= Constants.MAXITEM_AMOUNT && player.bankItemsN[toBankSlot] + amount > -1) {
player.bankItemsN[toBankSlot] += amount;
} else {
return false;
2006Scape Server/src/main/java/com/rs2/game/items/ItemData.java
+2 -3
View File
@@ -4,10 +4,9 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import com.rs2.Constants;
import org.apollo.cache.def.ItemDefinition;
import com.rs2.GameConstants;
public class ItemData {
public static int capes[] = { 2731, 2677, 2683, 2680, 2701, 2686, 2689,
@@ -193,7 +192,7 @@ public class ItemData {
return false;
}
public static int[] targetSlots = new int[GameConstants.ITEM_LIMIT];
public static int[] targetSlots = new int[Constants.ITEM_LIMIT];
static {
int counter = 0;
int c;
2006Scape Server/src/main/java/com/rs2/game/items/UseItem.java
+13 -13
View File
@@ -1,7 +1,7 @@
package com.rs2.game.items;
import com.rs2.Constants;
import com.rs2.event.impl.ItemOnItemEvent;
import com.rs2.GameConstants;
import com.rs2.game.content.skills.cooking.Cooking;
import com.rs2.game.content.skills.crafting.BattleStaffs;
import com.rs2.game.content.skills.crafting.GemCutting;
@@ -183,19 +183,19 @@ public class UseItem {
LogCutting.wolfBoneArrow(player);
}
if (itemUsed == 771 && useWith == 946
&& player.playerLevel[GameConstants.CRAFTING] > 30) {
&& player.playerLevel[Constants.CRAFTING] > 30) {
player.getItemAssistant().deleteItem(771, 1);
player.getItemAssistant().addItem(772, 1);
} else if (player.playerLevel[GameConstants.CRAFTING] < 31 && itemUsed == 771
} else if (player.playerLevel[Constants.CRAFTING] < 31 && itemUsed == 771
&& useWith == 946) {
player.getPacketSender().sendMessage(
"You need 31 crafting to make this.");
}
if (itemUsed == 946 && useWith == 771
&& player.playerLevel[GameConstants.CRAFTING] > 30) {
&& player.playerLevel[Constants.CRAFTING] > 30) {
player.getItemAssistant().deleteItem(771, 1);
player.getItemAssistant().addItem(772, 1);
} else if (player.playerLevel[GameConstants.CRAFTING] < 31 && itemUsed == 946
} else if (player.playerLevel[Constants.CRAFTING] < 31 && itemUsed == 946
&& useWith == 771) {
player.getPacketSender().sendMessage(
"You need 31 crafting to make this.");
@@ -247,12 +247,12 @@ public class UseItem {
player.getItemAssistant().deleteItem(4548, 1);
}
if (itemUsed == 1095 && useWith == 2370 || itemUsed == 2370
&& useWith == 1095 && player.playerLevel[GameConstants.CRAFTING] > 43) {// chaps
&& useWith == 1095 && player.playerLevel[Constants.CRAFTING] > 43) {// chaps
player.getItemAssistant().deleteItem(2370, 1);
player.getItemAssistant().deleteItem(1095, 1);
player.getItemAssistant().addItem(1097, 1);
player.getPlayerAssistant().addSkillXP(42, GameConstants.CRAFTING);
} else if (itemUsed == 1095 && useWith == 2370 || itemUsed == 2370 && useWith == 1095 && player.playerLevel[GameConstants.CRAFTING] < 44) {
player.getPlayerAssistant().addSkillXP(42, Constants.CRAFTING);
} else if (itemUsed == 1095 && useWith == 2370 || itemUsed == 2370 && useWith == 1095 && player.playerLevel[Constants.CRAFTING] < 44) {
player.getPacketSender().sendMessage("You need 44 crafting to make this.");
}
if (itemUsed == 946 && useWith == 1963 || itemUsed == 1963 && useWith == 946) {
@@ -265,12 +265,12 @@ public class UseItem {
player.getItemAssistant().addItem(1975, 1);
player.getPacketSender().sendMessage("You slice your chocolate bar.");
}
if (itemUsed == 1129 && useWith == 2370 || itemUsed == 2370 && useWith == 1129 && player.playerLevel[GameConstants.CRAFTING] > 40) {// body
if (itemUsed == 1129 && useWith == 2370 || itemUsed == 2370 && useWith == 1129 && player.playerLevel[Constants.CRAFTING] > 40) {// body
player.getItemAssistant().deleteItem(2370, 1);
player.getItemAssistant().deleteItem(1129, 1);
player.getItemAssistant().addItem(1133, 1);
player.getPlayerAssistant().addSkillXP(40, GameConstants.CRAFTING);
} else if (itemUsed == 1129 && useWith == 2370 || itemUsed == 2370 && useWith == 1129 && player.playerLevel[GameConstants.CRAFTING] < 41) {
player.getPlayerAssistant().addSkillXP(40, Constants.CRAFTING);
} else if (itemUsed == 1129 && useWith == 2370 || itemUsed == 2370 && useWith == 1129 && player.playerLevel[Constants.CRAFTING] < 41) {
player.getPacketSender().sendMessage("You need 41 crafting to make this.");
}
if (itemUsed == 4593 && useWith == 4591 || useWith == 4591 && itemUsed == 4593) {
@@ -375,11 +375,11 @@ public class UseItem {
if (itemUsed == 1987 && useWith == 1937 || itemUsed == 1937
&& useWith == 1987) {
if (player.playerLevel[GameConstants.COOKING] >= 35) {
if (player.playerLevel[Constants.COOKING] >= 35) {
player.getItemAssistant().addItem(1993, 1);
player.getItemAssistant().deleteItem(1937, 1);
player.getItemAssistant().deleteItem(1987, 1);
player.getPlayerAssistant().addSkillXP(200, GameConstants.COOKING);
player.getPlayerAssistant().addSkillXP(200, Constants.COOKING);
} else {
player.getPacketSender().sendMessage(
"You need grapes and a jug of water to make wine.");
2006Scape Server/src/main/java/com/rs2/game/items/impl/Dye.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.rs2.game.items.impl;
import com.rs2.GameConstants;
import com.rs2.Constants;
import com.rs2.game.items.DeprecatedItems;
import com.rs2.game.players.Player;
@@ -73,7 +73,7 @@ public enum Dye {
player.getItemAssistant().deleteItem(itemUsed, 1);
player.getItemAssistant().deleteItem(useWith, 1);
player.getItemAssistant().addItem(cape.getReward(), 1);
player.getPlayerAssistant().addSkillXP(2.5, GameConstants.CRAFTING);
player.getPlayerAssistant().addSkillXP(2.5, Constants.CRAFTING);
}
}
}