Skip to content

Commit 364859b

Browse files
committed
few fixes
1 parent 0efc07b commit 364859b

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

src/main/java/lol/hyper/toolstats/tools/TokenData.java

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,10 @@ public ItemStack createToken(String tokenType) {
176176
tokenMeta.displayName(title);
177177
tokenMeta.lore(lore);
178178

179+
// set the PDC
180+
tokenData.set(toolStats.tokenType, PersistentDataType.STRING, tokenType);
181+
token.setItemMeta(tokenMeta);
182+
179183
// set the custom model data
180184
if (tokenConfig.getBoolean("custom-model-data.enabled")) {
181185
String type = tokenConfig.getString("custom-model-data.type");
@@ -194,36 +198,26 @@ public ItemStack createToken(String tokenType) {
194198
}
195199
}
196200

197-
// set the PDC
198-
tokenData.set(toolStats.tokenType, PersistentDataType.STRING, tokenType);
199-
token.setItemMeta(tokenMeta);
200201
return token;
201202
}
202203

203204
private CustomModelData setData(String type, Object data) {
204205
switch (type.toLowerCase(Locale.ROOT)) {
205206
case "float": {
206-
Float f;
207-
if (data instanceof Float) {
208-
f = (Float) data;
209-
} else {
210-
toolStats.logger.info(type + " is not a valid float!");
207+
float f;
208+
try {
209+
f = Float.parseFloat(data.toString());
210+
} catch (NumberFormatException e) {
211+
toolStats.logger.info(data + " is not a valid float!");
211212
return null;
212213
}
213214
return CustomModelData.customModelData().addFloat(f).build();
214215
}
215216
case "string": {
216-
String s;
217-
if (data instanceof String) {
218-
s = (String) data;
219-
} else {
220-
toolStats.logger.info(type + " is not a valid string!");
221-
return null;
222-
}
223-
return CustomModelData.customModelData().addString(s).build();
217+
return CustomModelData.customModelData().addString(data.toString()).build();
224218
}
225219
default: {
226-
toolStats.logger.info(type + " is not a valid data type!");
220+
toolStats.logger.info(data + " is not a valid data type!");
227221
return null;
228222
}
229223
}

src/main/java/lol/hyper/toolstats/tools/config/ConfigTools.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public List<Component> getTokenLore(String tokenType) {
245245
List<Component> finalLore = new ArrayList<>();
246246
for (String line : raw) {
247247
if (line.contains("{levels}")) {
248-
Integer levels = toolStats.config.getInt("tokes.data." + tokenType + ".levels");
248+
Integer levels = toolStats.config.getInt("tokens.data." + tokenType + ".levels");
249249
// will return 0 if it doesn't exist
250250
if (levels != 0) {
251251
line = line.replace("{levels}", String.valueOf(levels));

0 commit comments

Comments
 (0)