Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up code, replace switch and try-with-resource where possible.

Browse Source
This commit is contained in:
Đạt Nhân Trương
2022-08-07 21:51:10 +07:00
parent f983b4dccf
commit 0ef3e69638
22 changed files with 609 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/server/quest/Quest.java
View File

@@ -111,12 +111,15 @@ public class Quest {
if (startReqData != null) {
for (Data startReq : startReqData.getChildren()) {
QuestRequirementType type = QuestRequirementType.getByWZName(startReq.getName());
if (type.equals(QuestRequirementType.INTERVAL)) {
switch (type) {
case INTERVAL:
repeatable = true;
} else if (type.equals(QuestRequirementType.MOB)) {
break;
case MOB:
for (Data mob : startReq.getChildren()) {
relevantMobs.add(DataTool.getInt(mob.getChildByPath("id")));
}
break;
}
AbstractQuestRequirement req = this.getRequirement(type, startReq);

37
src/main/java/server/quest/QuestActionType.java
View File

@@ -52,41 +52,42 @@ public enum QuestActionType {
}
public static QuestActionType getByWZName(String name) {
if (name.equals("exp")) {
switch (name) {
case "exp":
return EXP;
} else if (name.equals("money")) {
case "money":
return MESO;
} else if (name.equals("item")) {
case "item":
return ITEM;
} else if (name.equals("skill")) {
case "skill":
return SKILL;
} else if (name.equals("nextQuest")) {
case "nextQuest":
return NEXTQUEST;
} else if (name.equals("pop")) {
case "pop":
return FAME;
} else if (name.equals("buffItemID")) {
case "buffItemID":
return BUFF;
} else if (name.equals("petskill")) {
case "petskill":
return PETSKILL;
} else if (name.equals("no")) {
case "no":
return NO;
} else if (name.equals("yes")) {
case "yes":
return YES;
} else if (name.equals("npc")) {
case "npc":
return NPC;
} else if (name.equals("lvmin")) {
case "lvmin":
return MIN_LEVEL;
} else if (name.equals("normalAutoStart")) {
case "normalAutoStart":
return NORMAL_AUTO_START;
} else if (name.equals("pettameness")) {
case "pettameness":
return PETTAMENESS;
} else if (name.equals("petspeed")) {
case "petspeed":
return PETSPEED;
} else if (name.equals("info")) {
case "info":
return INFO;
} else if (name.equals("0")) {
case "0":
return ZERO;
} else {
default:
return UNDEFINED;
}
}

53
src/main/java/server/quest/QuestRequirementType.java
View File

@@ -62,57 +62,58 @@ public enum QuestRequirementType {
}
public static QuestRequirementType getByWZName(String name) {
if (name.equals("job")) {
switch (name) {
case "job":
return JOB;
} else if (name.equals("quest")) {
case "quest":
return QUEST;
} else if (name.equals("item")) {
case "item":
return ITEM;
} else if (name.equals("lvmin")) {
case "lvmin":
return MIN_LEVEL;
} else if (name.equals("lvmax")) {
case "lvmax":
return MAX_LEVEL;
} else if (name.equals("end")) {
case "end":
return END_DATE;
} else if (name.equals("mob")) {
case "mob":
return MOB;
} else if (name.equals("npc")) {
case "npc":
return NPC;
} else if (name.equals("fieldEnter")) {
case "fieldEnter":
return FIELD_ENTER;
} else if (name.equals("interval")) {
case "interval":
return INTERVAL;
} else if (name.equals("startscript")) {
case "startscript":
return SCRIPT;
} else if (name.equals("endscript")) {
case "endscript":
return SCRIPT;
} else if (name.equals("pet")) {
case "pet":
return PET;
} else if (name.equals("pettamenessmin")) {
case "pettamenessmin":
return MIN_PET_TAMENESS;
} else if (name.equals("mbmin")) {
case "mbmin":
return MONSTER_BOOK;
} else if (name.equals("normalAutoStart")) {
case "normalAutoStart":
return NORMAL_AUTO_START;
} else if (name.equals("infoNumber")) {
case "infoNumber":
return INFO_NUMBER;
} else if (name.equals("infoex")) {
case "infoex":
return INFO_EX;
} else if (name.equals("questComplete")) {
case "questComplete":
return COMPLETED_QUEST;
} else if (name.equals("start")) {
case "start":
return START;
/*} else if(name.equals("end")) { already coded
/* case "end":already coded
return END;*/
} else if (name.equals("daybyday")) {
case "daybyday":
return DAY_BY_DAY;
} else if (name.equals("money")) {
case "money":
return MESO;
} else if (name.equals("buff")) {
case "buff":
return BUFF;
} else if (name.equals("exceptbuff")) {
case "exceptbuff":
return EXCEPT_BUFF;
} else {
default:
return UNDEFINED;
}
}