mirror of
https://github.com/BlueMap-Minecraft/BlueMap.git
synced 2024-10-02 17:47:39 +02:00
Merge branch 'base'
This commit is contained in:
commit
eab962cdac
@ -70,7 +70,7 @@ public void update(File storageFolder) {
|
|||||||
BufferedImage head = createHead(skin);
|
BufferedImage head = createHead(skin);
|
||||||
ImageIO.write(head, "png", new File(storageFolder, uuid.toString() + ".png"));
|
ImageIO.write(head, "png", new File(storageFolder, uuid.toString() + ".png"));
|
||||||
} catch (ExecutionException | TimeoutException e) {
|
} 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) {
|
} catch (IOException e) {
|
||||||
Logger.global.logError("Failed to write player-head image!", e);
|
Logger.global.logError("Failed to write player-head image!", e);
|
||||||
} catch (InterruptedException ignore) {}
|
} catch (InterruptedException ignore) {}
|
||||||
|
@ -2,6 +2,8 @@ import $ from 'jquery';
|
|||||||
import Marker from "./Marker";
|
import Marker from "./Marker";
|
||||||
import {CSS2DObject} from "./CSS2DRenderer";
|
import {CSS2DObject} from "./CSS2DRenderer";
|
||||||
|
|
||||||
|
import STEVE from "../../../assets/playerheads/steve.png";
|
||||||
|
|
||||||
export default class PlayerMarker extends Marker {
|
export default class PlayerMarker extends Marker {
|
||||||
|
|
||||||
constructor(blueMap, markerSet, markerData, playerUuid, worldUuid) {
|
constructor(blueMap, markerSet, markerData, playerUuid, worldUuid) {
|
||||||
@ -21,7 +23,7 @@ export default class PlayerMarker extends Marker {
|
|||||||
this.blueMap.updateFrame = true;
|
this.blueMap.updateFrame = true;
|
||||||
|
|
||||||
if (!this.renderObject){
|
if (!this.renderObject){
|
||||||
let iconElement = $(`<div class="marker-player"><img src="assets/playerheads/${this.player}.png" onerror="this.onerror=null;this.src='assets/playerheads/steve.png';"><div class="nameplate">${this.label}</div></div>`);
|
let iconElement = $(`<div class="marker-player"><img src="assets/playerheads/${this.player}.png" onerror="this.onerror=null;this.src='${STEVE}';"><div class="nameplate">${this.label}</div></div>`);
|
||||||
iconElement.find("img").click(this.onClick);
|
iconElement.find("img").click(this.onClick);
|
||||||
|
|
||||||
this.renderObject = new CSS2DObject(iconElement[0]);
|
this.renderObject = new CSS2DObject(iconElement[0]);
|
||||||
|
@ -50,6 +50,7 @@ export default class PlayerMarkerSet {
|
|||||||
updateWith(liveData){
|
updateWith(liveData){
|
||||||
this.marker.forEach(marker => {
|
this.marker.forEach(marker => {
|
||||||
marker.nowOnline = false;
|
marker.nowOnline = false;
|
||||||
|
marker.worldChanged = false;
|
||||||
});
|
});
|
||||||
|
|
||||||
for(let i = 0; i < liveData.players.length; i++){
|
for(let i = 0; i < liveData.players.length; i++){
|
||||||
@ -72,11 +73,15 @@ export default class PlayerMarkerSet {
|
|||||||
|
|
||||||
marker.nowOnline = true;
|
marker.nowOnline = true;
|
||||||
marker.position = new Vector3(player.position.x, player.position.y + 1.5, player.position.z);
|
marker.position = new Vector3(player.position.x, player.position.y + 1.5, player.position.z);
|
||||||
|
if (marker.world !== player.world) {
|
||||||
|
marker.world = player.world;
|
||||||
|
marker.worldChanged = true;
|
||||||
|
}
|
||||||
marker.updatePosition();
|
marker.updatePosition();
|
||||||
}
|
}
|
||||||
|
|
||||||
this.marker.forEach(marker => {
|
this.marker.forEach(marker => {
|
||||||
if (marker.nowOnline !== marker.online){
|
if (marker.nowOnline !== marker.online || marker.worldChanged){
|
||||||
marker.online = marker.nowOnline;
|
marker.online = marker.nowOnline;
|
||||||
marker.setVisible(this.visible);
|
marker.setVisible(this.visible);
|
||||||
}
|
}
|
||||||
|
@ -189,6 +189,7 @@ public File getConfigFolder() {
|
|||||||
return new File("config/bluemap");
|
return new File("config/bluemap");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
public void onPlayerJoin(PlayerLoggedInEvent evt) {
|
public void onPlayerJoin(PlayerLoggedInEvent evt) {
|
||||||
PlayerEntity playerInstance = evt.getPlayer();
|
PlayerEntity playerInstance = evt.getPlayer();
|
||||||
if (!(playerInstance instanceof ServerPlayerEntity)) return;
|
if (!(playerInstance instanceof ServerPlayerEntity)) return;
|
||||||
@ -198,6 +199,7 @@ public void onPlayerJoin(PlayerLoggedInEvent evt) {
|
|||||||
onlinePlayerList.add(player);
|
onlinePlayerList.add(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SubscribeEvent
|
||||||
public void onPlayerLeave(PlayerLoggedOutEvent evt) {
|
public void onPlayerLeave(PlayerLoggedOutEvent evt) {
|
||||||
PlayerEntity player = evt.getPlayer();
|
PlayerEntity player = evt.getPlayer();
|
||||||
if (!(player instanceof ServerPlayerEntity)) return;
|
if (!(player instanceof ServerPlayerEntity)) return;
|
||||||
|
Loading…
Reference in New Issue
Block a user