diff --git a/build.gradle b/build.gradle
index 0453046..1c30188 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id "maven-publish"
     id "net.minecrell.plugin-yml.bukkit" version "0.5.1"
     id "com.github.johnrengelman.shadow" version "7.1.2"
-    id "io.papermc.paperweight.userdev" version "1.3.4"
+    id "io.papermc.paperweight.userdev" version "1.3.5"
 }
 
 repositories {
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.18.1-R0.1-SNAPSHOT")
+    paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.18.2-R0.1-SNAPSHOT")
 
     library 'org.json:json:20211205'
     library "org.projectlombok:lombok:1.18.22"
@@ -79,14 +79,11 @@ tasks {
     }
 
     compileJava {
-        options.encoding = StandardCharsets.UTF_8.name() // We want UTF-8 for everything
-
-        // Set the release flag. This configures what version bytecode the compiler will emit, as well as what JDK APIs are usable.
-        // See https://openjdk.java.net/jeps/247 for more information.
+        options.encoding = StandardCharsets.UTF_8.name()
         options.release.set(17)
     }
     processResources {
-        filteringCharset = StandardCharsets.UTF_8.name() // We want UTF-8 for everything
+        filteringCharset = StandardCharsets.UTF_8.name()
     }
 }
 
diff --git a/src/main/java/dev/plex/packet/impl/EndermanPotionPatch.java b/src/main/java/dev/plex/packet/impl/EndermanPotionPatch.java
index 1f0b7d7..fdfbbed 100644
--- a/src/main/java/dev/plex/packet/impl/EndermanPotionPatch.java
+++ b/src/main/java/dev/plex/packet/impl/EndermanPotionPatch.java
@@ -8,7 +8,7 @@ import net.minecraft.nbt.ListTag;
 import net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.item.ItemStack;
-import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack;
 import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.entity.PotionSplashEvent;
diff --git a/src/main/java/dev/plex/packet/impl/KnowledgeBookPatch.java b/src/main/java/dev/plex/packet/impl/KnowledgeBookPatch.java
index 3af34b3..65b8323 100644
--- a/src/main/java/dev/plex/packet/impl/KnowledgeBookPatch.java
+++ b/src/main/java/dev/plex/packet/impl/KnowledgeBookPatch.java
@@ -10,7 +10,7 @@ import net.minecraft.world.item.ItemStack;
 import org.apache.commons.lang3.EnumUtils;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
-import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
diff --git a/src/main/java/dev/plex/packet/impl/LecternPatch.java b/src/main/java/dev/plex/packet/impl/LecternPatch.java
index 18cf216..16a57f2 100644
--- a/src/main/java/dev/plex/packet/impl/LecternPatch.java
+++ b/src/main/java/dev/plex/packet/impl/LecternPatch.java
@@ -9,7 +9,7 @@ import net.minecraft.network.protocol.game.ServerboundUseItemOnPacket;
 import net.minecraft.world.item.ItemStack;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.json.JSONArray;
diff --git a/src/main/java/dev/plex/packet/impl/SkullOwnerPatch.java b/src/main/java/dev/plex/packet/impl/SkullOwnerPatch.java
index 229abfb..062e70f 100644
--- a/src/main/java/dev/plex/packet/impl/SkullOwnerPatch.java
+++ b/src/main/java/dev/plex/packet/impl/SkullOwnerPatch.java
@@ -8,8 +8,8 @@ import net.minecraft.network.protocol.game.ServerboundSetCreativeModeSlotPacket;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack;
 import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.inventory.InventoryClickEvent;
diff --git a/src/main/java/dev/plex/util/PacketInterceptorUtil.java b/src/main/java/dev/plex/util/PacketInterceptorUtil.java
index 4894d9a..8f66202 100644
--- a/src/main/java/dev/plex/util/PacketInterceptorUtil.java
+++ b/src/main/java/dev/plex/util/PacketInterceptorUtil.java
@@ -6,7 +6,7 @@ import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPipeline;
 import net.minecraft.network.protocol.Packet;
-import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
 public class PacketInterceptorUtil