Relocate source files + Bump paper-api to 1.20.4-R0.1-SNAPSHOT

build.gradle

@@ -1,54 +1,45 @@
 plugins {
     id "java"
-    id "xyz.jpenilla.run-paper" version "2.2.0"
+    id "xyz.jpenilla.run-paper" version "2.2.2"
 }
 
-group = "moe.minacle"
-version = "0.3.0"
+group = "moe.minacle.minecraft"
+version = "0.3.1"
 
 repositories {
     mavenCentral()
     maven {
-        name = "PaperMC"
-        url = "https://repo.papermc.io/repository/maven-public/"
+        name "PaperMC"
+        url "https://repo.papermc.io/repository/maven-public/"
     }
     maven {
-        name = "Sonatype"
-        url = "https://oss.sonatype.org/content/groups/public/"
+        name "Sonatype"
+        url "https://oss.sonatype.org/content/groups/public/"
     }
 }
 
 dependencies {
-    compileOnly "io.papermc.paper:paper-api:1.20.2-R0.1-SNAPSHOT"
+    compileOnly "io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT"
+    compileOnly "org.jetbrains:annotations:24.1.0"
 }
 
-def targetJavaVersion = 17
 java {
-    def javaVersion = JavaVersion.toVersion(targetJavaVersion)
-    sourceCompatibility = javaVersion
-    targetCompatibility = javaVersion
-    if (JavaVersion.current() < javaVersion) {
-        toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
-    }
-}
-
-tasks.withType(JavaCompile).configureEach {
-    if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
-        options.release = targetJavaVersion
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
     }
 }
 
 processResources {
     def props = [version: version]
     inputs.properties props
     filteringCharset "UTF-8"
-    filesMatching("plugin.yml") {
+    filesMatching("paper-plugin.yml") {
         expand props
     }
 }
 
 tasks {
     runServer {
-        minecraftVersion "1.20.2"
+        minecraftVersion "1.20.4"
     }
 }

src/main/java/moe/minacle/ebook/Plugin.java → src/main/java/moe/minacle/minecraft/plugins/enchantedbook/Plugin.java

@@ -1,4 +1,4 @@
-package moe.minacle.ebook;
+package moe.minacle.minecraft.plugins.enchantedbook;
 
 import java.util.Map;
 
@@ -14,6 +14,7 @@
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.Repairable;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
 
 public final class Plugin extends JavaPlugin implements Listener {
 
@@ -29,7 +30,7 @@ public final class Plugin extends JavaPlugin implements Listener {
      * @return
      *  the cost of the enchantment, or -1 if the rarity is invalid
      */
-    private static int getEnchantmentCost(Enchantment enchantment, int level) {
+    private static int getEnchantmentCost(final @NotNull Enchantment enchantment, int level) {
         switch (enchantment.getRarity()) {
         case COMMON:
         case UNCOMMON:
@@ -43,18 +44,8 @@ private static int getEnchantmentCost(Enchantment enchantment, int level) {
         }
     }
 
-    // MARK: JavaPlugin
-
-    @Override
-    public void onEnable() {
-        super.onEnable();
-        getServer().getPluginManager().registerEvents(this, this);
-    }
-
-    // MARK: Listener
-
     @EventHandler
-    void onPrepareAnvil(PrepareAnvilEvent event) {
+    private void onPrepareAnvil(final @NotNull PrepareAnvilEvent event) {
         final AnvilInventory anvilInventory = event.getInventory();
         final ItemStack firstItem;
         final ItemMeta firstItemMeta;
@@ -182,11 +173,18 @@ void onPrepareAnvil(PrepareAnvilEvent event) {
                 ((Repairable)resultMeta).setRepairCost((Math.max(firstItemRepairCost, secondItemRepairCost) + 1) * 2 - 1);
             }
         }
-        else {
+        else
             ((Repairable)resultMeta).setRepairCost(secondItemRepairCost);
-        }
         result.setItemMeta(resultMeta);
         anvilInventory.setRepairCost(totalEnchantmentCost);
         event.setResult(result);
     }
+
+    // MARK: JavaPlugin
+
+    @Override
+    public void onEnable() {
+        super.onEnable();
+        getServer().getPluginManager().registerEvents(this, this);
+    }
 }

src/main/resources/paper-plugin.yml

@@ -0,0 +1,9 @@
+name: EnchantedBook
+version: "${version}"
+main: moe.minacle.minecraft.plugins.enchantedbook.Plugin
+description: A plugin to extract enchantments from your armour into an Enchanted Book using the anvil.
+authors:
+  - Minacle
+website: https://modrinth.com/plugin/enchantedbook
+api-version: "1.20"
+folia-supported: true