Update to 1.21.8

Author: CorgiTaco

Common/src/main/java/corgitaco/corgilib/client/AnnouncementInfoClientTicker.java

@@ -9,6 +9,8 @@
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.world.entity.player.Player;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.concurrent.ThreadLocalRandom;
 
 public class AnnouncementInfoClientTicker {
@@ -35,9 +37,15 @@ public static void announcementTicker(Player player) {
                     player.displayClientMessage(Component.empty(), false);
                     player.displayClientMessage(announcementInfo.desc(), false);
                     Component component = announcementInfo.actionButtonText();
-                    MutableComponent open = ComponentUtils.wrapInSquareBrackets(component.copy().withStyle(style -> style.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, announcementInfo.url())).withBold(true).withColor(ChatFormatting.GREEN)));
+                    MutableComponent open = ComponentUtils.wrapInSquareBrackets(component.copy().withStyle(style -> {
+                        try {
+                            return style.withClickEvent(new ClickEvent.OpenUrl(new URI(announcementInfo.url()))).withBold(true).withColor(ChatFormatting.GREEN);
+                        } catch (URISyntaxException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }));
                     player.displayClientMessage(Component.empty(), false);
-                    MutableComponent dismiss = Component.literal("Dismiss").withStyle(ChatFormatting.ITALIC, ChatFormatting.GRAY).withStyle(style -> style.withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/corgilib_client announcement dismiss")));
+                    MutableComponent dismiss = Component.literal("Dismiss").withStyle(ChatFormatting.ITALIC, ChatFormatting.GRAY).withStyle(style -> style.withClickEvent(new ClickEvent.RunCommand("/corgilib_client announcement dismiss")));
                     player.displayClientMessage(Component.literal("").append(open).append(" | ").append(dismiss), false);
                 }
             }

Common/src/main/java/corgitaco/corgilib/serialization/codec/CodecUtil.java

@@ -57,22 +57,6 @@ public class CodecUtil {
 
     }, Difficulty::getKey);
 
-
-
-    public static final Codec<ClickEvent.Action> CLICK_EVENT_ACTION_CODEC = Codec.STRING.comapFlatMap(s -> {
-        try {
-            return DataResult.success(ClickEvent.Action.valueOf(s));
-        } catch (Exception e) {
-            return DataResult.error(e::getMessage);
-        }
-    }, ClickEvent.Action::name);
-
-
-    public static final Codec<ClickEvent> CLICK_EVENT_CODEC = RecordCodecBuilder.create((builder) -> builder.group(
-            CLICK_EVENT_ACTION_CODEC.fieldOf("action").forGetter(ClickEvent::getAction),
-            Codec.STRING.fieldOf("value").forGetter((ClickEvent::getValue))
-    ).apply(builder, ClickEvent::new));
-
     public static Function<String, DataResult<Integer>> validateColorHex() {
         return input -> {
 

Common/src/main/resources/corgilib.accesswidener

@@ -5,6 +5,7 @@ accessible class net/minecraft/core/registries/BuiltInRegistries$RegistryBootstr
 accessible method net/minecraft/core/registries/BuiltInRegistries registerSimple (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/core/registries/BuiltInRegistries$RegistryBootstrap;)Lnet/minecraft/core/Registry;
 
 accessible field net/minecraft/resources/DelegatingOps delegate Lcom/mojang/serialization/DynamicOps;
+accessible field net/minecraft/world/entity/player/Inventory items Lnet/minecraft/core/NonNullList;
 
 accessible method net/minecraft/world/entity/Display setTransformation (Lcom/mojang/math/Transformation;)V
 accessible method net/minecraft/world/entity/Display$TextDisplay setText (Lnet/minecraft/network/chat/Component;)V

Forge/src/main/java/corgitaco/corgilib/forge/CorgiLibForge.java

@@ -5,7 +5,7 @@
 import corgitaco.corgilib.forge.platform.ForgePlatform;
 import corgitaco.corgilib.server.commands.CorgiLibCommands;
 import net.minecraftforge.event.RegisterCommandsEvent;
-import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.eventbus.api.bus.BusGroup;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -15,11 +15,11 @@
 public class CorgiLibForge {
 
     public CorgiLibForge(final FMLJavaModLoadingContext context) {
-        IEventBus modEventBus = context.getModEventBus();
-        modEventBus.addListener((FMLCommonSetupEvent event) -> ForgeNetworkHandler.init());
+        BusGroup modEventBus = context.getModBusGroup();
+        FMLCommonSetupEvent.getBus(modEventBus).addListener(fmlCommonSetupEvent -> ForgeNetworkHandler.init());
         CorgiLib.init();
         ForgePlatform.CACHED.values().forEach(deferredRegister -> deferredRegister.register(modEventBus));
-        modEventBus.<DataPackRegistryEvent.NewRegistry>addListener(newRegistry -> ForgePlatform.DATAPACK_REGISTRIES.forEach(newRegistryConsumer -> newRegistryConsumer.accept(newRegistry)));
-        modEventBus.addListener((RegisterCommandsEvent event) -> CorgiLibCommands.registerCommands(event.getDispatcher(), event.getBuildContext()));
+        DataPackRegistryEvent.NewRegistry.getBus(modEventBus).addListener(newRegistry -> ForgePlatform.DATAPACK_REGISTRIES.forEach(newRegistryConsumer -> newRegistryConsumer.accept(newRegistry)));
+        RegisterCommandsEvent.BUS.addListener(commandBus -> CorgiLibCommands.registerCommands(commandBus.getDispatcher(), commandBus.getBuildContext()));
     }
 }

Forge/src/main/java/corgitaco/corgilib/forge/client/CorgiLibForgeClientEvents.java

@@ -6,7 +6,7 @@
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.RegisterClientCommandsEvent;
 import net.minecraftforge.event.TickEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 
 @Mod.EventBusSubscriber(modid = CorgiLib.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT)

NeoForge/src/main/java/dev/corgitaco/corgilib/neoforge/CorgiLibNeoForge.java

@@ -5,6 +5,7 @@
 import dev.corgitaco.corgilib.neoforge.platform.NeoForgePlatform;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.common.Mod;
+import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.RegisterCommandsEvent;
 import net.neoforged.neoforge.registries.DataPackRegistryEvent;
 import net.neoforged.neoforge.registries.NewRegistryEvent;
@@ -19,6 +20,6 @@ public CorgiLibNeoForge(IEventBus modEventBus) {
         NeoForgePlatform.CACHED.values().forEach(deferredRegister -> deferredRegister.register(modEventBus));
         modEventBus.addListener(DataPackRegistryEvent.NewRegistry.class, newRegistry -> NeoForgePlatform.DATAPACK_REGISTRIES.forEach(newRegistryConsumer -> newRegistryConsumer.accept(newRegistry)));
         modEventBus.addListener(NewRegistryEvent.class, newRegistry -> NeoForgePlatform.NEW_REGISTRIES.forEach(newRegistryConsumer -> newRegistryConsumer.accept(newRegistry)));
-        modEventBus.addListener((RegisterCommandsEvent event) -> CorgiLibCommands.registerCommands(event.getDispatcher(), event.getBuildContext()));
+        NeoForge.EVENT_BUS.addListener((RegisterCommandsEvent event) -> CorgiLibCommands.registerCommands(event.getDispatcher(), event.getBuildContext()));
     }
 }

NeoForge/src/main/java/dev/corgitaco/corgilib/neoforge/network/NeoForgeNetworkHandler.java

@@ -7,7 +7,7 @@
 import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
 import net.neoforged.neoforge.network.registration.PayloadRegistrar;
 
-@EventBusSubscriber(modid = CorgiLib.MOD_ID, bus = EventBusSubscriber.Bus.MOD)
+@EventBusSubscriber(modid = CorgiLib.MOD_ID)
 public class NeoForgeNetworkHandler {
 
 

NeoForge/src/main/java/dev/corgitaco/corgilib/neoforge/platform/NeoForgePlatformNetwork.java

@@ -4,6 +4,7 @@
 import corgitaco.corgilib.network.Packet;
 import corgitaco.corgilib.platform.PlatformNetwork;
 import net.minecraft.server.level.ServerPlayer;
+import net.neoforged.neoforge.client.network.ClientPacketDistributor;
 import net.neoforged.neoforge.network.PacketDistributor;
 
 @AutoService(PlatformNetwork.class)
@@ -15,6 +16,6 @@ public <P extends Packet> void sendToClient(ServerPlayer player, P packet) {
 
     @Override
     public <P extends Packet> void sendToServer(P packet) {
-        PacketDistributor.sendToServer(packet);
+        ClientPacketDistributor.sendToServer(packet);
     }
 }

build.gradle.kts

@@ -43,7 +43,7 @@ subprojects {
         "minecraft"("com.mojang:minecraft:$minecraftVersion")
         "mappings"(loom.layered{
             officialMojangMappings()
-            parchment("org.parchmentmc.data:parchment-$minecraftVersion:${project.properties["parchment"]}@zip")
+//            parchment("org.parchmentmc.data:parchment-$minecraftVersion:${project.properties["parchment"]}@zip")
         })
 
         compileOnly("org.jetbrains:annotations:26.0.2")

gradle.properties

@@ -1,5 +1,5 @@
 # Project
-version=6.0.0.2
+version=7.0.0.0
 group=dev.corgitaco
 archives_base_name=Corgilib
 
@@ -8,17 +8,17 @@ curseforge_id=693313
 modrinth_id=ziOp6EO8
 
 # Common
-minecraft_version=1.21.4
+minecraft_version=1.21.8
 
 # Forge
-forge_version=54.1.3
+forge_version=58.0.1
 
 # Neoforge
-neoforge_version=21.4.147
+neoforge_version=21.8.17
 
 # Fabric
 fabric_loader_version=0.16.14
-fabric_api_version=0.119.3
+fabric_api_version=0.130.0
 
 # Mod options
 mod_name=CorgiLib