Port to 1.21.6

Author: Mrbysco

gradle.properties

@@ -5,8 +5,8 @@ org.gradle.daemon=false
 org.gradle.debug=false
 
 # Base info
-mc_version=1.21.5
-neo_version=21.5.82
+mc_version=1.21.6
+neo_version=21.6.20-beta
 neogradle.subsystems.parchment.minecraftVersion=1.21.5
 neogradle.subsystems.parchment.mappingsVersion=2025.06.01
 neogradle.subsystems.conventions.runs.create-default-run-per-type=false

src/main/java/mrbysco/constructionstick/data/ModData.java

@@ -16,7 +16,7 @@
 
 import java.util.concurrent.CompletableFuture;
 
-@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD)
+@EventBusSubscriber
 public class ModData {
 	@SubscribeEvent
 	public static void gatherData(GatherDataEvent.Client event) {
@@ -26,7 +26,7 @@ public static void gatherData(GatherDataEvent.Client event) {
 
 		BlockTagsProvider blockTags = new BlockTagsGenerator(packOutput, lookupProvider);
 		generator.addProvider(true, blockTags);
-		generator.addProvider(true, new ItemTagsGenerator(packOutput, lookupProvider, blockTags));
+		generator.addProvider(true, new ItemTagsGenerator(packOutput, lookupProvider));
 		generator.addProvider(true, new RecipeGenerator.Runner(packOutput, lookupProvider));
 		generator.addProvider(true, new AdvancementGenerator(packOutput, lookupProvider));
 

src/main/java/mrbysco/constructionstick/data/server/ItemTagsGenerator.java

@@ -6,16 +6,13 @@
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.HolderLookup.Provider;
 import net.minecraft.data.PackOutput;
-import net.minecraft.data.tags.ItemTagsProvider;
-import net.minecraft.data.tags.TagsProvider;
-import net.minecraft.world.level.block.Block;
+import net.neoforged.neoforge.common.data.ItemTagsProvider;
 
 import java.util.concurrent.CompletableFuture;
 
 public class ItemTagsGenerator extends ItemTagsProvider {
-	public ItemTagsGenerator(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider,
-	                         TagsProvider<Block> blockTagProvider) {
-		super(output, lookupProvider, blockTagProvider.contentsGetter(), ConstructionStick.MOD_ID);
+	public ItemTagsGenerator(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider) {
+		super(output, lookupProvider, ConstructionStick.MOD_ID);
 	}
 
 	@Override

src/main/java/mrbysco/constructionstick/registry/ModItems.java

@@ -31,7 +31,7 @@
 import java.util.List;
 import java.util.function.Supplier;
 
-@EventBusSubscriber(modid = ConstructionStick.MOD_ID, bus = EventBusSubscriber.Bus.MOD)
+@EventBusSubscriber(modid = ConstructionStick.MOD_ID)
 public class ModItems {
 	public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(ConstructionStick.MOD_ID);
 	public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, ConstructionStick.MOD_ID);

src/main/resources/META-INF/neoforge.mods.toml

@@ -20,12 +20,12 @@ behind the block you are facing, conjure blocks in mid air or destroy lots of bl
 [[dependencies.constructionstick]]
     modId="neoforge"
     type="required"
-    versionRange="[21.5.0-beta,)"
+    versionRange="[21.6.0-beta,)"
     ordering = "NONE"
     side="BOTH"
 [[dependencies.constructionstick]]
     modId="minecraft"
     type="required"
-    versionRange="[1.21.5,1.22)"
+    versionRange="[1.21.6,1.22)"
     ordering = "NONE"
     side="BOTH"