Merge pull request #98 from BuildTheEarth/railgen-v2

Add configurable multi-track rail generation and persistent in-game editing

Author: Zoriot

build.gradle.kts

@@ -76,7 +76,7 @@ dependencies {
 
     testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.12.2")
-    testRuntimeOnly(libs.paper.api)
+    testImplementation(libs.paper.api)
 }
 
 fun Project.versionDetails(): VersionDetails {

src/main/java/net/buildtheearth/buildteamtools/modules/common/commands/BuildTeamToolsCommand.java

@@ -28,7 +28,7 @@ public class BuildTeamToolsCommand implements CommandExecutor, TabCompleter {
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String @NotNull [] args) {
 
         if (!sender.hasPermission(Permissions.BUILD_TEAM_TOOLS)) {
-            Utils.sendNoPermissionMessage(sender, Permissions.BUILD_TEAM_TOOLS);
+            Permissions.sendNoPermissionMessage(sender, Permissions.BUILD_TEAM_TOOLS);
             return true;
         }
 
@@ -40,7 +40,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
         switch (args[0].toLowerCase()) {
             case "communicators" -> {
                 if (!sender.hasPermission(Permissions.BUILD_TEAM_TOOLS_COMMUNICATORS)) {
-                    Utils.sendNoPermissionMessage(sender, Permissions.BUILD_TEAM_TOOLS_COMMUNICATORS);
+                    Permissions.sendNoPermissionMessage(sender, Permissions.BUILD_TEAM_TOOLS_COMMUNICATORS);
                     return true;
                 }
 
@@ -70,7 +70,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N
 
     private static void debugCommand(@NonNull CommandSender sender, String @NonNull [] args) {
         if (!sender.hasPermission(Permissions.BUILD_TEAM_TOOLS_DEBUG)) {
-            Utils.sendNoPermissionMessage(sender, Permissions.BUILD_TEAM_TOOLS_DEBUG);
+            Permissions.sendNoPermissionMessage(sender, Permissions.BUILD_TEAM_TOOLS_DEBUG);
             return;
         }
 
@@ -88,7 +88,7 @@ private static void debugCommand(@NonNull CommandSender sender, String @NonNull
 
     private static void cacheCommand(@NonNull CommandSender sender, String @NonNull [] args) {
         if (!sender.hasPermission(Permissions.BUILD_TEAM_TOOLS_CACHE)) {
-            Utils.sendNoPermissionMessage(sender, Permissions.BUILD_TEAM_TOOLS_CACHE);
+            Permissions.sendNoPermissionMessage(sender, Permissions.BUILD_TEAM_TOOLS_CACHE);
             return;
         }
 
@@ -110,7 +110,7 @@ private static void cacheCommand(@NonNull CommandSender sender, String @NonNull
 
     private static void reloadCommand(@NonNull CommandSender sender) {
         if (!sender.hasPermission(Permissions.BUILD_TEAM_TOOLS_RELOAD)) {
-            Utils.sendNoPermissionMessage(sender, Permissions.BUILD_TEAM_TOOLS_RELOAD);
+            Permissions.sendNoPermissionMessage(sender, Permissions.BUILD_TEAM_TOOLS_RELOAD);
             return;
         }
 
@@ -127,7 +127,7 @@ private static void reloadCommand(@NonNull CommandSender sender) {
 
     private void updateCommand(@NotNull CommandSender sender) {
         if (!sender.hasPermission(Permissions.BUILD_TEAM_TOOLS_UPDATE)) {
-            Utils.sendNoPermissionMessage(sender, Permissions.BUILD_TEAM_TOOLS_UPDATE);
+            Permissions.sendNoPermissionMessage(sender, Permissions.BUILD_TEAM_TOOLS_UPDATE);
             return;
         }
 

src/main/java/net/buildtheearth/buildteamtools/modules/common/components/updater/UpdaterComponent.java

@@ -5,7 +5,6 @@
 import net.buildtheearth.buildteamtools.BuildTeamTools;
 import net.buildtheearth.buildteamtools.modules.ModuleComponent;
 import net.buildtheearth.buildteamtools.modules.network.model.Permissions;
-import net.buildtheearth.buildteamtools.utils.Utils;
 import net.buildtheearth.buildteamtools.utils.io.ConfigPaths;
 import org.bukkit.Bukkit;
 import org.bukkit.Sound;
@@ -84,7 +83,7 @@ public void update(CommandSender sender, boolean checkMsg) {
 
     public void checkForUpdates(@NonNull CommandSender sender) {
         if (!sender.hasPermission(Permissions.BUILD_TEAM_TOOLS_CHECK_FOR_UPDATES)) {
-            Utils.sendNoPermissionMessage(sender, Permissions.BUILD_TEAM_TOOLS_CHECK_FOR_UPDATES);
+            Permissions.sendNoPermissionMessage(sender, Permissions.BUILD_TEAM_TOOLS_CHECK_FOR_UPDATES);
             return;
         }
 

src/main/java/net/buildtheearth/buildteamtools/modules/generator/components/rail/Rail.java

@@ -6,9 +6,14 @@
 import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.regions.Polygonal2DRegion;
 import com.sk89q.worldedit.regions.Region;
+import lombok.Getter;
+import net.buildtheearth.buildteamtools.BuildTeamTools;
 import net.buildtheearth.buildteamtools.modules.generator.GeneratorModule;
+import net.buildtheearth.buildteamtools.modules.generator.components.rail.configuration.RailTypeManager;
+import net.buildtheearth.buildteamtools.modules.generator.components.rail.generation.RailScripts;
 import net.buildtheearth.buildteamtools.modules.generator.model.GeneratorComponent;
 import net.buildtheearth.buildteamtools.modules.generator.model.GeneratorType;
+import net.buildtheearth.buildteamtools.modules.network.model.Permissions;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 
@@ -20,8 +25,12 @@ public class Rail extends GeneratorComponent {
 
     private final Set<UUID> preparingPlayers = ConcurrentHashMap.newKeySet();
 
+    @Getter
+    private final RailTypeManager railTypeManager;
+
     public Rail() {
         super(GeneratorType.RAIL);
+        railTypeManager = new RailTypeManager(BuildTeamTools.getInstance().getDataFolder());
     }
 
     @Override
@@ -38,7 +47,7 @@ public boolean checkForPlayer(Player player) {
                 "Rail Generator supports cuboid, polygonal and convex WorldEdit selections."
         )));
         player.closeInventory();
-        player.playSound(player.getLocation(), Sound.ENTITY_ITEM_BREAK, 1.0F, 1.0F);
+        playSound(player, Sound.ENTITY_ITEM_BREAK);
         return false;
     }
 
@@ -50,6 +59,9 @@ private boolean isSupportedRailSelection(Region region) {
 
     @Override
     public void generate(Player player) {
+        if (!Permissions.checkPermission(player, Permissions.RAIL_GENERATOR_USE))
+            return;
+
         if (GeneratorModule.getInstance().isGenerating(player) || !preparingPlayers.add(player.getUniqueId())) {
             sendAlreadyGeneratingMessage(player);
             return;
@@ -67,6 +79,10 @@ private void sendAlreadyGeneratingMessage(Player player) {
         player.sendMessage(ChatHelper.PREFIX_COMPONENT.append(ChatHelper.getErrorComponent(
                 "Rail Generator is already running. Please wait until the current generation is finished."
         )));
-        player.playSound(player.getLocation(), Sound.ENTITY_ITEM_BREAK, 1.0F, 1.0F);
+        playSound(player, Sound.ENTITY_ITEM_BREAK);
+    }
+
+    private void playSound(Player player, Sound sound) {
+        player.playSound(player, sound, 1.0F, 1.0F);
     }
 }