Updated to Minecraft 1.21.11

Author: replaceitem

build.gradle

@@ -18,13 +18,13 @@ repositories {
 	}
 }
 
-sourceCompatibility = JavaVersion.VERSION_21
-targetCompatibility = JavaVersion.VERSION_21
-
-archivesBaseName = project.archives_base_name
 version = project.minecraft_version+'-'+project.mod_version
 group = project.maven_group
 
+base {
+    archivesName = project.archives_base_name
+}
+
 loom {
 	runs {
 		testServer {
@@ -47,8 +47,6 @@ dependencies {
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 	modImplementation "carpet:fabric-carpet:${project.carpet_minecraft_version}-${project.carpet_core_version}"
 
-	implementation 'com.google.code.findbugs:jsr305:3.0.2'
-
 	def includeImplementation = { String dependencyNotation ->
 		implementation(dependencyNotation) {
 			transitive = false
@@ -62,7 +60,11 @@ dependencies {
 	includeImplementation "com.squareup.okio:okio:1.17.2"
 	includeImplementation "net.sf.trove4j:core:3.1.0"
 	includeImplementation "org.apache.commons:commons-collections4:4.4"
-	
+	includeImplementation "com.fasterxml.jackson.core:jackson-core:2.20.0"
+	includeImplementation "com.fasterxml.jackson.core:jackson-databind:2.20.0"
+	includeImplementation "com.fasterxml.jackson.core:jackson-annotations:2.20"
+	includeImplementation "com.fasterxml.jackson:jackson-bom:2.20.0"
+
 
 	// soft dependencies
 
@@ -85,11 +87,16 @@ tasks.withType(JavaCompile).configureEach {
 
 java {
 	withSourcesJar()
+
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {
+    inputs.property "archivesName", project.base.archivesName
+
 	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}"}
+        rename { "${it}_${inputs.properties.archivesBaseName}"}
 	}
 }
 

changelog.md

@@ -1,37 +1 @@
-## Changes
-
-* Updated to JDA 6.1.1. With that comes some breaking changes. See "Migrating" section below for necessary migrations
-
-### Components
-
-* Added new Label component type
-  * This replaces the use of Action rows in modals and the `label` property in text inputs
-* Action rows are now its own component type
-  * Instead of the `components` in the message content schema being a list of lists of components,
-    action rows can be declared explicitly with a component of type `action_row`.
-    The old syntax of defining an action row from an array is still supported for backward compatibility and convenience.
-* The `label` field of text inputs has been removed. Use a label component instead.
-* Added support for components V2 via `use_components_v2` in message content
-* Added new components from components V2 (See docs for details)
-  * Separator
-  * Container
-  * Text display
-  * Section
-  * Thumbnail
-  * Media gallery
-  * File display
-  * File upload
-
-### Documentation
-
-* Message components example was split into seperate buttons and select menus example
-* Added misc components example for component V2 components
-* Added links to relevant examples to docs for functions and schemas
-* Updated modal example with file upload and select menu
-
-## Migrating
-
-To migrate your scripts, the following is necessary:
-
-* Converting action rows in modals to labels
-  * Check the updated modal example in the documentation
+* Updated to Minecraft 1.21.11

gradle.properties

@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
-minecraft_version=1.21.10
-loader_version=0.17.3
-loom_version=1.11-SNAPSHOT
+minecraft_version=1.21.11
+loader_version=0.18.1
+loom_version=1.14-SNAPSHOT
 
 # check available versions on maven for the given minecraft version you are using
 # https://masa.dy.fi/maven/carpet/fabric-carpet/
-carpet_minecraft_version=1.21.10
-carpet_core_version=1.4.186+v251009
+carpet_minecraft_version=1.21.11
+carpet_core_version=1.4.193+v251211
 
 # Mod Properties
 mod_version=1.7.0

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/net/replaceitem/discarpet/commands/DiscarpetCommand.java

@@ -28,7 +28,7 @@ public class DiscarpetCommand {
 
     public static void register(CommandDispatcher<CommandSourceStack> dispatcher)
     {
-        dispatcher.register(literal("discarpet").requires(serverCommandSource -> serverCommandSource.hasPermission(2)).executes(commandContext->{
+        dispatcher.register(literal("discarpet").requires(Commands.hasPermission(Commands.LEVEL_GAMEMASTERS)).executes(commandContext->{
             commandContext.getSource().sendSuccess(() -> {
                 String version = FabricLoader.getInstance().getModContainer("discarpet").orElseThrow().getMetadata().getVersion().getFriendlyString();
                 MutableComponent text = Component.literal("Discarpet version " + version).withStyle(ChatFormatting.BLUE);

src/main/java/net/replaceitem/discarpet/mixins/FileArgumentMixin.java

@@ -7,13 +7,13 @@
 import carpet.script.exception.Throwables;
 import net.replaceitem.discarpet.script.util.FileArgumentExtension;
 import net.replaceitem.discarpet.util.StreamableByteArrayOutputStream;
-import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -29,7 +29,7 @@ public abstract class FileArgumentMixin implements FileArgumentExtension {
     @SuppressWarnings("SynchronizeOnNonFinalField")
     @Unique
     @Override
-    @NotNull
+    @NonNull
     public InputStream asInputStream(@Nullable Module module) {
         try {
             synchronized (writeIOSync) {

src/main/java/net/replaceitem/discarpet/script/events/package-info.java

@@ -1,8 +1,4 @@
-@ParametersAreNonnullByDefault
-@FieldsAreNonnullByDefault()
-@MethodsReturnNonnullByDefault()
+@NullMarked
 package net.replaceitem.discarpet.script.events;
 
-import net.minecraft.FieldsAreNonnullByDefault;
-import net.minecraft.MethodsReturnNonnullByDefault;
-import javax.annotation.ParametersAreNonnullByDefault;
+import org.jspecify.annotations.NullMarked;

src/main/java/net/replaceitem/discarpet/script/exception/package-info.java

@@ -1,8 +1,4 @@
-@ParametersAreNonnullByDefault
-@FieldsAreNonnullByDefault()
-@MethodsReturnNonnullByDefault()
+@NullMarked
 package net.replaceitem.discarpet.script.exception;
 
-import net.minecraft.FieldsAreNonnullByDefault;
-import net.minecraft.MethodsReturnNonnullByDefault;
-import javax.annotation.ParametersAreNonnullByDefault;
+import org.jspecify.annotations.NullMarked;

src/main/java/net/replaceitem/discarpet/script/schema/schemas/commands/package-info.java

@@ -1,6 +1,4 @@
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault()
+@NullMarked
 package net.replaceitem.discarpet.script.schema.schemas.commands;
 
-import net.minecraft.MethodsReturnNonnullByDefault;
-import javax.annotation.ParametersAreNonnullByDefault;
+import org.jspecify.annotations.NullMarked;

src/main/java/net/replaceitem/discarpet/script/schema/schemas/components/package-info.java

@@ -1,6 +1,4 @@
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault()
+@NullMarked
 package net.replaceitem.discarpet.script.schema.schemas.components;
 
-import net.minecraft.MethodsReturnNonnullByDefault;
-import javax.annotation.ParametersAreNonnullByDefault;
+import org.jspecify.annotations.NullMarked;