diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cda70b7..ad59ca9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,10 +21,10 @@ jobs: with: distribution: temurin java-version: '21' - - name: Install pinned TLibs in Maven - uses: TF-Minecraft/TLibs/.github/actions/setup@94043ef24d509592df8a42d4d4bdfb5bc0d6a499 + - name: Install shared plugin dependencies + uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@c19d797eb3565838790089af59e5e5028fc56576 with: - token: ${{ secrets.DEPS_TOKEN }} + mode: pinned - name: Prepare pinned dependencies env: diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index d0a18f2..4b5147b 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -50,10 +50,10 @@ jobs: } [[ "${TAG^^}" != *SNAPSHOT* ]] || exit 1 - - name: Install pinned TLibs in Maven - uses: TF-Minecraft/TLibs/.github/actions/setup@94043ef24d509592df8a42d4d4bdfb5bc0d6a499 + - name: Install shared plugin dependencies + uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@c19d797eb3565838790089af59e5e5028fc56576 with: - token: ${{ secrets.DEPS_TOKEN }} + mode: pinned - name: Prepare pinned dependencies env: diff --git a/pom.xml b/pom.xml index 9526f3d..0944a61 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ 21 UTF-8 - 1.1.1 + 2.0.0 diff --git a/src/main/java/net/tfminecraft/Main.java b/src/main/java/net/tfminecraft/pointshop/Main.java similarity index 76% rename from src/main/java/net/tfminecraft/Main.java rename to src/main/java/net/tfminecraft/pointshop/Main.java index 994ae7b..f0d979e 100644 --- a/src/main/java/net/tfminecraft/Main.java +++ b/src/main/java/net/tfminecraft/pointshop/Main.java @@ -1,4 +1,4 @@ -package net.tfminecraft; +package net.tfminecraft.pointshop; public class Main { public static void main(String[] args) { diff --git a/src/main/java/net/tfminecraft/PointShop/PointShop.java b/src/main/java/net/tfminecraft/pointshop/PointShop.java similarity index 86% rename from src/main/java/net/tfminecraft/PointShop/PointShop.java rename to src/main/java/net/tfminecraft/pointshop/PointShop.java index 30c390e..9d5ea45 100644 --- a/src/main/java/net/tfminecraft/PointShop/PointShop.java +++ b/src/main/java/net/tfminecraft/pointshop/PointShop.java @@ -1,4 +1,4 @@ -package net.tfminecraft.PointShop; +package net.tfminecraft.pointshop; import java.io.File; @@ -7,12 +7,12 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; -import net.tfminecraft.PointShop.database.Database; -import net.tfminecraft.PointShop.loaders.PointLoader; -import net.tfminecraft.PointShop.loaders.TradeLoader; -import net.tfminecraft.PointShop.managers.CommandManager; -import net.tfminecraft.PointShop.managers.PlayerManager; -import net.tfminecraft.PointShop.managers.PointManager; +import net.tfminecraft.pointshop.database.Database; +import net.tfminecraft.pointshop.loaders.PointLoader; +import net.tfminecraft.pointshop.loaders.TradeLoader; +import net.tfminecraft.pointshop.managers.CommandManager; +import net.tfminecraft.pointshop.managers.PlayerManager; +import net.tfminecraft.pointshop.managers.PointManager; public class PointShop extends JavaPlugin{ diff --git a/src/main/java/net/tfminecraft/PointShop/database/Database.java b/src/main/java/net/tfminecraft/pointshop/database/Database.java similarity index 95% rename from src/main/java/net/tfminecraft/PointShop/database/Database.java rename to src/main/java/net/tfminecraft/pointshop/database/Database.java index 8e87f66..719d8c7 100644 --- a/src/main/java/net/tfminecraft/PointShop/database/Database.java +++ b/src/main/java/net/tfminecraft/pointshop/database/Database.java @@ -1,4 +1,4 @@ -package net.tfminecraft.PointShop.database; +package net.tfminecraft.pointshop.database; import java.io.File; import java.io.FileInputStream; @@ -18,10 +18,10 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import net.tfminecraft.PointShop.loaders.PointLoader; -import net.tfminecraft.PointShop.managers.PlayerManager; -import net.tfminecraft.PointShop.objects.PlayerData; -import net.tfminecraft.PointShop.objects.PointInstance; +import net.tfminecraft.pointshop.loaders.PointLoader; +import net.tfminecraft.pointshop.managers.PlayerManager; +import net.tfminecraft.pointshop.objects.PlayerData; +import net.tfminecraft.pointshop.objects.PointInstance; public class Database { private JSONObject json; // org.json.simple diff --git a/src/main/java/net/tfminecraft/PointShop/loaders/PointLoader.java b/src/main/java/net/tfminecraft/pointshop/loaders/PointLoader.java similarity index 89% rename from src/main/java/net/tfminecraft/PointShop/loaders/PointLoader.java rename to src/main/java/net/tfminecraft/pointshop/loaders/PointLoader.java index a832486..e741536 100644 --- a/src/main/java/net/tfminecraft/PointShop/loaders/PointLoader.java +++ b/src/main/java/net/tfminecraft/pointshop/loaders/PointLoader.java @@ -1,4 +1,4 @@ -package net.tfminecraft.PointShop.loaders; +package net.tfminecraft.pointshop.loaders; import java.io.File; import java.io.IOException; @@ -10,8 +10,8 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import me.Plugins.TLibs.Interface.LoaderInterface; -import net.tfminecraft.PointShop.objects.PointInstance; +import net.tfminecraft.tlibs.interfaces.LoaderInterface; +import net.tfminecraft.pointshop.objects.PointInstance; public class PointLoader implements LoaderInterface{ static List oList = new ArrayList(); diff --git a/src/main/java/net/tfminecraft/PointShop/loaders/TradeLoader.java b/src/main/java/net/tfminecraft/pointshop/loaders/TradeLoader.java similarity index 88% rename from src/main/java/net/tfminecraft/PointShop/loaders/TradeLoader.java rename to src/main/java/net/tfminecraft/pointshop/loaders/TradeLoader.java index 6389a3e..3010716 100644 --- a/src/main/java/net/tfminecraft/PointShop/loaders/TradeLoader.java +++ b/src/main/java/net/tfminecraft/pointshop/loaders/TradeLoader.java @@ -1,4 +1,4 @@ -package net.tfminecraft.PointShop.loaders; +package net.tfminecraft.pointshop.loaders; import java.io.File; import java.io.IOException; @@ -10,8 +10,8 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import me.Plugins.TLibs.Interface.LoaderInterface; -import net.tfminecraft.PointShop.objects.Trade; +import net.tfminecraft.tlibs.interfaces.LoaderInterface; +import net.tfminecraft.pointshop.objects.Trade; public class TradeLoader implements LoaderInterface{ static List oList = new ArrayList(); diff --git a/src/main/java/net/tfminecraft/PointShop/managers/CommandManager.java b/src/main/java/net/tfminecraft/pointshop/managers/CommandManager.java similarity index 95% rename from src/main/java/net/tfminecraft/PointShop/managers/CommandManager.java rename to src/main/java/net/tfminecraft/pointshop/managers/CommandManager.java index 72588eb..3e0886f 100644 --- a/src/main/java/net/tfminecraft/PointShop/managers/CommandManager.java +++ b/src/main/java/net/tfminecraft/pointshop/managers/CommandManager.java @@ -1,4 +1,4 @@ -package net.tfminecraft.PointShop.managers; +package net.tfminecraft.pointshop.managers; import org.bukkit.Bukkit; import org.bukkit.command.*; @@ -6,11 +6,11 @@ import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; -import net.tfminecraft.PointShop.PointShop; -import net.tfminecraft.PointShop.loaders.PointLoader; -import net.tfminecraft.PointShop.objects.PlayerData; -import net.tfminecraft.PointShop.objects.PointInstance; -import net.tfminecraft.PointShop.utils.Permissions; +import net.tfminecraft.pointshop.PointShop; +import net.tfminecraft.pointshop.loaders.PointLoader; +import net.tfminecraft.pointshop.objects.PlayerData; +import net.tfminecraft.pointshop.objects.PointInstance; +import net.tfminecraft.pointshop.utils.Permissions; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/net/tfminecraft/PointShop/managers/InventoryManager.java b/src/main/java/net/tfminecraft/pointshop/managers/InventoryManager.java similarity index 85% rename from src/main/java/net/tfminecraft/PointShop/managers/InventoryManager.java rename to src/main/java/net/tfminecraft/pointshop/managers/InventoryManager.java index ae812b5..7b6ec67 100644 --- a/src/main/java/net/tfminecraft/PointShop/managers/InventoryManager.java +++ b/src/main/java/net/tfminecraft/pointshop/managers/InventoryManager.java @@ -1,4 +1,4 @@ -package net.tfminecraft.PointShop.managers; +package net.tfminecraft.pointshop.managers; import java.util.ArrayList; import java.util.List; @@ -10,10 +10,10 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.persistence.PersistentDataType; -import net.tfminecraft.PointShop.PointShop; -import net.tfminecraft.PointShop.loaders.TradeLoader; -import net.tfminecraft.PointShop.objects.PlayerData; -import net.tfminecraft.PointShop.objects.Trade; +import net.tfminecraft.pointshop.PointShop; +import net.tfminecraft.pointshop.loaders.TradeLoader; +import net.tfminecraft.pointshop.objects.PlayerData; +import net.tfminecraft.pointshop.objects.Trade; public class InventoryManager { public void shopView(Player player, Inventory i, boolean update) { diff --git a/src/main/java/net/tfminecraft/PointShop/managers/PlayerManager.java b/src/main/java/net/tfminecraft/pointshop/managers/PlayerManager.java similarity index 91% rename from src/main/java/net/tfminecraft/PointShop/managers/PlayerManager.java rename to src/main/java/net/tfminecraft/pointshop/managers/PlayerManager.java index cee2a48..508cdde 100644 --- a/src/main/java/net/tfminecraft/PointShop/managers/PlayerManager.java +++ b/src/main/java/net/tfminecraft/pointshop/managers/PlayerManager.java @@ -1,4 +1,4 @@ -package net.tfminecraft.PointShop.managers; +package net.tfminecraft.pointshop.managers; import java.util.ArrayList; import java.util.List; @@ -11,8 +11,8 @@ import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; -import net.tfminecraft.PointShop.database.Database; -import net.tfminecraft.PointShop.objects.PlayerData; +import net.tfminecraft.pointshop.database.Database; +import net.tfminecraft.pointshop.objects.PlayerData; public class PlayerManager implements Listener{ public static List players = new ArrayList<>(); diff --git a/src/main/java/net/tfminecraft/PointShop/managers/PointManager.java b/src/main/java/net/tfminecraft/pointshop/managers/PointManager.java similarity index 88% rename from src/main/java/net/tfminecraft/PointShop/managers/PointManager.java rename to src/main/java/net/tfminecraft/pointshop/managers/PointManager.java index 4a4c18c..8a8222f 100644 --- a/src/main/java/net/tfminecraft/PointShop/managers/PointManager.java +++ b/src/main/java/net/tfminecraft/pointshop/managers/PointManager.java @@ -1,4 +1,4 @@ -package net.tfminecraft.PointShop.managers; +package net.tfminecraft.pointshop.managers; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; @@ -12,10 +12,10 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.persistence.PersistentDataType; -import net.tfminecraft.PointShop.PointShop; -import net.tfminecraft.PointShop.loaders.TradeLoader; -import net.tfminecraft.PointShop.objects.PlayerData; -import net.tfminecraft.PointShop.objects.Trade; +import net.tfminecraft.pointshop.PointShop; +import net.tfminecraft.pointshop.loaders.TradeLoader; +import net.tfminecraft.pointshop.objects.PlayerData; +import net.tfminecraft.pointshop.objects.Trade; public class PointManager implements Listener{ @EventHandler diff --git a/src/main/java/net/tfminecraft/PointShop/objects/PlayerData.java b/src/main/java/net/tfminecraft/pointshop/objects/PlayerData.java similarity index 96% rename from src/main/java/net/tfminecraft/PointShop/objects/PlayerData.java rename to src/main/java/net/tfminecraft/pointshop/objects/PlayerData.java index c35b880..bfab343 100644 --- a/src/main/java/net/tfminecraft/PointShop/objects/PlayerData.java +++ b/src/main/java/net/tfminecraft/pointshop/objects/PlayerData.java @@ -1,4 +1,4 @@ -package net.tfminecraft.PointShop.objects; +package net.tfminecraft.pointshop.objects; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/net/tfminecraft/PointShop/objects/PointInstance.java b/src/main/java/net/tfminecraft/pointshop/objects/PointInstance.java similarity index 88% rename from src/main/java/net/tfminecraft/PointShop/objects/PointInstance.java rename to src/main/java/net/tfminecraft/pointshop/objects/PointInstance.java index 2a2ca5e..adb8a86 100644 --- a/src/main/java/net/tfminecraft/PointShop/objects/PointInstance.java +++ b/src/main/java/net/tfminecraft/pointshop/objects/PointInstance.java @@ -1,8 +1,8 @@ -package net.tfminecraft.PointShop.objects; +package net.tfminecraft.pointshop.objects; import org.bukkit.configuration.ConfigurationSection; -import me.Plugins.TLibs.Objects.API.SubAPI.StringFormatter; +import net.tfminecraft.tlibs.objects.api.subapi.StringFormatter; public class PointInstance { private String id; diff --git a/src/main/java/net/tfminecraft/PointShop/objects/Trade.java b/src/main/java/net/tfminecraft/pointshop/objects/Trade.java similarity index 95% rename from src/main/java/net/tfminecraft/PointShop/objects/Trade.java rename to src/main/java/net/tfminecraft/pointshop/objects/Trade.java index 999ad1d..a677aed 100644 --- a/src/main/java/net/tfminecraft/PointShop/objects/Trade.java +++ b/src/main/java/net/tfminecraft/pointshop/objects/Trade.java @@ -1,12 +1,12 @@ -package net.tfminecraft.PointShop.objects; +package net.tfminecraft.pointshop.objects; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.inventory.ItemStack; -import me.Plugins.TLibs.TLibs; -import me.Plugins.TLibs.Enums.APIType; -import me.Plugins.TLibs.Objects.API.ItemAPI; -import net.tfminecraft.PointShop.loaders.PointLoader; +import net.tfminecraft.tlibs.TLibs; +import net.tfminecraft.tlibs.enums.APIType; +import net.tfminecraft.tlibs.objects.api.ItemAPI; +import net.tfminecraft.pointshop.loaders.PointLoader; import java.util.*; import java.util.regex.Matcher; diff --git a/src/main/java/net/tfminecraft/PointShop/utils/Permissions.java b/src/main/java/net/tfminecraft/pointshop/utils/Permissions.java similarity index 89% rename from src/main/java/net/tfminecraft/PointShop/utils/Permissions.java rename to src/main/java/net/tfminecraft/pointshop/utils/Permissions.java index 9b4e6bb..876a086 100644 --- a/src/main/java/net/tfminecraft/PointShop/utils/Permissions.java +++ b/src/main/java/net/tfminecraft/pointshop/utils/Permissions.java @@ -1,4 +1,4 @@ -package net.tfminecraft.PointShop.utils; +package net.tfminecraft.pointshop.utils; import org.bukkit.command.CommandSender; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 54ff990..eb431d4 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,4 +1,4 @@ -main: net.tfminecraft.PointShop.PointShop +main: net.tfminecraft.pointshop.PointShop api-version: '1.21.10' name: PointShop version: ${project.version}