Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-27 20:58:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v3.0' of git@github-home:webbukkit/dynmap.git into v3.0

Browse Source
This commit is contained in:
Michael Primm 2022-12-11 15:44:11 -06:00
commit 814068cf53
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bukkit-helper-119=3/build/libs/bukkit-helper-119-3-3.5-SNAPSHOT.jar
View File

Binary file not shown.

2
bukkit-helper-119=3/build/tmp/jar/MANIFEST.MF
View File

@ -1,2 +0,0 @@
Manifest-Version: 1.0

1
fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/DynmapPlugin.java
View File

@ -363,6 +363,7 @@ public class DynmapPlugin {
bmap.setWaterColorMultiplier(watermult); bmap.setWaterColorMultiplier(watermult);
Log.verboseinfo("Set watercolormult for " + bmap.toString() + " (" + i + ") to " + Integer.toHexString(watermult)); Log.verboseinfo("Set watercolormult for " + bmap.toString() + " (" + i + ") to " + Integer.toHexString(watermult));
} }
bmap.setBiomeObject(bb);
} }
} }
if (cnt > 0) if (cnt > 0)

13
fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/FabricMapChunkCache.java
View File

@ -11,6 +11,7 @@ import net.minecraft.util.math.WordPackedArray;
import net.minecraft.world.ChunkSerializer; import net.minecraft.world.ChunkSerializer;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.BiomeEffects;
import net.minecraft.world.chunk.ChunkManager; import net.minecraft.world.chunk.ChunkManager;
import net.minecraft.world.chunk.ChunkStatus; import net.minecraft.world.chunk.ChunkStatus;
@ -100,4 +101,16 @@ public class FabricMapChunkCache extends GenericMapChunkCache {
} }
return gc; return gc;
} }
@Override
public int getFoliageColor(BiomeMap bm, int[] colormap, int x, int z) {
return bm.<Biome>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.<Biome>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()]));
}
} }