updated to 1.21 (no way)

Author: JustS-js

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-	id 'fabric-loom' version '0.12-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -45,14 +45,17 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
 	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	it.options.release = 17
+	it.options.release = 21
 }
 
 java {
 	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
 	// if it is present.
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
+
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {

gradle.properties

@@ -1,13 +1,14 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
+org.gradle.java.home=C:/Program Files/Java/jdk-21/
 
 # Fabric Properties
-minecraft_version=1.20
-yarn_mappings=1.20+build.1
-loader_version=0.14.21
+minecraft_version=1.21
+yarn_mappings=1.21+build.2
+loader_version=0.15.11
 
 #Fabric api
-fabric_version=0.83.0+1.20
+fabric_version=0.100.3+1.21
 
 # Mod Properties
 mod_version = 1.0.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/net/just_s/sds/mixin/DebugStickMixin.java

@@ -3,16 +3,16 @@
 import net.just_s.sds.Config;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.DebugStickStateComponent;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.DebugStickItem;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NbtCompound;
+import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.Property;
 import net.minecraft.text.Text;
-import net.minecraft.util.Util;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.registry.Registries;
 import net.minecraft.world.WorldAccess;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
@@ -36,13 +36,19 @@ private static <T extends Comparable<T>> BlockState cycle(BlockState state, Prop
         return null;
     }
 
+    @Shadow
+    private static <T> T cycle(Iterable<T> values, @Nullable T value, boolean inverse) {
+        return null;
+    }
+
     @Inject(at = @At("HEAD"), method = "use", cancellable = true)
     private void onUSE(PlayerEntity player, BlockState state, WorldAccess world, BlockPos pos, boolean update, ItemStack stack, CallbackInfoReturnable<Boolean> cir) {
         // if the player already does have the rights to use Debug Stick, the mod should not interfere
         if (player.isCreativeLevelTwoOp()) {return;}
 
         Block block = state.getBlock();
-        StateManager<Block, BlockState> stateManager = block.getStateManager();
+        RegistryEntry<Block> registryEntry = state.getRegistryEntry();
+        StateManager<Block, BlockState> stateManager = (registryEntry.value()).getStateManager();
         Collection<Property<?>> collection = stateManager.getProperties();
 
         // check if block is modifiable by the config
@@ -52,22 +58,23 @@ private void onUSE(PlayerEntity player, BlockState state, WorldAccess world, Blo
             return;
         }
 
-        // https://minecraft.fandom.com/wiki/Debug_Stick#Item_data
+        // https://minecraft.wiki/w/Debug_Stick
         // to remember the data of which property for which block is chosen,
-        // Minecraft Devs decided to use NBT data for Debug Stick.
-        // Who am I to disagree?
-        NbtCompound nbtCompound = stack.getOrCreateSubNbt("DebugProperty");
+        // Minecraft Devs decided to use Component for Debug Stick.
+        // Who am I to disagree? (btw thx to @MrBretze for example code)
+        DebugStickStateComponent stateComponent = stack.get(DataComponentTypes.DEBUG_STICK_STATE);
 
-        String blockName = Registries.BLOCK.getId(block).toString();
-        String propertyName = nbtCompound.getString(blockName);
+        if (stateComponent == null) {
+            return;
+        }
 
-        Property<?> property = stateManager.getProperty(propertyName);
+        Property<?> property = stateComponent.properties().get(registryEntry);
 
         if (player.isSneaking()) {
             // select next property
             property = getNextProperty(collection, property, block);
             // save chosen property in the NBT data of Debug Stick
-            nbtCompound.putString(blockName, property.getName());
+            stack.set(DataComponentTypes.DEBUG_STICK_STATE, stateComponent.with(registryEntry, property));
 
             // send the player a message of successful selecting
             sendMessage(player, Text.of(
@@ -105,11 +112,11 @@ private void onUSE(PlayerEntity player, BlockState state, WorldAccess world, Blo
      * Choose next property that is appropriate for the configuration file
      * */
     private Property<?> getNextProperty(Collection<Property<?>> collection, @Nullable Property<?> property, @Nullable Block block) {
-        int len = collection.size();
+        int i = 0;
         do { // simply scrolling through the list of properties until suitable is found
-            property = Util.next(collection, property);
-            len--;
-        } while (len > 0 && !isPropertyModifiable(property, block));
+            property = cycle(collection, property, false);
+            i++;
+        } while (i < collection.size() && !isPropertyModifiable(property, block));
         return property;
     }
 

src/main/resources/data/sds/recipe/debug_stick.json

@@ -0,0 +1,11 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    {"item": "minecraft:stick"},
+    {"item": "minecraft:chorus_fruit"}
+  ],
+  "result": {
+    "id": "minecraft:debug_stick",
+    "count": 1
+  }
+}

src/main/resources/data/sds/recipes/debug_stick.json

@@ -5,7 +5,7 @@
     {"item": "minecraft:chorus_fruit"}
   ],
   "result": {
-    "count": 1,
-    "item": "minecraft:debug_stick"
+    "id": "minecraft:debug_stick",
+    "count": 1
   }
 }

src/main/resources/fabric.mod.json

@@ -27,10 +27,10 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.14.6",
+    "fabricloader": ">=0.15.10",
     "fabric": "*",
-    "minecraft": ">=1.20",
-    "java": ">=17"
+    "minecraft": ">=1.20.5",
+    "java": ">=21"
   },
   "suggests": {
     "another-mod": "*"