Dev

.github/workflows/build_app.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - id: checkout
         name: Checkout
-        uses: actions/checkout@v6.0.1
+        uses: actions/checkout@v6.0.2
 
       - id: setup-java
         name: Setup Java
@@ -30,7 +30,7 @@ jobs:
 
       - id: setup-gradle
         name: Setup Gradle
-        uses: gradle/actions/setup-gradle@63b23c47ec369cc3851ad527daec269a2f949651
+        uses: gradle/actions/setup-gradle@576fcbecfed70890e466eeffd7c78d93b30b0472
 
       - id: build-gradle
         name: Build with Gradle
@@ -39,6 +39,6 @@ jobs:
       - id: upload-artifact
         name: Upload Build Artifact
         if: ${{ success() }}
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           path: build/libs/*.jar

build.gradle.kts

@@ -1,12 +1,11 @@
-import xyz.jpenilla.resourcefactory.paper.PaperPluginYaml
 import xyz.jpenilla.runtask.task.AbstractRun
 
 plugins {
     id("java")
     id("idea")
-    kotlin("jvm") version "2.2.21"
-    kotlin("plugin.serialization") version "2.2.21"
-    id("com.gradleup.shadow") version "9.3.0"
+    kotlin("jvm") version "2.3.0"
+    kotlin("plugin.serialization") version "2.3.0"
+    id("com.gradleup.shadow") version "9.3.1"
     id("xyz.jpenilla.run-paper") version "3.0.2"
     id("xyz.jpenilla.resource-factory-paper-convention") version "1.3.1"
 }
@@ -20,16 +19,14 @@ description = "Minecraft plugin that enhances the base gameplay"
 repositories {
     mavenCentral()
     maven("https://repo.papermc.io/repository/maven-public/")
-    maven("https://maven.enginehub.org/repo/")
 }
 
 dependencies {
     compileOnly("io.papermc.paper:paper-api:$version-R0.1-SNAPSHOT")
-    compileOnly("com.sk89q.worldedit:worldedit-bukkit:7.3.17") // TODO("Move away from WorldEdit")
 
     implementation(kotlin("stdlib"))
     implementation("org.jetbrains.kotlin:kotlin-reflect")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.10.0")
 }
 
 java {
@@ -57,10 +54,8 @@ tasks {
 
 paperPluginYaml {
     main.set(group.toString())
+    website.set("https://github.com/XodiumSoftware/VanillaPlus")
     authors.add("Xodium")
     apiVersion.set(version)
     bootstrapper.set("org.xodium.vanillaplus.VanillaPlusBootstrap")
-    dependencies {
-        server(name = "WorldEdit", load = PaperPluginYaml.Load.BEFORE, required = false, joinClasspath = true)
-    }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/kotlin/org/xodium/vanillaplus/VanillaPlus.kt

@@ -5,11 +5,12 @@ package org.xodium.vanillaplus
 import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents
 import org.bukkit.plugin.java.JavaPlugin
 import org.xodium.vanillaplus.data.ConfigData
-import org.xodium.vanillaplus.hooks.WorldEditHook
-import org.xodium.vanillaplus.managers.ConfigManager
+import org.xodium.vanillaplus.data.ConfigData.Companion.load
 import org.xodium.vanillaplus.modules.*
+import org.xodium.vanillaplus.modules.ArmorStandModule.info
+import org.xodium.vanillaplus.recipes.PaintingRecipe
+import org.xodium.vanillaplus.recipes.PaintingRecipe.info
 import org.xodium.vanillaplus.recipes.RottenFleshRecipe
-import org.xodium.vanillaplus.recipes.TorchArrowRecipe
 import org.xodium.vanillaplus.recipes.WoodLogRecipe
 
 /** Main class of the plugin. */
@@ -34,35 +35,43 @@ internal class VanillaPlus : JavaPlugin() {
 
         instance.lifecycleManager.registerEventHandler(LifecycleEvents.COMMANDS) { event ->
             event.registrar().register(
-                ConfigManager.reloadCommand.builder.build(),
-                ConfigManager.reloadCommand.description,
-                ConfigManager.reloadCommand.aliases,
+                ConfigData.reloadCommand.builder.build(),
+                ConfigData.reloadCommand.description,
+                ConfigData.reloadCommand.aliases,
             )
         }
-        instance.server.pluginManager.addPermission(ConfigManager.reloadPermission)
 
-        configData = ConfigManager.load()
+        instance.server.pluginManager.addPermission(ConfigData.reloadPermission)
 
-        RottenFleshRecipe.register()
-        TorchArrowRecipe.register()
-        WoodLogRecipe.register()
+        configData = ConfigData().load("config.json")
 
-        BooksModule.register()
-        ChatModule.register()
-        DimensionsModule.register()
-        EntityModule.register()
-        InvModule.register()
-        LocatorModule.register()
-        MotdModule.register()
-        OpenableModule.register()
-        PetModule.register()
-        PlayerModule.register()
-        ScoreBoardModule.register()
-        SignModule.register()
-        SitModule.register()
-        TabListModule.register()
-        ArrowModule.register()
-        if (WorldEditHook.get()) TreesModule.register()
+        logger.info(
+            listOf(
+                PaintingRecipe,
+                RottenFleshRecipe,
+                WoodLogRecipe,
+            ),
+        )
+
+        logger.info(
+            listOf(
+                ArmorStandModule,
+                BooksModule,
+                ChatModule,
+                DimensionsModule,
+                EntityModule,
+                InventoryModule,
+                LocatorModule,
+                MotdModule,
+                OpenableModule,
+                PlayerModule,
+                ScoreBoardModule,
+                SignModule,
+                SitModule,
+                TabListModule,
+                TameableModule,
+            ),
+        )
     }
 
     /**

src/main/kotlin/org/xodium/vanillaplus/data/BookData.kt

@@ -4,7 +4,7 @@ import kotlinx.serialization.Serializable
 import net.kyori.adventure.inventory.Book
 import org.bukkit.permissions.PermissionDefault
 import org.xodium.vanillaplus.VanillaPlus.Companion.instance
-import org.xodium.vanillaplus.utils.ExtUtils.mm
+import org.xodium.vanillaplus.utils.Utils.MM
 
 /**
  * Represents the data structure for a book in the game.
@@ -26,5 +26,6 @@ internal data class BookData(
      * Converts this [BookData] instance to a [Book] instance.
      * @return A [Book] instance with the properties of this [BookData].
      */
-    fun toBook(): Book = Book.book(title.mm(), author.mm(), pages.map { it.joinToString("\n").mm() })
+    fun toBook(): Book =
+        Book.book(MM.deserialize(title), MM.deserialize(author), pages.map { MM.deserialize(it.joinToString("\n")) })
 }