Merge pull request #47 from TheNextLvl-net/commands

Added tiktok social link and made all commands toggleable individuable

src/main/java/net/thenextlvl/tweaks/TweaksPlugin.java

@@ -76,7 +76,7 @@ public class TweaksPlugin extends JavaPlugin {
     private final CommandConfig commands = new GsonFile<>(
             IO.of(getDataFolder(), "commands.json"),
             new CommandConfig()
-    ).validate().saveIfAbsent().getRoot();
+    ).validate().save().getRoot();
 
     private @Nullable ComponentBundle bundle;
     private @Nullable FileIO<PluginConfig> config;
@@ -127,9 +127,9 @@ private void registerCommands() {
             registerItemCommands(registrar);
             registerPlayerCommands(registrar);
             registerServerCommands(registrar);
-            registerTimeCommands(registrar);
-            registerWeatherCommands(registrar);
-            registerWorkstationCommands(registrar);
+            if (features.time()) registerTimeCommands(registrar);
+            if (features.weather()) registerWeatherCommands(registrar);
+            if (features.workstation()) registerWorkstationCommands(registrar);
             if (features.homes()) registerHomeCommands(registrar);
             if (features.msg()) registerMSGCommands(registrar);
             if (features.spawn()) registerSpawnCommands(registrar);
@@ -140,109 +140,108 @@ private void registerCommands() {
     }
 
     private void registerTimeCommands(Commands registrar) {
-        new DayCommand(this).register(registrar);
-        new MidnightCommand(this).register(registrar);
-        new NightCommand(this).register(registrar);
-        new NoonCommand(this).register(registrar);
-        new TimeCommand(this).register(registrar);
+        if (commands().day().enabled()) new DayCommand(this).register(registrar);
+        if (commands().midnight().enabled()) new MidnightCommand(this).register(registrar);
+        if (commands().night().enabled()) new NightCommand(this).register(registrar);
+        if (commands().noon().enabled()) new NoonCommand(this).register(registrar);
+        if (commands().time().enabled()) new TimeCommand(this).register(registrar);
     }
 
     private void registerWeatherCommands(Commands registrar) {
-        new RainCommand(this).register(registrar);
-        new SunCommand(this).register(registrar);
-        new ThunderCommand(this).register(registrar);
-        new WeatherCommand(this).register(registrar);
+        if (commands().rain().enabled()) new RainCommand(this).register(registrar);
+        if (commands().sun().enabled()) new SunCommand(this).register(registrar);
+        if (commands().thunder().enabled()) new ThunderCommand(this).register(registrar);
+        if (commands().weather().enabled()) new WeatherCommand(this).register(registrar);
     }
 
     private void registerItemCommands(Commands registrar) {
-        new EnchantCommand(this).register(registrar);
-        new HeadCommand(this).register(registrar);
-        new ItemCommand(this).register(registrar);
-        new LoreCommand(this).register(registrar);
-        new RenameCommand(this).register(registrar);
-        new RepairCommand(this).register(registrar);
-        new UnbreakableCommand(this).register(registrar);
-        new UnenchantCommand(this).register(registrar);
+        if (commands().enchant().enabled()) new EnchantCommand(this).register(registrar);
+        if (commands().head().enabled()) new HeadCommand(this).register(registrar);
+        if (commands().item().enabled()) new ItemCommand(this).register(registrar);
+        if (commands().lore().enabled()) new LoreCommand(this).register(registrar);
+        if (commands().rename().enabled()) new RenameCommand(this).register(registrar);
+        if (commands().repair().enabled()) new RepairCommand(this).register(registrar);
+        if (commands().unbreakable().enabled()) new UnbreakableCommand(this).register(registrar);
+        if (commands().unenchant().enabled()) new UnenchantCommand(this).register(registrar);
     }
 
     private void registerPlayerCommands(Commands registrar) {
-        new BackCommand(this).register(registrar);
-        new EnderChestCommand(this).register(registrar);
-        new FeedCommand(this).register(registrar);
-        new FlyCommand(this).register(registrar);
-        new GameModeCommand(this).register(registrar);
-        new GodCommand(this).register(registrar);
-        new HatCommand(this).register(registrar);
-        new HealCommand(this).register(registrar);
-        new InventoryCommand(this).register(registrar);
-        new OfflineTeleportCommand(this).register(registrar);
-        new PingCommand(this).register(registrar);
-        new SeenCommand(this).register(registrar);
-        new SpeedCommand(this).register(registrar);
-        new SuicideCommand(this).register(registrar);
-        new VanishCommand(this).register(registrar);
+        if (commands().back().enabled()) new BackCommand(this).register(registrar);
+        if (commands().enderchest().enabled()) new EnderChestCommand(this).register(registrar);
+        if (commands().feed().enabled()) new FeedCommand(this).register(registrar);
+        if (commands().fly().enabled()) new FlyCommand(this).register(registrar);
+        if (commands().gamemode().enabled()) new GameModeCommand(this).register(registrar);
+        if (commands().god().enabled()) new GodCommand(this).register(registrar);
+        if (commands().hat().enabled()) new HatCommand(this).register(registrar);
+        if (commands().heal().enabled()) new HealCommand(this).register(registrar);
+        if (commands().inventory().enabled()) new InventoryCommand(this).register(registrar);
+        if (commands().offlineTeleport().enabled()) new OfflineTeleportCommand(this).register(registrar);
+        if (commands().ping().enabled()) new PingCommand(this).register(registrar);
+        if (commands().seen().enabled()) new SeenCommand(this).register(registrar);
+        if (commands().speed().enabled()) new SpeedCommand(this).register(registrar);
+        if (commands().suicide().enabled()) new SuicideCommand(this).register(registrar);
+        if (commands().vanish().enabled()) new VanishCommand(this).register(registrar);
     }
 
     private void registerServerCommands(Commands registrar) {
-        new BroadcastCommand(this).register(registrar);
-        if (config().features().lobby())
-            new LobbyCommand(this).register(registrar);
-        new MotdCommand(this).register(registrar);
+        if (commands().back().enabled()) new BroadcastCommand(this).register(registrar);
+        if (commands().lobby().enabled()) new LobbyCommand(this).register(registrar);
+        if (commands().motd().enabled()) new MotdCommand(this).register(registrar);
     }
 
     private void registerWorkstationCommands(Commands registrar) {
-        new AnvilCommand(this).register(registrar);
-        new CartographyTableCommand(this).register(registrar);
-        new EnchantingTableCommand(this).register(registrar);
-        new GrindstoneCommand(this).register(registrar);
-        new LoomCommand(this).register(registrar);
-        new SmithingTableCommand(this).register(registrar);
-        new StonecutterCommand(this).register(registrar);
-        new WorkbenchCommand(this).register(registrar);
+        if (commands().anvil().enabled()) new AnvilCommand(this).register(registrar);
+        if (commands().cartographyTable().enabled()) new CartographyTableCommand(this).register(registrar);
+        if (commands().enchantingTable().enabled()) new EnchantingTableCommand(this).register(registrar);
+        if (commands().grindstone().enabled()) new GrindstoneCommand(this).register(registrar);
+        if (commands().loom().enabled()) new LoomCommand(this).register(registrar);
+        if (commands().smithingTable().enabled()) new SmithingTableCommand(this).register(registrar);
+        if (commands().stonecutter().enabled()) new StonecutterCommand(this).register(registrar);
+        if (commands().workbench().enabled()) new WorkbenchCommand(this).register(registrar);
     }
 
     private void registerHomeCommands(Commands registrar) {
-        new DeleteHomeCommand(this).register(registrar);
-        new HomeCommand(this).register(registrar);
-        new HomesCommand(this).register(registrar);
-        new SetHomeCommand(this).register(registrar);
+        if (commands().deleteHome().enabled()) new DeleteHomeCommand(this).register(registrar);
+        if (commands().home().enabled()) new HomeCommand(this).register(registrar);
+        if (commands().homes().enabled()) new HomesCommand(this).register(registrar);
+        if (commands().setHome().enabled()) new SetHomeCommand(this).register(registrar);
     }
 
     private void registerMSGCommands(Commands registrar) {
-        new MSGCommand(this).register(registrar);
-        new MSGToggleCommand(this).register(registrar);
-        new ReplyCommand(this).register(registrar);
+        if (commands().msg().enabled()) new MSGCommand(this).register(registrar);
+        if (commands().msgToggle().enabled()) new MSGToggleCommand(this).register(registrar);
+        if (commands().reply().enabled()) new ReplyCommand(this).register(registrar);
     }
 
     private void registerSpawnCommands(Commands registrar) {
-        new SetSpawnCommand(this).register(registrar);
-        new SpawnCommand(this).register(registrar);
+        if (commands().setSpawn().enabled()) new SetSpawnCommand(this).register(registrar);
+        if (commands().spawn().enabled()) new SpawnCommand(this).register(registrar);
     }
 
     private void registerTpaCommands(Commands registrar) {
-        new TPADenyCommand(this).register(registrar);
-        new TPAHereCommand(this).register(registrar);
-        new TPAcceptCommand(this).register(registrar);
-        new TPAskCommand(this).register(registrar);
-        new TPAToggleCommand(this).register(registrar);
+        if (commands().teleportAccept().enabled()) new TPAcceptCommand(this).register(registrar);
+        if (commands().teleportAsk().enabled()) new TPAskCommand(this).register(registrar);
+        if (commands().teleportDeny().enabled()) new TPADenyCommand(this).register(registrar);
+        if (commands().teleportHere().enabled()) new TPAHereCommand(this).register(registrar);
+        if (commands().teleportToggle().enabled()) new TPAToggleCommand(this).register(registrar);
     }
 
     private void registerWarpCommands(Commands registrar) {
-        new DeleteWarpCommand(this).register(registrar);
-        new SetWarpCommand(this).register(registrar);
-        new WarpCommand(this).register(registrar);
-        new WarpsCommand(this).register(registrar);
+        if (commands().deleteWarp().enabled()) new DeleteWarpCommand(this).register(registrar);
+        if (commands().setWarp().enabled()) new SetWarpCommand(this).register(registrar);
+        if (commands().warp().enabled()) new WarpCommand(this).register(registrar);
+        if (commands().warps().enabled()) new WarpsCommand(this).register(registrar);
     }
 
     private void registerLinkCommands(Commands registrar) {
-        var social = config().features().social();
-        if (social.discord()) new DiscordCommand(this).register(registrar);
-        if (social.reddit()) new RedditCommand(this).register(registrar);
-        if (social.teamspeak()) new TeamSpeakCommand(this).register(registrar);
-        if (social.twitch()) new TwitchCommand(this).register(registrar);
-        if (social.website()) new WebsiteCommand(this).register(registrar);
-        if (social.x()) new XCommand(this).register(registrar);
-        if (social.youtube()) new YouTubeCommand(this).register(registrar);
+        if (commands().discord().enabled()) new DiscordCommand(this).register(registrar);
+        if (commands().reddit().enabled()) new RedditCommand(this).register(registrar);
+        if (commands().teamspeak().enabled()) new TeamSpeakCommand(this).register(registrar);
+        if (commands().tiktok().enabled()) new TikTokCommand(this).register(registrar);
+        if (commands().twitch().enabled()) new TwitchCommand(this).register(registrar);
+        if (commands().website().enabled()) new WebsiteCommand(this).register(registrar);
+        if (commands().x().enabled()) new XCommand(this).register(registrar);
+        if (commands().youtube().enabled()) new YouTubeCommand(this).register(registrar);
     }
 
     private void registerLinks() {
@@ -251,6 +250,7 @@ private void registerLinks() {
 
         if (social.discord()) registerLink("url.discord", config().links().discord());
         if (social.reddit()) registerLink("url.reddit", config().links().reddit());
+        if (social.tiktok()) registerLink("url.tiktok", config().links().tiktok());
         if (social.twitch()) registerLink("url.twitch", config().links().twitch());
         if (social.x()) registerLink("url.x", config().links().x());
         if (social.youtube()) registerLink("url.youtube", config().links().youtube());
@@ -313,6 +313,7 @@ private void initTranslations() {
                         Placeholder.parsed("status", config().links().status()),
                         Placeholder.parsed("support", config().links().support()),
                         Placeholder.parsed("teamspeak", config().links().teamspeak()),
+                        Placeholder.parsed("tiktok", config().links().tiktok()),
                         Placeholder.parsed("twitch", config().links().twitch()),
                         Placeholder.parsed("website", config().links().website()),
                         Placeholder.parsed("x", config().links().x()),

src/main/java/net/thenextlvl/tweaks/command/social/TikTokCommand.java

@@ -0,0 +1,22 @@
+package net.thenextlvl.tweaks.command.social;
+
+import com.mojang.brigadier.Command;
+import io.papermc.paper.command.brigadier.Commands;
+import lombok.RequiredArgsConstructor;
+import net.thenextlvl.tweaks.TweaksPlugin;
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+@RequiredArgsConstructor
+@SuppressWarnings("UnstableApiUsage")
+public class TikTokCommand {
+    private final TweaksPlugin plugin;
+
+    public void register(Commands registrar) {
+        var command = Commands.literal(plugin.commands().tiktok().command()).executes(context -> {
+            plugin.bundle().sendMessage(context.getSource().getSender(), "social.tiktok");
+            return Command.SINGLE_SUCCESS;
+        }).build();
+        registrar.register(command, "Follow us on TikTok", plugin.commands().tiktok().aliases());
+    }
+}

src/main/java/net/thenextlvl/tweaks/command/social/TwitchCommand.java

@@ -17,6 +17,6 @@ public void register(Commands registrar) {
             plugin.bundle().sendMessage(context.getSource().getSender(), "social.twitch");
             return Command.SINGLE_SUCCESS;
         }).build();
-        registrar.register(command, "Watch us on Twitch", plugin.commands().twitch().aliases());
+        registrar.register(command, "Follow us on Twitch", plugin.commands().twitch().aliases());
     }
 }