From b4550d1b109090786349885f59169c0eb8dfa67f Mon Sep 17 00:00:00 2001
From: Ian <60456400+KaboomB52@users.noreply.github.com>
Date: Fri, 29 Nov 2024 02:43:01 -0600
Subject: [PATCH 1/2] Update to Java 11, fix RSAIO

---
 pom.xml                                       | 20 ++++++++++++-------
 .../vexsoftware/votifier/crypto/RSAIO.java    |  4 ++--
 src/main/resources/plugin.yml                 |  3 ++-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6287efc..9d4bdba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.vexsoftware</groupId>
     <artifactId>votifier</artifactId>
-    <version>1.9</version>
+    <version>2.0</version>
     <name>Votifier</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -19,12 +19,18 @@
     <dependencies>
         <!-- Bukkit Dependency -->
         <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>1.7.9-R0.2</version>
+            <groupId>org.eytril.spigot</groupId>
+            <artifactId>kewlspigot-server</artifactId>
+            <version>1.8.8-R0.1-SNAPSHOT</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>4.0.2</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -36,15 +42,15 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
             <!-- Jar Plugin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
+                <version>3.3.0</version>
             </plugin>
             <plugin>
                 <groupId>com.google.code.maven-replacer-plugin</groupId>
diff --git a/src/main/java/com/vexsoftware/votifier/crypto/RSAIO.java b/src/main/java/com/vexsoftware/votifier/crypto/RSAIO.java
index a5727ee..1e64ac1 100644
--- a/src/main/java/com/vexsoftware/votifier/crypto/RSAIO.java
+++ b/src/main/java/com/vexsoftware/votifier/crypto/RSAIO.java
@@ -18,6 +18,8 @@
 
 package com.vexsoftware.votifier.crypto;
 
+import jakarta.xml.bind.DatatypeConverter;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -28,8 +30,6 @@
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
 
-import javax.xml.bind.DatatypeConverter;
-
 /**
  * Static utility methods for saving and loading RSA key pairs.
  * 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 0762eea..c356caa 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -2,4 +2,5 @@ name: Votifier
 main: com.vexsoftware.votifier.Votifier
 version: maven-version-number
 description: A plugin that gets notified when votes are made for the server on toplists.
-authors: [blakeman8192, Kramer]
\ No newline at end of file
+authors: [blakeman8192, Kramer, Ian]
+api-version: 1.13+ # For those higher versions <3
\ No newline at end of file

From ff5add66d6e4787b96e6c6e6814909e3f5258079 Mon Sep 17 00:00:00 2001
From: Ian <60456400+KaboomB52@users.noreply.github.com>
Date: Fri, 29 Nov 2024 02:56:22 -0600
Subject: [PATCH 2/2] Forgot to shade it, 2.0 now done!

---
 dependency-reduced-pom.xml    | 56 +++++++++++++++++++++++++++++++++++
 pom.xml                       | 35 +++++++++-------------
 src/main/resources/plugin.yml |  2 +-
 3 files changed, 71 insertions(+), 22 deletions(-)
 create mode 100644 dependency-reduced-pom.xml

diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
new file mode 100644
index 0000000..b0557cb
--- /dev/null
+++ b/dependency-reduced-pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.vexsoftware</groupId>
+  <artifactId>votifier</artifactId>
+  <name>Votifier</name>
+  <version>2.0</version>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
+        <configuration>
+          <source>11</source>
+          <target>11</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.3.0</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.4.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <createDependencyReducedPom>true</createDependencyReducedPom>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <repositories>
+    <repository>
+      <id>bukkit</id>
+      <url>http://repo.bukkit.org/content/groups/public/</url>
+    </repository>
+  </repositories>
+  <dependencies>
+    <dependency>
+      <groupId>org.eytril.spigot</groupId>
+      <artifactId>kewlspigot-server</artifactId>
+      <version>1.8.8-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+</project>
diff --git a/pom.xml b/pom.xml
index 9d4bdba..dff2892 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
             <artifactId>kewlspigot-server</artifactId>
             <version>1.8.8-R0.1-SNAPSHOT</version>
             <type>jar</type>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
@@ -34,8 +34,8 @@
     </dependencies>
 
     <build>
-        <defaultGoal>clean package</defaultGoal>
         <plugins>
+
             <!-- Compiler -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -46,39 +46,32 @@
                     <target>11</target>
                 </configuration>
             </plugin>
+
             <!-- Jar Plugin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.3.0</version>
             </plugin>
+
+            <!-- Shade Plugin -->
             <plugin>
-                <groupId>com.google.code.maven-replacer-plugin</groupId>
-                <artifactId>maven-replacer-plugin</artifactId>
-                <version>1.3.8</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
-                        <phase>prepare-package</phase>
+                        <phase>package</phase>
                         <goals>
-                            <goal>replace</goal>
+                            <goal>shade</goal>
                         </goals>
+                        <configuration>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <file>target/classes/plugin.yml</file>
-                    <replacements>
-                        <replacement>
-                            <token>maven-version-number</token>
-                            <value>${project.version}</value>
-                        </replacement>
-                    </replacements>
-                </configuration>
-            </plugin>
-            <plugin>
-            	<groupId>org.apache.maven.plugins</groupId>
-            	<artifactId>maven-javadoc-plugin</artifactId>
-            	<version>2.9</version>
             </plugin>
+
         </plugins>
     </build>
 </project>
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index c356caa..0a65855 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: Votifier
 main: com.vexsoftware.votifier.Votifier
-version: maven-version-number
+version: 2.0
 description: A plugin that gets notified when votes are made for the server on toplists.
 authors: [blakeman8192, Kramer, Ian]
 api-version: 1.13+ # For those higher versions <3
\ No newline at end of file