2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-04 08:39:05 +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/objects/ObjectsActions.java
+28 -28
View File
@@ -1,6 +1,6 @@
package com.rs2.game.objects;
import com.rs2.GameConstants;
import com.rs2.Constants;
import com.rs2.GameEngine;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
@@ -314,7 +314,7 @@ public class ObjectsActions {
//if (c.objectX == 2675 && c.objectY == 3170) {
//c.getDH().sendDialogues(79, 0);
//} else {
if (player.playerLevel[GameConstants.FISHING] <= 50) {
if (player.playerLevel[Constants.FISHING] <= 50) {
player.getPacketSender().sendMessage("You need a fishing level of 50 or higher to play Fishing Trawler.");
return;
}
@@ -433,16 +433,16 @@ public class ObjectsActions {
case 2112:
if (player.absY == 9756
&& player.playerLevel[GameConstants.MINING] >= 60) {
&& player.playerLevel[Constants.MINING] >= 60) {
player.getPlayerAssistant().movePlayer(3046, 9757, 0);
player.getPacketSender()
.sendMessage("You enter the guild.");
} else if (player.absY == 9757
&& player.playerLevel[GameConstants.MINING] >= 60) {
&& player.playerLevel[Constants.MINING] >= 60) {
player.getPlayerAssistant().movePlayer(3046, 9756, 0);
player.getPacketSender()
.sendMessage("You enter the guild.");
} else if (player.playerLevel[GameConstants.MINING] < 60) {
} else if (player.playerLevel[Constants.MINING] < 60) {
player.getPacketSender().sendMessage(
"You need 60 mining to enter this guild");
}
@@ -673,7 +673,7 @@ public class ObjectsActions {
break;
case 10596:
if (player.playerLevel[GameConstants.SLAYER] < 72) {
if (player.playerLevel[Constants.SLAYER] < 72) {
player.getPacketSender().sendMessage(
"You need 72 slayer to enter.");
return;
@@ -784,14 +784,14 @@ public class ObjectsActions {
case 2634:
if (player.absX == 2837
&& player.playerLevel[GameConstants.MINING] >= 50) {
&& player.playerLevel[Constants.MINING] >= 50) {
player.getPlayerAssistant().movePlayer(player.absX + 3,
player.absY, 0);
} else if (player.absX == 2840
&& player.playerLevel[GameConstants.MINING] >= 50) {
&& player.playerLevel[Constants.MINING] >= 50) {
player.getPlayerAssistant().movePlayer(player.absX - 3,
player.absY, 0);
} else if (player.playerLevel[GameConstants.MINING] < 50) {
} else if (player.playerLevel[Constants.MINING] < 50) {
player.getDialogueHandler().sendStatement("You need 50 mining to pass to this rock slide.");
player.nextChat = 0;
return;
@@ -1400,7 +1400,7 @@ public class ObjectsActions {
break;
case 9295:
if (player.playerLevel[GameConstants.AGILITY] < 51) {
if (player.playerLevel[Constants.AGILITY] < 51) {
player.getPacketSender().sendMessage(
"You need 51 agility to use this shortcut.");
return;
@@ -1512,7 +1512,7 @@ public class ObjectsActions {
break;
case 2287:
if (player.playerLevel[GameConstants.AGILITY] < 35) {
if (player.playerLevel[Constants.AGILITY] < 35) {
player.getPacketSender().sendMessage(
"You need 35 agility to enter here!");
return;
@@ -1664,21 +1664,21 @@ public class ObjectsActions {
case 2320:
long clickTimer = 0;
if (player.absY <= 9963 && player.playerLevel[GameConstants.AGILITY] > 14 && System.currentTimeMillis() - clickTimer > 2000) {
if (player.absY <= 9963 && player.playerLevel[Constants.AGILITY] > 14 && System.currentTimeMillis() - clickTimer > 2000) {
player.getPlayerAssistant().movePlayer(3120, 9970, 0);
player.startAnimation(744);
player.turnPlayerTo(player.objectX, player.objectY);
player.getPacketSender().sendMessage("You swing on the monkey bars.");
player.getPlayerAssistant().addSkillXP(25, GameConstants.AGILITY);
player.getPlayerAssistant().addSkillXP(25, Constants.AGILITY);
clickTimer = System.currentTimeMillis();
} else if (player.absY <= 9970 && player.playerLevel[GameConstants.AGILITY] > 14 && System.currentTimeMillis() - clickTimer > 2000) {
} else if (player.absY <= 9970 && player.playerLevel[Constants.AGILITY] > 14 && System.currentTimeMillis() - clickTimer > 2000) {
player.getPlayerAssistant().movePlayer(3120, 9963, 0);
player.startAnimation(744);
player.turnPlayerTo(player.objectX, player.objectY);
player.getPacketSender().sendMessage("You swing on the monkey bars.");
player.getPlayerAssistant().addSkillXP(25, GameConstants.AGILITY);
player.getPlayerAssistant().addSkillXP(25, Constants.AGILITY);
clickTimer = System.currentTimeMillis();
} else if (player.playerLevel[GameConstants.AGILITY] < 15) {
} else if (player.playerLevel[Constants.AGILITY] < 15) {
player.getPacketSender().sendMessage("You need 15 agility to use these monkey bars.");
} else {
player.getPacketSender().sendMessage("You can't do the monkey bars here.");
@@ -1889,7 +1889,7 @@ public class ObjectsActions {
player.getItemAssistant().addItem(2130, 1);
player.getItemAssistant().deleteItem(1927, 1);
player.getPlayerAssistant()
.addSkillXP(18, GameConstants.COOKING);
.addSkillXP(18, Constants.COOKING);
} else {
player.getPacketSender().sendMessage(
"You need a bucket of milk to do this.");
@@ -2164,7 +2164,7 @@ public class ObjectsActions {
break;
case 9398:// deposit box
player.getPacketSender().sendString("The Bank of " + GameConstants.SERVER_NAME + " - Deposit Box", 7421);
player.getPacketSender().sendString("The Bank of " + Constants.SERVER_NAME + " - Deposit Box", 7421);
player.getPacketSender().sendFrame248(4465, 197);
player.getItemAssistant().resetItems(7423);
break;
@@ -2538,14 +2538,14 @@ public class ObjectsActions {
case 10638:
case 411:
case 412:
if (player.playerLevel[GameConstants.PRAYER] < player.getPlayerAssistant()
.getLevelForXP(player.playerXP[GameConstants.PRAYER])) {
if (player.playerLevel[Constants.PRAYER] < player.getPlayerAssistant()
.getLevelForXP(player.playerXP[Constants.PRAYER])) {
player.startAnimation(645);
player.playerLevel[GameConstants.PRAYER] = player.getPlayerAssistant()
.getLevelForXP(player.playerXP[GameConstants.PRAYER]);
player.playerLevel[Constants.PRAYER] = player.getPlayerAssistant()
.getLevelForXP(player.playerXP[Constants.PRAYER]);
player.getPacketSender().sendMessage(
"You recharge your prayer points.");
player.getPlayerAssistant().refreshSkill(GameConstants.PRAYER);
player.getPlayerAssistant().refreshSkill(Constants.PRAYER);
} else {
player.getPacketSender().sendMessage(
"You already have full prayer points.");
@@ -2558,14 +2558,14 @@ public class ObjectsActions {
"You can't use this in the wilderness.");
return;
}
if (player.playerLevel[GameConstants.PRAYER] < player.getPlayerAssistant()
.getLevelForXP(player.playerXP[GameConstants.PRAYER])) {
if (player.playerLevel[Constants.PRAYER] < player.getPlayerAssistant()
.getLevelForXP(player.playerXP[Constants.PRAYER])) {
player.startAnimation(645);
player.playerLevel[GameConstants.PRAYER] = player.getPlayerAssistant()
.getLevelForXP(player.playerXP[GameConstants.PRAYER]) + 2;
player.playerLevel[Constants.PRAYER] = player.getPlayerAssistant()
.getLevelForXP(player.playerXP[Constants.PRAYER]) + 2;
player.getPacketSender().sendMessage(
"You recharge your prayer points.");
player.getPlayerAssistant().refreshSkill(GameConstants.PRAYER);
player.getPlayerAssistant().refreshSkill(Constants.PRAYER);
} else {
player.getPacketSender().sendMessage(
"You already have full prayer points.");
2006Scape Server/src/main/java/com/rs2/game/objects/impl/Climbing.java
+13 -13
View File
@@ -1,6 +1,6 @@
package com.rs2.game.objects.impl;
import com.rs2.GameConstants;
import com.rs2.Constants;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
import com.rs2.event.CycleEventHandler;
@@ -372,10 +372,10 @@ public class Climbing {
break;
case 2408:
if (client.playerLevel[GameConstants.PRAYER] > 0) {
client.playerLevel[GameConstants.PRAYER] = 0;
if (client.playerLevel[Constants.PRAYER] > 0) {
client.playerLevel[Constants.PRAYER] = 0;
}
client.getPlayerAssistant().refreshSkill(GameConstants.PRAYER);
client.getPlayerAssistant().refreshSkill(Constants.PRAYER);
client.getPacketSender().sendMessage(
"Your prayer is drained as you enter the dungeon.");
client.getPlayerAssistant().movePlayer(2823, 9771, 0);
@@ -445,7 +445,7 @@ public class Climbing {
} else if (client.objectX == 3258 && client.objectY == 3487) {
client.getPlayerAssistant().movePlayer(3257, 3487, 1);
client.resetWalkingQueue();
} else if (client.objectX == 3144 && client.objectY == 3447 && client.playerLevel[GameConstants.COOKING] > 31 && client.playerEquipment[client.playerHat] == 1949) {
} else if (client.objectX == 3144 && client.objectY == 3447 && client.playerLevel[Constants.COOKING] > 31 && client.playerEquipment[client.playerHat] == 1949) {
client.getPlayerAssistant().movePlayer(3143, 3448, 1);
client.resetWalkingQueue();
} else if (client.objectX == 3010 && client.objectY == 3515) {
@@ -580,7 +580,7 @@ public class Climbing {
"You go down the trapdoor.");
client.startAnimation(827);
client.getPlayerAssistant().addSkillXP(.5,
GameConstants.THIEVING);
Constants.THIEVING);
client.getPacketSender().closeAllWindows();
} else if (!client.getItemAssistant().playerHasItem(1523, 1)
&& Misc.random(5) < 2) {
@@ -589,7 +589,7 @@ public class Climbing {
"You go down the trapdoor.");
client.startAnimation(827);
client.getPlayerAssistant().addSkillXP(.5,
GameConstants.THIEVING);
Constants.THIEVING);
client.getPacketSender().closeAllWindows();
client.resetWalkingQueue();
} else if (client.getItemAssistant().playerHasItem(1523, 1)
@@ -599,9 +599,9 @@ public class Climbing {
client.getPacketSender()
.sendMessage(
"Your thieving has been drained, your fingers feel numb.");
client.playerLevel[GameConstants.THIEVING] = client.getPlayerAssistant()
.getLevelForXP(client.playerXP[GameConstants.THIEVING]) - 1;
client.getPlayerAssistant().refreshSkill(GameConstants.THIEVING);
client.playerLevel[Constants.THIEVING] = client.getPlayerAssistant()
.getLevelForXP(client.playerXP[Constants.THIEVING]) - 1;
client.getPlayerAssistant().refreshSkill(Constants.THIEVING);
client.getItemAssistant().deleteItem(1523, 1);
} else if (!client.getItemAssistant().playerHasItem(1523, 1)
&& Misc.random(5) > 2) {
@@ -610,9 +610,9 @@ public class Climbing {
client.getPacketSender()
.sendMessage(
"Your thieving has been drained, your fingers feel numb.");
client.playerLevel[GameConstants.THIEVING] = client.getPlayerAssistant()
.getLevelForXP(client.playerXP[GameConstants.THIEVING]) - 1;
client.getPlayerAssistant().refreshSkill(GameConstants.THIEVING);
client.playerLevel[Constants.THIEVING] = client.getPlayerAssistant()
.getLevelForXP(client.playerXP[Constants.THIEVING]) - 1;
client.getPlayerAssistant().refreshSkill(Constants.THIEVING);
}
break;
2006Scape Server/src/main/java/com/rs2/game/objects/impl/OtherObjects.java
+3 -3
View File
@@ -1,8 +1,8 @@
package com.rs2.game.objects.impl;
import com.rs2.Constants;
import org.apollo.cache.def.ObjectDefinition;
import com.rs2.GameConstants;
import com.rs2.GameEngine;
import com.rs2.event.CycleEvent;
import com.rs2.event.CycleEventContainer;
@@ -201,7 +201,7 @@ public class OtherObjects {
player.updateRequired = true;
player.poisonMask = 2;
player.dealDamage(nettlesDamage);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
player.getPlayerAssistant().refreshSkill(Constants.HITPOINTS);
player.getPacketSender().sendMessage("You have been stung by the nettles.");
player.stopPlayer(false);
}
@@ -220,7 +220,7 @@ public class OtherObjects {
} else if (random == 9) {
player.handleHitMask(damage);
player.dealDamage(damage);
player.getPlayerAssistant().refreshSkill(GameConstants.HITPOINTS);
player.getPlayerAssistant().refreshSkill(Constants.HITPOINTS);
container.stop();
} else {
player.getPacketSender().sendMessage("You find nothing of interest.");