diff --git a/eco-core/core-nms/v1_18_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_18_R1/EcoCraftEnchantmentManager.java b/eco-core/core-nms/v1_18_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_18_R1/EcoCraftEnchantmentManager.java
index 01913596..bb3877dd 100644
--- a/eco-core/core-nms/v1_18_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_18_R1/EcoCraftEnchantmentManager.java
+++ b/eco-core/core-nms/v1_18_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_18_R1/EcoCraftEnchantmentManager.java
@@ -7,7 +7,7 @@ import com.willfp.ecoenchants.proxy.v1_18_R1.enchants.EcoCraftEnchantment;
 import net.minecraft.core.IRegistry;
 import net.minecraft.world.item.enchantment.Enchantment;
 import org.bukkit.NamespacedKey;
-import org.bukkit.craftbukkit.v1_17_R1.util.CraftNamespacedKey;
+import org.bukkit.craftbukkit.v1_18_R1.util.CraftNamespacedKey;
 
 import java.util.Map;
 
@@ -16,8 +16,8 @@ public final class EcoCraftEnchantmentManager implements EcoCraftEnchantmentMana
     public void registerNewCraftEnchantments() {
         Map<org.bukkit.enchantments.Enchantment, VanillaEnchantmentMetadata> metadataMap = VanillaEnchantments.getMetadataMap();
 
-        for (Enchantment enchantment : IRegistry.X) {
-            NamespacedKey key = CraftNamespacedKey.fromMinecraft(IRegistry.X.getKey(enchantment));
+        for (Enchantment enchantment : IRegistry.Y) {
+            NamespacedKey key = CraftNamespacedKey.fromMinecraft(IRegistry.Y.b(enchantment));
             VanillaEnchantmentMetadata metadata = metadataMap.get(org.bukkit.enchantments.Enchantment.getByKey(key));
             new EcoCraftEnchantment(enchantment, metadata).register();
         }
diff --git a/eco-core/core-nms/v1_18_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_18_R1/OpenInventory.java b/eco-core/core-nms/v1_18_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_18_R1/OpenInventory.java
index c2869f4e..e5704fe5 100644
--- a/eco-core/core-nms/v1_18_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_18_R1/OpenInventory.java
+++ b/eco-core/core-nms/v1_18_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_18_R1/OpenInventory.java
@@ -1,13 +1,13 @@
 package com.willfp.ecoenchants.proxy.v1_18_R1;
 
 import com.willfp.ecoenchants.proxy.proxies.OpenInventoryProxy;
-import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 public final class OpenInventory implements OpenInventoryProxy {
     @Override
     public Object getOpenInventory(@NotNull final Player player) {
-        return ((CraftPlayer) player).getHandle().bV;
+        return ((CraftPlayer) player).getHandle().bW;
     }
 }
diff --git a/eco-core/core-nms/v1_18_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_18_R1/enchants/EcoCraftEnchantment.java b/eco-core/core-nms/v1_18_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_18_R1/enchants/EcoCraftEnchantment.java
index a99c2ff0..3b661b90 100644
--- a/eco-core/core-nms/v1_18_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_18_R1/enchants/EcoCraftEnchantment.java
+++ b/eco-core/core-nms/v1_18_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_18_R1/enchants/EcoCraftEnchantment.java
@@ -4,7 +4,7 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.support.vanilla.VanillaEnchantmentMetadata;
 import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils;
 import net.minecraft.world.item.enchantment.Enchantment;
-import org.bukkit.craftbukkit.v1_17_R1.enchantments.CraftEnchantment;
+import org.bukkit.craftbukkit.v1_18_R1.enchantments.CraftEnchantment;
 import org.jetbrains.annotations.NotNull;
 
 public class EcoCraftEnchantment extends CraftEnchantment {
@@ -18,7 +18,7 @@ public class EcoCraftEnchantment extends CraftEnchantment {
 
     @Override
     public int getMaxLevel() {
-        return metadata.maxLevel() == null ? this.getHandle().getMaxLevel() : metadata.maxLevel();
+        return metadata.maxLevel() == null ? this.getHandle().a() : metadata.maxLevel();
     }
 
     @Override
diff --git a/settings.gradle b/settings.gradle
index 5c85006c..f6d41df4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,7 +5,7 @@ include ':eco-core'
 include ':eco-core:core-nms'
 include ':eco-core:core-nms:v1_16_R3'
 include ':eco-core:core-nms:v1_17_R1'
-//include ':eco-core:core-nms:v1_18_R1'
+include ':eco-core:core-nms:v1_18_R1'
 include ':eco-core:core-proxy'
 include ':eco-core:core-plugin'
 include ':eco-core:core-stub'