move all spigot modules to a module

HSGamer · HSGamer · commit 7b825ef35414 · 2025-11-23T23:30:00.000+07:00
diff --git a/pom.xml b/pom.xml
@@ -10,13 +10,7 @@
     <version>5.0.0-SNAPSHOT</version>
 
     <modules>
-        <module>api</module>
-        <module>test</module>
-        <module>fawe</module>
-        <module>folia</module>
-        <module>simple</module>
-        <module>vanilla</module>
-        <module>we</module>
+        <module>spigot</module>
     </modules>
 
     <name>BlockUtil</name>
@@ -55,17 +49,6 @@
         <mc.version>1.12.2-R0.1-20190527.155359-34</mc.version>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>nms-repo</id>
-            <url>https://repo.codemc.io/repository/nms/</url>
-        </repository>
-        <repository>
-            <id>codemc-repo</id>
-            <url>https://repo.codemc.io/repository/maven-public/</url>
-        </repository>
-    </repositories>
-
     <build>
         <plugins>
             <plugin>
@@ -110,15 +93,6 @@
         </plugins>
     </build>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot</artifactId>
-            <version>${mc.version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
     <profiles>
         <profile>
             <id>central</id>
diff --git a/spigot/api/pom.xml b/spigot/api/pom.xml
@@ -4,13 +4,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>io.github.projectunified</groupId>
-        <artifactId>block-util</artifactId>
+        <artifactId>block-util-spigot</artifactId>
         <version>5.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>block-util-api</artifactId>
-    <name>BlockUtil Api</name>
+    <artifactId>block-util-spigot-api</artifactId>
+    <name>BlockUtil Spigot - API</name>
 
     <dependencies>
         <dependency>
diff --git a/spigot/api/src/main/java/io/github/projectunified/blockutil/spigot/api/BlockData.java b/spigot/api/src/main/java/io/github/projectunified/blockutil/spigot/api/BlockData.java
@@ -1,4 +1,4 @@
-package io.github.projectunified.blockutil.api;
+package io.github.projectunified.blockutil.spigot.api;
 
 import org.bukkit.Material;
 
diff --git a/spigot/api/src/main/java/io/github/projectunified/blockutil/spigot/api/BlockHandler.java b/spigot/api/src/main/java/io/github/projectunified/blockutil/spigot/api/BlockHandler.java
@@ -1,4 +1,4 @@
-package io.github.projectunified.blockutil.api;
+package io.github.projectunified.blockutil.spigot.api;
 
 import com.lewdev.probabilitylib.ProbabilityCollection;
 import me.hsgamer.hscore.minecraft.block.box.BlockBox;
diff --git a/spigot/api/src/main/java/io/github/projectunified/blockutil/spigot/api/BlockProcess.java b/spigot/api/src/main/java/io/github/projectunified/blockutil/spigot/api/BlockProcess.java
@@ -1,4 +1,4 @@
-package io.github.projectunified.blockutil.api;
+package io.github.projectunified.blockutil.spigot.api;
 
 public interface BlockProcess {
     BlockProcess COMPLETED = new BlockProcess() {
diff --git a/spigot/api/src/main/java/io/github/projectunified/blockutil/spigot/api/Pair.java b/spigot/api/src/main/java/io/github/projectunified/blockutil/spigot/api/Pair.java
@@ -1,4 +1,4 @@
-package io.github.projectunified.blockutil.api;
+package io.github.projectunified.blockutil.spigot.api;
 
 import java.util.Objects;
 
diff --git a/spigot/api/src/main/java/io/github/projectunified/blockutil/spigot/api/Version.java b/spigot/api/src/main/java/io/github/projectunified/blockutil/spigot/api/Version.java
@@ -1,4 +1,4 @@
-package io.github.projectunified.blockutil.api;
+package io.github.projectunified.blockutil.spigot.api;
 
 import org.bukkit.Bukkit;
 
diff --git a/spigot/fawe/pom.xml b/spigot/fawe/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.github.projectunified</groupId>
-        <artifactId>block-util</artifactId>
+        <artifactId>block-util-spigot</artifactId>
         <version>5.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>block-util-fawe</artifactId>
-    <name>BlockUtil FastAsyncWorldEdit</name>
+    <artifactId>block-util-spigot-fawe</artifactId>
+    <name>BlockUtil Spigot - FastAsyncWorldEdit</name>
 
     <properties>
         <java.version>11</java.version>
@@ -21,7 +21,7 @@
     <dependencies>
         <dependency>
             <groupId>io.github.projectunified</groupId>
-            <artifactId>block-util-api</artifactId>
+            <artifactId>block-util-spigot-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/spigot/fawe/src/main/java/io/github/projectunified/blockutil/spigot/fawe/FaweBlockHandler.java b/spigot/fawe/src/main/java/io/github/projectunified/blockutil/spigot/fawe/FaweBlockHandler.java
@@ -1,4 +1,4 @@
-package io.github.projectunified.blockutil.fawe;
+package io.github.projectunified.blockutil.spigot.fawe;
 
 import com.fastasyncworldedit.core.util.TaskManager;
 import com.lewdev.probabilitylib.ProbabilityCollection;
@@ -11,7 +11,7 @@
 import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.world.block.BlockState;
-import io.github.projectunified.blockutil.api.*;
+import io.github.projectunified.blockutil.spigot.api.*;
 import me.hsgamer.hscore.minecraft.block.box.BlockBox;
 import me.hsgamer.hscore.minecraft.block.box.Position;
 import me.hsgamer.hscore.minecraft.block.iterator.PositionIterator;
diff --git a/spigot/folia/pom.xml b/spigot/folia/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.github.projectunified</groupId>
-        <artifactId>block-util</artifactId>
+        <artifactId>block-util-spigot</artifactId>
         <version>5.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>block-util-folia</artifactId>
-    <name>BlockUtil Folia</name>
+    <artifactId>block-util-spigot-folia</artifactId>
+    <name>BlockUtil Spigot - Folia</name>
 
     <repositories>
         <repository>
@@ -28,7 +28,7 @@
         </dependency>
         <dependency>
             <groupId>io.github.projectunified</groupId>
-            <artifactId>block-util-simple</artifactId>
+            <artifactId>block-util-spigot-simple</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/spigot/folia/src/main/java/io/github/projectunified/blockutil/spigot/folia/FoliaBlockHandler.java b/spigot/folia/src/main/java/io/github/projectunified/blockutil/spigot/folia/FoliaBlockHandler.java
@@ -1,9 +1,9 @@
-package io.github.projectunified.blockutil.folia;
+package io.github.projectunified.blockutil.spigot.folia;
 
-import io.github.projectunified.blockutil.api.BlockData;
-import io.github.projectunified.blockutil.api.BlockProcess;
-import io.github.projectunified.blockutil.api.Pair;
-import io.github.projectunified.blockutil.simple.SimpleBlockHandler;
+import io.github.projectunified.blockutil.spigot.api.BlockData;
+import io.github.projectunified.blockutil.spigot.api.BlockProcess;
+import io.github.projectunified.blockutil.spigot.api.Pair;
+import io.github.projectunified.blockutil.spigot.simple.SimpleBlockHandler;
 import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
 import me.hsgamer.hscore.bukkit.block.BukkitBlockAdapter;
 import me.hsgamer.hscore.minecraft.block.box.Position;
diff --git a/spigot/pom.xml b/spigot/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.github.projectunified</groupId>
+        <artifactId>block-util</artifactId>
+        <version>5.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>block-util-spigot</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>api</module>
+        <module>test</module>
+        <module>fawe</module>
+        <module>folia</module>
+        <module>simple</module>
+        <module>vanilla</module>
+        <module>we</module>
+    </modules>
+
+    <name>BlockUtil Spigot</name>
+
+    <properties>
+        <mc.version>1.12.2-R0.1-20190527.155359-34</mc.version>
+    </properties>
+
+    <repositories>
+        <repository>
+            <id>nms-repo</id>
+            <url>https://repo.codemc.io/repository/nms/</url>
+        </repository>
+        <repository>
+            <id>codemc-repo</id>
+            <url>https://repo.codemc.io/repository/maven-public/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>${mc.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/spigot/simple/pom.xml b/spigot/simple/pom.xml
@@ -5,17 +5,17 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.github.projectunified</groupId>
-        <artifactId>block-util</artifactId>
+        <artifactId>block-util-spigot</artifactId>
         <version>5.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>block-util-simple</artifactId>
-    <name>BlockUtil Simple</name>
+    <artifactId>block-util-spigot-simple</artifactId>
+    <name>BlockUtil Spigot - Simple</name>
 
     <dependencies>
         <dependency>
             <groupId>io.github.projectunified</groupId>
-            <artifactId>block-util-api</artifactId>
+            <artifactId>block-util-spigot-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/spigot/simple/src/main/java/io/github/projectunified/blockutil/spigot/simple/SimpleBlockHandler.java b/spigot/simple/src/main/java/io/github/projectunified/blockutil/spigot/simple/SimpleBlockHandler.java
@@ -1,9 +1,9 @@
-package io.github.projectunified.blockutil.simple;
+package io.github.projectunified.blockutil.spigot.simple;
 
 import com.lewdev.probabilitylib.ProbabilityCollection;
-import io.github.projectunified.blockutil.api.BlockData;
-import io.github.projectunified.blockutil.api.BlockHandler;
-import io.github.projectunified.blockutil.api.BlockProcess;
+import io.github.projectunified.blockutil.spigot.api.BlockData;
+import io.github.projectunified.blockutil.spigot.api.BlockHandler;
+import io.github.projectunified.blockutil.spigot.api.BlockProcess;
 import me.hsgamer.hscore.minecraft.block.box.BlockBox;
 import me.hsgamer.hscore.minecraft.block.box.Position;
 import me.hsgamer.hscore.minecraft.block.iterator.BasePositionIterator;
diff --git a/spigot/test/pom.xml b/spigot/test/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.github.projectunified</groupId>
-        <artifactId>block-util</artifactId>
+        <artifactId>block-util-spigot</artifactId>
         <version>5.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>block-util-test</artifactId>
-    <name>BlockUtil Test</name>
+    <artifactId>block-util-spigot-test</artifactId>
+    <name>BlockUtil Spigot - Test</name>
 
     <build>
         <plugins>
@@ -53,12 +53,12 @@
     <dependencies>
         <dependency>
             <groupId>io.github.projectunified</groupId>
-            <artifactId>block-util-fawe</artifactId>
+            <artifactId>block-util-spigot-fawe</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.github.projectunified</groupId>
-            <artifactId>block-util-folia</artifactId>
+            <artifactId>block-util-spigot-folia</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/spigot/test/src/main/java/io/github/projectunified/blockutil/spigot/test/BlockUtilTest.java b/spigot/test/src/main/java/io/github/projectunified/blockutil/spigot/test/BlockUtilTest.java
@@ -1,11 +1,11 @@
-package io.github.projectunified.blockutil.test;
-
-import io.github.projectunified.blockutil.api.BlockHandler;
-import io.github.projectunified.blockutil.fawe.FaweBlockHandler;
-import io.github.projectunified.blockutil.folia.FoliaBlockHandler;
-import io.github.projectunified.blockutil.test.command.Pos1Command;
-import io.github.projectunified.blockutil.test.command.Pos2Command;
-import io.github.projectunified.blockutil.test.command.SetBlockCommand;
+package io.github.projectunified.blockutil.spigot.test;
+
+import io.github.projectunified.blockutil.spigot.api.BlockHandler;
+import io.github.projectunified.blockutil.spigot.fawe.FaweBlockHandler;
+import io.github.projectunified.blockutil.spigot.folia.FoliaBlockHandler;
+import io.github.projectunified.blockutil.spigot.test.command.Pos1Command;
+import io.github.projectunified.blockutil.spigot.test.command.Pos2Command;
+import io.github.projectunified.blockutil.spigot.test.command.SetBlockCommand;
 import me.hsgamer.hscore.bukkit.baseplugin.BasePlugin;
 import org.bukkit.Location;
 
diff --git a/spigot/test/src/main/java/io/github/projectunified/blockutil/spigot/test/command/BlockCommand.java b/spigot/test/src/main/java/io/github/projectunified/blockutil/spigot/test/command/BlockCommand.java
@@ -1,6 +1,6 @@
-package io.github.projectunified.blockutil.test.command;
+package io.github.projectunified.blockutil.spigot.test.command;
 
-import io.github.projectunified.blockutil.test.BlockUtilTest;
+import io.github.projectunified.blockutil.spigot.test.BlockUtilTest;
 import org.bukkit.Location;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
diff --git a/spigot/test/src/main/java/io/github/projectunified/blockutil/spigot/test/command/Pos1Command.java b/spigot/test/src/main/java/io/github/projectunified/blockutil/spigot/test/command/Pos1Command.java
@@ -1,6 +1,6 @@
-package io.github.projectunified.blockutil.test.command;
+package io.github.projectunified.blockutil.spigot.test.command;
 
-import io.github.projectunified.blockutil.test.BlockUtilTest;
+import io.github.projectunified.blockutil.spigot.test.BlockUtilTest;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
diff --git a/spigot/test/src/main/java/io/github/projectunified/blockutil/spigot/test/command/Pos2Command.java b/spigot/test/src/main/java/io/github/projectunified/blockutil/spigot/test/command/Pos2Command.java
@@ -1,6 +1,6 @@
-package io.github.projectunified.blockutil.test.command;
+package io.github.projectunified.blockutil.spigot.test.command;
 
-import io.github.projectunified.blockutil.test.BlockUtilTest;
+import io.github.projectunified.blockutil.spigot.test.BlockUtilTest;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
diff --git a/spigot/test/src/main/java/io/github/projectunified/blockutil/spigot/test/command/SetBlockCommand.java b/spigot/test/src/main/java/io/github/projectunified/blockutil/spigot/test/command/SetBlockCommand.java
@@ -1,9 +1,9 @@
-package io.github.projectunified.blockutil.test.command;
+package io.github.projectunified.blockutil.spigot.test.command;
 
 import com.lewdev.probabilitylib.ProbabilityCollection;
-import io.github.projectunified.blockutil.api.BlockData;
-import io.github.projectunified.blockutil.api.BlockProcess;
-import io.github.projectunified.blockutil.test.BlockUtilTest;
+import io.github.projectunified.blockutil.spigot.api.BlockData;
+import io.github.projectunified.blockutil.spigot.api.BlockProcess;
+import io.github.projectunified.blockutil.spigot.test.BlockUtilTest;
 import me.hsgamer.hscore.bukkit.block.BukkitBlockAdapter;
 import me.hsgamer.hscore.minecraft.block.box.BlockBox;
 import org.bukkit.Location;
diff --git a/spigot/test/src/main/resources/plugin.yml b/spigot/test/src/main/resources/plugin.yml
@@ -1,4 +1,4 @@
-main: io.github.projectunified.blockutil.test.BlockUtilTest
+main: io.github.projectunified.blockutil.spigot.test.BlockUtilTest
 name: BlockUtilTest
 version: "${project.version}"
 api-version: 1.13
diff --git a/spigot/vanilla/pom.xml b/spigot/vanilla/pom.xml
@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.github.projectunified</groupId>
-        <artifactId>block-util</artifactId>
+        <artifactId>block-util-spigot</artifactId>
         <version>5.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>block-util-vanilla</artifactId>
-    <name>BlockUtil Vanilla</name>
+    <artifactId>block-util-spigot-vanilla</artifactId>
+    <name>BlockUtil Spigot - Vanilla</name>
 
     <properties>
         <mc.version>1.13.2-R0.1-20191113.201242-53</mc.version>
@@ -19,7 +19,7 @@
     <dependencies>
         <dependency>
             <groupId>io.github.projectunified</groupId>
-            <artifactId>block-util-simple</artifactId>
+            <artifactId>block-util-spigot-simple</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/spigot/vanilla/src/main/java/io/github/projectunified/blockutil/spigot/vanilla/VanillaBlockHandler.java b/spigot/vanilla/src/main/java/io/github/projectunified/blockutil/spigot/vanilla/VanillaBlockHandler.java
diff --git a/spigot/we/pom.xml b/spigot/we/pom.xml
diff --git a/spigot/we/src/main/java/io/github/projectunified/blockutil/spigot/we/WeBlockHandler.java b/spigot/we/src/main/java/io/github/projectunified/blockutil/spigot/we/WeBlockHandler.java
diff --git a/update_versions.sh b/update_versions.sh

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.github.projectunified.blockutil.api;`
	`1`	`+package io.github.projectunified.blockutil.spigot.api;`
`2`	`2`
`3`	`3`	`import org.bukkit.Material;`
`4`	`4`