Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-22 00:29:19 +00:00
Code Issues Releases Activity

Updated kyori.

Browse Source
This commit is contained in:
Vatuu
2022-06-09 12:51:33 +02:00
parent 39100a5011
commit c51172acbc
4 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@@ -133,9 +133,9 @@ dependencies {
// Shaded // Shaded
implementation 'com.dfsek:Paralithic:0.4.0' implementation 'com.dfsek:Paralithic:0.4.0'
implementation 'io.papermc:paperlib:1.0.5' implementation 'io.papermc:paperlib:1.0.5'
implementation "net.kyori:adventure-text-minimessage:4.2.0-SNAPSHOT" implementation "net.kyori:adventure-text-minimessage:4.11.0"
implementation 'net.kyori:adventure-platform-bukkit:4.0.1' // Dont upgrade yet implementation 'net.kyori:adventure-platform-bukkit:4.1.0'
implementation 'net.kyori:adventure-api:4.9.3' // Dont upgrade yet implementation 'net.kyori:adventure-api:4.11.0'
// Dynamically Loaded // Dynamically Loaded
implementation 'io.timeandspace:smoothie-map:2.0.2' implementation 'io.timeandspace:smoothie-map:2.0.2'
@@ -267,6 +267,10 @@ task specialSourceRemap(type: JavaExec)
tasks.compileJava.dependsOn(executeBuildTools) tasks.compileJava.dependsOn(executeBuildTools)
compileJava {
options.encoding = "UTF-8"
}
task setup() task setup()
{ {
group("iris") group("iris")

1
src/main/java/com/volmit/iris/Iris.java
View File

@@ -21,7 +21,6 @@ package com.volmit.iris;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import com.google.gson.stream.JsonReader;
import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.core.ServerConfigurator; import com.volmit.iris.core.ServerConfigurator;
import com.volmit.iris.core.link.*; import com.volmit.iris.core.link.*;

1
src/main/java/com/volmit/iris/core/commands/CommandObject.java
View File

@@ -18,7 +18,6 @@
package com.volmit.iris.core.commands; package com.volmit.iris.core.commands;
import com.mojang.datafixers.util.Pair;
import com.volmit.iris.Iris; import com.volmit.iris.Iris;
import com.volmit.iris.core.link.WorldEditLink; import com.volmit.iris.core.link.WorldEditLink;
import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.loader.IrisData;

24
src/main/java/com/volmit/iris/util/plugin/VolmitSender.java
View File

@@ -230,7 +230,7 @@ public class VolmitSender implements CommandSender {
Iris.audiences.player(player()).showTitle(Title.title( Iris.audiences.player(player()).showTitle(Title.title(
createComponent(title), createComponent(title),
createComponent(subtitle), 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) { public void sendProgress(double percent, String thing) {
@@ -260,43 +260,43 @@ public class VolmitSender implements CommandSender {
Iris.audiences.player(player()).showTitle(Title.title( Iris.audiences.player(player()).showTitle(Title.title(
createNoPrefixComponent(" "), createNoPrefixComponent(" "),
createNoPrefixComponent(subtitle), 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) { private Component createNoPrefixComponent(String message) {
if(!IrisSettings.get().getGeneral().canUseCustomColors(this)) { if(!IrisSettings.get().getGeneral().canUseCustomColors(this)) {
String t = C.translateAlternateColorCodes('&', MiniMessage.get().stripTokens(message)); String t = C.translateAlternateColorCodes('&', MiniMessage.miniMessage().stripTags(message));
return MiniMessage.get().parse(t); return MiniMessage.miniMessage().deserialize(t);
} }
String t = C.translateAlternateColorCodes('&', message); String t = C.translateAlternateColorCodes('&', message);
String a = C.aura(t, IrisSettings.get().getGeneral().getSpinh(), IrisSettings.get().getGeneral().getSpins(), IrisSettings.get().getGeneral().getSpinb(), 0.36); 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) { private Component createNoPrefixComponentNoProcessing(String message) {
return MiniMessage.get().parse(message); return MiniMessage.miniMessage().deserialize(message);
} }
private Component createComponent(String message) { private Component createComponent(String message) {
if(!IrisSettings.get().getGeneral().canUseCustomColors(this)) { if(!IrisSettings.get().getGeneral().canUseCustomColors(this)) {
String t = C.translateAlternateColorCodes('&', MiniMessage.get().stripTokens(getTag() + message)); String t = C.translateAlternateColorCodes('&', MiniMessage.miniMessage().stripTags(getTag() + message));
return MiniMessage.get().parse(t); return MiniMessage.miniMessage().deserialize(t);
} }
String t = C.translateAlternateColorCodes('&', getTag() + message); String t = C.translateAlternateColorCodes('&', getTag() + message);
String a = C.aura(t, IrisSettings.get().getGeneral().getSpinh(), IrisSettings.get().getGeneral().getSpins(), IrisSettings.get().getGeneral().getSpinb()); 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) { private Component createComponentRaw(String message) {
if(!IrisSettings.get().getGeneral().canUseCustomColors(this)) { if(!IrisSettings.get().getGeneral().canUseCustomColors(this)) {
String t = C.translateAlternateColorCodes('&', MiniMessage.get().stripTokens(getTag() + message)); String t = C.translateAlternateColorCodes('&', MiniMessage.miniMessage().stripTags(getTag() + message));
return MiniMessage.get().parse(t); return MiniMessage.miniMessage().deserialize(t);
} }
String t = C.translateAlternateColorCodes('&', getTag() + message); String t = C.translateAlternateColorCodes('&', getTag() + message);
return MiniMessage.get().parse(t); return MiniMessage.miniMessage().deserialize(t);
} }
public <T> void showWaiting(String passive, CompletableFuture<T> f) { public <T> void showWaiting(String passive, CompletableFuture<T> f) {