From 17a94bcb2c7e6cfa085f8c2c5c41b970dc2e5065 Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Sun, 16 Aug 2020 17:41:34 +0200 Subject: [PATCH 1/5] Fix forge-listener methods not subscribed correctly --- .../main/java/de/bluecolored/bluemap/forge/ForgeMod.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/BlueMapForge/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java b/BlueMapForge/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java index 0ebdb700..321b6e09 100644 --- a/BlueMapForge/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java +++ b/BlueMapForge/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java @@ -190,7 +190,8 @@ private File getFolderForWorld(ServerWorld world) throws IOException { public File getConfigFolder() { return new File("config/bluemap"); } - + + @SubscribeEvent public void onPlayerJoin(PlayerLoggedInEvent evt) { PlayerEntity playerInstance = evt.getPlayer(); if (!(playerInstance instanceof ServerPlayerEntity)) return; @@ -199,7 +200,8 @@ public void onPlayerJoin(PlayerLoggedInEvent evt) { onlinePlayerMap.put(player.getUuid(), player); onlinePlayerList.add(player); } - + + @SubscribeEvent public void onPlayerLeave(PlayerLoggedOutEvent evt) { PlayerEntity player = evt.getPlayer(); if (!(player instanceof ServerPlayerEntity)) return; From 2b2cf2da4bd0e3364d7bd597c7310e2869e673e5 Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Sun, 16 Aug 2020 17:48:14 +0200 Subject: [PATCH 2/5] Fix player-markers not updating the world correctly --- BlueMapCore/src/main/webroot/js/libs/hud/PlayerMarkerSet.js | 1 + 1 file changed, 1 insertion(+) diff --git a/BlueMapCore/src/main/webroot/js/libs/hud/PlayerMarkerSet.js b/BlueMapCore/src/main/webroot/js/libs/hud/PlayerMarkerSet.js index 9668af24..f140074f 100644 --- a/BlueMapCore/src/main/webroot/js/libs/hud/PlayerMarkerSet.js +++ b/BlueMapCore/src/main/webroot/js/libs/hud/PlayerMarkerSet.js @@ -72,6 +72,7 @@ export default class PlayerMarkerSet { marker.nowOnline = true; marker.position = new Vector3(player.position.x, player.position.y + 1.5, player.position.z); + marker.world = player.world; marker.updatePosition(); } From bb7592cdfefab87ae0dedd265f9dc255aecdd750 Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Sun, 16 Aug 2020 17:54:21 +0200 Subject: [PATCH 3/5] Fix player-markers not updating the world correctly, the second --- .../src/main/webroot/js/libs/hud/PlayerMarkerSet.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/BlueMapCore/src/main/webroot/js/libs/hud/PlayerMarkerSet.js b/BlueMapCore/src/main/webroot/js/libs/hud/PlayerMarkerSet.js index f140074f..073c9139 100644 --- a/BlueMapCore/src/main/webroot/js/libs/hud/PlayerMarkerSet.js +++ b/BlueMapCore/src/main/webroot/js/libs/hud/PlayerMarkerSet.js @@ -50,6 +50,7 @@ export default class PlayerMarkerSet { updateWith(liveData){ this.marker.forEach(marker => { marker.nowOnline = false; + marker.worldChanged = false; }); for(let i = 0; i < liveData.players.length; i++){ @@ -72,12 +73,15 @@ export default class PlayerMarkerSet { marker.nowOnline = true; marker.position = new Vector3(player.position.x, player.position.y + 1.5, player.position.z); - marker.world = player.world; + if (marker.world !== player.world) { + marker.world = player.world; + marker.worldChanged = true; + } marker.updatePosition(); } this.marker.forEach(marker => { - if (marker.nowOnline !== marker.online){ + if (marker.nowOnline !== marker.online || marker.worldChanged){ marker.online = marker.nowOnline; marker.setVisible(this.visible); } From 24c3d52f17d08dba1bb9e8962412758ee9aa2188 Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Sun, 16 Aug 2020 19:05:30 +0200 Subject: [PATCH 4/5] Fix steve-include and make skin update warnings a debug-message --- .../bluecolored/bluemap/common/plugin/skins/PlayerSkin.java | 2 +- BlueMapCore/src/main/webroot/js/libs/hud/PlayerMarker.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/skins/PlayerSkin.java b/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/skins/PlayerSkin.java index 5201f8dc..a0b7bd99 100644 --- a/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/skins/PlayerSkin.java +++ b/BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/skins/PlayerSkin.java @@ -70,7 +70,7 @@ public void update(File storageFolder) { BufferedImage head = createHead(skin); ImageIO.write(head, "png", new File(storageFolder, uuid.toString() + ".png")); } catch (ExecutionException | TimeoutException e) { - Logger.global.logWarning("Failed to load player-skin from mojang-servers: " + e); + Logger.global.logDebug("Failed to load player-skin from mojang-servers: " + e); } catch (IOException e) { Logger.global.logError("Failed to write player-head image!", e); } catch (InterruptedException ignore) {} diff --git a/BlueMapCore/src/main/webroot/js/libs/hud/PlayerMarker.js b/BlueMapCore/src/main/webroot/js/libs/hud/PlayerMarker.js index 1129fa5b..ca99eba5 100644 --- a/BlueMapCore/src/main/webroot/js/libs/hud/PlayerMarker.js +++ b/BlueMapCore/src/main/webroot/js/libs/hud/PlayerMarker.js @@ -2,6 +2,8 @@ import $ from 'jquery'; import Marker from "./Marker"; import {CSS2DObject} from "./CSS2DRenderer"; +import STEVE from "../../../assets/playerheads/steve.svg"; + export default class PlayerMarker extends Marker { constructor(blueMap, markerSet, markerData, playerUuid, worldUuid) { @@ -21,7 +23,7 @@ export default class PlayerMarker extends Marker { this.blueMap.updateFrame = true; if (!this.renderObject){ - let iconElement = $(`
${this.label}
`); + let iconElement = $(`
${this.label}
`); iconElement.find("img").click(this.onClick); this.renderObject = new CSS2DObject(iconElement[0]); From e60d60fc939e8fd9fef38dcc5c718c6a449f98d3 Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Sun, 16 Aug 2020 19:08:52 +0200 Subject: [PATCH 5/5] Fix head image file extension --- BlueMapCore/src/main/webroot/js/libs/hud/PlayerMarker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BlueMapCore/src/main/webroot/js/libs/hud/PlayerMarker.js b/BlueMapCore/src/main/webroot/js/libs/hud/PlayerMarker.js index ca99eba5..544a8c84 100644 --- a/BlueMapCore/src/main/webroot/js/libs/hud/PlayerMarker.js +++ b/BlueMapCore/src/main/webroot/js/libs/hud/PlayerMarker.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import Marker from "./Marker"; import {CSS2DObject} from "./CSS2DRenderer"; -import STEVE from "../../../assets/playerheads/steve.svg"; +import STEVE from "../../../assets/playerheads/steve.png"; export default class PlayerMarker extends Marker {