diff --git a/ansible/build.gradle.kts b/ansible/build.gradle.kts index 6042ac73a..6dac5bdf4 100644 --- a/ansible/build.gradle.kts +++ b/ansible/build.gradle.kts @@ -34,6 +34,7 @@ dependencies { pvpPlugin(project(path = ":plugins:finale-paper")) pvpPlugin(project(path = ":plugins:simpleadminhacks-paper")) pvpPlugin(project(path = ":plugins:kitpvp-paper")) + pvpPlugin(project(path = ":plugins:voidworld-paper")) } val copyPaperPlugins = tasks.register("copyPaperPlugins") { diff --git a/ansible/templates/stacks/minecraft.yml.j2 b/ansible/templates/stacks/minecraft.yml.j2 index a5eafe0b0..acbaa1a9d 100644 --- a/ansible/templates/stacks/minecraft.yml.j2 +++ b/ansible/templates/stacks/minecraft.yml.j2 @@ -161,6 +161,8 @@ services: CIV_WHITELIST: 'false' {% endif %} + CIV_WORLD_GENERATOR: VoidWorld + CIV_MYSQL_HOST: minecraft_mariadb CIV_MYSQL_USERNAME: '{{secret.minecraft.mysql.username}}' CIV_MYSQL_PASSWORD: '{{secret.minecraft.mysql.password}}' diff --git a/plugins/kitpvp-paper/src/main/java/net/civmc/kitpvp/KitPvpPlugin.java b/plugins/kitpvp-paper/src/main/java/net/civmc/kitpvp/KitPvpPlugin.java index a07074394..5c888f249 100644 --- a/plugins/kitpvp-paper/src/main/java/net/civmc/kitpvp/KitPvpPlugin.java +++ b/plugins/kitpvp-paper/src/main/java/net/civmc/kitpvp/KitPvpPlugin.java @@ -3,6 +3,9 @@ package net.civmc.kitpvp; import net.civmc.kitpvp.command.ClearCommand; import net.civmc.kitpvp.command.KitCommand; import net.civmc.kitpvp.sql.SqlKitPvpDao; +import org.bukkit.generator.ChunkGenerator; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import vg.civcraft.mc.civmodcore.ACivMod; import vg.civcraft.mc.civmodcore.dao.DatabaseCredentials; import vg.civcraft.mc.civmodcore.dao.ManagedDatasource; @@ -16,4 +19,11 @@ public class KitPvpPlugin extends ACivMod { getCommand("kit").setExecutor(new KitCommand(new SqlKitPvpDao(source))); getCommand("clear").setExecutor(new ClearCommand()); } + + @Override + public @Nullable ChunkGenerator getDefaultWorldGenerator(@NotNull String worldName, @Nullable String id) { + return new ChunkGenerator() { + + }; + } } diff --git a/plugins/kitpvp-paper/src/main/resources/plugin.yml b/plugins/kitpvp-paper/src/main/resources/plugin.yml index 8ca78881b..e9bc70b9f 100644 --- a/plugins/kitpvp-paper/src/main/resources/plugin.yml +++ b/plugins/kitpvp-paper/src/main/resources/plugin.yml @@ -5,6 +5,7 @@ author: Okx description: KitPvP for CivMC api-version: 1.21.1 depend: [CivModCore] +load: STARTUP commands: kit: usage: |- diff --git a/plugins/voidworld-paper/build.gradle.kts b/plugins/voidworld-paper/build.gradle.kts new file mode 100644 index 000000000..7871c2417 --- /dev/null +++ b/plugins/voidworld-paper/build.gradle.kts @@ -0,0 +1,11 @@ +plugins { + id("io.papermc.paperweight.userdev") +} + +version = "1.0.0" + +dependencies { + paperweight { + paperDevBundle("1.21.1-R0.1-SNAPSHOT") + } +} diff --git a/plugins/voidworld-paper/src/main/java/net/civmc/voidworld/VoidWorldPlugin.java b/plugins/voidworld-paper/src/main/java/net/civmc/voidworld/VoidWorldPlugin.java new file mode 100644 index 000000000..eabc0937e --- /dev/null +++ b/plugins/voidworld-paper/src/main/java/net/civmc/voidworld/VoidWorldPlugin.java @@ -0,0 +1,14 @@ +package net.civmc.voidworld; + +import org.bukkit.generator.ChunkGenerator; +import org.bukkit.plugin.java.JavaPlugin; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +public class VoidWorldPlugin extends JavaPlugin { + + @Override + public @Nullable ChunkGenerator getDefaultWorldGenerator(@NotNull String worldName, @Nullable String id) { + return new ChunkGenerator() {}; + } +} diff --git a/plugins/voidworld-paper/src/main/resources/plugin.yml b/plugins/voidworld-paper/src/main/resources/plugin.yml new file mode 100644 index 000000000..6483dd49e --- /dev/null +++ b/plugins/voidworld-paper/src/main/resources/plugin.yml @@ -0,0 +1,7 @@ +name: VoidWorld +version: ${version} +main: net.civmc.voidworld.VoidWorldPlugin +author: Okx +description: Provides a void world +api-version: 1.21.1 +load: STARTUP diff --git a/settings.gradle.kts b/settings.gradle.kts index 2e57558ae..f9fa3ac47 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -31,3 +31,4 @@ include(":plugins:civduties-paper") include(":plugins:namecolors-paper") include(":plugins:kirabukkitgateway-paper") include(":plugins:kitpvp-paper") +include(":plugins:voidworld-paper")