From 776d079be047c1e6b629ba4a498613a415693538 Mon Sep 17 00:00:00 2001
From: Hanro50 <hlareman2@gmail.com>
Date: Wed, 15 Oct 2025 09:47:48 +0200
Subject: [PATCH] forge fix

---
 Forge/src/main/java/tschipp/carryon/CarryOnForge.java |  1 -
 .../java/tschipp/carryon/events/ModClientEvents.java  | 11 ++---------
 .../tschipp/carryon/platform/ForgePlatformHelper.java |  4 ----
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/Forge/src/main/java/tschipp/carryon/CarryOnForge.java b/Forge/src/main/java/tschipp/carryon/CarryOnForge.java
index 292bf7b..9c773ee 100644
--- a/Forge/src/main/java/tschipp/carryon/CarryOnForge.java
+++ b/Forge/src/main/java/tschipp/carryon/CarryOnForge.java
@@ -30,7 +30,6 @@ import net.minecraftforge.network.ChannelBuilder;
 import net.minecraftforge.network.SimpleChannel;
 import tschipp.carryon.config.forge.ConfigLoaderImpl;
 import tschipp.carryon.networking.ClientboundSyncCarryDataPacket;
-import tschipp.carryon.networking.clientbound.ClientboundStartRidingPacket;
 import tschipp.carryon.platform.Services;
 
 @Mod(Constants.MOD_ID)
diff --git a/Forge/src/main/java/tschipp/carryon/events/ModClientEvents.java b/Forge/src/main/java/tschipp/carryon/events/ModClientEvents.java
index 98c4e34..0fa5770 100644
--- a/Forge/src/main/java/tschipp/carryon/events/ModClientEvents.java
+++ b/Forge/src/main/java/tschipp/carryon/events/ModClientEvents.java
@@ -21,17 +21,13 @@
 package tschipp.carryon.events;
 
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.client.ConfigScreenHandler;
 import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
 import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
-import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import tschipp.carryon.Constants;
 import tschipp.carryon.client.keybinds.CarryOnKeybinds;
-import tschipp.carryon.compat.ClothConfigCompatForge;
 import tschipp.carryon.config.BuiltConfig;
 import tschipp.carryon.config.forge.ConfigLoaderImpl;
 import tschipp.carryon.platform.Services;
@@ -39,13 +35,10 @@ import tschipp.carryon.platform.Services;
 @Mod.EventBusSubscriber(bus = Bus.MOD, modid = Constants.MOD_ID, value=Dist.CLIENT)
 public class ModClientEvents
 {
-	@SubscribeEvent
-	public static void registerKeybinds(RegisterKeyMappingsEvent event)
-	{
-		CarryOnKeybinds.registerKeybinds(event::register);
+	static{
+		RegisterKeyMappingsEvent.BUS.addListener((e)->CarryOnKeybinds.registerKeybinds(e::register));
 	}
 
-
 	@SubscribeEvent
 	public static void clientSetup(FMLClientSetupEvent event)
 	{
diff --git a/Forge/src/main/java/tschipp/carryon/platform/ForgePlatformHelper.java b/Forge/src/main/java/tschipp/carryon/platform/ForgePlatformHelper.java
index bb522eb..cc4d147 100644
--- a/Forge/src/main/java/tschipp/carryon/platform/ForgePlatformHelper.java
+++ b/Forge/src/main/java/tschipp/carryon/platform/ForgePlatformHelper.java
@@ -21,7 +21,6 @@
 package tschipp.carryon.platform;
 
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.ResourceLocation;
@@ -31,14 +30,12 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraftforge.event.network.CustomPayloadEvent;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.network.NetworkDirection;
 import net.minecraftforge.network.PacketDistributor;
 import tschipp.carryon.CarryOnCommonClient;
 import tschipp.carryon.CarryOnForge;
 import tschipp.carryon.Constants;
 import tschipp.carryon.carry.CarryOnDataCapability;
 import tschipp.carryon.carry.CarryOnDataCapabilityProvider;
-import tschipp.carryon.carry.ICarryOnDataCapability;
 import tschipp.carryon.common.carry.CarryOnData;
 import tschipp.carryon.config.BuiltConfig;
 import tschipp.carryon.config.forge.ConfigLoaderImpl;
@@ -47,7 +44,6 @@ import tschipp.carryon.networking.PacketBase;
 import tschipp.carryon.platform.services.IPlatformHelper;
 
 import java.util.function.BiConsumer;
-import java.util.function.Function;
 
 public class ForgePlatformHelper implements IPlatformHelper {