Compare commits

...

2 Commits

Author SHA1 Message Date
Lukas Rieger (Blue) ee3ab6ff9a
Make use of updated spigot api to send command-messages in a better way 2024-03-29 13:39:12 +01:00
Lukas Rieger (Blue) 498a4f3190
Minimum required Java version is now 16, drop support for spigot versions < 1.16.5 2024-03-29 13:08:59 +01:00
6 changed files with 9 additions and 22 deletions

View File

@ -12,7 +12,7 @@ plugins {
group = "de.bluecolored.bluemap.common"
version = "0.0.0"
val javaTarget = 11
val javaTarget = 16
java {
sourceCompatibility = JavaVersion.toVersion(javaTarget)
targetCompatibility = JavaVersion.toVersion(javaTarget)

View File

@ -46,7 +46,7 @@ version = lastVersion +
System.setProperty("bluemap.version", version.toString())
println("Version: $version")
val javaTarget = 11
val javaTarget = 16
java {
sourceCompatibility = JavaVersion.toVersion(javaTarget)
targetCompatibility = JavaVersion.toVersion(javaTarget)

View File

@ -9,7 +9,7 @@ plugins {
group = "de.bluecolored.bluemap.cli"
version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
val javaTarget = 11
val javaTarget = 16
java {
sourceCompatibility = JavaVersion.toVersion(javaTarget)
targetCompatibility = JavaVersion.toVersion(javaTarget)

View File

@ -10,7 +10,7 @@ plugins {
group = "de.bluecolored.bluemap.bukkit"
version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore
val javaTarget = 11
val javaTarget = 16
java {
sourceCompatibility = JavaVersion.toVersion(javaTarget)
targetCompatibility = JavaVersion.toVersion(javaTarget)
@ -42,7 +42,7 @@ dependencies {
exclude( group = "com.google.code.gson", module = "gson" )
}
shadow ("org.spigotmc:spigot-api:1.13-R0.1-SNAPSHOT")
shadow ("org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT")
implementation ("org.bstats:bstats-bukkit:2.2.1")
testImplementation ("org.junit.jupiter:junit-jupiter:5.8.2")
@ -128,10 +128,7 @@ modrinth {
uploadFile.set(tasks.findByName("shadowJar"))
loaders.addAll("spigot", "paper", "purpur")
gameVersions.addAll(
"1.13.2",
"1.14", "1.14.1", "1.14.2", "1.14.3", "1.14.4",
"1.15", "1.15.1", "1.15.2",
"1.16", "1.16.1", "1.16.2", "1.16.3", "1.16.4", "1.16.5",
"1.16.5",
"1.17", "1.17.1",
"1.18", "1.18.1", "1.18.2",
"1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4",

View File

@ -30,12 +30,12 @@ import de.bluecolored.bluemap.common.plugin.text.Text;
import de.bluecolored.bluemap.common.serverinterface.CommandSource;
import de.bluecolored.bluemap.common.serverinterface.ServerWorld;
import de.bluecolored.bluemap.core.world.World;
import net.md_5.bungee.chat.ComponentSerializer;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.command.BlockCommandSender;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import java.util.Optional;
@ -51,17 +51,7 @@ public class BukkitCommandSource implements CommandSource {
@Override
public void sendMessage(Text text) {
Bukkit.getScheduler().runTask(BukkitPlugin.getInstance(), () -> {
if (delegate instanceof Player) {
Player player = (Player) delegate;
//kinda hacky but works
Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), "minecraft:tellraw " + player.getName() + " " + text.toJSONString());
return;
}
delegate.sendMessage(text.toPlainString());
});
delegate.spigot().sendMessage(ComponentSerializer.parse(text.toJSONString()));
}
@Override

View File

@ -2,7 +2,7 @@ name: BlueMap
description: "A 3d-map of your Minecraft worlds view-able in your browser using three.js (WebGL)"
main: de.bluecolored.bluemap.bukkit.BukkitPlugin
version: "${version}"
api-version: 1.13
api-version: 1.16
author: "Blue (TBlueF / Lukas Rieger)"
website: "https://github.com/BlueMap-Minecraft"
commands: