From 60d6ebcd1b05e9b6b0bb3f8854c32ea9c7f9452a Mon Sep 17 00:00:00 2001 From: Ryan Barlow <7389646+ryanbarlow97@users.noreply.github.com> Date: Tue, 22 Sep 2026 20:05:15 +0000 Subject: [PATCH 1/2] refactor: standardize Java plugin packages --- src/main/java/net/tfminecraft/games/Messages.java | 2 +- .../net/tfminecraft/games/command/CommandManager.java | 2 +- .../java/net/tfminecraft/games/gui/GameSelectGui.java | 2 +- .../java/net/tfminecraft/games/guild/GuildTables.java | 8 ++++---- src/main/java/net/tfminecraft/games/help/HelpBook.java | 2 +- .../java/net/tfminecraft/games/loader/CardLoader.java | 2 +- .../net/tfminecraft/games/loader/ConfigLoader.java | 2 +- .../java/net/tfminecraft/games/loader/GamesLoader.java | 2 +- .../java/net/tfminecraft/games/loader/HelpLoader.java | 2 +- .../java/net/tfminecraft/games/table/TableManager.java | 2 +- src/main/java/net/tfminecraft/games/voice/RpNames.java | 2 +- src/main/java/net/tfminecraft/games/voice/RpVoice.java | 10 +++++----- .../java/net/tfminecraft/games/wager/ChipItems.java | 4 ++-- .../java/net/tfminecraft/games/wager/CitizenTax.java | 4 ++-- .../java/net/tfminecraft/games/wager/GuildBank.java | 6 +++--- .../net/tfminecraft/games/wager/WagerItemOverride.java | 2 +- 16 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/main/java/net/tfminecraft/games/Messages.java b/src/main/java/net/tfminecraft/games/Messages.java index 88d4dd5..aed701e 100644 --- a/src/main/java/net/tfminecraft/games/Messages.java +++ b/src/main/java/net/tfminecraft/games/Messages.java @@ -7,7 +7,7 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import me.Plugins.TLibs.Objects.API.SubAPI.StringFormatter; +import net.tfminecraft.tlibs.objects.api.subapi.StringFormatter; /** * Player-facing strings from messages.yml. diff --git a/src/main/java/net/tfminecraft/games/command/CommandManager.java b/src/main/java/net/tfminecraft/games/command/CommandManager.java index 48dfb50..0cdf076 100644 --- a/src/main/java/net/tfminecraft/games/command/CommandManager.java +++ b/src/main/java/net/tfminecraft/games/command/CommandManager.java @@ -19,7 +19,7 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import me.Plugins.TLibs.TLibs; +import net.tfminecraft.tlibs.TLibs; import net.tfminecraft.games.Games; import net.tfminecraft.games.Messages; import net.tfminecraft.games.cache.Cache; diff --git a/src/main/java/net/tfminecraft/games/gui/GameSelectGui.java b/src/main/java/net/tfminecraft/games/gui/GameSelectGui.java index 3816149..672077e 100644 --- a/src/main/java/net/tfminecraft/games/gui/GameSelectGui.java +++ b/src/main/java/net/tfminecraft/games/gui/GameSelectGui.java @@ -13,7 +13,7 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.persistence.PersistentDataType; -import me.Plugins.TLibs.TLibs; +import net.tfminecraft.tlibs.TLibs; import net.tfminecraft.games.Messages; import net.tfminecraft.games.cache.Cache; import net.tfminecraft.games.table.TableManager; diff --git a/src/main/java/net/tfminecraft/games/guild/GuildTables.java b/src/main/java/net/tfminecraft/games/guild/GuildTables.java index 17b456a..9eaec66 100644 --- a/src/main/java/net/tfminecraft/games/guild/GuildTables.java +++ b/src/main/java/net/tfminecraft/games/guild/GuildTables.java @@ -4,10 +4,10 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; -import me.Plugins.SimpleFactions.Guild.Guild; -import me.Plugins.SimpleFactions.Managers.FactionManager; -import me.Plugins.SimpleFactions.Objects.Bank; -import me.Plugins.SimpleFactions.enums.GuildModifier; +import net.tfminecraft.simplefactions.guild.Guild; +import net.tfminecraft.simplefactions.managers.FactionManager; +import net.tfminecraft.simplefactions.objects.Bank; +import net.tfminecraft.simplefactions.enums.GuildModifier; import net.tfminecraft.games.Games; import net.tfminecraft.games.Messages; import net.tfminecraft.games.table.Table; diff --git a/src/main/java/net/tfminecraft/games/help/HelpBook.java b/src/main/java/net/tfminecraft/games/help/HelpBook.java index 9036514..2a12a97 100644 --- a/src/main/java/net/tfminecraft/games/help/HelpBook.java +++ b/src/main/java/net/tfminecraft/games/help/HelpBook.java @@ -9,7 +9,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.BookMeta; -import me.Plugins.TLibs.Objects.API.SubAPI.StringFormatter; +import net.tfminecraft.tlibs.objects.api.subapi.StringFormatter; /** * One book from help.yml. Pages are written by hand in the config rather than wrapped here, diff --git a/src/main/java/net/tfminecraft/games/loader/CardLoader.java b/src/main/java/net/tfminecraft/games/loader/CardLoader.java index 2b199a4..b9e3b7c 100644 --- a/src/main/java/net/tfminecraft/games/loader/CardLoader.java +++ b/src/main/java/net/tfminecraft/games/loader/CardLoader.java @@ -15,7 +15,7 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import me.Plugins.TLibs.Interface.LoaderInterface; +import net.tfminecraft.tlibs.interfaces.LoaderInterface; import net.tfminecraft.games.Games; import net.tfminecraft.games.card.Card; diff --git a/src/main/java/net/tfminecraft/games/loader/ConfigLoader.java b/src/main/java/net/tfminecraft/games/loader/ConfigLoader.java index f5abf19..0e205ee 100644 --- a/src/main/java/net/tfminecraft/games/loader/ConfigLoader.java +++ b/src/main/java/net/tfminecraft/games/loader/ConfigLoader.java @@ -11,7 +11,7 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import me.Plugins.TLibs.Interface.LoaderInterface; +import net.tfminecraft.tlibs.interfaces.LoaderInterface; import net.tfminecraft.games.Games; import net.tfminecraft.games.cache.Cache; import net.tfminecraft.games.wager.WagerItemOverride; diff --git a/src/main/java/net/tfminecraft/games/loader/GamesLoader.java b/src/main/java/net/tfminecraft/games/loader/GamesLoader.java index a1dd7c6..4140012 100644 --- a/src/main/java/net/tfminecraft/games/loader/GamesLoader.java +++ b/src/main/java/net/tfminecraft/games/loader/GamesLoader.java @@ -11,7 +11,7 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import me.Plugins.TLibs.Interface.LoaderInterface; +import net.tfminecraft.tlibs.interfaces.LoaderInterface; import net.tfminecraft.games.Games; import net.tfminecraft.games.cache.Cache; import net.tfminecraft.games.layout.TableLayout; diff --git a/src/main/java/net/tfminecraft/games/loader/HelpLoader.java b/src/main/java/net/tfminecraft/games/loader/HelpLoader.java index 5ca71d5..80ad7ce 100644 --- a/src/main/java/net/tfminecraft/games/loader/HelpLoader.java +++ b/src/main/java/net/tfminecraft/games/loader/HelpLoader.java @@ -10,7 +10,7 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import me.Plugins.TLibs.Interface.LoaderInterface; +import net.tfminecraft.tlibs.interfaces.LoaderInterface; import net.tfminecraft.games.Games; import net.tfminecraft.games.cache.Cache; import net.tfminecraft.games.help.HelpBook; diff --git a/src/main/java/net/tfminecraft/games/table/TableManager.java b/src/main/java/net/tfminecraft/games/table/TableManager.java index 2aea43a..a8fd090 100644 --- a/src/main/java/net/tfminecraft/games/table/TableManager.java +++ b/src/main/java/net/tfminecraft/games/table/TableManager.java @@ -60,7 +60,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import me.Plugins.TLibs.TLibs; +import net.tfminecraft.tlibs.TLibs; import net.tfminecraft.games.Games; import net.tfminecraft.games.Messages; import net.tfminecraft.games.cache.Cache; diff --git a/src/main/java/net/tfminecraft/games/voice/RpNames.java b/src/main/java/net/tfminecraft/games/voice/RpNames.java index 589d700..c4dc0ee 100644 --- a/src/main/java/net/tfminecraft/games/voice/RpNames.java +++ b/src/main/java/net/tfminecraft/games/voice/RpNames.java @@ -6,7 +6,7 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; -import net.tfminecraft.RPCharacters.identity.DisplayIdentityService; +import net.tfminecraft.rpcharacters.identity.DisplayIdentityService; import net.tfminecraft.games.Games; /** diff --git a/src/main/java/net/tfminecraft/games/voice/RpVoice.java b/src/main/java/net/tfminecraft/games/voice/RpVoice.java index 0812d20..e0f9764 100644 --- a/src/main/java/net/tfminecraft/games/voice/RpVoice.java +++ b/src/main/java/net/tfminecraft/games/voice/RpVoice.java @@ -4,11 +4,11 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; -import net.tfminecraft.RPCharacters.Loaders.ChatLoader; -import net.tfminecraft.RPCharacters.Managers.PlayerManager; -import net.tfminecraft.RPCharacters.Objects.PlayerData; -import net.tfminecraft.RPCharacters.chat.ChatChannel; -import net.tfminecraft.RPCharacters.chat.ChatManager; +import net.tfminecraft.rpcharacters.loaders.ChatLoader; +import net.tfminecraft.rpcharacters.managers.PlayerManager; +import net.tfminecraft.rpcharacters.objects.PlayerData; +import net.tfminecraft.rpcharacters.chat.ChatChannel; +import net.tfminecraft.rpcharacters.chat.ChatManager; import net.tfminecraft.games.Games; import net.tfminecraft.games.layout.TableLayout; import net.tfminecraft.games.layout.TableLayout.VoiceLines; diff --git a/src/main/java/net/tfminecraft/games/wager/ChipItems.java b/src/main/java/net/tfminecraft/games/wager/ChipItems.java index 401d484..33a0525 100644 --- a/src/main/java/net/tfminecraft/games/wager/ChipItems.java +++ b/src/main/java/net/tfminecraft/games/wager/ChipItems.java @@ -9,8 +9,8 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.plugin.Plugin; -import net.tfminecraft.DenarEconomy.DenarEconomy; -import net.tfminecraft.DenarEconomy.Item.Coin; +import net.tfminecraft.denareconomy.DenarEconomy; +import net.tfminecraft.denareconomy.item.Coin; import net.tfminecraft.games.cache.Cache; /** diff --git a/src/main/java/net/tfminecraft/games/wager/CitizenTax.java b/src/main/java/net/tfminecraft/games/wager/CitizenTax.java index e0ab8a1..3bf9ad5 100644 --- a/src/main/java/net/tfminecraft/games/wager/CitizenTax.java +++ b/src/main/java/net/tfminecraft/games/wager/CitizenTax.java @@ -2,8 +2,8 @@ import org.bukkit.entity.Player; -import net.tfminecraft.DenarEconomy.DenarEconomy; -import net.tfminecraft.DenarEconomy.Loaders.MessageLoader; +import net.tfminecraft.denareconomy.DenarEconomy; +import net.tfminecraft.denareconomy.loaders.MessageLoader; /** * Citizen tax on net coin profit from a table round. Uses DenarEconomy {@code doTaxes} so diff --git a/src/main/java/net/tfminecraft/games/wager/GuildBank.java b/src/main/java/net/tfminecraft/games/wager/GuildBank.java index 2da4881..55e9599 100644 --- a/src/main/java/net/tfminecraft/games/wager/GuildBank.java +++ b/src/main/java/net/tfminecraft/games/wager/GuildBank.java @@ -3,9 +3,9 @@ import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; -import me.Plugins.SimpleFactions.Guild.Guild; -import me.Plugins.SimpleFactions.Managers.FactionManager; -import me.Plugins.SimpleFactions.Objects.Bank; +import net.tfminecraft.simplefactions.guild.Guild; +import net.tfminecraft.simplefactions.managers.FactionManager; +import net.tfminecraft.simplefactions.objects.Bank; import net.tfminecraft.games.Games; /** diff --git a/src/main/java/net/tfminecraft/games/wager/WagerItemOverride.java b/src/main/java/net/tfminecraft/games/wager/WagerItemOverride.java index 50529e3..0d28104 100644 --- a/src/main/java/net/tfminecraft/games/wager/WagerItemOverride.java +++ b/src/main/java/net/tfminecraft/games/wager/WagerItemOverride.java @@ -5,7 +5,7 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import me.Plugins.TLibs.TLibs; +import net.tfminecraft.tlibs.TLibs; /** * Per-item look and optional denar value. Null value means /wager amount is required. From d7bfa6b9357a8cbbaeb6f4c0fcb12c53c79dfab9 Mon Sep 17 00:00:00 2001 From: Ryan Barlow <7389646+ryanbarlow97@users.noreply.github.com> Date: Tue, 22 Sep 2026 20:16:27 +0000 Subject: [PATCH 2/2] build: pin matching shared plugin APIs --- .github/workflows/build.yml | 4 ++-- .github/workflows/maven-release.yml | 4 ++-- pom.xml | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bc8044f..293881b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,9 +22,9 @@ jobs: distribution: temurin java-version: '21' - name: Install shared plugin dependencies - uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@7afa185bee605908a99ac55288ed27a3babbad62 + uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@c19d797eb3565838790089af59e5e5028fc56576 with: - mode: latest + mode: pinned - name: Prepare pinned dependencies env: diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index f29b160..fb3a97c 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -51,9 +51,9 @@ jobs: [[ "${TAG^^}" != *SNAPSHOT* ]] || exit 1 - name: Install shared plugin dependencies - uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@7afa185bee605908a99ac55288ed27a3babbad62 + uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@c19d797eb3565838790089af59e5e5028fc56576 with: - mode: latest + mode: pinned - name: Prepare pinned dependencies env: diff --git a/pom.xml b/pom.xml index e08aee1..b7cbea9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,15 +6,15 @@ net.tfminecraft games - 0.1.1 + 0.2.0 21 UTF-8 - 0.1.9 - 1.1.7 - 2.8.7 - 1.1.1 + 0.2.0 + 2.0.0 + 3.0.0 + 2.0.0