From f34929c6cf9706bc7d95b110b4b1f32590f4b412 Mon Sep 17 00:00:00 2001
From: mastermc05 <masmc05@gmail.com>
Date: Fri, 14 Oct 2022 15:59:20 +0300
Subject: [PATCH] Support 1.18

---
 .../v118/BukkitVersionHelperSpigot118.java      |  2 +-
 .../bukkit/helper/v118/MapChunkCache118.java    | 17 +++++++++++++++++
 spigot/build.gradle                             |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/bukkit-helper-118/src/main/java/org/dynmap/bukkit/helper/v118/BukkitVersionHelperSpigot118.java b/bukkit-helper-118/src/main/java/org/dynmap/bukkit/helper/v118/BukkitVersionHelperSpigot118.java
index fbacfa6d..3e9b464c 100644
--- a/bukkit-helper-118/src/main/java/org/dynmap/bukkit/helper/v118/BukkitVersionHelperSpigot118.java
+++ b/bukkit-helper-118/src/main/java/org/dynmap/bukkit/helper/v118/BukkitVersionHelperSpigot118.java
@@ -104,7 +104,7 @@ public class BukkitVersionHelperSpigot118 extends BukkitVersionHelper {
 
     private static IRegistry<BiomeBase> reg = null;
 
-    private static IRegistry<BiomeBase> getBiomeReg() {
+    public static IRegistry<BiomeBase> getBiomeReg() {
     	if (reg == null) {
     		reg = MinecraftServer.getServer().aV().d(IRegistry.aR);
     	}
diff --git a/bukkit-helper-118/src/main/java/org/dynmap/bukkit/helper/v118/MapChunkCache118.java b/bukkit-helper-118/src/main/java/org/dynmap/bukkit/helper/v118/MapChunkCache118.java
index f9bb442c..98117bbd 100644
--- a/bukkit-helper-118/src/main/java/org/dynmap/bukkit/helper/v118/MapChunkCache118.java
+++ b/bukkit-helper-118/src/main/java/org/dynmap/bukkit/helper/v118/MapChunkCache118.java
@@ -1,5 +1,7 @@
 package org.dynmap.bukkit.helper.v118;
 
+import net.minecraft.resources.MinecraftKey;
+import net.minecraft.world.level.biome.BiomeBase;
 import org.bukkit.ChunkSnapshot;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
@@ -85,4 +87,19 @@ public class MapChunkCache118 extends GenericMapChunkCache {
 		this.w = dw.getWorld();
 		super.setChunks(dw, chunks);
 	}
+
+
+	@Override
+	public int getFoliageColor(BiomeMap bm, int[] colormap, int x, int z) {
+		if (bm.getResourcelocation() == null) return colormap[bm.biomeLookup()];
+		BiomeBase base = BukkitVersionHelperSpigot118.getBiomeReg().a(MinecraftKey.a(bm.getResourcelocation()));
+		return base == null ? colormap[bm.biomeLookup()] : base.j().e().orElse(colormap[bm.biomeLookup()]);
+	}
+
+	@Override
+	public int getGrassColor(BiomeMap bm, int[] colormap, int x, int z) {
+		if (bm.getResourcelocation() == null) return colormap[bm.biomeLookup()];
+		BiomeBase base = BukkitVersionHelperSpigot118.getBiomeReg().a(MinecraftKey.a(bm.getResourcelocation()));
+		return base == null ? colormap[bm.biomeLookup()] : base.j().g().a(x, z, base.j().f().orElse(colormap[bm.biomeLookup()]));
+	}
 }
diff --git a/spigot/build.gradle b/spigot/build.gradle
index 86778407..25918f99 100644
--- a/spigot/build.gradle
+++ b/spigot/build.gradle
@@ -88,7 +88,7 @@ runServer {
     // Configure the Minecraft version for our task.
     // This is the only required configuration besides applying the plugin.
     // Your plugin's jar (or shadowJar if present) will be used automatically.
-    minecraftVersion("1.18.2")
+    minecraftVersion("1.18")
 }
 shadowJar {
     dependencies {