diff --git a/build.gradle b/build.gradle index e23c0a98d..ee9818e4a 100644 --- a/build.gradle +++ b/build.gradle @@ -133,9 +133,9 @@ dependencies { // Shaded implementation 'com.dfsek:Paralithic:0.4.0' implementation 'io.papermc:paperlib:1.0.5' - implementation "net.kyori:adventure-text-minimessage:4.2.0-SNAPSHOT" - implementation 'net.kyori:adventure-platform-bukkit:4.0.1' // Dont upgrade yet - implementation 'net.kyori:adventure-api:4.9.3' // Dont upgrade yet + implementation "net.kyori:adventure-text-minimessage:4.11.0" + implementation 'net.kyori:adventure-platform-bukkit:4.1.0' + implementation 'net.kyori:adventure-api:4.11.0' // Dynamically Loaded implementation 'io.timeandspace:smoothie-map:2.0.2' @@ -267,6 +267,10 @@ task specialSourceRemap(type: JavaExec) tasks.compileJava.dependsOn(executeBuildTools) +compileJava { + options.encoding = "UTF-8" +} + task setup() { group("iris") diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index f3216a1e0..2ab745545 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -21,7 +21,6 @@ package com.volmit.iris; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import com.google.gson.JsonParser; -import com.google.gson.stream.JsonReader; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.ServerConfigurator; import com.volmit.iris.core.link.*; diff --git a/src/main/java/com/volmit/iris/core/commands/CommandObject.java b/src/main/java/com/volmit/iris/core/commands/CommandObject.java index c58cab46c..4f6c2d15e 100644 --- a/src/main/java/com/volmit/iris/core/commands/CommandObject.java +++ b/src/main/java/com/volmit/iris/core/commands/CommandObject.java @@ -18,7 +18,6 @@ package com.volmit.iris.core.commands; -import com.mojang.datafixers.util.Pair; import com.volmit.iris.Iris; import com.volmit.iris.core.link.WorldEditLink; import com.volmit.iris.core.loader.IrisData; diff --git a/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java index 25c6b363b..2894593c5 100644 --- a/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java +++ b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java @@ -230,7 +230,7 @@ public class VolmitSender implements CommandSender { Iris.audiences.player(player()).showTitle(Title.title( createComponent(title), createComponent(subtitle), - Title.Times.of(Duration.ofMillis(i), Duration.ofMillis(s), Duration.ofMillis(o)))); + Title.Times.times(Duration.ofMillis(i), Duration.ofMillis(s), Duration.ofMillis(o)))); } public void sendProgress(double percent, String thing) { @@ -260,43 +260,43 @@ public class VolmitSender implements CommandSender { Iris.audiences.player(player()).showTitle(Title.title( createNoPrefixComponent(" "), createNoPrefixComponent(subtitle), - Title.Times.of(Duration.ofMillis(i), Duration.ofMillis(s), Duration.ofMillis(o)))); + Title.Times.times(Duration.ofMillis(i), Duration.ofMillis(s), Duration.ofMillis(o)))); } private Component createNoPrefixComponent(String message) { if(!IrisSettings.get().getGeneral().canUseCustomColors(this)) { - String t = C.translateAlternateColorCodes('&', MiniMessage.get().stripTokens(message)); - return MiniMessage.get().parse(t); + String t = C.translateAlternateColorCodes('&', MiniMessage.miniMessage().stripTags(message)); + return MiniMessage.miniMessage().deserialize(t); } String t = C.translateAlternateColorCodes('&', message); String a = C.aura(t, IrisSettings.get().getGeneral().getSpinh(), IrisSettings.get().getGeneral().getSpins(), IrisSettings.get().getGeneral().getSpinb(), 0.36); - return MiniMessage.get().parse(a); + return MiniMessage.miniMessage().deserialize(a); } private Component createNoPrefixComponentNoProcessing(String message) { - return MiniMessage.get().parse(message); + return MiniMessage.miniMessage().deserialize(message); } private Component createComponent(String message) { if(!IrisSettings.get().getGeneral().canUseCustomColors(this)) { - String t = C.translateAlternateColorCodes('&', MiniMessage.get().stripTokens(getTag() + message)); - return MiniMessage.get().parse(t); + String t = C.translateAlternateColorCodes('&', MiniMessage.miniMessage().stripTags(getTag() + message)); + return MiniMessage.miniMessage().deserialize(t); } String t = C.translateAlternateColorCodes('&', getTag() + message); String a = C.aura(t, IrisSettings.get().getGeneral().getSpinh(), IrisSettings.get().getGeneral().getSpins(), IrisSettings.get().getGeneral().getSpinb()); - return MiniMessage.get().parse(a); + return MiniMessage.miniMessage().deserialize(a); } private Component createComponentRaw(String message) { if(!IrisSettings.get().getGeneral().canUseCustomColors(this)) { - String t = C.translateAlternateColorCodes('&', MiniMessage.get().stripTokens(getTag() + message)); - return MiniMessage.get().parse(t); + String t = C.translateAlternateColorCodes('&', MiniMessage.miniMessage().stripTags(getTag() + message)); + return MiniMessage.miniMessage().deserialize(t); } String t = C.translateAlternateColorCodes('&', getTag() + message); - return MiniMessage.get().parse(t); + return MiniMessage.miniMessage().deserialize(t); } public void showWaiting(String passive, CompletableFuture f) {