Reformat and clean up "constants" package

This commit is contained in:
P0nk
2021-09-09 23:23:32 +02:00
parent 250d49e85d
commit 69f4580637
61 changed files with 307 additions and 356 deletions
@@ -530,8 +530,12 @@ public class GameConstants {
if (!isInBranchJobTree(skillJob, jobId, 0)) { if (!isInBranchJobTree(skillJob, jobId, 0)) {
for (int i = 1; i <= 3; i++) { for (int i = 1; i <= 3; i++) {
if(hasDivergedBranchJobTree(skillJob, jobId, i)) return false; if (hasDivergedBranchJobTree(skillJob, jobId, i)) {
if(isInBranchJobTree(skillJob, jobId, i)) return (skillJob <= jobId); return false;
}
if (isInBranchJobTree(skillJob, jobId, i)) {
return (skillJob <= jobId);
}
} }
} else { } else {
return (skillJob <= jobId); return (skillJob <= jobId);
@@ -1,7 +1,6 @@
package constants.inventory; package constants.inventory;
/** /**
*
* @author The Spookster (The Real Spookster) * @author The Spookster (The Real Spookster)
*/ */
public enum EquipSlot { public enum EquipSlot {
@@ -33,10 +32,10 @@ public enum EquipSlot {
private String name; private String name;
private int[] allowed; private int[] allowed;
private EquipSlot() { EquipSlot() {
} }
private EquipSlot(String wz, int... in) { EquipSlot(String wz, int... in) {
name = wz; name = wz;
allowed = in; allowed = in;
} }
@@ -23,7 +23,6 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
*
* @author RonanLana * @author RonanLana
*/ */
public enum EquipType { public enum EquipType {
@@ -66,7 +65,7 @@ public enum EquipType {
private final int i; private final int i;
private static final Map<Integer, EquipType> map = new HashMap(34); private static final Map<Integer, EquipType> map = new HashMap(34);
private EquipType(int val) { EquipType(int val) {
this.i = val; this.i = val;
} }
@@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
/** /**
*
* @author Jay Estrella * @author Jay Estrella
* @author Ronan * @author Ronan
*/ */
@@ -150,9 +149,10 @@ public final class ItemConstants {
} }
public static boolean isFlagModifier(int scrollId, short flag) { public static boolean isFlagModifier(int scrollId, short flag) {
if(scrollId == 2041058 && ((flag & ItemConstants.COLD) == ItemConstants.COLD)) return true; if (scrollId == 2041058 && ((flag & ItemConstants.COLD) == ItemConstants.COLD)) {
if(scrollId == 2040727 && ((flag & ItemConstants.SPIKES) == ItemConstants.SPIKES)) return true; return true;
return false; }
return scrollId == 2040727 && ((flag & ItemConstants.SPIKES) == ItemConstants.SPIKES);
} }
public static boolean isChaosScroll(int scrollId) { public static boolean isChaosScroll(int scrollId) {
@@ -19,13 +19,13 @@
*/ */
package constants.net; package constants.net;
import java.util.Map;
import java.util.HashMap;
import net.opcodes.RecvOpcode; import net.opcodes.RecvOpcode;
import net.opcodes.SendOpcode; import net.opcodes.SendOpcode;
import java.util.HashMap;
import java.util.Map;
/** /**
*
* @author Ronan * @author Ronan
*/ */
public class OpcodeConstants { public class OpcodeConstants {
-1
View File
@@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Aran { public class Aran {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Archer { public class Archer {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Assassin { public class Assassin {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Bandit { public class Bandit {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Beginner { public class Beginner {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Bishop { public class Bishop {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class BlazeWizard { public class BlazeWizard {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Bowmaster { public class Bowmaster {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Brawler { public class Brawler {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Buccaneer { public class Buccaneer {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class ChiefBandit { public class ChiefBandit {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Corsair { public class Corsair {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Crossbowman { public class Crossbowman {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Crusader { public class Crusader {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class DarkKnight { public class DarkKnight {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class DawnWarrior { public class DawnWarrior {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author David * @author David
*/ */
public class DragonKnight { public class DragonKnight {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class FPArchMage { public class FPArchMage {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class FPMage { public class FPMage {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class FPWizard { public class FPWizard {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Fighter { public class Fighter {
+1 -1
View File
@@ -20,8 +20,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class GM { public class GM {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Gunslinger { public class Gunslinger {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Hermit { public class Hermit {
-1
View File
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Hero { public class Hero {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Hunter { public class Hunter {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class ILArchMage { public class ILArchMage {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class ILMage { public class ILMage {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class ILWizard { public class ILWizard {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author kevintjuh93 * @author kevintjuh93
*/ */
public class Legend { public class Legend {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Magician { public class Magician {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Marauder { public class Marauder {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Marksman { public class Marksman {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class NightLord { public class NightLord {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class NightWalker { public class NightWalker {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Noblesse { public class Noblesse {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Outlaw { public class Outlaw {
-1
View File
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Page { public class Page {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Paladin { public class Paladin {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Pirate { public class Pirate {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Priest { public class Priest {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Ranger { public class Ranger {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Rogue { public class Rogue {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Shadower { public class Shadower {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Sniper { public class Sniper {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class Spearman { public class Spearman {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class SuperGM { public class SuperGM {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class ThunderBreaker { public class ThunderBreaker {
@@ -5,7 +5,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author Tyler * @author Tyler
*/ */
public class Warrior { public class Warrior {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class WhiteKnight { public class WhiteKnight {
@@ -22,7 +22,6 @@
package constants.skills; package constants.skills;
/** /**
*
* @author BubblesDev * @author BubblesDev
*/ */
public class WindArcher { public class WindArcher {
@@ -3,7 +3,6 @@ package constants.string;
import client.Character; import client.Character;
/** /**
*
* @author Drago (Dragohe4rt) * @author Drago (Dragohe4rt)
*/ */
public class LanguageConstants { public class LanguageConstants {
@@ -15,7 +14,7 @@ public class LanguageConstants {
int lang; int lang;
private Language(int lang) { Language(int lang) {
this.lang = lang; this.lang = lang;
} }