diff --git a/sources/pom.xml b/sources/pom.xml index 4ea3f81be..0d910973f 100644 --- a/sources/pom.xml +++ b/sources/pom.xml @@ -1,12 +1,11 @@ 4.0.0 - com.destroystokyo.paper - paper + akarin jar 1.12.2-R0.1-SNAPSHOT - Paper - https://github.com/PaperMC/Paper + Akarin + https://github.com/Akarin-project/Akarin UTF-8 diff --git a/sources/src/main/java/io/akarin/server/mixin/core/MixinCraftServer.java b/sources/src/main/java/io/akarin/server/mixin/core/MixinCraftServer.java index 7a6a1d75a..19f7459f8 100644 --- a/sources/src/main/java/io/akarin/server/mixin/core/MixinCraftServer.java +++ b/sources/src/main/java/io/akarin/server/mixin/core/MixinCraftServer.java @@ -2,12 +2,13 @@ package io.akarin.server.mixin.core; import org.bukkit.craftbukkit.CraftServer; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Mutable; -import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Overwrite; @Mixin(value = CraftServer.class, remap = false) public class MixinCraftServer { - @Shadow @Mutable @Final private final String serverName = "Akarin"; // Paper -> Akarin + @Overwrite + public String getName() { + return "Akarin"; + } } diff --git a/sources/src/main/java/io/akarin/server/mixin/core/MixinMetrics.java b/sources/src/main/java/io/akarin/server/mixin/core/MixinMetrics.java index cc8f2780f..a50d29068 100644 --- a/sources/src/main/java/io/akarin/server/mixin/core/MixinMetrics.java +++ b/sources/src/main/java/io/akarin/server/mixin/core/MixinMetrics.java @@ -17,7 +17,7 @@ import com.destroystokyo.paper.Metrics.CustomChart; @Mixin(value = Metrics.class, remap = false) public class MixinMetrics { // The url to which the data is sent - bukkit/Torch (keep our old name) - @Shadow @Mutable @Final public static String URL = "https://bStats.org/submitData/bukkit"; + @Shadow @Mutable @Final public final static String URL = "https://bStats.org/submitData/bukkit"; // The name of the server software @Shadow @Final private String name; @@ -57,7 +57,6 @@ public class MixinMetrics { int onlineMode = Bukkit.getOnlineMode() ? 1 : 0; String bukkitVersion = org.bukkit.Bukkit.getVersion(); bukkitVersion = bukkitVersion.substring(bukkitVersion.indexOf("MC: ") + 4, bukkitVersion.length() - 1); - LogWrapper.logger.warn("Akarin debug: " + URL); JSONObject data = new JSONObject(); data.put("playerAmount", playerAmount); diff --git a/sources/src/main/resources/mixins.akarin.core.json b/sources/src/main/resources/mixins.akarin.core.json index 3a1b9e5c8..e9d003c03 100644 --- a/sources/src/main/resources/mixins.akarin.core.json +++ b/sources/src/main/resources/mixins.akarin.core.json @@ -11,6 +11,7 @@ "MixinMetrics", "MixinPaperConfig", + "MixinCraftServer", "MixinVersionCommand", "MixinMinecraftServer" ] diff --git a/work/Paper b/work/Paper index caedc8f27..e59eb37e0 160000 --- a/work/Paper +++ b/work/Paper @@ -1 +1 @@ -Subproject commit caedc8f27880512b2df9f7032cfbb4a5059cefb1 +Subproject commit e59eb37e0eeaf1d7ab2d6c9bbcd254384ff4c484