diff --git a/implementations/fabric-1.15.2/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java b/implementations/fabric-1.15.2/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java index 314098ef..7886b891 100644 --- a/implementations/fabric-1.15.2/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java +++ b/implementations/fabric-1.15.2/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java @@ -187,7 +187,7 @@ public Optional getModsFolder() { public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) { if (this.serverInstance != server) return; - FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this, pluginInstance.getBlueMap()); + FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this); onlinePlayerMap.put(player.getUuid(), player); onlinePlayerList.add(player); } @@ -206,6 +206,10 @@ public MinecraftServer getServer() { return this.serverInstance; } + public Plugin getPluginInstance() { + return pluginInstance; + } + @Override public Collection getOnlinePlayers() { return onlinePlayerMap.values(); diff --git a/implementations/fabric-1.15.2/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java b/implementations/fabric-1.15.2/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java index f071b123..d94be1e8 100644 --- a/implementations/fabric-1.15.2/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java +++ b/implementations/fabric-1.15.2/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java @@ -25,10 +25,9 @@ package de.bluecolored.bluemap.fabric; import com.flowpowered.math.vector.Vector3d; -import de.bluecolored.bluemap.common.BlueMapService; +import de.bluecolored.bluemap.common.plugin.text.Text; import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Player; -import de.bluecolored.bluemap.common.plugin.text.Text; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.server.MinecraftServer; @@ -66,12 +65,10 @@ public class FabricPlayer implements Player { private Gamemode gamemode; private final FabricMod mod; - private final BlueMapService blueMap; - public FabricPlayer(UUID playerUuid, FabricMod mod, BlueMapService blueMap) { + public FabricPlayer(UUID playerUuid, FabricMod mod) { this.uuid = playerUuid; this.mod = mod; - this.blueMap = blueMap; update(); } @@ -166,8 +163,8 @@ public void update() { try { var world = mod.getWorld(player.getServerWorld()); - this.world = blueMap.getWorldId(world.getSaveFolder()); - } catch (IOException e) { + this.world = mod.getPluginInstance().getBlueMap().getWorldId(world.getSaveFolder()); + } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded this.world = "unknown"; } } diff --git a/implementations/fabric-1.16.1/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java b/implementations/fabric-1.16.1/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java index e23142dc..0a5f110b 100644 --- a/implementations/fabric-1.16.1/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java +++ b/implementations/fabric-1.16.1/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java @@ -186,7 +186,7 @@ public Optional getModsFolder() { public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) { if (this.serverInstance != server) return; - FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this, pluginInstance.getBlueMap()); + FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this); onlinePlayerMap.put(player.getUuid(), player); onlinePlayerList.add(player); } @@ -205,6 +205,10 @@ public MinecraftServer getServer() { return this.serverInstance; } + public Plugin getPluginInstance() { + return pluginInstance; + } + @Override public Collection getOnlinePlayers() { return onlinePlayerMap.values(); diff --git a/implementations/fabric-1.16.1/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java b/implementations/fabric-1.16.1/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java index f071b123..d94be1e8 100644 --- a/implementations/fabric-1.16.1/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java +++ b/implementations/fabric-1.16.1/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java @@ -25,10 +25,9 @@ package de.bluecolored.bluemap.fabric; import com.flowpowered.math.vector.Vector3d; -import de.bluecolored.bluemap.common.BlueMapService; +import de.bluecolored.bluemap.common.plugin.text.Text; import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Player; -import de.bluecolored.bluemap.common.plugin.text.Text; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.server.MinecraftServer; @@ -66,12 +65,10 @@ public class FabricPlayer implements Player { private Gamemode gamemode; private final FabricMod mod; - private final BlueMapService blueMap; - public FabricPlayer(UUID playerUuid, FabricMod mod, BlueMapService blueMap) { + public FabricPlayer(UUID playerUuid, FabricMod mod) { this.uuid = playerUuid; this.mod = mod; - this.blueMap = blueMap; update(); } @@ -166,8 +163,8 @@ public void update() { try { var world = mod.getWorld(player.getServerWorld()); - this.world = blueMap.getWorldId(world.getSaveFolder()); - } catch (IOException e) { + this.world = mod.getPluginInstance().getBlueMap().getWorldId(world.getSaveFolder()); + } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded this.world = "unknown"; } } diff --git a/implementations/fabric-1.16.2/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java b/implementations/fabric-1.16.2/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java index b3196e58..c058bc54 100644 --- a/implementations/fabric-1.16.2/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java +++ b/implementations/fabric-1.16.2/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java @@ -186,7 +186,7 @@ public Optional getModsFolder() { public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) { if (this.serverInstance != server) return; - FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this, pluginInstance.getBlueMap()); + FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this); onlinePlayerMap.put(player.getUuid(), player); onlinePlayerList.add(player); } @@ -205,6 +205,10 @@ public MinecraftServer getServer() { return this.serverInstance; } + public Plugin getPluginInstance() { + return pluginInstance; + } + @Override public Collection getOnlinePlayers() { return onlinePlayerMap.values(); diff --git a/implementations/fabric-1.16.2/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java b/implementations/fabric-1.16.2/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java index f071b123..d94be1e8 100644 --- a/implementations/fabric-1.16.2/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java +++ b/implementations/fabric-1.16.2/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java @@ -25,10 +25,9 @@ package de.bluecolored.bluemap.fabric; import com.flowpowered.math.vector.Vector3d; -import de.bluecolored.bluemap.common.BlueMapService; +import de.bluecolored.bluemap.common.plugin.text.Text; import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Player; -import de.bluecolored.bluemap.common.plugin.text.Text; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.server.MinecraftServer; @@ -66,12 +65,10 @@ public class FabricPlayer implements Player { private Gamemode gamemode; private final FabricMod mod; - private final BlueMapService blueMap; - public FabricPlayer(UUID playerUuid, FabricMod mod, BlueMapService blueMap) { + public FabricPlayer(UUID playerUuid, FabricMod mod) { this.uuid = playerUuid; this.mod = mod; - this.blueMap = blueMap; update(); } @@ -166,8 +163,8 @@ public void update() { try { var world = mod.getWorld(player.getServerWorld()); - this.world = blueMap.getWorldId(world.getSaveFolder()); - } catch (IOException e) { + this.world = mod.getPluginInstance().getBlueMap().getWorldId(world.getSaveFolder()); + } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded this.world = "unknown"; } } diff --git a/implementations/fabric-1.17/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java b/implementations/fabric-1.17/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java index 94038bd2..e43d9072 100644 --- a/implementations/fabric-1.17/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java +++ b/implementations/fabric-1.17/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java @@ -186,7 +186,7 @@ public Optional getModsFolder() { public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) { if (this.serverInstance != server) return; - FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this, pluginInstance.getBlueMap()); + FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this); onlinePlayerMap.put(player.getUuid(), player); onlinePlayerList.add(player); } @@ -205,6 +205,10 @@ public MinecraftServer getServer() { return this.serverInstance; } + public Plugin getPluginInstance() { + return pluginInstance; + } + @Override public Collection getOnlinePlayers() { return onlinePlayerMap.values(); diff --git a/implementations/fabric-1.17/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java b/implementations/fabric-1.17/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java index b5cda46e..1775124f 100644 --- a/implementations/fabric-1.17/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java +++ b/implementations/fabric-1.17/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java @@ -25,10 +25,9 @@ package de.bluecolored.bluemap.fabric; import com.flowpowered.math.vector.Vector3d; -import de.bluecolored.bluemap.common.BlueMapService; +import de.bluecolored.bluemap.common.plugin.text.Text; import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Player; -import de.bluecolored.bluemap.common.plugin.text.Text; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.server.MinecraftServer; @@ -65,12 +64,10 @@ public class FabricPlayer implements Player { private Gamemode gamemode; private final FabricMod mod; - private final BlueMapService blueMap; - public FabricPlayer(UUID playerUuid, FabricMod mod, BlueMapService blueMap) { + public FabricPlayer(UUID playerUuid, FabricMod mod) { this.uuid = playerUuid; this.mod = mod; - this.blueMap = blueMap; update(); } @@ -165,8 +162,8 @@ public void update() { try { var world = mod.getWorld(player.getServerWorld()); - this.world = blueMap.getWorldId(world.getSaveFolder()); - } catch (IOException e) { + this.world = mod.getPluginInstance().getBlueMap().getWorldId(world.getSaveFolder()); + } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded this.world = "unknown"; } } diff --git a/implementations/fabric-1.18/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java b/implementations/fabric-1.18/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java index 249f11e9..2c99fd6a 100644 --- a/implementations/fabric-1.18/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java +++ b/implementations/fabric-1.18/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java @@ -186,7 +186,7 @@ public Optional getModsFolder() { public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) { if (this.serverInstance != server) return; - FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this, pluginInstance.getBlueMap()); + FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this); onlinePlayerMap.put(player.getUuid(), player); onlinePlayerList.add(player); } @@ -205,6 +205,10 @@ public MinecraftServer getServer() { return this.serverInstance; } + public Plugin getPluginInstance() { + return pluginInstance; + } + @Override public Collection getOnlinePlayers() { return onlinePlayerMap.values(); diff --git a/implementations/fabric-1.18/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java b/implementations/fabric-1.18/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java index 2006d702..addba0fd 100644 --- a/implementations/fabric-1.18/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java +++ b/implementations/fabric-1.18/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java @@ -25,10 +25,9 @@ package de.bluecolored.bluemap.fabric; import com.flowpowered.math.vector.Vector3d; -import de.bluecolored.bluemap.common.BlueMapService; +import de.bluecolored.bluemap.common.plugin.text.Text; import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Player; -import de.bluecolored.bluemap.common.plugin.text.Text; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.server.MinecraftServer; @@ -65,12 +64,10 @@ public class FabricPlayer implements Player { private Gamemode gamemode; private final FabricMod mod; - private final BlueMapService blueMap; - public FabricPlayer(UUID playerUuid, FabricMod mod, BlueMapService blueMap) { + public FabricPlayer(UUID playerUuid, FabricMod mod) { this.uuid = playerUuid; this.mod = mod; - this.blueMap = blueMap; update(); } @@ -165,8 +162,8 @@ public void update() { try { var world = mod.getWorld(player.getWorld()); - this.world = blueMap.getWorldId(world.getSaveFolder()); - } catch (IOException e) { + this.world = mod.getPluginInstance().getBlueMap().getWorldId(world.getSaveFolder()); + } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded this.world = "unknown"; } } diff --git a/implementations/fabric-1.19/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java b/implementations/fabric-1.19/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java index fe03837c..1b8eb35e 100644 --- a/implementations/fabric-1.19/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java +++ b/implementations/fabric-1.19/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java @@ -191,7 +191,7 @@ public Optional getModsFolder() { public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) { if (this.serverInstance != server) return; - FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this, pluginInstance.getBlueMap()); + FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this); onlinePlayerMap.put(player.getUuid(), player); onlinePlayerList.add(player); } @@ -210,6 +210,10 @@ public MinecraftServer getServer() { return this.serverInstance; } + public Plugin getPluginInstance() { + return pluginInstance; + } + @Override public Collection getOnlinePlayers() { return onlinePlayerMap.values(); diff --git a/implementations/fabric-1.19/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java b/implementations/fabric-1.19/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java index a5a393d8..69aecb43 100644 --- a/implementations/fabric-1.19/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java +++ b/implementations/fabric-1.19/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java @@ -25,10 +25,9 @@ package de.bluecolored.bluemap.fabric; import com.flowpowered.math.vector.Vector3d; -import de.bluecolored.bluemap.common.BlueMapService; +import de.bluecolored.bluemap.common.plugin.text.Text; import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Player; -import de.bluecolored.bluemap.common.plugin.text.Text; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.server.MinecraftServer; @@ -65,12 +64,10 @@ public class FabricPlayer implements Player { private Gamemode gamemode; private final FabricMod mod; - private final BlueMapService blueMap; - public FabricPlayer(UUID playerUuid, FabricMod mod, BlueMapService blueMap) { + public FabricPlayer(UUID playerUuid, FabricMod mod) { this.uuid = playerUuid; this.mod = mod; - this.blueMap = blueMap; update(); } @@ -165,8 +162,8 @@ public void update() { try { var world = mod.getWorld(player.getWorld()); - this.world = blueMap.getWorldId(world.getSaveFolder()); - } catch (IOException e) { + this.world = mod.getPluginInstance().getBlueMap().getWorldId(world.getSaveFolder()); + } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded this.world = "unknown"; } } diff --git a/implementations/forge-1.14.4/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java b/implementations/forge-1.14.4/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java index bd694cec..547aad9a 100644 --- a/implementations/forge-1.14.4/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java +++ b/implementations/forge-1.14.4/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java @@ -205,7 +205,7 @@ public void onPlayerJoin(PlayerLoggedInEvent evt) { PlayerEntity playerInstance = evt.getPlayer(); if (!(playerInstance instanceof ServerPlayerEntity)) return; - ForgePlayer player = new ForgePlayer(playerInstance.getUniqueID(), this, getPlugin().getBlueMap()); + ForgePlayer player = new ForgePlayer(playerInstance.getUniqueID(), this); onlinePlayerMap.put(player.getUuid(), player); onlinePlayerList.add(player); } diff --git a/implementations/forge-1.14.4/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java b/implementations/forge-1.14.4/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java index 4bcbcd2b..32c62588 100644 --- a/implementations/forge-1.14.4/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java +++ b/implementations/forge-1.14.4/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java @@ -25,10 +25,9 @@ package de.bluecolored.bluemap.forge; import com.flowpowered.math.vector.Vector3d; -import de.bluecolored.bluemap.common.BlueMapService; +import de.bluecolored.bluemap.common.plugin.text.Text; import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Player; -import de.bluecolored.bluemap.common.plugin.text.Text; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; @@ -66,12 +65,10 @@ public class ForgePlayer implements Player { private Gamemode gamemode; private final ForgeMod mod; - private final BlueMapService blueMap; - public ForgePlayer(UUID playerUuid, ForgeMod mod, BlueMapService blueMap) { + public ForgePlayer(UUID playerUuid, ForgeMod mod) { this.uuid = playerUuid; this.mod = mod; - this.blueMap = blueMap; update(); } @@ -166,8 +163,8 @@ public void update() { try { var world = mod.getWorld(player.getServerWorld()); - this.world = blueMap.getWorldId(world.getSaveFolder()); - } catch (IOException e) { + this.world = mod.getPlugin().getBlueMap().getWorldId(world.getSaveFolder()); + } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded this.world = "unknown"; } } diff --git a/implementations/forge-1.15.2/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java b/implementations/forge-1.15.2/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java index c41ea7a4..47c8671c 100644 --- a/implementations/forge-1.15.2/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java +++ b/implementations/forge-1.15.2/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java @@ -205,7 +205,7 @@ public void onPlayerJoin(PlayerLoggedInEvent evt) { PlayerEntity playerInstance = evt.getPlayer(); if (!(playerInstance instanceof ServerPlayerEntity)) return; - ForgePlayer player = new ForgePlayer(playerInstance.getUniqueID(), this, getPlugin().getBlueMap()); + ForgePlayer player = new ForgePlayer(playerInstance.getUniqueID(), this); onlinePlayerMap.put(player.getUuid(), player); onlinePlayerList.add(player); } diff --git a/implementations/forge-1.15.2/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java b/implementations/forge-1.15.2/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java index 4193e6a4..c8ed00b5 100644 --- a/implementations/forge-1.15.2/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java +++ b/implementations/forge-1.15.2/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java @@ -25,10 +25,9 @@ package de.bluecolored.bluemap.forge; import com.flowpowered.math.vector.Vector3d; -import de.bluecolored.bluemap.common.BlueMapService; +import de.bluecolored.bluemap.common.plugin.text.Text; import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Player; -import de.bluecolored.bluemap.common.plugin.text.Text; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; @@ -66,12 +65,10 @@ public class ForgePlayer implements Player { private Gamemode gamemode; private final ForgeMod mod; - private final BlueMapService blueMap; - public ForgePlayer(UUID playerUuid, ForgeMod mod, BlueMapService blueMap) { + public ForgePlayer(UUID playerUuid, ForgeMod mod) { this.uuid = playerUuid; this.mod = mod; - this.blueMap = blueMap; update(); } @@ -166,7 +163,7 @@ public void update() { try { var world = mod.getWorld(player.getServerWorld()); - this.world = blueMap.getWorldId(world.getSaveFolder()); + this.world = mod.getPlugin().getBlueMap().getWorldId(world.getSaveFolder()); } catch (IOException e) { this.world = "unknown"; } diff --git a/implementations/forge-1.16.2/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java b/implementations/forge-1.16.2/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java index 280c0091..a0859b79 100644 --- a/implementations/forge-1.16.2/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java +++ b/implementations/forge-1.16.2/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java @@ -205,7 +205,7 @@ public void onPlayerJoin(PlayerLoggedInEvent evt) { PlayerEntity playerInstance = evt.getPlayer(); if (!(playerInstance instanceof ServerPlayerEntity)) return; - ForgePlayer player = new ForgePlayer(playerInstance.getUniqueID(), this, getPlugin().getBlueMap()); + ForgePlayer player = new ForgePlayer(playerInstance.getUniqueID(), this); onlinePlayerMap.put(player.getUuid(), player); onlinePlayerList.add(player); } diff --git a/implementations/forge-1.16.2/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java b/implementations/forge-1.16.2/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java index 0769e429..232b1131 100644 --- a/implementations/forge-1.16.2/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java +++ b/implementations/forge-1.16.2/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java @@ -25,10 +25,9 @@ package de.bluecolored.bluemap.forge; import com.flowpowered.math.vector.Vector3d; -import de.bluecolored.bluemap.common.BlueMapService; +import de.bluecolored.bluemap.common.plugin.text.Text; import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Player; -import de.bluecolored.bluemap.common.plugin.text.Text; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; @@ -66,12 +65,10 @@ public class ForgePlayer implements Player { private Gamemode gamemode; private final ForgeMod mod; - private final BlueMapService blueMap; - public ForgePlayer(UUID playerUuid, ForgeMod mod, BlueMapService blueMap) { + public ForgePlayer(UUID playerUuid, ForgeMod mod) { this.uuid = playerUuid; this.mod = mod; - this.blueMap = blueMap; update(); } @@ -166,8 +163,8 @@ public void update() { try { var world = mod.getWorld(player.getServerWorld()); - this.world = blueMap.getWorldId(world.getSaveFolder()); - } catch (IOException e) { + this.world = mod.getPlugin().getBlueMap().getWorldId(world.getSaveFolder()); + } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded this.world = "unknown"; } } diff --git a/implementations/forge-1.17.1/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java b/implementations/forge-1.17.1/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java index 8d1407cf..4a6ebd02 100644 --- a/implementations/forge-1.17.1/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java +++ b/implementations/forge-1.17.1/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java @@ -204,7 +204,7 @@ public void onPlayerJoin(PlayerLoggedInEvent evt) { var playerInstance = evt.getPlayer(); if (!(playerInstance instanceof ServerPlayer)) return; - ForgePlayer player = new ForgePlayer(playerInstance.getUUID(), this, getPlugin().getBlueMap()); + ForgePlayer player = new ForgePlayer(playerInstance.getUUID(), this); onlinePlayerMap.put(player.getUuid(), player); onlinePlayerList.add(player); } diff --git a/implementations/forge-1.17.1/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java b/implementations/forge-1.17.1/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java index ef4876a0..a739b0da 100644 --- a/implementations/forge-1.17.1/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java +++ b/implementations/forge-1.17.1/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java @@ -25,10 +25,9 @@ package de.bluecolored.bluemap.forge; import com.flowpowered.math.vector.Vector3d; -import de.bluecolored.bluemap.common.BlueMapService; +import de.bluecolored.bluemap.common.plugin.text.Text; import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Player; -import de.bluecolored.bluemap.common.plugin.text.Text; import net.minecraft.core.BlockPos; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; @@ -66,12 +65,10 @@ public class ForgePlayer implements Player { private Gamemode gamemode; private final ForgeMod mod; - private final BlueMapService blueMap; - public ForgePlayer(UUID playerUuid, ForgeMod mod, BlueMapService blueMap) { + public ForgePlayer(UUID playerUuid, ForgeMod mod) { this.uuid = playerUuid; this.mod = mod; - this.blueMap = blueMap; update(); } @@ -166,8 +163,8 @@ public void update() { try { var world = mod.getWorld(player.getLevel()); - this.world = blueMap.getWorldId(world.getSaveFolder()); - } catch (IOException e) { + this.world = mod.getPlugin().getBlueMap().getWorldId(world.getSaveFolder()); + } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded this.world = "unknown"; } } diff --git a/implementations/forge-1.18.1/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java b/implementations/forge-1.18.1/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java index 20f11050..04a18bab 100644 --- a/implementations/forge-1.18.1/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java +++ b/implementations/forge-1.18.1/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java @@ -204,7 +204,7 @@ public void onPlayerJoin(PlayerLoggedInEvent evt) { var playerInstance = evt.getPlayer(); if (!(playerInstance instanceof ServerPlayer)) return; - ForgePlayer player = new ForgePlayer(playerInstance.getUUID(), this, getPlugin().getBlueMap()); + ForgePlayer player = new ForgePlayer(playerInstance.getUUID(), this); onlinePlayerMap.put(player.getUuid(), player); onlinePlayerList.add(player); } diff --git a/implementations/forge-1.18.1/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java b/implementations/forge-1.18.1/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java index ef4876a0..a739b0da 100644 --- a/implementations/forge-1.18.1/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java +++ b/implementations/forge-1.18.1/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java @@ -25,10 +25,9 @@ package de.bluecolored.bluemap.forge; import com.flowpowered.math.vector.Vector3d; -import de.bluecolored.bluemap.common.BlueMapService; +import de.bluecolored.bluemap.common.plugin.text.Text; import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Player; -import de.bluecolored.bluemap.common.plugin.text.Text; import net.minecraft.core.BlockPos; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; @@ -66,12 +65,10 @@ public class ForgePlayer implements Player { private Gamemode gamemode; private final ForgeMod mod; - private final BlueMapService blueMap; - public ForgePlayer(UUID playerUuid, ForgeMod mod, BlueMapService blueMap) { + public ForgePlayer(UUID playerUuid, ForgeMod mod) { this.uuid = playerUuid; this.mod = mod; - this.blueMap = blueMap; update(); } @@ -166,8 +163,8 @@ public void update() { try { var world = mod.getWorld(player.getLevel()); - this.world = blueMap.getWorldId(world.getSaveFolder()); - } catch (IOException e) { + this.world = mod.getPlugin().getBlueMap().getWorldId(world.getSaveFolder()); + } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded this.world = "unknown"; } } diff --git a/implementations/forge-1.19.1/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java b/implementations/forge-1.19.1/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java index 3af9a1e3..e7fbc16e 100644 --- a/implementations/forge-1.19.1/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java +++ b/implementations/forge-1.19.1/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java @@ -209,7 +209,7 @@ public void onPlayerJoin(PlayerLoggedInEvent evt) { var playerInstance = evt.getEntity(); if (!(playerInstance instanceof ServerPlayer)) return; - ForgePlayer player = new ForgePlayer(playerInstance.getUUID(), this, getPlugin().getBlueMap()); + ForgePlayer player = new ForgePlayer(playerInstance.getUUID(), this); onlinePlayerMap.put(player.getUuid(), player); onlinePlayerList.add(player); } diff --git a/implementations/forge-1.19.1/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java b/implementations/forge-1.19.1/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java index ef4876a0..a739b0da 100644 --- a/implementations/forge-1.19.1/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java +++ b/implementations/forge-1.19.1/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java @@ -25,10 +25,9 @@ package de.bluecolored.bluemap.forge; import com.flowpowered.math.vector.Vector3d; -import de.bluecolored.bluemap.common.BlueMapService; +import de.bluecolored.bluemap.common.plugin.text.Text; import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Player; -import de.bluecolored.bluemap.common.plugin.text.Text; import net.minecraft.core.BlockPos; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; @@ -66,12 +65,10 @@ public class ForgePlayer implements Player { private Gamemode gamemode; private final ForgeMod mod; - private final BlueMapService blueMap; - public ForgePlayer(UUID playerUuid, ForgeMod mod, BlueMapService blueMap) { + public ForgePlayer(UUID playerUuid, ForgeMod mod) { this.uuid = playerUuid; this.mod = mod; - this.blueMap = blueMap; update(); } @@ -166,8 +163,8 @@ public void update() { try { var world = mod.getWorld(player.getLevel()); - this.world = blueMap.getWorldId(world.getSaveFolder()); - } catch (IOException e) { + this.world = mod.getPlugin().getBlueMap().getWorldId(world.getSaveFolder()); + } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded this.world = "unknown"; } } diff --git a/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java b/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java index 37376b86..a9843367 100644 --- a/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java +++ b/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java @@ -209,7 +209,7 @@ public void onPlayerJoin(PlayerLoggedInEvent evt) { var playerInstance = evt.getPlayer(); if (!(playerInstance instanceof ServerPlayer)) return; - ForgePlayer player = new ForgePlayer(playerInstance.getUUID(), this, getPlugin().getBlueMap()); + ForgePlayer player = new ForgePlayer(playerInstance.getUUID(), this); onlinePlayerMap.put(player.getUuid(), player); onlinePlayerList.add(player); } diff --git a/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java b/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java index ef4876a0..a739b0da 100644 --- a/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java +++ b/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java @@ -25,10 +25,9 @@ package de.bluecolored.bluemap.forge; import com.flowpowered.math.vector.Vector3d; -import de.bluecolored.bluemap.common.BlueMapService; +import de.bluecolored.bluemap.common.plugin.text.Text; import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Player; -import de.bluecolored.bluemap.common.plugin.text.Text; import net.minecraft.core.BlockPos; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; @@ -66,12 +65,10 @@ public class ForgePlayer implements Player { private Gamemode gamemode; private final ForgeMod mod; - private final BlueMapService blueMap; - public ForgePlayer(UUID playerUuid, ForgeMod mod, BlueMapService blueMap) { + public ForgePlayer(UUID playerUuid, ForgeMod mod) { this.uuid = playerUuid; this.mod = mod; - this.blueMap = blueMap; update(); } @@ -166,8 +163,8 @@ public void update() { try { var world = mod.getWorld(player.getLevel()); - this.world = blueMap.getWorldId(world.getSaveFolder()); - } catch (IOException e) { + this.world = mod.getPlugin().getBlueMap().getWorldId(world.getSaveFolder()); + } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded this.world = "unknown"; } } diff --git a/implementations/spigot/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlayer.java b/implementations/spigot/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlayer.java index 3b775344..dbe7806e 100644 --- a/implementations/spigot/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlayer.java +++ b/implementations/spigot/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlayer.java @@ -163,7 +163,7 @@ public void update() { try { var world = BukkitPlugin.getInstance().getWorld(player.getWorld()); this.world = BukkitPlugin.getInstance().getPlugin().getBlueMap().getWorldId(world.getSaveFolder()); - } catch (IOException e) { + } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded this.world = "unknown"; } } diff --git a/implementations/sponge-8.0.0/src/main/java/de/bluecolored/bluemap/sponge/SpongePlayer.java b/implementations/sponge-8.0.0/src/main/java/de/bluecolored/bluemap/sponge/SpongePlayer.java index 04f71fc7..6801da2b 100644 --- a/implementations/sponge-8.0.0/src/main/java/de/bluecolored/bluemap/sponge/SpongePlayer.java +++ b/implementations/sponge-8.0.0/src/main/java/de/bluecolored/bluemap/sponge/SpongePlayer.java @@ -166,7 +166,7 @@ public void update() { try { var world = SpongePlugin.getInstance().getWorld(player.world()); this.world = SpongePlugin.getInstance().getPlugin().getBlueMap().getWorldId(world.getSaveFolder()); - } catch (IOException e) { + } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded this.world = "unknown"; } } diff --git a/implementations/sponge-9.0.0/src/main/java/de/bluecolored/bluemap/sponge/SpongePlayer.java b/implementations/sponge-9.0.0/src/main/java/de/bluecolored/bluemap/sponge/SpongePlayer.java index ea6b5072..6b3c2058 100644 --- a/implementations/sponge-9.0.0/src/main/java/de/bluecolored/bluemap/sponge/SpongePlayer.java +++ b/implementations/sponge-9.0.0/src/main/java/de/bluecolored/bluemap/sponge/SpongePlayer.java @@ -165,7 +165,7 @@ public void update() { try { var world = SpongePlugin.getInstance().getWorld(player.world()); this.world = SpongePlugin.getInstance().getPlugin().getBlueMap().getWorldId(world.getSaveFolder()); - } catch (IOException e) { + } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded this.world = "unknown"; } }