Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-06 04:46:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Further work on items

Browse Source
This commit is contained in:
Matthew Miller
2018-06-14 11:55:02 +10:00
parent 001a3544fb
commit 1cc735e359
11 changed files with 36 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/DefaultItemParser.java
View File

@ -35,7 +35,7 @@ public class DefaultItemParser extends InputParser<BaseItem> {
public BaseItem parseFromInput(String input, ParserContext context) throws InputParseException {
String[] tokens = input.split(":", 3);
BaseItem item;
short meta = 0;
short damage = 0;
try {
int id = Integer.parseInt(tokens[0]);
@ -43,24 +43,23 @@ public class DefaultItemParser extends InputParser<BaseItem> {
// Parse metadata
if (tokens.length == 2) {
try {
meta = Short.parseShort(tokens[1]);
damage = Short.parseShort(tokens[1]);
} catch (NumberFormatException ignored) {
throw new InputParseException("Expected '" + tokens[1] + "' to be a metadata value but it's not a number");
throw new InputParseException("Expected '" + tokens[1] + "' to be a damage value but it's not a number");
}
}
item = context.requireWorld().getWorldData().getItemRegistry().createFromId(id);
} catch (NumberFormatException e) {
if (input.length() < 2) {
throw new InputParseException("'" + input + "' isn't a known item name format");
String name = tokens[0];
if (input.length() >= 2) {
name += ":" + tokens[1];
}
String name = tokens[0] + ":" + tokens[1];
// Parse metadata
if (tokens.length == 3) {
try {
meta = Short.parseShort(tokens[2]);
damage = Short.parseShort(tokens[2]);
} catch (NumberFormatException ignored) {
throw new InputParseException("Expected '" + tokens[2] + "' to be a metadata value but it's not a number");
}
@ -72,7 +71,7 @@ public class DefaultItemParser extends InputParser<BaseItem> {
if (item == null) {
throw new InputParseException("'" + input + "' did not match any item");
} else {
item.setData(meta);
item.setDamage(damage);
return item;
}
}