Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-07 00:48:28 +01:00
Code Issues Projects Releases Wiki Activity

hollow-cube/biome-manager-concurrency (#39)

Browse Source 
Co-authored-by: tahmid-23 <60953955+tahmid-23@users.noreply.github.com>

See https://github.com/Minestom/Minestom/pull/1917

(cherry picked from commit ef37e40cd8)
This commit is contained in:
Matt Worzala 2023-08-05 10:21:05 -04:00
parent c616b3498a
commit 802f72aa0d
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/net/minestom/server/world/biomes/BiomeManager.java
View File

@ -1,7 +1,5 @@
package net.minestom.server.world.biomes; package net.minestom.server.world.biomes;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import net.minestom.server.utils.NamespaceID; import net.minestom.server.utils.NamespaceID;
import org.jglrxavpok.hephaistos.nbt.NBT; import org.jglrxavpok.hephaistos.nbt.NBT;
import org.jglrxavpok.hephaistos.nbt.NBTCompound; import org.jglrxavpok.hephaistos.nbt.NBTCompound;
@ -10,6 +8,7 @@ import org.jglrxavpok.hephaistos.nbt.NBTType;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/** /**
@ -18,7 +17,7 @@ import java.util.Map;
* Contains {@link Biome#PLAINS} by default but can be removed. * Contains {@link Biome#PLAINS} by default but can be removed.
*/ */
public final class BiomeManager { public final class BiomeManager {
private final Int2ObjectMap<Biome> biomes = new Int2ObjectOpenHashMap<>(); private final Map<Integer, Biome> biomes = new ConcurrentHashMap<>();
public BiomeManager() { public BiomeManager() {
addBiome(Biome.PLAINS); addBiome(Biome.PLAINS);
@ -29,7 +28,7 @@ public final class BiomeManager {
* *
* @param biome the biome to add * @param biome the biome to add
*/ */
public synchronized void addBiome(Biome biome) { public void addBiome(Biome biome) {
this.biomes.put(biome.id(), biome); this.biomes.put(biome.id(), biome);
} }
@ -38,7 +37,7 @@ public final class BiomeManager {
* *
* @param biome the biome to remove * @param biome the biome to remove
*/ */
public synchronized void removeBiome(Biome biome) { public void removeBiome(Biome biome) {
this.biomes.remove(biome.id()); this.biomes.remove(biome.id());
} }
@ -47,7 +46,7 @@ public final class BiomeManager {
* *
* @return an immutable copy of the biomes already registered * @return an immutable copy of the biomes already registered
*/ */
public synchronized Collection<Biome> unmodifiableCollection() { public Collection<Biome> unmodifiableCollection() {
return Collections.unmodifiableCollection(biomes.values()); return Collections.unmodifiableCollection(biomes.values());
} }
@ -57,11 +56,11 @@ public final class BiomeManager {
* @param id the id of the biome * @param id the id of the biome
* @return the {@link Biome} linked to this id * @return the {@link Biome} linked to this id
*/ */
public synchronized Biome getById(int id) { public Biome getById(int id) {
return biomes.get(id); return biomes.get(id);
} }
public synchronized Biome getByName(NamespaceID namespaceID) { public Biome getByName(NamespaceID namespaceID) {
Biome biome = null; Biome biome = null;
for (final Biome biomeT : biomes.values()) { for (final Biome biomeT : biomes.values()) {
if (biomeT.name().equals(namespaceID)) { if (biomeT.name().equals(namespaceID)) {
@ -72,7 +71,7 @@ public final class BiomeManager {
return biome; return biome;
} }
public synchronized NBTCompound toNBT() { public NBTCompound toNBT() {
return NBT.Compound(Map.of( return NBT.Compound(Map.of(
"type", NBT.String("minecraft:worldgen/biome"), "type", NBT.String("minecraft:worldgen/biome"),
"value", NBT.List(NBTType.TAG_Compound, biomes.values().stream().map(Biome::toNbt).toList()))); "value", NBT.List(NBTType.TAG_Compound, biomes.values().stream().map(Biome::toNbt).toList())));