Merge pull request #1 from ZombieStriker/v1.0.35

v1.0.35
ZombieStriker · May 4, 2018 · 6ab42f6 · 6ab42f6
2 parents 830bf5b + bdb7793
commit 6ab42f6
Show file tree

Hide file tree

Showing 9 changed files with 272 additions and 93 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,21 @@
+1.0.35
+	Added more blocks faces. Added Pistons, pumpkins, dispencers, and observers.
+
+1.0.34
+	More skin support.
+
+1.0.33
+	Added more skin support
+
+1.0.32
+	Fixed legacy skin issue
+
+1.0.31
+	Added more linecodes.
+
+1.0.30
+	Fixed imports
+
 1.0.29
 	Fixed Java9 JavaX import
 

diff --git a/plugin.yml b/plugin.yml
@@ -1,5 +1,5 @@
 main: me.zombie_striker.pixelprinter.PixelPrinter
-version: 1.0.29
+version: 1.0.35
 name: PixelPrinter
 commands:
   PixelPrinter:

diff --git a/src/me/zombie_striker/pixelprinter/GithubDependDownloader.java b/src/me/zombie_striker/pixelprinter/GithubDependDownloader.java
@@ -2,7 +2,6 @@
 
 import java.io.*;
 import java.net.*;
-import java.nio.file.*;
 
 import com.google.gson.*;
 import org.bukkit.*;

diff --git a/src/me/zombie_striker/pixelprinter/GithubUpdater.java b/src/me/zombie_striker/pixelprinter/GithubUpdater.java
@@ -2,7 +2,6 @@
 
 import java.io.*;
 import java.net.*;
-import java.nio.file.*;
 
 import com.google.gson.*;
 import org.bukkit.*;

diff --git a/src/me/zombie_striker/pixelprinter/Metrics.java b/src/me/zombie_striker/pixelprinter/Metrics.java
@@ -172,7 +172,8 @@ public void run() {
      *
      * @return The plugin specific data.
      */
-    public JSONObject getPluginData() {
+    @SuppressWarnings("unchecked")
+	public JSONObject getPluginData() {
         JSONObject data = new JSONObject();
 
         String pluginName = plugin.getDescription().getName();
@@ -199,7 +200,8 @@ public JSONObject getPluginData() {
      *
      * @return The server specific data.
      */
-    private JSONObject getServerData() {
+    @SuppressWarnings("unchecked")
+	private JSONObject getServerData() {
         // Minecraft specific data
         int playerAmount;
         try {
@@ -243,7 +245,8 @@ private JSONObject getServerData() {
     /**
      * Collects the data and sends it afterwards.
      */
-    private void submitData() {
+    @SuppressWarnings("unchecked")
+	private void submitData() {
         final JSONObject data = getServerData();
 
         JSONArray pluginData = new JSONArray();
@@ -354,7 +357,8 @@ public static abstract class CustomChart {
             this.chartId = chartId;
         }
 
-        private JSONObject getRequestJsonObject() {
+        @SuppressWarnings("unchecked")
+		private JSONObject getRequestJsonObject() {
             JSONObject chart = new JSONObject();
             chart.put("chartId", chartId);
             try {
@@ -395,7 +399,8 @@ public SimplePie(String chartId, Callable<String> callable) {
             this.callable = callable;
         }
 
-        @Override
+        @SuppressWarnings("unchecked")
+		@Override
         protected JSONObject getChartData() throws Exception {
             JSONObject data = new JSONObject();
             String value = callable.call();
@@ -426,7 +431,8 @@ public AdvancedPie(String chartId, Callable<Map<String, Integer>> callable) {
             this.callable = callable;
         }
 
-        @Override
+        @SuppressWarnings("unchecked")
+		@Override
         protected JSONObject getChartData() throws Exception {
             JSONObject data = new JSONObject();
             JSONObject values = new JSONObject();
@@ -470,7 +476,8 @@ public DrilldownPie(String chartId, Callable<Map<String, Map<String, Integer>>>
             this.callable = callable;
         }
 
-        @Override
+        @SuppressWarnings("unchecked")
+		@Override
         public JSONObject getChartData() throws Exception {
             JSONObject data = new JSONObject();
             JSONObject values = new JSONObject();
@@ -519,7 +526,8 @@ public SingleLineChart(String chartId, Callable<Integer> callable) {
             this.callable = callable;
         }
 
-        @Override
+        @SuppressWarnings("unchecked")
+		@Override
         protected JSONObject getChartData() throws Exception {
             JSONObject data = new JSONObject();
             int value = callable.call();
@@ -551,7 +559,8 @@ public MultiLineChart(String chartId, Callable<Map<String, Integer>> callable) {
             this.callable = callable;
         }
 
-        @Override
+        @SuppressWarnings("unchecked")
+		@Override
         protected JSONObject getChartData() throws Exception {
             JSONObject data = new JSONObject();
             JSONObject values = new JSONObject();
@@ -596,7 +605,8 @@ public SimpleBarChart(String chartId, Callable<Map<String, Integer>> callable) {
             this.callable = callable;
         }
 
-        @Override
+        @SuppressWarnings("unchecked")
+		@Override
         protected JSONObject getChartData() throws Exception {
             JSONObject data = new JSONObject();
             JSONObject values = new JSONObject();
@@ -634,7 +644,8 @@ public AdvancedBarChart(String chartId, Callable<Map<String, int[]>> callable) {
             this.callable = callable;
         }
 
-        @Override
+        @SuppressWarnings("unchecked")
+		@Override
         protected JSONObject getChartData() throws Exception {
             JSONObject data = new JSONObject();
             JSONObject values = new JSONObject();

diff --git a/src/me/zombie_striker/pixelprinter/PixelPrinter.java b/src/me/zombie_striker/pixelprinter/PixelPrinter.java
@@ -25,7 +25,6 @@
 
 import me.zombie_striker.pixelprinter.data.*;
 import me.zombie_striker.pixelprinter.util.*;
-import me.zombie_striker.pixelprinter.util.DependencyDownloader;
 import me.zombie_striker.pluginconstructor.*;
 import me.zombie_striker.pluginconstructor.RGBBlockColor.Pixel;
 
@@ -87,8 +86,8 @@ public void run() {
 		}.runTaskTimer(this, 0, 10);
 
 		instance = this;
-		images = new File(getDataFolder() + File.separator + "images");
-		resoucepackFolder = new File(getDataFolder() + File.separator + "custom_textures");
+		images = new File(getDataFolder() ,"images");
+		resoucepackFolder = new File(getDataFolder() ,"custom_textures");
 
 		Bukkit.getPluginManager().registerEvents(new PPListener(this), this);
 		if (!getDataFolder().exists())