1.20.5

Author: jpenilla

build.gradle.kts

@@ -2,8 +2,8 @@ import xyz.jpenilla.resourcefactory.bukkit.BukkitPluginYaml
 
 plugins {
   `java-library`
-  id("io.papermc.paperweight.userdev") version "1.5.15"
-  id("xyz.jpenilla.run-paper") version "2.2.3" // Adds runServer and runMojangMappedServer tasks for testing
+  id("io.papermc.paperweight.userdev") version "1.6.0"
+  id("xyz.jpenilla.run-paper") version "2.2.4" // Adds runServer and runMojangMappedServer tasks for testing
   id("xyz.jpenilla.resource-factory-bukkit-convention") version "1.1.1" // Generates plugin.yml based on the Gradle config
 }
 
@@ -12,33 +12,40 @@ version = "1.0.0-SNAPSHOT"
 description = "Test plugin for paperweight-userdev"
 
 java {
-  // Configure the java toolchain. This allows gradle to auto-provision JDK 17 on systems that only have JDK 8 installed for example.
-  toolchain.languageVersion = JavaLanguageVersion.of(17)
+  // Configure the java toolchain. This allows gradle to auto-provision JDK 21 on systems that only have JDK 11 installed for example.
+  toolchain.languageVersion = JavaLanguageVersion.of(21)
 }
 
+// 1)
+// For 1.20.5+ when you don't care about supporting spigot
+// paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
+
+// 2)
+// For 1.20.4 or below, or when you care about supporting Spigot on 1.20.5+
+// Configure reobfJar to run when invoking the build task
+/*
+tasks.assemble {
+  dependsOn(tasks.reobfJar)
+}
+ */
+
 dependencies {
-  paperweight.paperDevBundle("1.20.4-R0.1-SNAPSHOT")
-  // paperweight.foliaDevBundle("1.20.4-R0.1-SNAPSHOT")
-  // paperweight.devBundle("com.example.paperfork", "1.20.4-R0.1-SNAPSHOT")
+  paperweight.paperDevBundle("1.20.5-R0.1-SNAPSHOT")
+  // paperweight.foliaDevBundle("1.20.5-R0.1-SNAPSHOT")
+  // paperweight.devBundle("com.example.paperfork", "1.20.5-R0.1-SNAPSHOT")
 }
 
 tasks {
-  // Configure reobfJar to run when invoking the build task
-  assemble {
-    dependsOn(reobfJar)
-  }
-
   compileJava {
-    options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything
-
     // Set the release flag. This configures what version bytecode the compiler will emit, as well as what JDK APIs are usable.
     // See https://openjdk.java.net/jeps/247 for more information.
-    options.release = 17
+    options.release = 21
   }
   javadoc {
     options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything
   }
 
+  // Only relevant when going with option 2 above
   /*
   reobfJar {
     // This is an example of how you might change the output location for reobfJar. It's recommended not to do this

src/main/java/io/papermc/paperweight/testplugin/PluginBrigadierCommand.java

@@ -13,8 +13,8 @@
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.PluginIdentifiableCommand;
-import org.bukkit.craftbukkit.v1_20_R3.CraftServer;
-import org.bukkit.craftbukkit.v1_20_R3.command.VanillaCommandWrapper;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.command.VanillaCommandWrapper;
 import org.bukkit.plugin.Plugin;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;

src/main/java/io/papermc/paperweight/testplugin/TestPlugin.java

@@ -13,7 +13,7 @@
 import net.minecraft.network.chat.ClickEvent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
-import org.bukkit.craftbukkit.v1_20_R3.CraftServer;
+import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;