From fe4ff57279a448742324e67f67e22c227ad269a2 Mon Sep 17 00:00:00 2001 From: mastermc05 Date: Sat, 10 Dec 2022 20:24:34 +0200 Subject: [PATCH 1/2] Add the forgotten colorful biomes to 1.19.3 --- .../java/org/dynmap/fabric_1_19_3/DynmapPlugin.java | 1 + .../dynmap/fabric_1_19_3/FabricMapChunkCache.java | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/DynmapPlugin.java b/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/DynmapPlugin.java index af9a14e1..309229e3 100644 --- a/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/DynmapPlugin.java +++ b/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/DynmapPlugin.java @@ -363,6 +363,7 @@ public class DynmapPlugin { bmap.setWaterColorMultiplier(watermult); Log.verboseinfo("Set watercolormult for " + bmap.toString() + " (" + i + ") to " + Integer.toHexString(watermult)); } + bmap.setBiomeObject(bb); } } if (cnt > 0) diff --git a/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/FabricMapChunkCache.java b/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/FabricMapChunkCache.java index 08aa2d70..37743fb1 100644 --- a/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/FabricMapChunkCache.java +++ b/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/FabricMapChunkCache.java @@ -11,6 +11,7 @@ import net.minecraft.util.math.WordPackedArray; import net.minecraft.world.ChunkSerializer; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; +import net.minecraft.world.biome.BiomeEffects; import net.minecraft.world.chunk.ChunkManager; import net.minecraft.world.chunk.ChunkStatus; @@ -100,4 +101,16 @@ public class FabricMapChunkCache extends GenericMapChunkCache { } return gc; } + + @Override + public int getFoliageColor(BiomeMap bm, int[] colormap, int x, int z) { + return bm.getBiomeObject().map(Biome::getEffects).flatMap(BiomeEffects::getFoliageColor).orElse(colormap[bm.biomeLookup()]); + } + + @Override + public int getGrassColor(BiomeMap bm, int[] colormap, int x, int z) { + BiomeEffects effects = bm.getBiomeObject().map(Biome::getEffects).orElse(null); + if (effects == null) return colormap[bm.biomeLookup()]; + return effects.getGrassColorModifier().getModifiedGrassColor(x, z, effects.getGrassColor().orElse(colormap[bm.biomeLookup()])); + } } From 0122561150c287ae904d0527915009d3a519a62f Mon Sep 17 00:00:00 2001 From: Joo200 Date: Sun, 11 Dec 2022 18:10:30 +0100 Subject: [PATCH 2/2] Delete build files in wrong directory --- .../libs/bukkit-helper-119-3-3.5-SNAPSHOT.jar | Bin 261 -> 0 bytes bukkit-helper-119=3/build/tmp/jar/MANIFEST.MF | 2 -- 2 files changed, 2 deletions(-) delete mode 100644 bukkit-helper-119=3/build/libs/bukkit-helper-119-3-3.5-SNAPSHOT.jar delete mode 100644 bukkit-helper-119=3/build/tmp/jar/MANIFEST.MF diff --git a/bukkit-helper-119=3/build/libs/bukkit-helper-119-3-3.5-SNAPSHOT.jar b/bukkit-helper-119=3/build/libs/bukkit-helper-119-3-3.5-SNAPSHOT.jar deleted file mode 100644 index bf69f651ae3c0d6366f0939385949440b4d4299c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 261 zcmWIWW@h1HVBp|j5Q*vtWdH&u5CH_7KE;?7qUY=O+4sz8A8%c~i@e^tTIbH3-yCFc#rVO~M^Bl6hA}dUFypotXd(~@ sFuZjH(QsFwYeRPhNHGX3Y19OgaBWC#3h-uS1F2vF!b%`r2I4RP0I