Upstream
/
BlueMap
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into feature/bukkit

This commit is contained in:
Blue (Lukas Rieger) 2020-01-13 18:59:10 +01:00
parent 35d7827611 7ecc86f498
commit 91e7c083c0
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BlueMapCore/src/main/java/de/bluecolored/bluemap/core/BlueMap.java
View File

@ -2,6 +2,6 @@ package de.bluecolored.bluemap.core;
public class BlueMap {
public static final String VERSION = "0.2.0";
public static final String VERSION = "0.2.1";
}

7
BlueMapCore/src/main/java/de/bluecolored/bluemap/core/config/BiomeConfig.java
View File

@ -25,8 +25,9 @@
package de.bluecolored.bluemap.core.config;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import de.bluecolored.bluemap.core.logger.Logger;
import de.bluecolored.bluemap.core.mca.mapping.BiomeMapper;
@ -37,7 +38,7 @@ import ninja.leaping.configurate.loader.ConfigurationLoader;
public class BiomeConfig implements BiomeMapper {
private ConfigurationLoader<? extends ConfigurationNode> autopoulationConfigLoader;
private HashMap<Integer, Biome> biomes;
private Map<Integer, Biome> biomes;
public BiomeConfig(ConfigurationNode node) {
this(node, null);
@ -46,7 +47,7 @@ public class BiomeConfig implements BiomeMapper {
public BiomeConfig(ConfigurationNode node, ConfigurationLoader<? extends ConfigurationNode> autopoulationConfigLoader) {
this.autopoulationConfigLoader = autopoulationConfigLoader;
biomes = new HashMap<>();
biomes = new ConcurrentHashMap<>(200, 0.5f, 8);
for (Entry<Object, ? extends ConfigurationNode> e : node.getChildrenMap().entrySet()){
String id = e.getKey().toString();

18
BlueMapCore/src/main/java/de/bluecolored/bluemap/core/config/BlockIdConfig.java
View File

@ -25,9 +25,11 @@
package de.bluecolored.bluemap.core.config;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import com.google.common.base.Preconditions;
import de.bluecolored.bluemap.core.logger.Logger;
import de.bluecolored.bluemap.core.mca.mapping.BlockIdMapper;
@ -48,8 +50,8 @@ public class BlockIdConfig implements BlockIdMapper {
public BlockIdConfig(ConfigurationNode node, ConfigurationLoader<? extends ConfigurationNode> autopoulationConfigLoader) {
this.autopoulationConfigLoader = autopoulationConfigLoader;
numeralMappings = new HashMap<>();
idMappings = new HashMap<>();
numeralMappings = new ConcurrentHashMap<>(200, 0.5f, 8);
idMappings = new ConcurrentHashMap<>(200, 0.5f, 8);
for (Entry<Object, ? extends ConfigurationNode> e : node.getChildrenMap().entrySet()){
String key = e.getKey().toString();
@ -99,9 +101,9 @@ public class BlockIdConfig implements BlockIdMapper {
if (state == null) {
state = numeralMappings.getOrDefault(new BlockNumeralIDMeta(numeralId, 0), BlockState.MISSING); //meta-fallback
numeralMappings.put(numidmeta, state);
if (autopoulationConfigLoader != null) {
numeralMappings.put(numidmeta, state);
synchronized (autopoulationConfigLoader) {
try {
ConfigurationNode node = autopoulationConfigLoader.load();
@ -134,10 +136,10 @@ public class BlockIdConfig implements BlockIdMapper {
if (state == null) state = new BlockState(id);
}
idMappings.put(idmeta, state);
Preconditions.checkArgument(numeralMappings.put(numidmeta, state) == null);
if (autopoulationConfigLoader != null) {
idMappings.put(idmeta, state);
numeralMappings.put(numidmeta, state);
synchronized (autopoulationConfigLoader) {
try {
ConfigurationNode node = autopoulationConfigLoader.load();

3
BlueMapCore/src/main/java/de/bluecolored/bluemap/core/config/BlockPropertiesConfig.java
View File

@ -33,6 +33,7 @@ import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.common.collect.Multimap;
import com.google.common.collect.MultimapBuilder;
import com.google.common.collect.Multimaps;
import de.bluecolored.bluemap.core.logger.Logger;
import de.bluecolored.bluemap.core.mca.mapping.BlockPropertiesMapper;
@ -61,7 +62,7 @@ public class BlockPropertiesConfig implements BlockPropertiesMapper {
this.resourcePack = resourcePack;
this.autopoulationConfigLoader = autopoulationConfigLoader;
mappings = MultimapBuilder.hashKeys().arrayListValues().build();
mappings = Multimaps.synchronizedListMultimap(MultimapBuilder.hashKeys().arrayListValues().build());
for (Entry<Object, ? extends ConfigurationNode> e : node.getChildrenMap().entrySet()){
String key = e.getKey().toString();

2
src/main/resources/mcmod.info
View File

@ -2,7 +2,7 @@
{
"modid": "bluemap",
"name": "BlueMap",
"version": "0.2.0",
"version": "0.2.1",
"description": "A 3d-map of your Minecraft worlds view-able in your browser using three.js (WebGL)",
"url": "https://github.com/BlueMap-Minecraft",
"authorList": [