diff --git a/build.gradle.kts b/build.gradle.kts index 67f9d8d..b916cf2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { `java-library` id("io.papermc.paperweight.userdev") version "1.5.5" - id("xyz.jpenilla.run-paper") version "2.0.1" // Adds runServer and runMojangMappedServer tasks for testing + id("xyz.jpenilla.run-paper") version "2.1.0" // Adds runServer and runMojangMappedServer tasks for testing } group = "io.papermc.paperweight" @@ -14,9 +14,9 @@ java { } dependencies { - paperweight.paperDevBundle("1.19.4-R0.1-SNAPSHOT") - // paperweight.foliaDevBundle("1.19.4-R0.1-SNAPSHOT") - // paperweight.devBundle("com.example.paperfork", "1.19.4-R0.1-SNAPSHOT") + paperweight.paperDevBundle("1.20-R0.1-SNAPSHOT") + // paperweight.foliaDevBundle("1.20-R0.1-SNAPSHOT") + // paperweight.devBundle("com.example.paperfork", "1.20-R0.1-SNAPSHOT") } tasks { @@ -41,7 +41,7 @@ tasks { "name" to project.name, "version" to project.version, "description" to project.description, - "apiVersion" to "1.19" + "apiVersion" to "1.20" ) inputs.properties(props) filesMatching("plugin.yml") { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba7..c1962a7 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bdc9a83..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 79a61d4..aeb74cb 100755 --- a/gradlew +++ b/gradlew @@ -85,9 +85,6 @@ done APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in diff --git a/settings.gradle.kts b/settings.gradle.kts index 2e781ba..14205e4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0") + id("org.gradle.toolchains.foojay-resolver-convention") version("0.5.0") } rootProject.name = "paperweight-test-plugin" diff --git a/src/main/java/io/papermc/paperweight/testplugin/PluginBrigadierCommand.java b/src/main/java/io/papermc/paperweight/testplugin/PluginBrigadierCommand.java index c508dce..e2288f3 100644 --- a/src/main/java/io/papermc/paperweight/testplugin/PluginBrigadierCommand.java +++ b/src/main/java/io/papermc/paperweight/testplugin/PluginBrigadierCommand.java @@ -13,8 +13,8 @@ import org.bukkit.Location; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.command.PluginIdentifiableCommand; -import org.bukkit.craftbukkit.v1_19_R3.CraftServer; -import org.bukkit.craftbukkit.v1_19_R3.command.VanillaCommandWrapper; +import org.bukkit.craftbukkit.v1_20_R1.CraftServer; +import org.bukkit.craftbukkit.v1_20_R1.command.VanillaCommandWrapper; import org.bukkit.plugin.Plugin; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; diff --git a/src/main/java/io/papermc/paperweight/testplugin/TestPlugin.java b/src/main/java/io/papermc/paperweight/testplugin/TestPlugin.java index 21268cf..6b5dea5 100644 --- a/src/main/java/io/papermc/paperweight/testplugin/TestPlugin.java +++ b/src/main/java/io/papermc/paperweight/testplugin/TestPlugin.java @@ -13,7 +13,7 @@ import net.minecraft.commands.arguments.EntityArgument; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; -import org.bukkit.craftbukkit.v1_19_R3.CraftServer; +import org.bukkit.craftbukkit.v1_20_R1.CraftServer; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin;