diff --git a/pom.xml b/pom.xml index 54f8237..2109a6c 100644 --- a/pom.xml +++ b/pom.xml @@ -7,18 +7,65 @@ com.softwarerat BansystemAPI - 1.6.7-BETA + 1.6.9-BETA - 18 - 18 + 1.8 UTF-8 + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + ${java.version} + ${java.version} + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.4 + + + package + + shade + + + false + + + + + + + + src/main/resources + true + + + + + + + forgejo + Forgejo Maven + http://heimserver.local:36107/api/packages/minecraft/maven + + papermc-repo https://repo.papermc.io/repository/maven-public/ + + gitea + http://heimserver.local:36107/api/packages/minecraft/maven + diff --git a/src/main/java/com/softwarerat/Bansystem.java b/src/main/java/com/softwarerat/bansystemAPI/Bansystem.java similarity index 58% rename from src/main/java/com/softwarerat/Bansystem.java rename to src/main/java/com/softwarerat/bansystemAPI/Bansystem.java index 0fcda5e..7824a5b 100644 --- a/src/main/java/com/softwarerat/Bansystem.java +++ b/src/main/java/com/softwarerat/bansystemAPI/Bansystem.java @@ -1,12 +1,10 @@ -package com.softwarerat; +package com.softwarerat.bansystemAPI; -import org.bukkit.plugin.java.JavaPlugin; - -import com.softwarerat.MySQL.Ban; -import com.softwarerat.MySQL.Login; -import com.softwarerat.MySQL.Mute; -import com.softwarerat.MySQL.Report; -import com.softwarerat.yml.Yaml; +import com.softwarerat.bansystemAPI.MySQL.Ban; +import com.softwarerat.bansystemAPI.MySQL.Login; +import com.softwarerat.bansystemAPI.MySQL.Mute; +import com.softwarerat.bansystemAPI.MySQL.Report; +import com.softwarerat.bansystemAPI.yml.Yaml; import lombok.Getter; @Getter diff --git a/src/main/java/com/softwarerat/MySQL/Ban.java b/src/main/java/com/softwarerat/bansystemAPI/MySQL/Ban.java similarity index 93% rename from src/main/java/com/softwarerat/MySQL/Ban.java rename to src/main/java/com/softwarerat/bansystemAPI/MySQL/Ban.java index d2808e4..c59c660 100644 --- a/src/main/java/com/softwarerat/MySQL/Ban.java +++ b/src/main/java/com/softwarerat/bansystemAPI/MySQL/Ban.java @@ -1,9 +1,9 @@ -package com.softwarerat.MySQL; - -import com.softwarerat.yml.Yaml; +package com.softwarerat.bansystemAPI.MySQL; import java.util.UUID; +import com.softwarerat.bansystemAPI.yml.Yaml; + // Class containing all SQL things for the Ban Topic public class Ban { diff --git a/src/main/java/com/softwarerat/MySQL/Login.java b/src/main/java/com/softwarerat/bansystemAPI/MySQL/Login.java similarity index 81% rename from src/main/java/com/softwarerat/MySQL/Login.java rename to src/main/java/com/softwarerat/bansystemAPI/MySQL/Login.java index c98c916..3568677 100644 --- a/src/main/java/com/softwarerat/MySQL/Login.java +++ b/src/main/java/com/softwarerat/bansystemAPI/MySQL/Login.java @@ -1,4 +1,4 @@ -package com.softwarerat.MySQL; +package com.softwarerat.bansystemAPI.MySQL; import lombok.Getter; diff --git a/src/main/java/com/softwarerat/MySQL/Mute.java b/src/main/java/com/softwarerat/bansystemAPI/MySQL/Mute.java similarity index 93% rename from src/main/java/com/softwarerat/MySQL/Mute.java rename to src/main/java/com/softwarerat/bansystemAPI/MySQL/Mute.java index 56519ff..7502b1b 100644 --- a/src/main/java/com/softwarerat/MySQL/Mute.java +++ b/src/main/java/com/softwarerat/bansystemAPI/MySQL/Mute.java @@ -1,9 +1,9 @@ -package com.softwarerat.MySQL; - -import com.softwarerat.yml.Yaml; +package com.softwarerat.bansystemAPI.MySQL; import java.util.UUID; +import com.softwarerat.bansystemAPI.yml.Yaml; + // Class containing all SQL things for the Ban Topic public class Mute { diff --git a/src/main/java/com/softwarerat/MySQL/Report.java b/src/main/java/com/softwarerat/bansystemAPI/MySQL/Report.java similarity index 94% rename from src/main/java/com/softwarerat/MySQL/Report.java rename to src/main/java/com/softwarerat/bansystemAPI/MySQL/Report.java index 62ad442..a3e806b 100644 --- a/src/main/java/com/softwarerat/MySQL/Report.java +++ b/src/main/java/com/softwarerat/bansystemAPI/MySQL/Report.java @@ -1,12 +1,12 @@ -package com.softwarerat.MySQL; - -import com.softwarerat.yml.Yaml; +package com.softwarerat.bansystemAPI.MySQL; import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.UUID; +import com.softwarerat.bansystemAPI.yml.Yaml; + public class Report { private final Yaml yaml; diff --git a/src/main/java/com/softwarerat/yml/Yaml.java b/src/main/java/com/softwarerat/bansystemAPI/yml/Yaml.java similarity index 94% rename from src/main/java/com/softwarerat/yml/Yaml.java rename to src/main/java/com/softwarerat/bansystemAPI/yml/Yaml.java index 1cb4e2f..210601e 100644 --- a/src/main/java/com/softwarerat/yml/Yaml.java +++ b/src/main/java/com/softwarerat/bansystemAPI/yml/Yaml.java @@ -1,13 +1,12 @@ -package com.softwarerat.yml; +package com.softwarerat.bansystemAPI.yml; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.plugin.java.JavaPlugin; - import java.io.File; import java.io.IOException; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.configuration.file.YamlConfiguration; + public class Yaml { private final File file;