Upstream
/
ChestShop-3
mirror of https://github.com/ChestShop-authors/ChestShop-3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow loading of different numbers to BigDecimal (Fixes #225) 

Also catch wrong types when loading the config better without completely disabling the plugin and revert "Make sure special parsers are setup" and register the parsers static again.
This commit is contained in:
Phoenix616 2019-05-03 21:08:56 +01:00
parent da1dd94705
commit 4769ae2cf7
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/Acrobot/Breeze/Configuration/Configuration.java
View File

@ -63,9 +63,7 @@ public class Configuration {
writer.write(FieldParser.parse(field));
writer.newLine();
}
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (IOException e) {
} catch (IllegalArgumentException | IllegalAccessException | IOException e) {
e.printStackTrace();
}
}

1
src/main/java/com/Acrobot/ChestShop/ChestShop.java
View File

@ -146,7 +146,6 @@ public class ChestShop extends JavaPlugin {
}
public void loadConfig() {
Properties.setup();
Configuration.pairFileAndClass(loadFile("config.yml"), Properties.class);
Configuration.pairFileAndClass(loadFile("local.yml"), Messages.class);

6
src/main/java/com/Acrobot/ChestShop/Configuration/Properties.java
View File

@ -21,7 +21,7 @@ import java.util.logging.Level;
*/
public class Properties {
public static void setup() {
static {
Configuration.registerParser("StringSet", new ValueParser(){
public Object parseToJava(Object object) {
if (object instanceof Collection) {
@ -62,6 +62,10 @@ public class Properties {
public Object parseToJava(Object object) {
if (object instanceof Double) {
return BigDecimal.valueOf((Double) object);
} else if (object instanceof Long) {
return BigDecimal.valueOf((Long) object);
} else if (object instanceof Integer) {
return BigDecimal.valueOf((Integer) object);
}
return object;
}