From 5b25cf4f6c59095e83d954d5bfc79d1e6839a567 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Wed, 8 Feb 2023 16:41:25 +0800
Subject: [PATCH] chore: Update vault and json dependency
---
pom.xml | 4 ++--
.../utils/webpaste/GitHubPasteService.java | 8 ++++----
.../utils/webpaste/HastebinPasteService.java | 8 ++++----
.../utils/webpaste/PasteGGPasteService.java | 10 +++++-----
.../MultiverseCore/world/SimpleMVWorld.java | 2 +-
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8c348bae..c1a7813a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -311,7 +311,7 @@
com.github.MilkBowl
VaultAPI
- 1.7
+ 1.7.1
provided
@@ -325,7 +325,7 @@
net.minidev
json-smart
- 2.4.1
+ 2.4.8
com.dumptruckman.minecraft
diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/GitHubPasteService.java b/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/GitHubPasteService.java
index bee098df..0ee23313 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/GitHubPasteService.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/GitHubPasteService.java
@@ -1,13 +1,13 @@
package com.onarandombox.MultiverseCore.utils.webpaste;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import net.minidev.json.JSONObject;
+import net.minidev.json.parser.JSONParser;
+import net.minidev.json.parser.ParseException;
+
/**
* Pastes to {@code gist.github.com}. Requires an access token with the {@code gist} scope.
*/
diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/HastebinPasteService.java b/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/HastebinPasteService.java
index e1fa7272..c07d0ff6 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/HastebinPasteService.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/HastebinPasteService.java
@@ -1,12 +1,12 @@
package com.onarandombox.MultiverseCore.utils.webpaste;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
import java.io.IOException;
import java.util.Map;
+import net.minidev.json.JSONObject;
+import net.minidev.json.parser.JSONParser;
+import net.minidev.json.parser.ParseException;
+
/**
* Pastes to {@code hastebin.com}.
*/
diff --git a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteGGPasteService.java b/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteGGPasteService.java
index 956d71c1..cf54c346 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteGGPasteService.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteGGPasteService.java
@@ -1,14 +1,14 @@
package com.onarandombox.MultiverseCore.utils.webpaste;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import net.minidev.json.JSONArray;
+import net.minidev.json.JSONObject;
+import net.minidev.json.parser.JSONParser;
+import net.minidev.json.parser.ParseException;
+
/**
* Pastes to {@code paste.gg}.
*/
diff --git a/src/main/java/com/onarandombox/MultiverseCore/world/SimpleMVWorld.java b/src/main/java/com/onarandombox/MultiverseCore/world/SimpleMVWorld.java
index 258cd56a..8b5de66a 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/world/SimpleMVWorld.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/world/SimpleMVWorld.java
@@ -27,6 +27,7 @@ import com.onarandombox.MultiverseCore.world.configuration.WorldPropertyValidato
import me.main__.util.SerializationConfig.ChangeDeniedException;
import me.main__.util.SerializationConfig.NoSuchPropertyException;
import me.main__.util.SerializationConfig.VirtualProperty;
+import net.minidev.json.JSONObject;
import org.bukkit.ChatColor;
import org.bukkit.Difficulty;
import org.bukkit.GameMode;
@@ -41,7 +42,6 @@ import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionDefault;
import org.bukkit.util.Vector;
import org.jetbrains.annotations.Nullable;
-import org.json.simple.JSONObject;
/**
* The implementation of a Multiverse handled world.