diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 8bace745..802fade2 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -88,8 +88,6 @@ jobs:
 
           game-versions: |
             ${{ steps.minecraft_version.outputs.value }}
-            1.19.1
-            1.19.2
           java: |
             17
             18
diff --git a/gradle.properties b/gradle.properties
index 677e3240..fa178f0f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,17 +1,17 @@
 org.gradle.jvmargs=-Xmx1G
 
-minecraft_version=1.19
-yarn_mappings=1.19+build.4
+minecraft_version=1.18.2
+yarn_mappings=1.18.2+build.4
 loader_version=0.14.8
 
-release_fancyname = 1.2.0 for 1.19.x
-mod_version = 1.2.0+1.19
+release_fancyname = 1.2.0 for 1.18.2
+mod_version = 1.2.0+1.18
 maven_group = nl.enjarai
 archives_base_name = do-a-barrel-roll
 
-fabric_version=0.58.0+1.19
-modmenu_version=4.0.4
-cloth_config_version=8.0.75
-spruceui_version=4.0.0+1.19
-midnightlib_version=0.5.2
-midnightcontrols_version=1.5.0+1.19
+fabric_version=0.58.0+1.18.2
+modmenu_version=3.2.3
+cloth_config_version=6.2.62
+spruceui_version=3.3.3+1.18
+midnightlib_version=0.4.4
+midnightcontrols_version=1.5.0+1.18
diff --git a/src/main/java/nl/enjarai/doabarrelroll/MomentumCrosshairWidget.java b/src/main/java/nl/enjarai/doabarrelroll/MomentumCrosshairWidget.java
index 2634bba9..ee113b5e 100644
--- a/src/main/java/nl/enjarai/doabarrelroll/MomentumCrosshairWidget.java
+++ b/src/main/java/nl/enjarai/doabarrelroll/MomentumCrosshairWidget.java
@@ -2,6 +2,7 @@
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.render.*;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.math.Vec2f;
@@ -31,7 +32,8 @@ public static void render(MatrixStack matrices, int scaledWidth, int scaledHeigh
                 bufferBuilder.vertex(matrix, (float) x + 1, (float) y + 1, 0.0F).color(color).next();
                 bufferBuilder.vertex(matrix, (float) x + 1, (float) y, 0.0F).color(color).next();
                 bufferBuilder.vertex(matrix, (float) x, (float) y, 0.0F).color(color).next();
-                BufferRenderer.drawWithShader(bufferBuilder.end());
+                bufferBuilder.end();
+                BufferRenderer.draw(bufferBuilder);
 
             });
             RenderSystem.enableTexture();
diff --git a/src/main/java/nl/enjarai/doabarrelroll/mixin/ClientPlayerEntityMixin.java b/src/main/java/nl/enjarai/doabarrelroll/mixin/ClientPlayerEntityMixin.java
index a6e93d73..3a87a674 100644
--- a/src/main/java/nl/enjarai/doabarrelroll/mixin/ClientPlayerEntityMixin.java
+++ b/src/main/java/nl/enjarai/doabarrelroll/mixin/ClientPlayerEntityMixin.java
@@ -7,12 +7,10 @@
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.recipebook.ClientRecipeBook;
 import net.minecraft.client.world.ClientWorld;
-import net.minecraft.network.encryption.PlayerPublicKey;
 import net.minecraft.stat.StatHandler;
 import nl.enjarai.doabarrelroll.DoABarrelRollClient;
 import nl.enjarai.doabarrelroll.ElytraMath;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -20,9 +18,9 @@
 @Mixin(ClientPlayerEntity.class)
 public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity {
 
-	@Shadow public abstract float getYaw(float tickDelta);
-
-	public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile, PlayerPublicKey publicKey) { super(world, profile, publicKey); }
+	public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile) {
+		super(world, profile);
+	}
 
 	@Inject(
 			method = "<init>(Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/client/network/ClientPlayNetworkHandler;Lnet/minecraft/stat/StatHandler;Lnet/minecraft/client/recipebook/ClientRecipeBook;ZZ)V",
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index af35fb4d..eb63b40e 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -34,7 +34,8 @@
 	],
 
 	"depends": {
-		"cloth-config": "*"
+		"cloth-config": "*",
+		"minecraft": "1.18.x"
 	},
 
 	"custom": {