feat: Update to Minecraft 1.21.6

Author: BlayTheNinth

common/src/main/java/net/blay09/mods/littlejoys/poi/ModPoiTypes.java

@@ -3,6 +3,9 @@
 import net.blay09.mods.balm.api.DeferredObject;
 import net.blay09.mods.balm.api.world.BalmWorldGen;
 import net.blay09.mods.littlejoys.block.ModBlocks;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.ai.village.poi.PoiType;
 
 import java.util.Set;
@@ -11,11 +14,14 @@
 
 public class ModPoiTypes {
 
+    public static ResourceKey<PoiType> DIG_SPOT = ResourceKey.create(Registries.POINT_OF_INTEREST_TYPE, id("dig_spot"));
+    public static ResourceKey<PoiType> FISHING_SPOT = ResourceKey.create(Registries.POINT_OF_INTEREST_TYPE, id("fishing_spot"));
+
     public static DeferredObject<PoiType> digSpot;
     public static DeferredObject<PoiType> fishingSpot;
 
     public static void initialize(BalmWorldGen worldGen) {
-        digSpot = worldGen.registerPoiType(id("dig_spot"), () -> new PoiType(Set.of(ModBlocks.digSpot.defaultBlockState()), 1, 1));
-        fishingSpot = worldGen.registerPoiType(id("fishing_spot"), () -> new PoiType(Set.of(ModBlocks.fishingSpot.defaultBlockState()), 1, 1));
+        digSpot = worldGen.registerPoiType(DIG_SPOT.location(), () -> new PoiType(Set.of(ModBlocks.digSpot.defaultBlockState()), 1, 1));
+        fishingSpot = worldGen.registerPoiType(FISHING_SPOT.location(), () -> new PoiType(Set.of(ModBlocks.fishingSpot.defaultBlockState()), 1, 1));
     }
 }

fabric/src/main/java/net/blay09/mods/littlejoys/fabric/FabricLittleJoys.java

@@ -8,6 +8,6 @@
 public class FabricLittleJoys implements ModInitializer {
     @Override
     public void onInitialize() {
-        Balm.initialize(LittleJoys.MOD_ID, EmptyLoadContext.INSTANCE, LittleJoys::initialize);
+        Balm.initializeMod(LittleJoys.MOD_ID, EmptyLoadContext.INSTANCE, LittleJoys::initialize);
     }
 }

fabric/src/main/java/net/blay09/mods/littlejoys/fabric/client/FabricLittleJoysClient.java

@@ -9,6 +9,6 @@
 public class FabricLittleJoysClient implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
-        BalmClient.initialize(LittleJoys.MOD_ID, EmptyLoadContext.INSTANCE, LittleJoysClient::initialize);
+        BalmClient.initializeMod(LittleJoys.MOD_ID, EmptyLoadContext.INSTANCE, LittleJoysClient::initialize);
     }
 }

fabric/src/main/java/net/blay09/mods/littlejoys/fabric/datagen/ModBlockTagProvider.java

@@ -1,23 +1,23 @@
 package net.blay09.mods.littlejoys.fabric.datagen;
 
-import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
-import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.data.PackOutput;
+import net.minecraft.data.tags.IntrinsicHolderTagsProvider;
 import net.minecraft.world.level.block.Block;
 import net.blay09.mods.littlejoys.block.ModBlocks;
 import net.blay09.mods.littlejoys.tag.ModBlockTags;
 
 import java.util.concurrent.CompletableFuture;
 
-public class ModBlockTagProvider extends FabricTagProvider<Block> {
-    public ModBlockTagProvider(FabricDataOutput output, CompletableFuture<HolderLookup.Provider> registriesFuture) {
-        super(output, Registries.BLOCK, registriesFuture);
+public class ModBlockTagProvider extends IntrinsicHolderTagsProvider<Block> {
+    public ModBlockTagProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registriesFuture) {
+        super(output, Registries.BLOCK, registriesFuture, (block) -> block.builtInRegistryHolder().key());
     }
 
     @Override
     protected void addTags(HolderLookup.Provider arg) {
-        getOrCreateTagBuilder(ModBlockTags.DIG_SPOTS).add(ModBlocks.digSpot);
-        getOrCreateTagBuilder(ModBlockTags.FISHING_SPOTS).add(ModBlocks.fishingSpot);
+        tag(ModBlockTags.DIG_SPOTS).add(ModBlocks.digSpot);
+        tag(ModBlockTags.FISHING_SPOTS).add(ModBlocks.fishingSpot);
     }
 }

fabric/src/main/java/net/blay09/mods/littlejoys/fabric/datagen/ModPoiTypeTagProvider.java

@@ -6,18 +6,22 @@
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.data.PackOutput;
+import net.minecraft.data.tags.IntrinsicHolderTagsProvider;
+import net.minecraft.data.tags.KeyTagProvider;
 import net.minecraft.world.entity.ai.village.poi.PoiType;
+import net.minecraft.world.level.block.Block;
 
 import java.util.concurrent.CompletableFuture;
 
-public class ModPoiTypeTagProvider extends FabricTagProvider<PoiType> {
-    public ModPoiTypeTagProvider(FabricDataOutput output, CompletableFuture<HolderLookup.Provider> registriesFuture) {
-        super(output, Registries.POINT_OF_INTEREST_TYPE, registriesFuture);
+public class ModPoiTypeTagProvider extends KeyTagProvider<PoiType> {
+    public ModPoiTypeTagProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider) {
+        super(output, Registries.POINT_OF_INTEREST_TYPE, provider);
     }
 
     @Override
     protected void addTags(HolderLookup.Provider arg) {
-        getOrCreateTagBuilder(ModPoiTypeTags.DIG_SPOTS).add(ModPoiTypes.digSpot.get());
-        getOrCreateTagBuilder(ModPoiTypeTags.FISHING_SPOTS).add(ModPoiTypes.fishingSpot.get());
+        tag(ModPoiTypeTags.DIG_SPOTS).add(ModPoiTypes.DIG_SPOT);
+        tag(ModPoiTypeTags.FISHING_SPOTS).add(ModPoiTypes.FISHING_SPOT);
     }
 }

neoforge/src/main/java/net/blay09/mods/littlejoys/neoforge/NeoForgeLittleJoys.java

@@ -11,6 +11,6 @@ public class NeoForgeLittleJoys {
 
     public NeoForgeLittleJoys(IEventBus modEventBus) {
         final var context = new NeoForgeLoadContext(modEventBus);
-        Balm.initialize(LittleJoys.MOD_ID, context, LittleJoys::initialize);
+        Balm.initializeMod(LittleJoys.MOD_ID, context, LittleJoys::initialize);
     }
 }

neoforge/src/main/java/net/blay09/mods/littlejoys/neoforge/client/NeoForgeYourModClient.java renamed to neoforge/src/main/java/net/blay09/mods/littlejoys/neoforge/client/NeoForgeLittleJoysClient.java

@@ -9,10 +9,10 @@
 import net.neoforged.fml.common.Mod;
 
 @Mod(value = LittleJoys.MOD_ID, dist = Dist.CLIENT)
-public class NeoForgeYourModClient {
+public class NeoForgeLittleJoysClient {
 
-    public NeoForgeYourModClient(IEventBus modEventBus) {
+    public NeoForgeLittleJoysClient(IEventBus modEventBus) {
         final var context = new NeoForgeLoadContext(modEventBus);
-        BalmClient.initialize(LittleJoys.MOD_ID, context, LittleJoysClient::initialize);
+        BalmClient.initializeMod(LittleJoys.MOD_ID, context, LittleJoysClient::initialize);
     }
 }