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

Merge branch 'mc/1.13'

This commit is contained in:
Blue (Lukas Rieger) 2020-03-08 22:03:19 +01:00
parent c4e2a4c683 dde30e932d
commit 3e11b67ed5
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BlueMapCLI/src/main/java/de/bluecolored/bluemap/cli/BlueMapCLI.java
View File

@ -181,7 +181,7 @@ public class BlueMapCLI {
Collection<Vector2i> chunks;
if (!forceRender) {
long lastRender = webSettings.getLong(map.getId(), "last-render");
long lastRender = webSettings.getLong("maps", map.getId(), "last-render");
chunks = map.getWorld().getChunkList(lastRender);
} else {
chunks = map.getWorld().getChunkList();
@ -264,7 +264,7 @@ public class BlueMapCLI {
rmstate.delete();
for (MapType map : maps.values()) {
webSettings.set(startTime, map.getId(), "last-render");
webSettings.set(startTime, "maps", map.getId(), "last-render");
}
try {

3
BlueMapCore/src/main/java/de/bluecolored/bluemap/core/threejs/BufferAttribute.java
View File

@ -31,7 +31,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import com.flowpowered.math.GenericMath;
import com.google.common.base.Preconditions;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
@ -78,7 +77,7 @@ public class BufferAttribute {
json.name("array").beginArray();
for (int i = 0; i < values.length; i++) {
// rounding and remove ".0" to save string space
double d = GenericMath.round(values[i], 4);
float d = Math.round(values[i] * 10000f) / 10000f;
if (d == (int) d) json.value((int) d);
else json.value(d);
}

2
BlueMapCore/src/main/webroot/style/ui/dropdown.scss
View File

@ -58,7 +58,7 @@
width: 100%;
overflow-x: hidden;
max-height: 300px;
max-height: 10rem;
overflow-y: auto;
z-index: 110;

12
BlueMapCore/src/main/webroot/style/ui/menu.scss
View File

@ -1,8 +1,6 @@
$menu-width: 375px;
.bluemap-container .ui .menu {
position: relative;
height: 100%;
width: $menu-width;
max-width: 100%;
@ -57,7 +55,13 @@ $menu-width: 375px;
> .close-button {
z-index: 20;
left: 0;
right: calc(375px - 2.5rem);
top: 0.5rem;
@media (max-width: $menu-width) {
left: 0.5rem;
top: 0.5rem;
}
}
> .content {
@ -66,7 +70,7 @@ $menu-width: 375px;
top: 3rem;
width: calc(375px - 1rem);
height: calc(100% - 3rem);
height: calc(100% - 4rem);
padding: 0.5rem;