From 8689d67d5c46bbda68744e64d40d2379d7a676bf Mon Sep 17 00:00:00 2001
From: MiranCZ <miran08.mail@gmail.com>
Date: Sat, 13 Jul 2024 14:11:53 +0200
Subject: [PATCH] added 1.18 support

---
 build.gradle                                            | 2 ++
 root.gradle.kts                                         | 4 +++-
 settings.gradle.kts                                     | 1 +
 src/main/java/adris/altoclef/mixins/LoadChunkMixin.java | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index a329db48..9a558b1e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,6 +38,7 @@ group = project.maven_group
 def mappingsVersions = [
         11605: "1.16.5+build.10",
         11701: "1.17.1+build.65",
+        11800: "1.18+build.1",
         11802: "1.18.2+build.4",
         11904: "1.19.4+build.2",
         12001: "1.20.1+build.10",
@@ -50,6 +51,7 @@ def mappingsVersions = [
 def fabricApiVersions = [
         11605: "0.42.0+1.16",
         11701: "0.46.1+1.17",
+        11800: "0.44.0+1.18",
         11802: "0.77.0+1.18.2",
         11904: "0.87.2+1.19.4",
         12001: "0.92.2+1.20.1",
diff --git a/root.gradle.kts b/root.gradle.kts
index dbcefcf2..8df76deb 100644
--- a/root.gradle.kts
+++ b/root.gradle.kts
@@ -23,6 +23,7 @@ preprocess {
     val mc12001 = createNode("1.20.1", 12001, "yarn")
     val mc11904 = createNode("1.19.4", 11904, "yarn")
     val mc11802 = createNode("1.18.2", 11802, "yarn")
+    val mc11800 = createNode("1.18", 11800, "yarn")
     val mc11701 = createNode("1.17.1", 11701, "yarn")
     val mc11605 = createNode("1.16.5", 11605, "yarn")
 
@@ -32,6 +33,7 @@ preprocess {
     mc12002.link(mc12001)
     mc12001.link(mc11904)
     mc11904.link(mc11802, file("versions/mapping-1.19.4-1.18.2.txt"))
-    mc11802.link(mc11701, file("versions/mapping-1.18.2-1.17.1.txt"))
+    mc11802.link(mc11800)
+    mc11800.link(mc11701, file("versions/mapping-1.18.2-1.17.1.txt"))
     mc11701.link(mc11605, file("versions/mapping-1.17.1-1.16.5.txt"))
 }
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 00a47a72..3836b3c5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -28,6 +28,7 @@ listOf(
     "1.20.1",
     "1.19.4",
     "1.18.2",
+    "1.18",
     "1.17.1",
     "1.16.5"
 ).forEach { version ->
diff --git a/src/main/java/adris/altoclef/mixins/LoadChunkMixin.java b/src/main/java/adris/altoclef/mixins/LoadChunkMixin.java
index cba166f9..12a05651 100644
--- a/src/main/java/adris/altoclef/mixins/LoadChunkMixin.java
+++ b/src/main/java/adris/altoclef/mixins/LoadChunkMixin.java
@@ -38,7 +38,7 @@ public class LoadChunkMixin {
             method = "loadChunkFromPacket",
             at = @At("RETURN")
     )
-    //#if MC >= 11802
+    //#if MC >= 11800
     private void onLoadChunk(int x, int z, PacketByteBuf buf, NbtCompound nbt, Consumer<net.minecraft.network.packet.s2c.play.ChunkData.BlockEntityVisitor> consumer, CallbackInfoReturnable<WorldChunk> cir) {
     //#elseif MC >= 11701
     //$$ private void onLoadChunk(int x, int z, net.minecraft.world.biome.source.BiomeArray biomes, PacketByteBuf buf, NbtCompound nbt, BitSet bitSet, CallbackInfoReturnable<WorldChunk> cir) {