Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove outdated http://jd.bukkit.org/apidocs and update dependency #7

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove outdated http://jd.bukkit.org/apidocs and update dependency #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1de371
Remove outdated http://jd.bukkit.org/apidocs and update dependency
sandtechnology Sep 22, 2021
df6812b
Update readme and version number
sandtechnology Sep 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ Maven Dependency Info
<dependency>
<groupId>com.dumptruckman.minecraft</groupId>
<artifactId>JsonConfiguration</artifactId>
<version>1.1</version>
<version>1.2</version>
</dependency>
<!-- Required json dependency because no other json lib can handle numbers appropriately. -->
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>1.1.1</version>
<version>2.4.7</version>
</dependency>
</dependencies>
```
11 changes: 4 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.dumptruckman.minecraft</groupId>
<artifactId>JsonConfiguration</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2</version>
<name>JsonConfiguration</name>
<description>A JSON Configuration for Bukkit based on FileConfiguration.</description>

Expand All @@ -25,7 +25,7 @@
</repository>
<repository>
<id>onarandombox</id>
<url>http://repo.onarandombox.com/content/groups/public/</url>
<url>https://repo.onarandombox.com/content/groups/public/</url>
</repository>
</repositories>

Expand All @@ -42,7 +42,7 @@
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>1.1.1</version>
<version>2.4.7</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
Expand Down Expand Up @@ -99,7 +99,7 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.12-R0.1-SNAPSHOT</version>
<version>1.12.2-R0.1-SNAPSHOT</version>
<type>jar</type>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -187,9 +187,6 @@
<goal>jar</goal>
</goals>
<configuration>
<links>
<link>http://jd.bukkit.org/apidocs/</link>
</links>
<linksource>true</linksource>
<!--dependencySourceExcludes>
<dependencySourceExclude>com.intellij:*</dependencySourceExclude>
Expand Down
9 changes: 2 additions & 7 deletions src/main/java/com/dumptruckman/bukkit/configuration/json/JsonConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import com.dumptruckman.bukkit.configuration.SerializableSet;
import com.dumptruckman.bukkit.configuration.util.SerializationHelper;
import com.google.common.base.Charsets;
import net.minidev.json.JSONValue;
import net.minidev.json.parser.JSONParser;
import net.minidev.json.parser.ParseException;
Expand All @@ -17,12 +16,8 @@

import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
import java.nio.charset.IllegalCharsetNameException;
import java.util.*;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;

Expand Down Expand Up @@ -57,7 +52,7 @@ public void loadFromString(@NotNull final String contents) throws InvalidConfigu

Map<?, ?> input;
try {
input = (Map<?, ?>) new JSONParser(JSONParser.USE_INTEGER_STORAGE).parse(contents);
input = (Map<?, ?>) new JSONParser(JSONParser.ACCEPT_TAILLING_SPACE | JSONParser.USE_INTEGER_STORAGE).parse(contents);
} catch (ParseException e) {
throw new InvalidConfigurationException("Invalid JSON detected.", e);
} catch (ClassCastException e) {
Expand Down