Skip to content

refactor: standardize Java packages and plugin API references #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanbarlow97 merged 2 commits into from
Sep 22, 2026
Merged

refactor: standardize Java packages and plugin API references #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27bf9fc
refactor: standardize Java plugin packages
ryanbarlow97 Sep 22, 2026
ed88b5d
build: pin matching shared plugin APIs
ryanbarlow97 Sep 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
private-token: ${{ secrets.DEPS_TOKEN }}

- name: Prepare pinned dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/maven-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
private-token: ${{ secrets.DEPS_TOKEN }}

- name: Prepare pinned dependencies
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@

<groupId>net.tfminecraft</groupId>
<artifactId>tfmccore</artifactId>
<version>1.0.0</version>
<version>2.0.0</version>

<properties>
<maven.compiler.release>21</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<advancedcrafting.version>1.2.3</advancedcrafting.version>
<rpcharacters.version>1.1.7</rpcharacters.version>
<simplefactions.version>2.8.7</simplefactions.version>
<tlibs.version>1.1.1</tlibs.version>
<vehicleframework.version>1.1.13</vehicleframework.version>
<advancedcrafting.version>2.0.0</advancedcrafting.version>
<rpcharacters.version>2.0.0</rpcharacters.version>
<simplefactions.version>3.0.0</simplefactions.version>
<tlibs.version>2.0.0</tlibs.version>
<vehicleframework.version>2.0.0</vehicleframework.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/tfmccore/TFMCCore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import org.bukkit.plugin.java.JavaPlugin;

import me.Plugins.TLibs.database.SqliteProvider;
import net.tfminecraft.tlibs.database.SqliteProvider;
import net.tfminecraft.tfmccore.commands.CoreCommands;
import net.tfminecraft.tfmccore.commands.CoreTabCompletion;
import net.tfminecraft.tfmccore.commands.SilentPermissionCommand;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/tfmccore/commands/CoreTabCompletion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import org.bukkit.command.TabCompleter;
import org.bukkit.entity.Player;

import me.Plugins.TLibs.Utils.TabCleaner;
import net.tfminecraft.tlibs.utils.TabCleaner;
import net.tfminecraft.tfmccore.stats.StatCategoryRegistry;

public final class CoreTabCompletion implements TabCompleter {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/tfmccore/focus/FocusListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerQuitEvent;

import net.tfminecraft.RPCharacters.lifecycle.CharacterActivatedEvent;
import net.tfminecraft.rpcharacters.lifecycle.CharacterActivatedEvent;

public final class FocusListener implements Listener {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/tfmccore/focus/FocusService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.scheduler.BukkitTask;

import net.tfminecraft.RPCharacters.Objects.RPCharacter;
import net.tfminecraft.rpcharacters.objects.RPCharacter;
import net.tfminecraft.tfmccore.TFMCCore;

public final class FocusService {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/tfminecraft/tfmccore/focus/RpCharactersBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;

import net.tfminecraft.RPCharacters.Objects.RPCharacter;
import net.tfminecraft.RPCharacters.RPCharacters;
import net.tfminecraft.rpcharacters.objects.RPCharacter;
import net.tfminecraft.rpcharacters.RPCharacters;

public final class RpCharactersBridge {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/tfmccore/letters/LetterItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,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.tfmccore.TFMCCore;

public class LetterItems {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/tfminecraft/tfmccore/manager/CoreManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;

import me.Plugins.TLibs.TLibs;
import me.Plugins.TLibs.Armour.ArmorEquipEvent;
import net.tfminecraft.tlibs.TLibs;
import net.tfminecraft.tlibs.armour.ArmorEquipEvent;
import net.tfminecraft.tfmccore.cache.Cache;

public class CoreManager implements Listener{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/tfmccore/manager/DropManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitRunnable;

import me.Plugins.TLibs.TLibs;
import net.tfminecraft.tlibs.TLibs;
import net.tfminecraft.tfmccore.TFMCCore;
import net.tfminecraft.tfmccore.loader.DropLoader;
import net.tfminecraft.tfmccore.reference.Drop;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/tfmccore/manager/StationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.EquipmentSlot;

import me.Plugins.TLibs.TLibs;
import net.tfminecraft.tlibs.TLibs;
import net.tfminecraft.tfmccore.loader.StationLoader;
import net.tfminecraft.tfmccore.reference.Station;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/tfmccore/reference/Drop.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;

import me.Plugins.TLibs.TLibs;
import net.tfminecraft.tlibs.TLibs;

public class Drop {
private String id;
Expand Down
8 changes: 4 additions & 4 deletions .../tfminecraft/tfmccore/stats/categories/advancedcrafting/AdvancedCraftingStatListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;

import net.tfminecraft.AdvancedCrafting.lifecycle.AlloyCraftedEvent;
import net.tfminecraft.AdvancedCrafting.lifecycle.AlloyDiscoveredEvent;
import net.tfminecraft.AdvancedCrafting.lifecycle.ItemCraftedEvent;
import net.tfminecraft.AdvancedCrafting.lifecycle.SmithingHitEvent;
import net.tfminecraft.advancedcrafting.lifecycle.AlloyCraftedEvent;
import net.tfminecraft.advancedcrafting.lifecycle.AlloyDiscoveredEvent;
import net.tfminecraft.advancedcrafting.lifecycle.ItemCraftedEvent;
import net.tfminecraft.advancedcrafting.lifecycle.SmithingHitEvent;

public final class AdvancedCraftingStatListener implements Listener {
private final AdvancedCraftingStatMain main;
Expand Down
8 changes: 4 additions & 4 deletions .../net/tfminecraft/tfmccore/stats/categories/advancedcrafting/AdvancedCraftingStatMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import java.util.Locale;
import java.util.UUID;

import net.tfminecraft.AdvancedCrafting.lifecycle.AlloyCraftedEvent;
import net.tfminecraft.AdvancedCrafting.lifecycle.AlloyDiscoveredEvent;
import net.tfminecraft.AdvancedCrafting.lifecycle.ItemCraftedEvent;
import net.tfminecraft.AdvancedCrafting.lifecycle.SmithingHitEvent;
import net.tfminecraft.advancedcrafting.lifecycle.AlloyCraftedEvent;
import net.tfminecraft.advancedcrafting.lifecycle.AlloyDiscoveredEvent;
import net.tfminecraft.advancedcrafting.lifecycle.ItemCraftedEvent;
import net.tfminecraft.advancedcrafting.lifecycle.SmithingHitEvent;
import net.tfminecraft.tfmccore.stats.StatManager;

public final class AdvancedCraftingStatMain {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/tfmccore/stats/categories/factions/FactionsStatListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;

import me.Plugins.SimpleFactions.War.battle.events.BattleEndedEvent;
import net.tfminecraft.simplefactions.war.battle.events.BattleEndedEvent;

public final class FactionsStatListener implements Listener {
private final FactionsStatMain main;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/tfmccore/stats/categories/factions/FactionsStatMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.util.UUID;

import me.Plugins.SimpleFactions.War.battle.events.BattleEndedEvent;
import net.tfminecraft.simplefactions.war.battle.events.BattleEndedEvent;
import net.tfminecraft.tfmccore.stats.StatManager;

public final class FactionsStatMain {
Expand Down
10 changes: 5 additions & 5 deletions ...java/net/tfminecraft/tfmccore/stats/categories/rpcharacters/RpCharactersStatListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;

import net.tfminecraft.RPCharacters.chat.CharacterChatEvent;
import net.tfminecraft.RPCharacters.lifecycle.CharacterClassChangeEvent;
import net.tfminecraft.RPCharacters.lifecycle.CharacterCreatedEvent;
import net.tfminecraft.RPCharacters.lifecycle.CharacterRaceChangeEvent;
import net.tfminecraft.RPCharacters.permadeath.CharacterPermakillEvent;
import net.tfminecraft.rpcharacters.chat.CharacterChatEvent;
import net.tfminecraft.rpcharacters.lifecycle.CharacterClassChangeEvent;
import net.tfminecraft.rpcharacters.lifecycle.CharacterCreatedEvent;
import net.tfminecraft.rpcharacters.lifecycle.CharacterRaceChangeEvent;
import net.tfminecraft.rpcharacters.permadeath.CharacterPermakillEvent;

public final class RpCharactersStatListener implements Listener {
private final RpCharactersStatMain main;
Expand Down
14 changes: 7 additions & 7 deletions ...ain/java/net/tfminecraft/tfmccore/stats/categories/rpcharacters/RpCharactersStatMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
import java.util.Locale;
import java.util.UUID;

import net.tfminecraft.RPCharacters.Objects.Races.Race;
import net.tfminecraft.RPCharacters.chat.CharacterChatEvent;
import net.tfminecraft.RPCharacters.lifecycle.CharacterClassChangeEvent;
import net.tfminecraft.RPCharacters.lifecycle.CharacterCreatedEvent;
import net.tfminecraft.RPCharacters.lifecycle.CharacterRaceChangeEvent;
import net.tfminecraft.RPCharacters.permadeath.CharacterPermakillEvent;
import net.tfminecraft.RPCharacters.permadeath.PermakillCause;
import net.tfminecraft.rpcharacters.objects.races.Race;
import net.tfminecraft.rpcharacters.chat.CharacterChatEvent;
import net.tfminecraft.rpcharacters.lifecycle.CharacterClassChangeEvent;
import net.tfminecraft.rpcharacters.lifecycle.CharacterCreatedEvent;
import net.tfminecraft.rpcharacters.lifecycle.CharacterRaceChangeEvent;
import net.tfminecraft.rpcharacters.permadeath.CharacterPermakillEvent;
import net.tfminecraft.rpcharacters.permadeath.PermakillCause;
import net.tfminecraft.tfmccore.stats.StatManager;

public final class RpCharactersStatMain {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/tfmccore/stats/categories/vehicles/VehiclesStatConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;

import net.tfminecraft.VehicleFramework.Enums.VehicleDeath;
import net.tfminecraft.vehicleframework.enums.VehicleDeath;
import net.tfminecraft.tfmccore.stats.StatLabelFormatter;

public final class VehiclesStatConfig {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/tfmccore/stats/categories/vehicles/VehiclesStatListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;

import net.tfminecraft.VehicleFramework.Events.VehicleRemoveEvent;
import net.tfminecraft.vehicleframework.events.VehicleRemoveEvent;

public final class VehiclesStatListener implements Listener {
private final VehiclesStatMain main;
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/net/tfminecraft/tfmccore/stats/categories/vehicles/VehiclesStatMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

import org.bukkit.entity.Player;

import net.tfminecraft.VehicleFramework.Data.VehicleRemovePayload;
import net.tfminecraft.VehicleFramework.Enums.SeatType;
import net.tfminecraft.VehicleFramework.Enums.VehicleDeath;
import net.tfminecraft.VehicleFramework.Events.VehicleRemoveEvent;
import net.tfminecraft.VehicleFramework.Vehicles.ActiveVehicle;
import net.tfminecraft.VehicleFramework.Vehicles.Seat.Seat;
import net.tfminecraft.vehicleframework.data.VehicleRemovePayload;
import net.tfminecraft.vehicleframework.enums.SeatType;
import net.tfminecraft.vehicleframework.enums.VehicleDeath;
import net.tfminecraft.vehicleframework.events.VehicleRemoveEvent;
import net.tfminecraft.vehicleframework.vehicles.ActiveVehicle;
import net.tfminecraft.vehicleframework.vehicles.seat.Seat;
import net.tfminecraft.tfmccore.stats.StatManager;

public final class VehiclesStatMain {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/tfminecraft/tfmccore/stats/storage/SqliteStatStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

import org.bukkit.Bukkit;

import me.Plugins.TLibs.database.SqliteDatabase;
import me.Plugins.TLibs.database.SqliteDatabaseException;
import net.tfminecraft.tlibs.database.SqliteDatabase;
import net.tfminecraft.tlibs.database.SqliteDatabaseException;

public final class SqliteStatStorage implements StatStorage {
private static final String CREATE_TABLE = """
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/tfmccore/stones/StoneItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;

import me.Plugins.TLibs.TLibs;
import net.tfminecraft.tlibs.TLibs;
import net.tfminecraft.tfmccore.TFMCCore;
import net.tfminecraft.tfmccore.util.TextUtil;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/tfminecraft/tfmccore/whistle/WhistleListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;

import me.Plugins.TLibs.TLibs;
import net.tfminecraft.tlibs.TLibs;
import net.tfminecraft.tfmccore.TFMCCore;

public class WhistleListener implements Listener {
Expand Down Expand Up @@ -104,7 +104,7 @@
// so fall back to matching registry entries with all separators stripped.
String flattened = raw.toLowerCase().replace("_", "");
for (Sound candidate : Registry.SOUNDS) {
String candidateKey = candidate.getKey().getKey().replace(".", "").replace("_", "");

Check warning on line 107 in src/main/java/net/tfminecraft/tfmccore/whistle/WhistleListener.java

View workflow job for this annotation

GitHub Actions / release / build 

getKey() in org.bukkit.Sound has been deprecated and marked for removal

Check warning on line 107 in src/main/java/net/tfminecraft/tfmccore/whistle/WhistleListener.java

View workflow job for this annotation

GitHub Actions / build 

getKey() in org.bukkit.Sound has been deprecated and marked for removal
if (candidateKey.equalsIgnoreCase(flattened)) {
cachedSound = candidate;
break;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/net/tfminecraft/tfmccore/stats/categories/vehicles/VehiclesStatConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

import net.tfminecraft.VehicleFramework.Enums.VehicleDeath;
import net.tfminecraft.vehicleframework.enums.VehicleDeath;

class VehiclesStatConfigTest {
@Test
Expand Down
Loading