Upstream
/
dynmap
mirror of https://github.com/webbukkit/dynmap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cache biome object, further reduce diff

This commit is contained in:
mastermc05 2022-11-18 13:06:54 +02:00
parent 0ebbc2bbe5
commit 0f8174796c
12 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
DynmapCore/src/main/java/org/dynmap/common/BiomeMap.java
View File

@ -3,6 +3,7 @@ package org.dynmap.common;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import org.dynmap.hdmap.HDBlockModels; import org.dynmap.hdmap.HDBlockModels;
@ -44,6 +45,7 @@ public class BiomeMap {
private int watercolormult; private int watercolormult;
private int grassmult; private int grassmult;
private int foliagemult; private int foliagemult;
private Optional<?> biomeObj = Optional.empty();
private final String id; private final String id;
private final String resourcelocation; private final String resourcelocation;
private final int index; private final int index;
@ -300,10 +302,13 @@ public class BiomeMap {
public String getId() { public String getId() {
return id; return id;
} }
public String getResourcelocation() {
return resourcelocation;
}
public String toString() { public String toString() {
return String.format("%s(%s)", id, resourcelocation); return String.format("%s(%s)", id, resourcelocation);
} }
public @SuppressWarnings("unchecked") <T> Optional<T> getBiomeObject() {
return (Optional<T>) biomeObj;
}
public void setBiomeObject(Object biomeObj) {
this.biomeObj = Optional.of(biomeObj);
}
} }

4
bukkit-helper-116-4/src/main/java/org/dynmap/bukkit/helper/v116_4/BukkitVersionHelperSpigot116_4.java
View File

@ -57,9 +57,9 @@ public class BukkitVersionHelperSpigot116_4 extends BukkitVersionHelperGeneric {
return names; return names;
} }
private static IRegistry<BiomeBase> reg = null; private IRegistry<BiomeBase> reg = null;
public static IRegistry<BiomeBase> getBiomeReg() { private IRegistry<BiomeBase> getBiomeReg() {
if (reg == null) { if (reg == null) {
reg = MinecraftServer.getServer().getCustomRegistry().b(IRegistry.ay); reg = MinecraftServer.getServer().getCustomRegistry().b(IRegistry.ay);
} }

9
bukkit-helper-116-4/src/main/java/org/dynmap/bukkit/helper/v116_4/MapChunkCache116_4.java
View File

@ -66,15 +66,14 @@ public class MapChunkCache116_4 extends GenericMapChunkCache {
} }
@Override @Override
public int getFoliageColor(BiomeMap bm, int[] colormap, int x, int z) { public int getFoliageColor(BiomeMap bm, int[] colormap, int x, int z) {
if (bm.getResourcelocation() == null) return colormap[bm.biomeLookup()]; Optional<BiomeBase> base = bm.getBiomeObject();
BiomeBase base = BukkitVersionHelperSpigot116_4.getBiomeReg().get(MinecraftKey.a(bm.getResourcelocation())); return BukkitVersionHelperSpigot116_4.getBiomeBaseFoliageMult(base.orElse(null)).orElse(colormap[bm.biomeLookup()]);
return BukkitVersionHelperSpigot116_4.getBiomeBaseFoliageMult(base).orElse(colormap[bm.biomeLookup()]);
} }
@Override @Override
public int getGrassColor(BiomeMap bm, int[] colormap, int x, int z) { public int getGrassColor(BiomeMap bm, int[] colormap, int x, int z) {
if (bm.getResourcelocation() == null) return colormap[bm.biomeLookup()]; BiomeBase base = bm.<BiomeBase>getBiomeObject().orElse(null);
BiomeBase base = BukkitVersionHelperSpigot116_4.getBiomeReg().get(MinecraftKey.a(bm.getResourcelocation())); if (base == null) return bm.getModifiedGrassMultiplier(colormap[bm.biomeLookup()]);
int grassMult = BukkitVersionHelperSpigot116_4.getBiomeBaseGrassMult(base).orElse(colormap[bm.biomeLookup()]); int grassMult = BukkitVersionHelperSpigot116_4.getBiomeBaseGrassMult(base).orElse(colormap[bm.biomeLookup()]);
BiomeFog.GrassColor modifier = BukkitVersionHelperSpigot116_4.getBiomeBaseGrassModifier(base); BiomeFog.GrassColor modifier = BukkitVersionHelperSpigot116_4.getBiomeBaseGrassModifier(base);
if (modifier == BiomeFog.GrassColor.DARK_FOREST) { if (modifier == BiomeFog.GrassColor.DARK_FOREST) {

4
bukkit-helper-117/src/main/java/org/dynmap/bukkit/helper/v117/BukkitVersionHelperSpigot117.java
View File

@ -85,9 +85,9 @@ public class BukkitVersionHelperSpigot117 extends BukkitVersionHelper {
return names; return names;
} }
private static IRegistry<BiomeBase> reg = null; private IRegistry<BiomeBase> reg = null;
public static IRegistry<BiomeBase> getBiomeReg() { private IRegistry<BiomeBase> getBiomeReg() {
if (reg == null) { if (reg == null) {
reg = MinecraftServer.getServer().getCustomRegistry().b(IRegistry.aO); reg = MinecraftServer.getServer().getCustomRegistry().b(IRegistry.aO);
} }

13
bukkit-helper-117/src/main/java/org/dynmap/bukkit/helper/v117/MapChunkCache117.java
View File

@ -1,7 +1,7 @@
package org.dynmap.bukkit.helper.v117; package org.dynmap.bukkit.helper.v117;
import net.minecraft.resources.MinecraftKey;
import net.minecraft.world.level.biome.BiomeBase; import net.minecraft.world.level.biome.BiomeBase;
import net.minecraft.world.level.biome.BiomeFog;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.craftbukkit.v1_17_R1.CraftWorld; import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
import org.dynmap.DynmapChunk; import org.dynmap.DynmapChunk;
@ -19,6 +19,7 @@ import net.minecraft.world.level.chunk.storage.ChunkRegionLoader;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Optional;
/** /**
* Container for managing chunks - dependent upon using chunk snapshots, since rendering is off server thread * Container for managing chunks - dependent upon using chunk snapshots, since rendering is off server thread
@ -72,15 +73,13 @@ public class MapChunkCache117 extends GenericMapChunkCache {
@Override @Override
public int getFoliageColor(BiomeMap bm, int[] colormap, int x, int z) { public int getFoliageColor(BiomeMap bm, int[] colormap, int x, int z) {
if (bm.getResourcelocation() == null) return colormap[bm.biomeLookup()]; return bm.<BiomeBase>getBiomeObject().map(BiomeBase::l).flatMap(BiomeFog::e).orElse(colormap[bm.biomeLookup()]);
BiomeBase base = BukkitVersionHelperSpigot117.getBiomeReg().get(MinecraftKey.a(bm.getResourcelocation()));
return base == null ? colormap[bm.biomeLookup()] : base.l().e().orElse(colormap[bm.biomeLookup()]);
} }
@Override @Override
public int getGrassColor(BiomeMap bm, int[] colormap, int x, int z) { public int getGrassColor(BiomeMap bm, int[] colormap, int x, int z) {
if (bm.getResourcelocation() == null) return colormap[bm.biomeLookup()]; BiomeFog fog = bm.<BiomeBase>getBiomeObject().map(BiomeBase::l).orElse(null);
BiomeBase base = BukkitVersionHelperSpigot117.getBiomeReg().get(MinecraftKey.a(bm.getResourcelocation())); if (fog == null) return colormap[bm.biomeLookup()];
return base == null ? colormap[bm.biomeLookup()] : base.l().g().a(x, z, base.l().f().orElse(colormap[bm.biomeLookup()])); return fog.g().a(x, z, fog.f().orElse(colormap[bm.biomeLookup()]));
} }
} }

2
bukkit-helper-118-2/src/main/java/org/dynmap/bukkit/helper/v118_2/BukkitVersionHelperSpigot118_2.java
View File

@ -111,7 +111,7 @@ public class BukkitVersionHelperSpigot118_2 extends BukkitVersionHelper {
private static IRegistry<BiomeBase> reg = null; private static IRegistry<BiomeBase> reg = null;
public static IRegistry<BiomeBase> getBiomeReg() { private static IRegistry<BiomeBase> getBiomeReg() {
if (reg == null) { if (reg == null) {
reg = MinecraftServer.getServer().aU().d(IRegistry.aP); reg = MinecraftServer.getServer().aU().d(IRegistry.aP);
} }

12
bukkit-helper-118-2/src/main/java/org/dynmap/bukkit/helper/v118_2/MapChunkCache118_2.java
View File

@ -1,8 +1,8 @@
package org.dynmap.bukkit.helper.v118_2; package org.dynmap.bukkit.helper.v118_2;
import net.minecraft.resources.MinecraftKey;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.world.level.biome.BiomeBase; import net.minecraft.world.level.biome.BiomeBase;
import net.minecraft.world.level.biome.BiomeFog;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.craftbukkit.v1_18_R2.CraftServer; import org.bukkit.craftbukkit.v1_18_R2.CraftServer;
@ -102,15 +102,13 @@ public class MapChunkCache118_2 extends GenericMapChunkCache {
@Override @Override
public int getFoliageColor(BiomeMap bm, int[] colormap, int x, int z) { public int getFoliageColor(BiomeMap bm, int[] colormap, int x, int z) {
if (bm.getResourcelocation() == null) return colormap[bm.biomeLookup()]; return bm.<BiomeBase>getBiomeObject().map(BiomeBase::j).flatMap(BiomeFog::e).orElse(colormap[bm.biomeLookup()]);
BiomeBase base = BukkitVersionHelperSpigot118_2.getBiomeReg().a(MinecraftKey.a(bm.getResourcelocation()));
return base == null ? colormap[bm.biomeLookup()] : base.j().e().orElse(colormap[bm.biomeLookup()]);
} }
@Override @Override
public int getGrassColor(BiomeMap bm, int[] colormap, int x, int z) { public int getGrassColor(BiomeMap bm, int[] colormap, int x, int z) {
if (bm.getResourcelocation() == null) return colormap[bm.biomeLookup()]; BiomeFog fog = bm.<BiomeBase>getBiomeObject().map(BiomeBase::j).orElse(null);
BiomeBase base = BukkitVersionHelperSpigot118_2.getBiomeReg().a(MinecraftKey.a(bm.getResourcelocation())); if (fog == null) return colormap[bm.biomeLookup()];
return base == null ? colormap[bm.biomeLookup()] : base.j().g().a(x, z, base.j().f().orElse(colormap[bm.biomeLookup()])); return fog.g().a(x, z, fog.f().orElse(colormap[bm.biomeLookup()]));
} }
} }

2
bukkit-helper-118/src/main/java/org/dynmap/bukkit/helper/v118/BukkitVersionHelperSpigot118.java
View File

@ -104,7 +104,7 @@ public class BukkitVersionHelperSpigot118 extends BukkitVersionHelper {
private static IRegistry<BiomeBase> reg = null; private static IRegistry<BiomeBase> reg = null;
public static IRegistry<BiomeBase> getBiomeReg() { private static IRegistry<BiomeBase> getBiomeReg() {
if (reg == null) { if (reg == null) {
reg = MinecraftServer.getServer().aV().d(IRegistry.aR); reg = MinecraftServer.getServer().aV().d(IRegistry.aR);
} }

12
bukkit-helper-118/src/main/java/org/dynmap/bukkit/helper/v118/MapChunkCache118.java
View File

@ -1,7 +1,7 @@
package org.dynmap.bukkit.helper.v118; package org.dynmap.bukkit.helper.v118;
import net.minecraft.resources.MinecraftKey;
import net.minecraft.world.level.biome.BiomeBase; import net.minecraft.world.level.biome.BiomeBase;
import net.minecraft.world.level.biome.BiomeFog;
import org.bukkit.ChunkSnapshot; import org.bukkit.ChunkSnapshot;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.Biome; import org.bukkit.block.Biome;
@ -91,15 +91,13 @@ public class MapChunkCache118 extends GenericMapChunkCache {
@Override @Override
public int getFoliageColor(BiomeMap bm, int[] colormap, int x, int z) { public int getFoliageColor(BiomeMap bm, int[] colormap, int x, int z) {
if (bm.getResourcelocation() == null) return colormap[bm.biomeLookup()]; return bm.<BiomeBase>getBiomeObject().map(BiomeBase::j).flatMap(BiomeFog::e).orElse(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 @Override
public int getGrassColor(BiomeMap bm, int[] colormap, int x, int z) { public int getGrassColor(BiomeMap bm, int[] colormap, int x, int z) {
if (bm.getResourcelocation() == null) return colormap[bm.biomeLookup()]; BiomeFog fog = bm.<BiomeBase>getBiomeObject().map(BiomeBase::j).orElse(null);
BiomeBase base = BukkitVersionHelperSpigot118.getBiomeReg().a(MinecraftKey.a(bm.getResourcelocation())); if (fog == null) return colormap[bm.biomeLookup()];
return base == null ? colormap[bm.biomeLookup()] : base.j().g().a(x, z, base.j().f().orElse(colormap[bm.biomeLookup()])); return fog.g().a(x, z, fog.f().orElse(colormap[bm.biomeLookup()]));
} }
} }

2
bukkit-helper-119/src/main/java/org/dynmap/bukkit/helper/v119/BukkitVersionHelperSpigot119.java
View File

@ -111,7 +111,7 @@ public class BukkitVersionHelperSpigot119 extends BukkitVersionHelper {
private static IRegistry<BiomeBase> reg = null; private static IRegistry<BiomeBase> reg = null;
public static IRegistry<BiomeBase> getBiomeReg() { private static IRegistry<BiomeBase> getBiomeReg() {
if (reg == null) { if (reg == null) {
reg = MinecraftServer.getServer().aX().d(IRegistry.aR); reg = MinecraftServer.getServer().aX().d(IRegistry.aR);
} }

12
bukkit-helper-119/src/main/java/org/dynmap/bukkit/helper/v119/MapChunkCache119.java
View File

@ -1,7 +1,7 @@
package org.dynmap.bukkit.helper.v119; package org.dynmap.bukkit.helper.v119;
import net.minecraft.resources.MinecraftKey;
import net.minecraft.world.level.biome.BiomeBase; import net.minecraft.world.level.biome.BiomeBase;
import net.minecraft.world.level.biome.BiomeFog;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; import org.bukkit.craftbukkit.v1_19_R1.CraftWorld;
import org.dynmap.DynmapChunk; import org.dynmap.DynmapChunk;
@ -100,15 +100,13 @@ public class MapChunkCache119 extends GenericMapChunkCache {
@Override @Override
public int getFoliageColor(BiomeMap bm, int[] colormap, int x, int z) { public int getFoliageColor(BiomeMap bm, int[] colormap, int x, int z) {
if (bm.getResourcelocation() == null) return colormap[bm.biomeLookup()]; return bm.<BiomeBase>getBiomeObject().map(BiomeBase::j).flatMap(BiomeFog::e).orElse(colormap[bm.biomeLookup()]);
BiomeBase base = BukkitVersionHelperSpigot119.getBiomeReg().a(MinecraftKey.a(bm.getResourcelocation()));
return base == null ? colormap[bm.biomeLookup()] : base.j().e().orElse(colormap[bm.biomeLookup()]);
} }
@Override @Override
public int getGrassColor(BiomeMap bm, int[] colormap, int x, int z) { public int getGrassColor(BiomeMap bm, int[] colormap, int x, int z) {
if (bm.getResourcelocation() == null) return colormap[bm.biomeLookup()]; BiomeFog fog = bm.<BiomeBase>getBiomeObject().map(BiomeBase::j).orElse(null);
BiomeBase base = BukkitVersionHelperSpigot119.getBiomeReg().a(MinecraftKey.a(bm.getResourcelocation())); if (fog == null) return colormap[bm.biomeLookup()];
return base == null ? colormap[bm.biomeLookup()] : base.j().g().a(x, z, base.j().f().orElse(colormap[bm.biomeLookup()])); return fog.g().a(x, z, fog.f().orElse(colormap[bm.biomeLookup()]));
} }
} }

1
spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
View File

@ -875,6 +875,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
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) {