diff --git a/forge/build.gradle b/forge/build.gradle
index 45fdeab0..84afb2ca 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -57,7 +57,7 @@ dependencies {
     minecraft(libs.forge)
     library(project(":common"))
 
-    implementation("me.shedaniel.cloth:cloth-config-forge:${libs.versions.clothConfigVersion.get()}")
+//    implementation("me.shedaniel.cloth:cloth-config-forge:${libs.versions.clothConfigVersion.get()}")
 
     // Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transitive dependencies request 6.0+
     implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
diff --git a/forge/src/main/java/fr/rakambda/fallingtree/forge/FallingTree.java b/forge/src/main/java/fr/rakambda/fallingtree/forge/FallingTree.java
index 6fbea030..4c874a8d 100644
--- a/forge/src/main/java/fr/rakambda/fallingtree/forge/FallingTree.java
+++ b/forge/src/main/java/fr/rakambda/fallingtree/forge/FallingTree.java
@@ -1,14 +1,10 @@
 package fr.rakambda.fallingtree.forge;
 
-import fr.rakambda.fallingtree.common.FallingTreeCommon;
-import fr.rakambda.fallingtree.forge.client.cloth.ClothConfigHook;
 import fr.rakambda.fallingtree.forge.common.FallingTreeCommonsImpl;
 import lombok.Getter;
 import lombok.extern.log4j.Log4j2;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.common.Mod;
-import java.lang.reflect.InvocationTargetException;
 
 @Log4j2
 @Mod(FallingTree.MOD_ID)
@@ -18,18 +14,18 @@ public class FallingTree{
 	private static final FallingTreeCommonsImpl mod = new FallingTreeCommonsImpl();
 	
 	public FallingTree(){
-		if(ModList.get().isLoaded("cloth_config")){
-			try{
-				Class.forName("fr.rakambda.fallingtree.forge.client.cloth.ClothConfigHook")
-						.asSubclass(ClothConfigHook.class)
-						.getConstructor(FallingTreeCommon.class)
-						.newInstance(mod)
-						.load();
-			}
-			catch(ClassNotFoundException | IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e){
-				log.error("Failed to hook into ClothConfig", e);
-			}
-		}
+		// if(ModList.get().isLoaded("cloth_config")){
+		// 	try{
+		// 		Class.forName("fr.rakambda.fallingtree.forge.client.cloth.ClothConfigHook")
+		// 				.asSubclass(ClothConfigHook.class)
+		// 				.getConstructor(FallingTreeCommon.class)
+		// 				.newInstance(mod)
+		// 				.load();
+		// 	}
+		// 	catch(ClassNotFoundException | IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e){
+		// 		log.error("Failed to hook into ClothConfig", e);
+		// 	}
+		// }
 		
 		mod.registerForge(MinecraftForge.EVENT_BUS);
 	}
diff --git a/forge/src/main/java/fr/rakambda/fallingtree/forge/client/cloth/ClothConfigHook.java b/forge/src/main/java/fr/rakambda/fallingtree/forge/client/cloth/ClothConfigHook.java
deleted file mode 100644
index 9d5f804d..00000000
--- a/forge/src/main/java/fr/rakambda/fallingtree/forge/client/cloth/ClothConfigHook.java
+++ /dev/null
@@ -1,388 +0,0 @@
-package fr.rakambda.fallingtree.forge.client.cloth;
-
-import com.google.common.collect.Lists;
-import fr.rakambda.fallingtree.common.FallingTreeCommon;
-import fr.rakambda.fallingtree.common.config.enums.AdjacentStopMode;
-import fr.rakambda.fallingtree.common.config.enums.BreakMode;
-import fr.rakambda.fallingtree.common.config.enums.BreakOrder;
-import fr.rakambda.fallingtree.common.config.enums.DamageRounding;
-import fr.rakambda.fallingtree.common.config.enums.DetectionMode;
-import fr.rakambda.fallingtree.common.config.enums.DurabilityMode;
-import fr.rakambda.fallingtree.common.config.enums.MaxSizeAction;
-import fr.rakambda.fallingtree.common.config.enums.NotificationMode;
-import fr.rakambda.fallingtree.common.config.enums.SneakMode;
-import fr.rakambda.fallingtree.common.config.real.Configuration;
-import fr.rakambda.fallingtree.common.config.real.EnchantmentConfiguration;
-import fr.rakambda.fallingtree.common.config.real.PlayerConfiguration;
-import fr.rakambda.fallingtree.common.config.real.ToolConfiguration;
-import fr.rakambda.fallingtree.common.config.real.TreeConfiguration;
-import fr.rakambda.fallingtree.common.config.real.cloth.ClothHookBase;
-import fr.rakambda.fallingtree.common.wrapper.IComponent;
-import me.shedaniel.clothconfig2.api.ConfigBuilder;
-import net.minecraft.network.chat.Component;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.client.ConfigScreenHandler;
-import net.minecraftforge.fml.ModLoadingContext;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import java.util.Optional;
-import java.util.function.Function;
-
-public class ClothConfigHook extends ClothHookBase{
-	public ClothConfigHook(@NotNull FallingTreeCommon<?> mod){
-		super(mod);
-	}
-	
-	public void load(){
-		ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> new ConfigScreenHandler.ConfigScreenFactory((minecraft, screen) -> {
-			var builder = ConfigBuilder.create()
-					.setParentScreen(screen)
-					.setTitle(Component.literal("FallingTree"));
-			
-			var configuration = getMod().getOwnConfiguration();
-			builder.setSavingRunnable(configuration::onUpdate);
-			
-			fillConfigScreen(builder, configuration);
-			
-			return builder.build();
-		}));
-	}
-	
-	@OnlyIn(Dist.CLIENT)
-	public void fillConfigScreen(@NotNull ConfigBuilder builder, @NotNull Configuration config){
-		var reverseSneakingEntry = builder.entryBuilder()
-				.startEnumSelector(translatable(getFieldName(null, "sneakMode")), SneakMode.class, config.getSneakMode())
-				.setDefaultValue(SneakMode.SNEAK_DISABLE)
-				.setTooltip(getTooltips(null, "sneakMode"))
-				.setSaveConsumer(config::setSneakMode)
-				.build();
-		var breakInCreativeEntry = builder.entryBuilder()
-				.startBooleanToggle(translatable(getFieldName(null, "breakInCreative")), config.isBreakInCreative())
-				.setDefaultValue(false)
-				.setTooltip(getTooltips(null, "breakInCreative"))
-				.setSaveConsumer(config::setBreakInCreative)
-				.build();
-		var lootInCreativeEntry = builder.entryBuilder()
-				.startBooleanToggle(translatable(getFieldName(null, "lootInCreative")), config.isLootInCreative())
-				.setDefaultValue(true)
-				.setTooltip(getTooltips(null, "lootInCreative"))
-				.setSaveConsumer(config::setLootInCreative)
-				.build();
-		var notificationModeEntry = builder.entryBuilder()
-				.startEnumSelector(translatable(getFieldName(null, "notificationMode")), NotificationMode.class, config.getNotificationMode())
-				.setDefaultValue(NotificationMode.ACTION_BAR)
-				.setTooltip(getTooltips(null, "notificationMode"))
-				.setSaveConsumer(config::setNotificationMode)
-				.build();
-		
-		var general = builder.getOrCreateCategory(translatable("text.autoconfig.fallingtree.category.default"));
-		general.addEntry(reverseSneakingEntry);
-		general.addEntry(breakInCreativeEntry);
-		general.addEntry(lootInCreativeEntry);
-		general.addEntry(notificationModeEntry);
-		
-		fillTreesConfigScreen(builder, config.getTrees());
-		fillToolsConfigScreen(builder, config.getTools());
-		fillPlayerConfigScreen(builder, config.getPlayer());
-		fillEnchantmentConfigScreen(builder, config.getEnchantment());
-	}
-	
-	@OnlyIn(Dist.CLIENT)
-	private void fillTreesConfigScreen(@NotNull ConfigBuilder builder, @NotNull TreeConfiguration config){
-		var breakModeEntry = builder.entryBuilder()
-				.startEnumSelector(translatable(getFieldName("trees", "breakMode")), BreakMode.class, config.getBreakMode())
-				.setDefaultValue(BreakMode.INSTANTANEOUS)
-				.setTooltip(getTooltips("trees", "breakMode"))
-				.setSaveConsumer(config::setBreakMode)
-				.build();
-		var detectionModeEntry = builder.entryBuilder()
-				.startEnumSelector(translatable(getFieldName("trees", "detectionMode")), DetectionMode.class, config.getDetectionMode())
-				.setDefaultValue(DetectionMode.WHOLE_TREE)
-				.setTooltip(getTooltips("trees", "detectionMode"))
-				.setSaveConsumer(config::setDetectionMode)
-				.build();
-		var allowedLogsEntry = builder.entryBuilder()
-				.startStrList(translatable(getFieldName("trees", "allowedLogs")), config.getAllowedLogs())
-				.setDefaultValue(Lists.newArrayList())
-				.setTooltip(getTooltips("trees", "allowedLogs"))
-				.setSaveConsumer(config::setAllowedLogs)
-				.setCellErrorSupplier(map(getMinecraftBlockIdCellError()))
-				.build();
-		var deniedLogsEntry = builder.entryBuilder()
-				.startStrList(translatable(getFieldName("trees", "deniedLogs")), config.getDeniedLogs())
-				.setDefaultValue(Lists.newArrayList())
-				.setTooltip(getTooltips("trees", "deniedLogs"))
-				.setSaveConsumer(config::setDeniedLogs)
-				.setCellErrorSupplier(map(getMinecraftBlockIdCellError()))
-				.build();
-		var allowedLeavesEntry = builder.entryBuilder()
-				.startStrList(translatable(getFieldName("trees", "allowedLeaves")), config.getAllowedLeaves())
-				.setDefaultValue(Lists.newArrayList())
-				.setTooltip(getTooltips("trees", "allowedLeaves"))
-				.setSaveConsumer(config::setAllowedLeaves)
-				.setCellErrorSupplier(map(getMinecraftBlockIdCellError()))
-				.build();
-		var allowedNonDecayLeavesEntry = builder.entryBuilder()
-				.startStrList(translatable(getFieldName("trees", "allowedNonDecayLeaves")), config.getAllowedNonDecayLeaves())
-				.setDefaultValue(Lists.newArrayList())
-				.setTooltip(getTooltips("trees", "allowedNonDecayLeaves"))
-				.setSaveConsumer(config::setAllowedNonDecayLeaves)
-				.setCellErrorSupplier(map(getMinecraftBlockIdCellError()))
-				.build();
-		var deniedLeavesEntry = builder.entryBuilder()
-				.startStrList(translatable(getFieldName("trees", "deniedLeaves")), config.getDeniedLeaves())
-				.setDefaultValue(Lists.newArrayList())
-				.setTooltip(getTooltips("trees", "deniedLeaves"))
-				.setSaveConsumer(config::setDeniedLeaves)
-				.setCellErrorSupplier(map(getMinecraftBlockIdCellError()))
-				.build();
-		var maxScanSizeEntry = builder.entryBuilder()
-				.startIntField(translatable(getFieldName("trees", "maxScanSize")), config.getMaxScanSize())
-				.setDefaultValue(500)
-				.setMin(1)
-				.setTooltip(getTooltips("trees", "maxScanSize"))
-				.setSaveConsumer(config::setMaxScanSize)
-				.build();
-		var maxSizeEntry = builder.entryBuilder()
-				.startIntField(translatable(getFieldName("trees", "maxSize")), config.getMaxSize())
-				.setDefaultValue(100)
-				.setMin(1)
-				.setTooltip(getTooltips("trees", "maxSize"))
-				.setSaveConsumer(config::setMaxSize)
-				.build();
-		var maxSizeActionEntry = builder.entryBuilder()
-				.startEnumSelector(translatable(getFieldName("trees", "maxSizeAction")), MaxSizeAction.class, config.getMaxSizeAction())
-				.setDefaultValue(MaxSizeAction.ABORT)
-				.setTooltip(getTooltips("trees", "maxSizeAction"))
-				.setSaveConsumer(config::setMaxSizeAction)
-				.build();
-		var maxLeafDistanceFromLogEntry = builder.entryBuilder()
-				.startIntField(translatable(getFieldName("trees", "maxLeafDistanceFromLog")), config.getMaxLeafDistanceFromLog())
-				.setDefaultValue(15)
-				.setTooltip(getTooltips("trees", "maxLeafDistanceFromLog"))
-				.setSaveConsumer(config::setMaxLeafDistanceFromLog)
-				.build();
-		var breakOrderEntry = builder.entryBuilder()
-				.startEnumSelector(translatable(getFieldName("trees", "breakOrder")), BreakOrder.class, config.getBreakOrder())
-				.setDefaultValue(BreakOrder.FURTHEST_FIRST)
-				.setTooltip(getTooltips("trees", "breakOrder"))
-				.setSaveConsumer(config::setBreakOrder)
-				.build();
-		var treeBreakingEntry = builder.entryBuilder()
-				.startBooleanToggle(translatable(getFieldName("trees", "treeBreaking")), config.isTreeBreaking())
-				.setDefaultValue(true)
-				.setTooltip(getTooltips("trees", "treeBreaking"))
-				.setSaveConsumer(config::setTreeBreaking)
-				.build();
-		var leavesBreakingEntry = builder.entryBuilder()
-				.startBooleanToggle(translatable(getFieldName("trees", "leavesBreaking")), config.isLeavesBreaking())
-				.setDefaultValue(true)
-				.setTooltip(getTooltips("trees", "leavesBreaking"))
-				.setSaveConsumer(config::setLeavesBreaking)
-				.build();
-		var leavesBreakingForceRadiusEntry = builder.entryBuilder()
-				.startIntField(translatable(getFieldName("trees", "leavesBreakingForceRadius")), config.getLeavesBreakingForceRadius())
-				.setDefaultValue(0)
-				.setMin(0)
-				.setMax(10)
-				.setTooltip(getTooltips("trees", "leavesBreakingForceRadius"))
-				.setSaveConsumer(config::setLeavesBreakingForceRadius)
-				.build();
-		var minimumLeavesAroundRequiredEntry = builder.entryBuilder()
-				.startIntField(translatable(getFieldName("trees", "minimumLeavesAroundRequired")), config.getMinimumLeavesAroundRequired())
-				.setDefaultValue(1)
-				.setMin(0)
-				.setMax(5)
-				.setTooltip(getTooltips("trees", "minimumLeavesAroundRequired"))
-				.setSaveConsumer(config::setMinimumLeavesAroundRequired)
-				.build();
-		var includePersistentLeavesInRequiredCountEntry = builder.entryBuilder()
-				.startBooleanToggle(translatable(getFieldName("trees", "includePersistentLeavesInRequiredCount")), config.isIncludePersistentLeavesInRequiredCount())
-				.setDefaultValue(true)
-				.setTooltip(getTooltips("trees", "includePersistentLeavesInRequiredCount"))
-				.setSaveConsumer(config::setIncludePersistentLeavesInRequiredCount)
-				.build();
-		var allowMixedLogsEntry = builder.entryBuilder()
-				.startBooleanToggle(translatable(getFieldName("trees", "allowMixedLogs")), config.isAllowMixedLogs())
-				.setDefaultValue(false)
-				.setTooltip(getTooltips("trees", "allowMixedLogs"))
-				.setSaveConsumer(config::setAllowMixedLogs)
-				.build();
-		var breakNetherTreeWartsEntry = builder.entryBuilder()
-				.startBooleanToggle(translatable(getFieldName("trees", "breakNetherTreeWarts")), config.isBreakNetherTreeWarts())
-				.setDefaultValue(false)
-				.setTooltip(getTooltips("trees", "breakNetherTreeWarts"))
-				.setSaveConsumer(config::setBreakNetherTreeWarts)
-				.build();
-		var breakMangroveRootsEntry = builder.entryBuilder()
-				.startBooleanToggle(translatable(getFieldName("trees", "breakMangroveRoots")), config.isBreakMangroveRoots())
-				.setDefaultValue(false)
-				.setTooltip(getTooltips("trees", "breakMangroveRoots"))
-				.setSaveConsumer(config::setBreakMangroveRoots)
-				.build();
-		var searchAreaRadiusEntry = builder.entryBuilder()
-				.startIntField(translatable(getFieldName("trees", "searchAreaRadius")), config.getSearchAreaRadius())
-				.setDefaultValue(-1)
-				.setTooltip(getTooltips("trees", "searchAreaRadius"))
-				.setSaveConsumer(config::setSearchAreaRadius)
-				.build();
-		var allowedAdjacentBlocks = builder.entryBuilder()
-				.startStrList(translatable(getFieldName("trees", "allowedAdjacentBlocks")), config.getAllowedAdjacentBlocks())
-				.setDefaultValue(Lists.newArrayList())
-				.setTooltip(getTooltips("trees", "allowedAdjacentBlocks"))
-				.setSaveConsumer(config::setAllowedAdjacentBlocks)
-				.setCellErrorSupplier(map(getMinecraftBlockIdCellError()))
-				.build();
-		var adjacentStopModeEntry = builder.entryBuilder()
-				.startEnumSelector(translatable(getFieldName("trees", "adjacentStopMode")), AdjacentStopMode.class, config.getAdjacentStopMode())
-				.setDefaultValue(AdjacentStopMode.STOP_ALL)
-				.setTooltip(getTooltips("trees", "adjacentStopMode"))
-				.setSaveConsumer(config::setAdjacentStopMode)
-				.build();
-		var spawnItemsAtBreakPointEntry = builder.entryBuilder()
-				.startBooleanToggle(translatable(getFieldName("trees", "spawnItemsAtBreakPoint")), config.isSpawnItemsAtBreakPoint())
-				.setDefaultValue(false)
-				.setTooltip(getTooltips("trees", "spawnItemsAtBreakPoint"))
-				.setSaveConsumer(config::setSpawnItemsAtBreakPoint)
-				.build();
-		
-		var trees = builder.getOrCreateCategory(translatable("text.autoconfig.fallingtree.category.trees"));
-		trees.addEntry(breakModeEntry);
-		trees.addEntry(detectionModeEntry);
-		trees.addEntry(allowedLogsEntry);
-		trees.addEntry(deniedLogsEntry);
-		trees.addEntry(allowedLeavesEntry);
-		trees.addEntry(allowedNonDecayLeavesEntry);
-		trees.addEntry(deniedLeavesEntry);
-		trees.addEntry(maxScanSizeEntry);
-		trees.addEntry(maxSizeEntry);
-		trees.addEntry(maxSizeActionEntry);
-		trees.addEntry(maxLeafDistanceFromLogEntry);
-		trees.addEntry(breakOrderEntry);
-		trees.addEntry(treeBreakingEntry);
-		trees.addEntry(leavesBreakingEntry);
-		trees.addEntry(leavesBreakingForceRadiusEntry);
-		trees.addEntry(minimumLeavesAroundRequiredEntry);
-		trees.addEntry(includePersistentLeavesInRequiredCountEntry);
-		trees.addEntry(allowMixedLogsEntry);
-		trees.addEntry(breakNetherTreeWartsEntry);
-		trees.addEntry(breakMangroveRootsEntry);
-		trees.addEntry(searchAreaRadiusEntry);
-		trees.addEntry(allowedAdjacentBlocks);
-		trees.addEntry(adjacentStopModeEntry);
-		trees.addEntry(spawnItemsAtBreakPointEntry);
-	}
-	
-	@OnlyIn(Dist.CLIENT)
-	private void fillToolsConfigScreen(@NotNull ConfigBuilder builder, @NotNull ToolConfiguration config){
-		var ignoreToolsEntry = builder.entryBuilder()
-				.startBooleanToggle(translatable(getFieldName("tools", "ignoreTools")), config.isIgnoreTools())
-				.setDefaultValue(false)
-				.setTooltip(getTooltips("tools", "ignoreTools"))
-				.setSaveConsumer(config::setIgnoreTools)
-				.build();
-		var allowedEntry = builder.entryBuilder()
-				.startStrList(translatable(getFieldName("tools", "allowed")), config.getAllowed())
-				.setDefaultValue(Lists.newArrayList())
-				.setTooltip(getTooltips("tools", "allowed"))
-				.setSaveConsumer(config::setAllowed)
-				.setCellErrorSupplier(map(getMinecraftItemIdCellError()))
-				.build();
-		var deniedEntry = builder.entryBuilder()
-				.startStrList(translatable(getFieldName("tools", "denied")), config.getDenied())
-				.setDefaultValue(Lists.newArrayList())
-				.setTooltip(getTooltips("tools", "denied"))
-				.setSaveConsumer(config::setDenied)
-				.setCellErrorSupplier(map(getMinecraftItemIdCellError()))
-				.build();
-		var damageMultiplicandEntry = builder.entryBuilder()
-				.startDoubleField(translatable(getFieldName("tools", "damageMultiplicand")), config.getDamageMultiplicand())
-				.setDefaultValue(1)
-				.setMin(0)
-				.setMax(100)
-				.setTooltip(getTooltips("tools", "damageMultiplicand"))
-				.setSaveConsumer(config::setDamageMultiplicand)
-				.build();
-		var damageRoundingEntry = builder.entryBuilder()
-				.startEnumSelector(translatable(getFieldName("tools", "damageRounding")), DamageRounding.class, config.getDamageRounding())
-				.setDefaultValue(DamageRounding.ROUND_DOWN)
-				.setTooltip(getTooltips("tools", "damageRounding"))
-				.setSaveConsumer(config::setDamageRounding)
-				.build();
-		var speedMultiplicandEntry = builder.entryBuilder()
-				.startDoubleField(translatable(getFieldName("tools", "speedMultiplicand")), config.getSpeedMultiplicand())
-				.setDefaultValue(0)
-				.setMin(0)
-				.setMax(50)
-				.setTooltip(getTooltips("tools", "speedMultiplicand"))
-				.setSaveConsumer(config::setSpeedMultiplicand)
-				.build();
-		var durabilityModeEntry = builder.entryBuilder()
-				.startEnumSelector(translatable(getFieldName("tools", "durabilityMode")), DurabilityMode.class, config.getDurabilityMode())
-				.setDefaultValue(DurabilityMode.NORMAL)
-				.setTooltip(getTooltips("tools", "durabilityMode"))
-				.setSaveConsumer(config::setDurabilityMode)
-				.build();
-		var forceToolUsageEntry = builder.entryBuilder()
-				.startBooleanToggle(translatable(getFieldName("tools", "forceToolUsage")), config.isForceToolUsage())
-				.setDefaultValue(false)
-				.setTooltip(getTooltips("tools", "forceToolUsage"))
-				.setSaveConsumer(config::setForceToolUsage)
-				.build();
-		
-		var tools = builder.getOrCreateCategory(translatable("text.autoconfig.fallingtree.category.tools"));
-		tools.addEntry(ignoreToolsEntry);
-		tools.addEntry(allowedEntry);
-		tools.addEntry(deniedEntry);
-		tools.addEntry(damageMultiplicandEntry);
-		tools.addEntry(damageRoundingEntry);
-		tools.addEntry(speedMultiplicandEntry);
-		tools.addEntry(durabilityModeEntry);
-		tools.addEntry(forceToolUsageEntry);
-	}
-	
-	@OnlyIn(Dist.CLIENT)
-	private void fillPlayerConfigScreen(@NotNull ConfigBuilder builder, @NotNull PlayerConfiguration config){
-		var allowedTagsEntry = builder.entryBuilder()
-				.startStrList(translatable(getFieldName("player", "allowedTags")), config.getAllowedTags())
-				.setDefaultValue(Lists.newArrayList())
-				.setTooltip(getTooltips("player", "allowedTags"))
-				.setSaveConsumer(config::setAllowedTags)
-				.build();
-		
-		var tools = builder.getOrCreateCategory(translatable("text.autoconfig.fallingtree.category.player"));
-		tools.addEntry(allowedTagsEntry);
-	}
-	
-	@OnlyIn(Dist.CLIENT)
-	private void fillEnchantmentConfigScreen(@NotNull ConfigBuilder builder, @NotNull EnchantmentConfiguration config){
-		var requireEnchantmentEntry = builder.entryBuilder()
-				.startBooleanToggle(translatable(getFieldName("enchantment", "requireEnchantment")), config.isRequireEnchantment())
-				.setDefaultValue(false)
-				.setTooltip(getTooltips("enchantment", "requireEnchantment"))
-				.setSaveConsumer(config::setRequireEnchantment)
-				.build();
-		
-		var enchantment = builder.getOrCreateCategory(translatable("text.autoconfig.fallingtree.category.enchantment"));
-		enchantment.addEntry(requireEnchantmentEntry);
-	}
-	
-	@NotNull
-	private Component translatable(@NotNull String key){
-		return (Component) getMod().translate(key).getRaw();
-	}
-	
-	@NotNull
-	private Function<String, Optional<Component>> map(@NotNull Function<String, Optional<IComponent>> fct){
-		return str -> fct.apply(str).map(IComponent::getRaw).map(Component.class::cast);
-	}
-	
-	@NotNull
-	protected Component[] getTooltips(@Nullable String category, @NotNull String fieldName){
-		return getTooltipsInternal(category, fieldName, 1)
-				.map(IComponent::getRaw)
-				.map(Component.class::cast)
-				.toArray(Component[]::new);
-	}
-}
diff --git a/forge/src/main/java/fr/rakambda/fallingtree/forge/common/wrapper/PlayerWrapper.java b/forge/src/main/java/fr/rakambda/fallingtree/forge/common/wrapper/PlayerWrapper.java
index e4ba1465..d854129c 100644
--- a/forge/src/main/java/fr/rakambda/fallingtree/forge/common/wrapper/PlayerWrapper.java
+++ b/forge/src/main/java/fr/rakambda/fallingtree/forge/common/wrapper/PlayerWrapper.java
@@ -36,7 +36,7 @@ public void sendMessage(@NotNull IComponent component, @NotNull NotificationMode
 			}
 		}
 		else{
-			raw.sendSystemMessage(text);
+			raw.displayClientMessage(text, true);
 		}
 	}
 	
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index 052a2b1b..b75d5153 100644
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[52,)"
+loaderVersion = "[53,)"
 issueTrackerURL = "https://github.com/${repoUser}/${repoName}/issues"
 license = "LGPL-3.0"
 
@@ -15,7 +15,7 @@ authors = "Rakambda"
 [[dependencies.fallingtree]]
 modId = "forge"
 mandatory = true
-versionRange = "[52,)"
+versionRange = "[53,)"
 ordering = "NONE"
 side = "BOTH"
 [[dependencies.fallingtree]]
@@ -27,6 +27,6 @@ side = "BOTH"
 [[dependencies.fallingtree]]
 modId = "cloth-config"
 mandatory = false
-versionRange = "[15.0.0,)"
+versionRange = "[16.0.0,)"
 ordering = "NONE"
 side = "CLIENT"
diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
index 2b9d3cb8..3976acfd 100644
--- a/forge/src/main/resources/pack.mcmeta
+++ b/forge/src/main/resources/pack.mcmeta
@@ -3,6 +3,6 @@
         "description": {
           "text": "FallingTree"
         },
-        "pack_format": 34
+        "pack_format": 42
     }
 }
diff --git a/gradle.properties b/gradle.properties
index dc96126a..b1068606 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.daemon=false
 modId=fallingtree
 modName=FallingTree
 includeFabric=true
-includeForge=false
+includeForge=true
 includeNeoForge=true
 # Repository
 repoUser=Rakambda
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f465354e..59943c4f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ log4j2-version = "2.24.1"
 minecraftVersion = "1.21.3"
 fabric-loader-version = "0.16.7"
 fabric-api-version = "0.106.1+1.21.3"
-forge-version = "1.21.1-52.0.4"
+forge-version = "1.21.3-53.0.4"
 neoforge-version = "21.3.0-beta"
 
 # Mod dependencies