diff --git a/Common/src/main/java/tschipp/carryon/CarryOnCommon.java b/Common/src/main/java/tschipp/carryon/CarryOnCommon.java
index 40cba15..44f4325 100644
--- a/Common/src/main/java/tschipp/carryon/CarryOnCommon.java
+++ b/Common/src/main/java/tschipp/carryon/CarryOnCommon.java
@@ -108,6 +108,8 @@ public class CarryOnCommon
 
 	public static void onCarryTick(ServerPlayer player)
 	{
+		//TODO: Remove
+		System.out.println(player.getGameProfile());
 	    CarryOnData carry = CarryOnDataManager.getCarryData(player);
 	    if(carry.isCarrying())
 	    {
@@ -115,7 +117,7 @@ public class CarryOnCommon
 	        {
 	            String cmd = carry.getActiveScript().get().scriptEffects().commandLoop();
 	            if(!cmd.isEmpty())
-	                player.getServer().getCommands().performPrefixedCommand(player.getServer().createCommandSourceStack(), "/execute as " + player.getGameProfile().getName() + " run " + cmd);
+	                player.level().getServer().getCommands().performPrefixedCommand(player.level().getServer().createCommandSourceStack(), "/execute as " + player.getGameProfile() + " run " + cmd);
 	        }
 
 		    Inventory inv = player.getInventory();
@@ -153,7 +155,7 @@ public class CarryOnCommon
 
 	public static void onPlayerAttacked(Player player)
 	{
-		if (Constants.COMMON_CONFIG.settings.dropCarriedWhenHit && !player.level().isClientSide)
+		if (Constants.COMMON_CONFIG.settings.dropCarriedWhenHit && !player.level().isClientSide())
 		{
 			CarryOnData carry = CarryOnDataManager.getCarryData(player);
 			if (carry.isCarrying())
diff --git a/Common/src/main/java/tschipp/carryon/CarryOnCommonClient.java b/Common/src/main/java/tschipp/carryon/CarryOnCommonClient.java
index 2cd4463..6167c79 100644
--- a/Common/src/main/java/tschipp/carryon/CarryOnCommonClient.java
+++ b/Common/src/main/java/tschipp/carryon/CarryOnCommonClient.java
@@ -21,6 +21,8 @@
 package tschipp.carryon;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.input.MouseButtonEvent;
+import net.minecraft.client.input.MouseButtonInfo;
 import net.minecraft.world.entity.player.Player;
 import tschipp.carryon.client.keybinds.CarryOnKeybinds;
 import tschipp.carryon.common.carry.CarryOnData;
@@ -49,7 +51,7 @@ public class CarryOnCommonClient
 	private static boolean checkMouse()
 	{
 		Minecraft mc = Minecraft.getInstance();
-		return (CarryOnKeybinds.carryKey.matchesMouse(0) && mc.mouseHandler.isLeftPressed()) || (CarryOnKeybinds.carryKey.matchesMouse(1) && mc.mouseHandler.isRightPressed()) || (CarryOnKeybinds.carryKey.matchesMouse(3) && mc.mouseHandler.isMiddlePressed());
+		return (CarryOnKeybinds.carryKey.matchesMouse(new MouseButtonEvent(0,0, new MouseButtonInfo(0,0))) && mc.mouseHandler.isLeftPressed()) || (CarryOnKeybinds.carryKey.matchesMouse(new MouseButtonEvent(0,0, new MouseButtonInfo(1,0))) || CarryOnKeybinds.carryKey.matchesMouse(new MouseButtonEvent(0,0, new MouseButtonInfo(3,0))) && mc.mouseHandler.isMiddlePressed());
 	}
 
 	public static void onCarryClientTick()
diff --git a/Common/src/main/java/tschipp/carryon/client/keybinds/ConflictFreeKeyMapping.java b/Common/src/main/java/tschipp/carryon/client/keybinds/ConflictFreeKeyMapping.java
index 074195b..9d67683 100644
--- a/Common/src/main/java/tschipp/carryon/client/keybinds/ConflictFreeKeyMapping.java
+++ b/Common/src/main/java/tschipp/carryon/client/keybinds/ConflictFreeKeyMapping.java
@@ -25,12 +25,12 @@ import net.minecraft.client.KeyMapping;
 
 public class ConflictFreeKeyMapping extends KeyMapping
 {
-	public ConflictFreeKeyMapping(String $$0, int $$1, String $$2)
+	public ConflictFreeKeyMapping(String $$0, int $$1, Category $$2)
 	{
 		super($$0, $$1, $$2);
 	}
 
-	public ConflictFreeKeyMapping(String $$0, Type $$1, int $$2, String $$3)
+	public ConflictFreeKeyMapping(String $$0, Type $$1, int $$2, Category $$3)
 	{
 		super($$0, $$1, $$2, $$3);
 	}
diff --git a/Common/src/main/java/tschipp/carryon/client/render/CarriedObjectRender.java b/Common/src/main/java/tschipp/carryon/client/render/CarriedObjectRender.java
index 5090b6e..2c6dd7f 100644
--- a/Common/src/main/java/tschipp/carryon/client/render/CarriedObjectRender.java
+++ b/Common/src/main/java/tschipp/carryon/client/render/CarriedObjectRender.java
@@ -128,7 +128,7 @@ public class CarriedObjectRender
 
 		ItemStack renderStack = CarryRenderHelper.getRenderItemStack(player);
 		Minecraft.getInstance().getItemModelResolver().updateForTopItem(renderState, renderStack, ItemDisplayContext.NONE, player.level(), null, 0);
-		renderState.render(matrix, buffer, light, OverlayTexture.NO_OVERLAY);
+		renderState.submit(matrix, buffer, light, OverlayTexture.NO_OVERLAY);
 
 
 
diff --git a/Common/src/main/java/tschipp/carryon/common/scripting/Matchables.java b/Common/src/main/java/tschipp/carryon/common/scripting/Matchables.java
index db8a4ab..fcbe34e 100644
--- a/Common/src/main/java/tschipp/carryon/common/scripting/Matchables.java
+++ b/Common/src/main/java/tschipp/carryon/common/scripting/Matchables.java
@@ -127,7 +127,7 @@ public final class Matchables
 		@Override
 		public boolean matches(ServerPlayer player)
 		{
-			ServerAdvancementManager manager = player.getServer().getAdvancements();
+			ServerAdvancementManager manager = player.level().getServer().getAdvancements();
 			AdvancementHolder adv = manager.get(ResourceLocation.parse(advancement.isEmpty() ? "" : advancement));
 
 			boolean achievement = adv == null ? true : player.getAdvancements().getOrStartProgress(adv).isDone();
@@ -167,7 +167,7 @@ public final class Matchables
 			if (cond == null || cond.isEmpty())
 				return true;
 
-			Scoreboard score = player.getScoreboard();
+			Scoreboard score = player.level().getScoreboard();
 			String numb;
 			String scorename;
 			int iE = cond.indexOf("=");
diff --git a/Common/src/main/java/tschipp/carryon/mixin/PlayerRenderStateMixin.java b/Common/src/main/java/tschipp/carryon/mixin/AvatarRenderStateMixin.java
similarity index 82%
rename from Common/src/main/java/tschipp/carryon/mixin/PlayerRenderStateMixin.java
rename to Common/src/main/java/tschipp/carryon/mixin/AvatarRenderStateMixin.java
index 0575c53..e50230e 100644
--- a/Common/src/main/java/tschipp/carryon/mixin/PlayerRenderStateMixin.java
+++ b/Common/src/main/java/tschipp/carryon/mixin/AvatarRenderStateMixin.java
@@ -1,13 +1,13 @@
 package tschipp.carryon.mixin;
 
-import net.minecraft.client.renderer.entity.state.PlayerRenderState;
+import net.minecraft.client.renderer.entity.state.AvatarRenderState;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import tschipp.carryon.client.render.ICarryOnRenderState;
 import tschipp.carryon.common.carry.CarryOnData;
 
-@Mixin(PlayerRenderState.class)
-public class PlayerRenderStateMixin implements ICarryOnRenderState {
+@Mixin(AvatarRenderState.class)
+public class AvatarRenderStateMixin implements ICarryOnRenderState {
 
     @Unique
     public CarryOnData carryOnData = null;
diff --git a/Common/src/main/java/tschipp/carryon/mixin/HumanoidModelMixin.java b/Common/src/main/java/tschipp/carryon/mixin/HumanoidModelMixin.java
index 0a9074c..e416cd4 100644
--- a/Common/src/main/java/tschipp/carryon/mixin/HumanoidModelMixin.java
+++ b/Common/src/main/java/tschipp/carryon/mixin/HumanoidModelMixin.java
@@ -23,7 +23,7 @@ package tschipp.carryon.mixin;
 import net.minecraft.client.model.HumanoidModel;
 import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.renderer.entity.state.HumanoidRenderState;
-import net.minecraft.client.renderer.entity.state.PlayerRenderState;
+import net.minecraft.client.renderer.entity.state.AvatarRenderState;
 import net.minecraft.world.phys.Vec3;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
diff --git a/Common/src/main/resources/carryon.mixins.json b/Common/src/main/resources/carryon.mixins.json
index 820444e..cb06f88 100644
--- a/Common/src/main/resources/carryon.mixins.json
+++ b/Common/src/main/resources/carryon.mixins.json
@@ -11,7 +11,7 @@
   "client": [
     "HumanoidModelMixin",
     "MinecraftMixin",
-    "PlayerRenderStateMixin",
+    "AvatarRenderStateMixin",
     "EntityRendererMixin"
   ],
   "server": [
diff --git a/Fabric/build.gradle b/Fabric/build.gradle
index ed15c5b..f1305cb 100644
--- a/Fabric/build.gradle
+++ b/Fabric/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'multiloader-loader'
-    id 'fabric-loom' version '1.10-SNAPSHOT'
+    id 'fabric-loom' version '1.11-SNAPSHOT'
 }
 
 repositories {
diff --git a/build.gradle b/build.gradle
index cc63bd5..1645185 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     // see https://fabricmc.net/develop/ for new versions
-    id 'fabric-loom' version '1.10-SNAPSHOT' apply false
+    id 'fabric-loom' version '1.11-SNAPSHOT' apply false
     // see https://projects.neoforged.net/neoforged/moddevgradle for new versions
     id 'net.neoforged.moddev' version "${mod_dev_version}" apply false
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 51e46db..fa35b2b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,36 +1,36 @@
 # Project
-version=2.7.0
+version=2.8.0
 group=tschipp.carryon
 
 # Common
-minecraft_version=1.21.8
+minecraft_version=1.21.9
 mod_name=Carry On
 mod_author=Tschipp, PurpliciousCow
 mod_id=carryon
 license=GNU LGPLv3
 credits=
 description=Carry On is a simple mod that improves game interaction by allowing players to pick up, carry, and place single block Tile Entities using only their empty hands.
-minecraft_version_range=[1.21.8, 1.22)
-neo_form_version=1.21.8-20250717.133445
+minecraft_version_range=[1.21.9, 1.22)
+neo_form_version=1.21.9-20250930.151910
 java_version=21
-parchment_version=2025.07.20
-mod_dev_version=2.0.107
+parchment_version=2025.10.05
+mod_dev_version=2.0.115
 # Forge
-forge_version=58.0.10
-forge_loader_version_range=[57,)
-parchment_mappings=2025.07.20-1.21.8
+forge_version= 59.0.5
+forge_loader_version_range=[59,)
+parchment_mappings=2025.10.05-1.21.9
 //forge_ats_enabled=true
 
 # Fabric
-fabric_version=0.132.0+1.21.8
-fabric_loader_version=0.17.2
-parchment_mappings_fabric=1.21.8:2025.07.20
+fabric_version=0.134.0+1.21.9
+fabric_loader_version=0.17.3
+parchment_mappings_fabric=1.21.9:2025.10.05
 
 # Neoforge
-neoforge_version=21.8.36
+neoforge_version=21.9.16-beta
 neoforge_loader_version_range=[4,)
-neogradle.subsystems.parchment.minecraftVersion=1.21.8
-neogradle.subsystems.parchment.mappingsVersion=2025.07.20
+neogradle.subsystems.parchment.minecraftVersion=1.21.9
+neogradle.subsystems.parchment.mappingsVersion=2025.10.05
 
 
 # Gradle
@@ -38,4 +38,4 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 mixinextras_version=0.3.6
-cloth_config_version=19.0.147
\ No newline at end of file
+cloth_config_version=20.0.149
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 8ca4152..0a7f7e0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,6 +13,7 @@ pluginManagement {
             filter {
                 includeGroup('net.fabricmc')
                 includeGroup('fabric-loom')
+                includeGroup('net.fabricmc.unpick')
             }
         }
         exclusiveContent {