Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2024-06-23 12:54:45 +02:00
Code Issues Projects Releases Wiki Activity

Refractoring + fixed a minor bug

Browse Source
This commit is contained in:
Acrobot 2013-02-08 19:29:31 +01:00
parent a499ab2cf0
commit 04abe9715c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
com/Acrobot/ChestShop/Listeners/PreShopCreation/ItemChecker.java
View File

@ -35,10 +35,10 @@ public class ItemChecker implements Listener {
}
String metadata = getMetadata(itemCode);
String longName = MaterialUtil.getName(item, LONG_NAME);
String longName = MaterialUtil.getName(item);
if (longName.length() <= (MAXIMUM_SIGN_LETTERS - metadata.length())) {
if (isStillValidItem(longName + metadata, item)) {
if (isSameItem(longName + metadata, item)) {
String itemName = StringUtil.capitalizeFirstLetter(longName + metadata);
event.setSignLine(ITEM_LINE, itemName);
@ -51,11 +51,13 @@ public class ItemChecker implements Listener {
String[] parts = itemCode.split("(?=:|-|#)", 2);
String data = (parts.length > 1 ? parts[1] : "");
if (!data.isEmpty() && code.length() >= (MAXIMUM_SIGN_LETTERS - 1 - data.length())) {
code = code.substring(0, MAXIMUM_SIGN_LETTERS - 1 - data.length()) + data;
if (!data.isEmpty() && code.length() > (MAXIMUM_SIGN_LETTERS - data.length())) {
code = code.substring(0, MAXIMUM_SIGN_LETTERS - data.length());
}
if (!isStillValidItem(code, item)) {
code += data;
if (!isSameItem(code, item)) {
code = String.valueOf(item.getTypeId()) + data;
}
@ -64,7 +66,7 @@ public class ItemChecker implements Listener {
event.setSignLine(ITEM_LINE, code);
}
private static boolean isStillValidItem(String newCode, ItemStack item) {
private static boolean isSameItem(String newCode, ItemStack item) {
ItemStack newItem = MaterialUtil.getItem(newCode);
return newItem != null && MaterialUtil.equals(newItem, item);