GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Chunk biome optimizations

Browse source
This commit is contained in:
RednedEpic 2023-04-09 14:11:46 -05:00
parent 5ea88a8cf1
commit 37c936e177
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
View file

@ -252,7 +252,8 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
/** /**
* Stores the map between Java and Bedrock biome network IDs. * Stores the map between Java and Bedrock biome network IDs.
*/ */
private final Int2IntMap biomeTranslations = new Int2IntOpenHashMap(); @Setter
private int[] biomeTranslations = null;
/** /**
* A map of Vector3i positions to Java entities. * A map of Vector3i positions to Java entities.

22
core/src/main/java/org/geysermc/geyser/translator/level/BiomeTranslator.java
View file

@ -35,6 +35,7 @@ import com.github.steveice10.opennbt.tag.builtin.IntTag;
import com.github.steveice10.opennbt.tag.builtin.ListTag; import com.github.steveice10.opennbt.tag.builtin.ListTag;
import com.github.steveice10.opennbt.tag.builtin.StringTag; import com.github.steveice10.opennbt.tag.builtin.StringTag;
import it.unimi.dsi.fastutil.ints.Int2IntMap; import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList; import it.unimi.dsi.fastutil.ints.IntList;
import it.unimi.dsi.fastutil.ints.IntLists; import it.unimi.dsi.fastutil.ints.IntLists;
@ -52,8 +53,7 @@ import org.geysermc.geyser.util.MathUtils;
public class BiomeTranslator { public class BiomeTranslator {
public static void loadServerBiomes(GeyserSession session, CompoundTag codec) { public static void loadServerBiomes(GeyserSession session, CompoundTag codec) {
Int2IntMap biomeTranslations = session.getBiomeTranslations(); Int2IntMap biomeTranslations = new Int2IntOpenHashMap();
biomeTranslations.clear();
CompoundTag worldGen = codec.get("minecraft:worldgen/biome"); CompoundTag worldGen = codec.get("minecraft:worldgen/biome");
ListTag serverBiomes = worldGen.get("value"); ListTag serverBiomes = worldGen.get("value");
@ -88,16 +88,22 @@ public class BiomeTranslator {
biomeTranslations.defaultReturnValue(bedrockId); biomeTranslations.defaultReturnValue(bedrockId);
} }
} }
int[] biomes = new int[biomeTranslations.size()];
for (Int2IntMap.Entry entry : biomeTranslations.int2IntEntrySet()) {
biomes[entry.getIntKey()] = entry.getIntValue();
}
session.setBiomeTranslations(biomes);
} }
public static BlockStorage toNewBedrockBiome(GeyserSession session, DataPalette biomeData) { public static BlockStorage toNewBedrockBiome(GeyserSession session, DataPalette biomeData) {
Int2IntMap biomeTranslations = session.getBiomeTranslations(); int[] biomeTranslations = session.getBiomeTranslations();
// As of 1.17.10: the client expects the same format as a chunk but filled with biomes // As of 1.17.10: the client expects the same format as a chunk but filled with biomes
// As of 1.18 this is the same as Java Edition // As of 1.18 this is the same as Java Edition
Palette palette = biomeData.getPalette(); Palette palette = biomeData.getPalette();
if (palette instanceof SingletonPalette) { if (palette instanceof SingletonPalette) {
int biomeId = biomeTranslations.get(palette.idToState(0)); int biomeId = biomeTranslations[palette.idToState(0)];
return new BlockStorage(SingletonBitArray.INSTANCE, IntLists.singleton(biomeId)); return new BlockStorage(SingletonBitArray.INSTANCE, IntLists.singleton(biomeId));
} else { } else {
BlockStorage storage; BlockStorage storage;
@ -112,7 +118,7 @@ public class BiomeTranslator {
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
int javaId = palette.idToState(i); int javaId = palette.idToState(i);
bedrockPalette.add(biomeTranslations.get(javaId)); bedrockPalette.add(biomeTranslations[javaId]);
} }
// Each section of biome corresponding to a chunk section contains 4 * 4 * 4 entries // Each section of biome corresponding to a chunk section contains 4 * 4 * 4 entries
@ -137,7 +143,7 @@ public class BiomeTranslator {
int y = (i >> 4) & 3; int y = (i >> 4) & 3;
int z = (i >> 2) & 3; int z = (i >> 2) & 3;
// Get the Bedrock biome ID override // Get the Bedrock biome ID override
int biomeId = biomeTranslations.get(javaId); int biomeId = biomeTranslations[javaId];
int idx = storage.idFor(biomeId); int idx = storage.idFor(biomeId);
// Convert biome coordinates into block coordinates // Convert biome coordinates into block coordinates
// Bedrock expects a full 4096 blocks // Bedrock expects a full 4096 blocks
@ -150,11 +156,11 @@ public class BiomeTranslator {
} }
} }
private static void multiplyIdToStorage(BitArray bitArray, int idx, int x, int y, int z) { private static void multiplyIdToStorage(final BitArray bitArray, final int idx, final int x, final int y, final int z) {
for (int blockX = x << 2; blockX < (x << 2) + 4; blockX++) { for (int blockX = x << 2; blockX < (x << 2) + 4; blockX++) {
for (int blockZ = z << 2; blockZ < (z << 2) + 4; blockZ++) { for (int blockZ = z << 2; blockZ < (z << 2) + 4; blockZ++) {
for (int blockY = y << 2; blockY < (y << 2) + 4; blockY++) { for (int blockY = y << 2; blockY < (y << 2) + 4; blockY++) {
bitArray.set(GeyserChunkSection.blockPosition(blockX, blockY, blockZ), idx); bitArray.set((blockX << 8) | (blockZ << 4) | blockY, idx);
} }
} }
} }