v1.0.29

ZombieStriker · Mar 23, 2018 · 830bf5b · 830bf5b
1 parent d71898e
commit 830bf5b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,6 @@
+1.0.29
+	Fixed Java9 JavaX import
+
 1.0.28
 	Fixed updater time-out error.
 

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

diff --git a/src/me/zombie_striker/pixelprinter/GithubDependDownloader.java b/src/me/zombie_striker/pixelprinter/GithubDependDownloader.java
@@ -27,7 +27,7 @@ public class GithubDependDownloader {
 	 * json.get("tag_name").getAsString();
 	 * 
 	 * String finalTagName = tagName.replace(".", ""); int latestVersion =
-	 * Integer.parseInt(finalTagName.substring(1, finalTagName.length()));
+	 * Integer.parseInt(finalTagName.substring(1, finalTagName.length())); 
 	 * 
 	 * if(latestVersion > Integer.parseInt(parsedVersion)) {
 	 * 

diff --git a/src/me/zombie_striker/pixelprinter/util/SkinCreator.java b/src/me/zombie_striker/pixelprinter/util/SkinCreator.java
@@ -2,16 +2,18 @@
 
 import java.awt.image.BufferedImage;
 import java.io.*;
+import java.lang.reflect.Method;
 import java.net.URL;
 
 import javax.imageio.ImageIO;
-import javax.xml.bind.DatatypeConverter;
 
 import me.zombie_striker.pluginconstructor.*;
 import me.zombie_striker.pluginconstructor.RGBBlockColor.Pixel;
 
 import org.bukkit.Location;
 
+import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
+
 public class SkinCreator {
 
 	public static BufferedImage[] getSkin(String uuid)
@@ -32,9 +34,16 @@ public static BufferedImage[] getSkin(String uuid)
 				System.out.println("The user does not exist- AAAA does not contain value.");
 				throw new NullPointerException();
 			}
-			String decode = new String(
-					DatatypeConverter.parseBase64Binary(aaaa[1]
+			String decode;
+			try{
+				Method m = Class.forName("javax.xml.bind.DatatypeConverter").getMethod("parseBase64Binary", new Class[] {String.class});
+				decode = new String(/*
+					javax.xml.bind.DatatypeConverter.parseBase64Binary(*/(String) m.invoke(null, aaaa[1]
+							.split("\"}],\"legacy\"")[0]));
+			}catch(Error|Exception e4) {
+				decode = new String(Base64.decode(aaaa[1]
 							.split("\"}],\"legacy\"")[0]));
+			}
 			linecode =38;
 			System.out.println(decode);
 			String url = decode.split("url\":\"")[1].split("\"}")[0].split("\",\"")[0];