Fix #8, add 1.14 support and fix esgive system cmd in console

SeanOMik · Sep 3, 2020 · e518e26 · e518e26
1 parent bb37c50
commit e518e26
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.seanomik</groupId>
     <artifactId>energeticstorage</artifactId>
-    <version>0.3-SNAPSHOT</version>
+    <version>0.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>EnergeticStorage</name>
@@ -47,8 +47,10 @@
                                 </relocation>
                             </relocations>
 
-                            <outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.15.2_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>
+                            <outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.14.4_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>
+                            <!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.15.2_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
                             <!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.16.1_\plugins\EnergeticStorage-MC-v${project.version}.jar</outputFile>-->
+                            <!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.16.2_\plugins\EnergeticStorage-MC-v${project.version}.jar</outputFile>-->
                         </configuration>
                     </execution>
                 </executions>
@@ -86,14 +88,13 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.15.2-R0.1-SNAPSHOT</version>
+            <version>1.14-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>de.tr7zw</groupId>
             <artifactId>item-nbt-api</artifactId>
-            <version>2.4.1</version>
-            <!--<scope>compile</scope>-->
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.WesJD.AnvilGUI</groupId>

diff --git a/src/main/java/net/seanomik/energeticstorage/commands/ESGiveCommand.java b/src/main/java/net/seanomik/energeticstorage/commands/ESGiveCommand.java
@@ -76,7 +76,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                 sender.sendMessage("Saved systems!");
                 break;
             case "system":
-                Player p = (Player) sender;
+                //Player p = (Player) sender;
 
                 if (args.length == 2) {
                     if (!PermissionChecks.canESGiveOthers(sender)) {
@@ -94,7 +94,13 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                         sender.sendMessage(Reference.PREFIX + ChatColor.RED + "Player does not exist or is not online!");
                     }
                 } else if (args.length == 1) {
-                    p.getInventory().addItem(ItemConstructor.createSystemBlock());
+                    if (sender instanceof Player) {
+                        Player player = (Player) sender;
+                        player.getInventory().addItem(ItemConstructor.createSystemBlock());
+                    } else {
+                        sender.sendMessage(Reference.PREFIX + ChatColor.RED + "Supply a player to run this command!");
+                        sender.sendMessage(generateCommandUsage(args));
+                    }
                 }
                 break;
             case "drive":
@@ -117,7 +123,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                         if (player != null) {
                             player.getInventory().addItem(ItemConstructor.createDrive(size, 0, 0));
 
-                            sender.sendMessage(Reference.PREFIX + ChatColor.GREEN + "Gave an ES System to " + player.getDisplayName());
+                            sender.sendMessage(Reference.PREFIX + ChatColor.GREEN + "Gave an ES Drive to " + player.getDisplayName());
                         } else {
                             sender.sendMessage(Reference.PREFIX + ChatColor.RED + "Player does not exist or is not online!");
                         }

diff --git a/src/main/java/net/seanomik/energeticstorage/files/PlayersFile.java b/src/main/java/net/seanomik/energeticstorage/files/PlayersFile.java
@@ -10,7 +10,7 @@
 import org.bukkit.Location;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.craftbukkit.libs.org.apache.commons.lang3.StringEscapeUtils;
+//import org.bukkit.craftbukkit.libs.org.apache.commons.lang3.StringEscapeUtils;
 import org.bukkit.inventory.ItemStack;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
@@ -245,7 +245,7 @@ public static void savePlayerSystem(ESSystem esSystem) {
             JSONArray itemsJson = new JSONArray();
             for (Map.Entry<ItemStack, Integer> entry : drive.getItems().entrySet()) {
                 try {
-                    String object = "{\"itemYAML\":\"" + StringEscapeUtils.escapeJson(ItemSerialization.serializeItem(entry.getKey(), entry.getValue())) + "\"}";
+                    String object = "{\"itemYAML\":\"" + ItemSerialization.serializeItem(entry.getKey(), entry.getValue()).replace("\"", "\\\"") + "\"}";
                     JSONObject itemJSON = (JSONObject) new JSONParser().parse(object);
 
                     itemsJson.add(itemJSON);

diff --git a/src/main/java/net/seanomik/energeticstorage/gui/ESTerminalGUI.java b/src/main/java/net/seanomik/energeticstorage/gui/ESTerminalGUI.java
@@ -10,7 +10,6 @@
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.Hash;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
 name: EnergeticStorage
 version: ${project.version}
 main: net.seanomik.energeticstorage.EnergeticStorage
-api-version: 1.15
+api-version: 1.14
 authors: [SeanOMik]
 softdepend: [Multiverse-Core]
 commands: