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

20
src/main/java/server/CashShop.java
View File

@@ -104,16 +104,20 @@ public class CashShop {
if (ItemConstants.EXPIRING_ITEMS) {
if (period == 1) {
if (itemId == ItemId.EXP_COUPON_2X_4H || itemId == ItemId.DROP_COUPON_2X_4H) { // 4 Hour 2X coupons, the period is 1, but we don't want them to last a day.
switch (itemId) {
case ItemId.DROP_COUPON_2X_4H, ItemId.EXP_COUPON_2X_4H: // 4 Hour 2X coupons, the period is 1, but we don't want them to last a day.
item.setExpiration(Server.getInstance().getCurrentTime() + HOURS.toMillis(4));
/*
} else if(itemId == 5211047 || itemId == 5360014) { // 3 Hour 2X coupons, unused as of now
item.setExpiration(Server.getInstance().getCurrentTime() + HOURS.toMillis(3));
*/
} else if (itemId == ItemId.EXP_COUPON_3X_2H) { // 2 Hour 3X coupons.
break;
case ItemId.EXP_COUPON_3X_2H:
item.setExpiration(Server.getInstance().getCurrentTime() + HOURS.toMillis(2));
} else {
break;
default:
item.setExpiration(Server.getInstance().getCurrentTime() + DAYS.toMillis(1));
break;
}
} else {
item.setExpiration(Server.getInstance().getCurrentTime() + DAYS.toMillis(period));
@@ -264,12 +268,16 @@ public class CashShop {
this.characterId = characterId;
if (!YamlConfig.config.server.USE_JOINT_CASHSHOP_INVENTORY) {
if (jobType == 0) {
switch (jobType) {
case 0:
factory = ItemFactory.CASH_EXPLORER;
} else if (jobType == 1) {
break;
case 1:
factory = ItemFactory.CASH_CYGNUS;
} else if (jobType == 2) {
break;
case 2:
factory = ItemFactory.CASH_ARAN;
break;
}
} else {
factory = ItemFactory.CASH_OVERALL;

3
src/main/java/server/SkillbookInformationProvider.java
View File

@@ -26,12 +26,9 @@ import provider.Data;
import provider.DataProvider;
import provider.DataProviderFactory;
import provider.DataTool;
import provider.wz.WZDirectoryEntry;
import provider.wz.WZFileEntry;
import provider.wz.WZFiles;
import tools.DatabaseConnection;
import java.io.File;
import java.io.IOException;
import java.nio.file.DirectoryStream;
import java.nio.file.Files;

10
src/main/java/server/events/gm/Snowball.java
View File

@@ -128,12 +128,16 @@ public class Snowball {
if (this.hits == 0) {
this.position += 1;
if (this.position == 45) {
switch (this.position) {
case 45:
map.getSnowball(team == 0 ? 1 : 0).message(1);
} else if (this.position == 290) {
break;
case 290:
map.getSnowball(team == 0 ? 1 : 0).message(2);
} else if (this.position == 560) {
break;
case 560:
map.getSnowball(team == 0 ? 1 : 0).message(3);
break;
}
this.hits = 3;

10
src/main/java/server/gachapon/GachaponItems.java
View File

@@ -43,14 +43,16 @@ public abstract class GachaponItems {
}
public final int[] getItems(int tier) {
if (tier == 0) {
switch (tier) {
case 0:
return commonItems;
} else if (tier == 1) {
case 1:
return uncommonItems;
} else if (tier == 2) {
case 2:
return rareItems;
default:
return null;
}
return null;
}
}

16
src/main/java/server/partyquest/AriantColiseum.java
View File

@@ -249,16 +249,14 @@ public class AriantColiseum {
}
private ExpeditionType getExpeditionType() {
ExpeditionType type;
if (map.getId() == MapId.ARPQ_ARENA_1) {
type = ExpeditionType.ARIANT;
} else if (map.getId() == MapId.ARPQ_ARENA_2) {
type = ExpeditionType.ARIANT1;
} else {
type = ExpeditionType.ARIANT2;
switch (map.getId()) {
case MapId.ARPQ_ARENA_1:
return ExpeditionType.ARIANT;
case MapId.ARPQ_ARENA_2:
return ExpeditionType.ARIANT1;
default:
return ExpeditionType.ARIANT2;
}
return type;
}
private void enterKingsRoom() {

41
src/main/java/server/partyquest/PartyQuest.java
View File

@@ -70,48 +70,47 @@ public class PartyQuest {
synchronized (participants) {
participants.remove(chr);
chr.setPartyQuest(null);
if (participants.isEmpty()) {
super.finalize();
}
//System.gc();
}
}
public static int getExp(String PQ, int level) {
if (PQ.equals("HenesysPQ")) {
switch (PQ) {
case "HenesysPQ":
return 1250 * level / 5;
} else if (PQ.equals("KerningPQFinal")) {
case "KerningPQFinal":
return 500 * level / 5;
} else if (PQ.equals("KerningPQ4th")) {
case "KerningPQ4th":
return 400 * level / 5;
} else if (PQ.equals("KerningPQ3rd")) {
case "KerningPQ3rd":
return 300 * level / 5;
} else if (PQ.equals("KerningPQ2nd")) {
case "KerningPQ2nd":
return 200 * level / 5;
} else if (PQ.equals("KerningPQ1st")) {
case "KerningPQ1st":
return 100 * level / 5;
} else if (PQ.equals("LudiMazePQ")) {
case "LudiMazePQ":
return 2000 * level / 5;
} else if (PQ.equals("LudiPQ1st")) {
case "LudiPQ1st":
return 100 * level / 5;
} else if (PQ.equals("LudiPQ2nd")) {
case "LudiPQ2nd":
return 250 * level / 5;
} else if (PQ.equals("LudiPQ3rd")) {
case "LudiPQ3rd":
return 350 * level / 5;
} else if (PQ.equals("LudiPQ4th")) {
case "LudiPQ4th":
return 350 * level / 5;
} else if (PQ.equals("LudiPQ5th")) {
case "LudiPQ5th":
return 400 * level / 5;
} else if (PQ.equals("LudiPQ6th")) {
case "LudiPQ6th":
return 450 * level / 5;
} else if (PQ.equals("LudiPQ7th")) {
case "LudiPQ7th":
return 500 * level / 5;
} else if (PQ.equals("LudiPQ8th")) {
case "LudiPQ8th":
return 650 * level / 5;
} else if (PQ.equals("LudiPQLast")) {
case "LudiPQLast":
return 800 * level / 5;
default:
log.warn("Unhandled PartyQuest: {}", PQ);
return 0;
}
log.warn("Unhandled PartyQuest: {}", PQ);
return 0;
}
}

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;
}
}