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

Turn item id magic numbers into constants

Browse Source
This commit is contained in:
P0nk
2021-11-07 11:38:32 +01:00
parent a4c079c2e8
commit 4efd356cbf
50 changed files with 790 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/constants/inventory/ItemConstants.java
View File

@@ -23,6 +23,7 @@ package constants.inventory;
import client.inventory.InventoryType;
import config.YamlConfig;
import constants.id.ItemId;
import java.util.HashMap;
import java.util.HashSet;
@@ -51,9 +52,9 @@ public final class ItemConstants {
public final static Set<Integer> permanentItemids = new HashSet<>();
static {
int[] pi = {5000060, 5000100, 5000101, 5000102}; // i ain't going to open one gigantic itemid cache just for 4 perma itemids, no way!
for (int i : pi) {
permanentItemids.add(i);
// i ain't going to open one gigantic itemid cache just for 4 perma itemids, no way!
for (int petItemId : ItemId.getPermaPets()) {
permanentItemids.add(petItemId);
}
}
@@ -108,7 +109,7 @@ public final class ItemConstants {
}
public static boolean isExpirablePet(int itemId) {
return YamlConfig.config.server.USE_ERASE_PET_ON_EXPIRATION || itemId == 5000054;
return YamlConfig.config.server.USE_ERASE_PET_ON_EXPIRATION || itemId == ItemId.PET_SNAIL;
}
public static boolean isPermanentItem(int itemId) {
@@ -133,11 +134,11 @@ public final class ItemConstants {
}
public static boolean isTownScroll(int itemId) {
return itemId >= 2030000 && itemId < 2030100;
return itemId >= 2030000 && itemId < ItemId.ANTI_BANISH_SCROLL;
}
public static boolean isAntibanishScroll(int itemId) {
return itemId == 2030100;
return itemId == ItemId.ANTI_BANISH_SCROLL;
}
public static boolean isCleanSlate(int scrollId) {
@@ -145,14 +146,14 @@ public final class ItemConstants {
}
public static boolean isModifierScroll(int scrollId) {
return scrollId == 2040727 || scrollId == 2041058;
return scrollId == ItemId.SPIKES_SCROLL || scrollId == ItemId.COLD_PROTECTION_SCROLl;
}
public static boolean isFlagModifier(int scrollId, short flag) {
if (scrollId == 2041058 && ((flag & ItemConstants.COLD) == ItemConstants.COLD)) {
if (scrollId == ItemId.COLD_PROTECTION_SCROLl && ((flag & ItemConstants.COLD) == ItemConstants.COLD)) {
return true;
}
return scrollId == 2040727 && ((flag & ItemConstants.SPIKES) == ItemConstants.SPIKES);
return scrollId == ItemId.SPIKES_SCROLL && ((flag & ItemConstants.SPIKES) == ItemConstants.SPIKES);
}
public static boolean isChaosScroll(int scrollId) {
@@ -172,10 +173,6 @@ public final class ItemConstants {
return itemId >= 2022430 && itemId <= 2022433 || itemId >= 2022160 && itemId <= 2022163;
}
public static boolean isPartyAllcure(int itemId) {
return itemId == 2022433 || itemId == 2022163;
}
public static boolean isHiredMerchant(int itemId) {
return itemId / 10000 == 503;
}
@@ -227,21 +224,13 @@ public final class ItemConstants {
}
public static boolean isFishingChair(int itemId) {
return itemId == 3011000;
return itemId == ItemId.FISHING_CHAIR;
}
public static boolean isMedal(int itemId) {
return itemId >= 1140000 && itemId < 1143000;
}
public static boolean isWeddingRing(int itemId) {
return itemId >= 1112803 && itemId <= 1112809;
}
public static boolean isWeddingToken(int itemId) {
return itemId >= 4031357 && itemId <= 4031364;
}
public static boolean isFace(int itemId) {
return itemId >= 20000 && itemId < 22000;
}
@@ -249,12 +238,4 @@ public final class ItemConstants {
public static boolean isHair(int itemId) {
return itemId >= 30000 && itemId < 35000;
}
public static boolean isFaceExpression(int itemId) {
return itemId / 10000 == 516;
}
public static boolean isChair(int itemId) {
return itemId / 10000 == 301;
}
}