easy fork
This commit is contained in:
@@ -41,7 +41,7 @@ allprojects {
|
|||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
name = "githubPackage"
|
name = "githubPackage"
|
||||||
url = uri("https://maven.pkg.github.com/PlazmaMC/PlazmaBukkit")
|
url = uri("https://maven.pkg.github.com/${property("projectRepo")}")
|
||||||
|
|
||||||
credentials {
|
credentials {
|
||||||
username = System.getenv("GITHUB_USERNAME")
|
username = System.getenv("GITHUB_USERNAME")
|
||||||
@@ -85,14 +85,12 @@ subprojects {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven("https://jitpack.io")
|
maven("https://jitpack.io")
|
||||||
maven("https://papermc.io/repo/repository/maven-public/")
|
maven("https://papermc.io/repo/repository/maven-public/")
|
||||||
maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots/") {
|
maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
|
||||||
name = "sonatype-oss-snapshots"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
paperweight {
|
paperweight {
|
||||||
serverProject = project(":plazma-server")
|
serverProject = project(":${property("projectName").toString().lowercase()}-server")
|
||||||
|
|
||||||
remapRepo = "https://repo.papermc.io/repository/maven-public/"
|
remapRepo = "https://repo.papermc.io/repository/maven-public/"
|
||||||
decompileRepo = "https://repo.papermc.io/repository/maven-public/"
|
decompileRepo = "https://repo.papermc.io/repository/maven-public/"
|
||||||
@@ -100,10 +98,10 @@ paperweight {
|
|||||||
usePaperUpstream(providers.gradleProperty("paperCommit")) {
|
usePaperUpstream(providers.gradleProperty("paperCommit")) {
|
||||||
withPaperPatcher {
|
withPaperPatcher {
|
||||||
apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
|
apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
|
||||||
apiOutputDir.set(layout.projectDirectory.dir("Plazma-API"))
|
apiOutputDir.set(layout.projectDirectory.dir("${property("projectName")}-API"))
|
||||||
|
|
||||||
serverPatchDir.set(layout.projectDirectory.dir("patches/server"))
|
serverPatchDir.set(layout.projectDirectory.dir("patches/server"))
|
||||||
serverOutputDir.set(layout.projectDirectory.dir("Plazma-Server"))
|
serverOutputDir.set(layout.projectDirectory.dir("${property("projectName")}-Server"))
|
||||||
}
|
}
|
||||||
|
|
||||||
patchTasks.register("generatedApi") {
|
patchTasks.register("generatedApi") {
|
||||||
@@ -117,7 +115,7 @@ paperweight {
|
|||||||
isBareDirectory = true
|
isBareDirectory = true
|
||||||
upstreamDirPath = "Paper-MojangAPI"
|
upstreamDirPath = "Paper-MojangAPI"
|
||||||
patchDir = layout.projectDirectory.dir("patches/mojang-api")
|
patchDir = layout.projectDirectory.dir("patches/mojang-api")
|
||||||
outputDir = layout.projectDirectory.dir("Plazma-MojangAPI")
|
outputDir = layout.projectDirectory.dir("${property("projectName")}-MojangAPI")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -148,11 +146,11 @@ tasks {
|
|||||||
}
|
}
|
||||||
|
|
||||||
generateDevelopmentBundle {
|
generateDevelopmentBundle {
|
||||||
apiCoordinates.set("org.plazmamc.plazma:plazma-api")
|
apiCoordinates.set("${group}:${property("projectName").toString().lowercase()}-api")
|
||||||
mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi")
|
mojangApiCoordinates.set("${group}:${property("projectName").toString().lowercase()}-mojangapi")
|
||||||
libraryRepositories.addAll(
|
libraryRepositories.addAll(
|
||||||
"https://repo.maven.apache.org/maven2/",
|
"https://repo.maven.apache.org/maven2/",
|
||||||
"https://maven.pkg.github.com/PlazmaMC/Plazma",
|
"https://maven.pkg.github.com/${property("projectRepo")}",
|
||||||
"https://papermc.io/repo/repository/maven-public/"
|
"https://papermc.io/repo/repository/maven-public/"
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -160,7 +158,7 @@ tasks {
|
|||||||
clean {
|
clean {
|
||||||
doLast {
|
doLast {
|
||||||
projectDir.resolve(".gradle/caches").deleteRecursively()
|
projectDir.resolve(".gradle/caches").deleteRecursively()
|
||||||
listOf("Plazma-API", "Plazma-MojangAPI", "Plazma-Server", "paper-api-generator", "run").forEach {
|
listOf("${property("projectName")}-API", "${property("projectName")}-MojangAPI", "${property("projectName")}-Server", "paper-api-generator", "run").forEach {
|
||||||
projectDir.resolve(it).deleteRecursively()
|
projectDir.resolve(it).deleteRecursively()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,9 @@ paper.runDisableWatchdog = true
|
|||||||
org.plazmamc.alwaysuptodate.paper.repository = https://github.com/PaperMC/Paper
|
org.plazmamc.alwaysuptodate.paper.repository = https://github.com/PaperMC/Paper
|
||||||
org.plazmamc.alwaysuptodate.purpur.repository = https://github.com/PurpurMC/Purpur
|
org.plazmamc.alwaysuptodate.purpur.repository = https://github.com/PurpurMC/Purpur
|
||||||
|
|
||||||
|
projectName = Plazma
|
||||||
|
projectRepo = PlazmaMC/PlazmaBukkit
|
||||||
|
|
||||||
version = 1.20.6-R0.1-SNAPSHOT
|
version = 1.20.6-R0.1-SNAPSHOT
|
||||||
mcVersion = 1.20.6
|
mcVersion = 1.20.6
|
||||||
jdkVersion = 21
|
jdkVersion = 21
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||||
index a278ee93d7001e8dc7fd2f5409c2f528c637cb2f..a00cf1659f1fd9dff3ff34561d78732645b51dfb 100644
|
index e60be45e2513ea49a8605682c3d80835df4c58ee..4ca37af5e5c68c8e8dbd0cdf9cc92285deecf269 100644
|
||||||
--- a/build.gradle.kts
|
--- a/build.gradle.kts
|
||||||
+++ b/build.gradle.kts
|
+++ b/build.gradle.kts
|
||||||
@@ -9,7 +9,7 @@ java {
|
@@ -9,7 +9,7 @@ java {
|
||||||
@@ -13,7 +13,7 @@ index a278ee93d7001e8dc7fd2f5409c2f528c637cb2f..a00cf1659f1fd9dff3ff34561d787326
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
- implementation(project(":paper-api"))
|
- implementation(project(":paper-api"))
|
||||||
+ implementation(project(":plazma-api")) // Plazma - Rebrand
|
+ implementation(project(":${property("projectName").toString().lowercase()}-api")) // Plazma - Rebrand
|
||||||
api("com.mojang:brigadier:1.0.18")
|
api("com.mojang:brigadier:1.0.18")
|
||||||
|
|
||||||
compileOnly("it.unimi.dsi:fastutil:8.5.6")
|
compileOnly("it.unimi.dsi:fastutil:8.5.6")
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||||
index feaff0406fa47ffb265ce316b057fb52aa367870..902c2eeedeeced8135ec97f64f08420c0996731b 100644
|
index feaff0406fa47ffb265ce316b057fb52aa367870..e6b6d1f26fd673f35f66a09a64c83810e092e757 100644
|
||||||
--- a/build.gradle.kts
|
--- a/build.gradle.kts
|
||||||
+++ b/build.gradle.kts
|
+++ b/build.gradle.kts
|
||||||
@@ -12,12 +12,10 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
|
@@ -12,12 +12,10 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
|
||||||
@@ -19,8 +19,8 @@ index feaff0406fa47ffb265ce316b057fb52aa367870..902c2eeedeeced8135ec97f64f08420c
|
|||||||
- }
|
- }
|
||||||
- // Purpur end
|
- // Purpur end
|
||||||
+ // Plazma start - Rebrand
|
+ // Plazma start - Rebrand
|
||||||
+ implementation(project(":plazma-api"))
|
+ implementation(project(":${property("projectName").toString().lowercase()}-api"))
|
||||||
+ implementation(project(":plazma-mojangapi"))
|
+ implementation(project(":${property("projectName").toString().lowercase()}-mojangapi"))
|
||||||
+ // Plazma end
|
+ // Plazma end
|
||||||
|
|
||||||
// Plazma start - Use Gradle Version Catalogs
|
// Plazma start - Use Gradle Version Catalogs
|
||||||
@@ -30,12 +30,12 @@ index feaff0406fa47ffb265ce316b057fb52aa367870..902c2eeedeeced8135ec97f64f08420c
|
|||||||
"Main-Class" to "org.bukkit.craftbukkit.Main",
|
"Main-Class" to "org.bukkit.craftbukkit.Main",
|
||||||
"Implementation-Title" to "CraftBukkit",
|
"Implementation-Title" to "CraftBukkit",
|
||||||
- "Implementation-Version" to "git-Purpur-$implementationVersion", // Pufferfish // Purpur
|
- "Implementation-Version" to "git-Purpur-$implementationVersion", // Pufferfish // Purpur
|
||||||
+ "Implementation-Version" to "git-Plazma-$implementationVersion", // Pufferfish // Purpur // Plazma - Setup Gradle Project
|
+ "Implementation-Version" to "git-${property("projectName")}-$implementationVersion", // Pufferfish // Purpur // Plazma - Setup Gradle Project
|
||||||
"Implementation-Vendor" to date, // Paper
|
"Implementation-Vendor" to date, // Paper
|
||||||
"Specification-Title" to "Bukkit",
|
"Specification-Title" to "Bukkit",
|
||||||
"Specification-Version" to project.version,
|
"Specification-Version" to project.version,
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
|
diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
|
||||||
index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..1de03b16c513d83550077bab46b52ae6e40eb98e 100644
|
index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..218d3a4147cab29937ad67a963e21ac1730daaa0 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/Metrics.java
|
--- a/src/main/java/com/destroystokyo/paper/Metrics.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
|
+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
|
||||||
@@ -593,7 +593,7 @@ public class Metrics {
|
@@ -593,7 +593,7 @@ public class Metrics {
|
||||||
@@ -52,48 +52,52 @@ index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..1de03b16c513d83550077bab46b52ae6
|
|||||||
metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
|
metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
|
||||||
metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() ? "bungee" : "offline"))); // Purpur
|
metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() ? "bungee" : "offline"))); // Purpur
|
||||||
- metrics.addCustomChart(new Metrics.SimplePie("purpur_version", () -> (org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() != null) ? org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() : "unknown")); // Purpur
|
- metrics.addCustomChart(new Metrics.SimplePie("purpur_version", () -> (org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() != null) ? org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() : "unknown")); // Purpur
|
||||||
+ metrics.addCustomChart(new Metrics.SimplePie("plazma_version", () -> (org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() != null) ? org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() : "unknown")); // Purpur // Plazma // Plazma - Rebrand
|
+ metrics.addCustomChart(new Metrics.SimplePie(metrics.name.toLowerCase(Locale.ROOT) + "_version", () -> (org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() != null) ? org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion() : "unknown")); // Purpur // Plazma // Plazma - Rebrand
|
||||||
|
|
||||||
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
|
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
|
||||||
Map<String, Map<String, Integer>> map = new HashMap<>();
|
Map<String, Map<String, Integer>> map = new HashMap<>();
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
||||||
index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..80159d9c8432f21aa774d3ade9e2ae84b2d5261c 100644
|
index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..0a846802f053c545992763e0447e15565204e764 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
||||||
@@ -20,10 +20,11 @@ import java.util.stream.StreamSupport;
|
@@ -20,10 +20,15 @@ import java.util.stream.StreamSupport;
|
||||||
public class PaperVersionFetcher implements VersionFetcher {
|
public class PaperVersionFetcher implements VersionFetcher {
|
||||||
private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end
|
private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end
|
||||||
// Purpur start
|
// Purpur start
|
||||||
- private static final String DOWNLOAD_PAGE = "https://purpurmc.org/downloads";
|
- private static final String DOWNLOAD_PAGE = "https://purpurmc.org/downloads";
|
||||||
+ private static final String DOWNLOAD_PAGE = "https://github.com/PlazmaMC/Plazma/releases"; // Plazma // Plazma - Rebrand
|
|
||||||
private static int distance = -2; public int distance() { return distance; }
|
private static int distance = -2; public int distance() { return distance; }
|
||||||
// Purpur end
|
// Purpur end
|
||||||
private static @Nullable String mcVer;
|
private static @Nullable String mcVer;
|
||||||
+ public static final boolean DEVELOPMENT = false; // Plazma
|
+ // Plazma start - Rebranding
|
||||||
|
+ private static final String PROJECT_NAME = "Plazma";
|
||||||
|
+ private static final String PROJECT_REPO = "PlazmaMC/PlazmaBukkit";
|
||||||
|
+ private static final String DOWNLOAD_PAGE = "https://docs.plazmamc.org/plazma/about/downloads";
|
||||||
|
+ public static final boolean DEVELOPMENT = false;
|
||||||
|
+ // Plazma end
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public long getCacheTime() {
|
public long getCacheTime() {
|
||||||
@@ -33,8 +34,8 @@ public class PaperVersionFetcher implements VersionFetcher {
|
@@ -33,8 +38,8 @@ public class PaperVersionFetcher implements VersionFetcher {
|
||||||
@Nonnull
|
@Nonnull
|
||||||
@Override
|
@Override
|
||||||
public Component getVersionMessage(@Nonnull String serverVersion) {
|
public Component getVersionMessage(@Nonnull String serverVersion) {
|
||||||
- String[] parts = serverVersion.substring("git-Purpur-".length()).split("[-\\s]"); // Purpur
|
- String[] parts = serverVersion.substring("git-Purpur-".length()).split("[-\\s]"); // Purpur
|
||||||
- final Component updateMessage = getUpdateStatusMessage("PurpurMC/Purpur", "ver/" + getMinecraftVersion(), parts[0]); // Purpur
|
- final Component updateMessage = getUpdateStatusMessage("PurpurMC/Purpur", "ver/" + getMinecraftVersion(), parts[0]); // Purpur
|
||||||
+ String[] parts = serverVersion.substring("git-Plazma-".length()).split("[-\\s]"); // Purpur // Plazma // Plazma - Rebrand
|
+ String[] parts = serverVersion.substring("git--".length() + PROJECT_NAME.length()).split("[-\\s]"); // Purpur // Plazma - Rebrand
|
||||||
+ final Component updateMessage = getUpdateStatusMessage("PlazmaMC/PlazmaBukkit", (DEVELOPMENT ? "dev/" : "ver/") + getMinecraftVersion(), parts[0]); // Purpur // Plazma // Plazma - Rebrand
|
+ final Component updateMessage = getUpdateStatusMessage(PROJECT_REPO, (DEVELOPMENT ? "dev/" : "ver/") + getMinecraftVersion(), parts[0]); // Purpur // Plazma - Rebrand
|
||||||
final Component history = getHistory();
|
final Component history = getHistory();
|
||||||
|
|
||||||
return history != null ? Component.join(net.kyori.adventure.text.JoinConfiguration.separator(Component.newline()), history, updateMessage) : updateMessage; // Purpur
|
return history != null ? Component.join(net.kyori.adventure.text.JoinConfiguration.separator(Component.newline()), history, updateMessage) : updateMessage; // Purpur
|
||||||
@@ -47,7 +48,7 @@ public class PaperVersionFetcher implements VersionFetcher {
|
@@ -47,7 +52,7 @@ public class PaperVersionFetcher implements VersionFetcher {
|
||||||
String result = matcher.group();
|
String result = matcher.group();
|
||||||
mcVer = result.substring(0, result.length() - 2); // strip 'R' anchor and trailing '-'
|
mcVer = result.substring(0, result.length() - 2); // strip 'R' anchor and trailing '-'
|
||||||
} else {
|
} else {
|
||||||
- org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to Purpur!"); // Purpur
|
- org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to Purpur!"); // Purpur
|
||||||
+ org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to Plazma!"); // Purpur // Plazma // Plazma - Rebrand
|
+ org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to " + PROJECT_NAME + "!"); // Purpur // Plazma // Plazma - Rebrand
|
||||||
org.bukkit.Bukkit.getLogger().warning("Pattern: " + VER_PATTERN.toString());
|
org.bukkit.Bukkit.getLogger().warning("Pattern: " + VER_PATTERN.toString());
|
||||||
org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
|
org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
|
||||||
}
|
}
|
||||||
@@ -57,6 +58,7 @@ public class PaperVersionFetcher implements VersionFetcher {
|
@@ -57,6 +62,7 @@ public class PaperVersionFetcher implements VersionFetcher {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) {
|
private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) {
|
||||||
@@ -101,7 +105,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..80159d9c8432f21aa774d3ade9e2ae84
|
|||||||
//int distance; // Purpur - use field
|
//int distance; // Purpur - use field
|
||||||
try {
|
try {
|
||||||
int jenkinsBuild = Integer.parseInt(versionInfo);
|
int jenkinsBuild = Integer.parseInt(versionInfo);
|
||||||
@@ -65,6 +67,11 @@ public class PaperVersionFetcher implements VersionFetcher {
|
@@ -65,6 +71,11 @@ public class PaperVersionFetcher implements VersionFetcher {
|
||||||
versionInfo = versionInfo.replace("\"", "");
|
versionInfo = versionInfo.replace("\"", "");
|
||||||
distance = fetchDistanceFromGitHub(repo, branch, versionInfo);
|
distance = fetchDistanceFromGitHub(repo, branch, versionInfo);
|
||||||
}
|
}
|
||||||
@@ -113,7 +117,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..80159d9c8432f21aa774d3ade9e2ae84
|
|||||||
|
|
||||||
switch (distance) {
|
switch (distance) {
|
||||||
case -1:
|
case -1:
|
||||||
@@ -83,6 +90,7 @@ public class PaperVersionFetcher implements VersionFetcher {
|
@@ -83,6 +94,7 @@ public class PaperVersionFetcher implements VersionFetcher {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -121,7 +125,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..80159d9c8432f21aa774d3ade9e2ae84
|
|||||||
private static int fetchDistanceFromSiteApi(int jenkinsBuild, @Nullable String siteApiVersion) {
|
private static int fetchDistanceFromSiteApi(int jenkinsBuild, @Nullable String siteApiVersion) {
|
||||||
if (siteApiVersion == null) { return -1; }
|
if (siteApiVersion == null) { return -1; }
|
||||||
try {
|
try {
|
||||||
@@ -102,6 +110,7 @@ public class PaperVersionFetcher implements VersionFetcher {
|
@@ -102,6 +114,7 @@ public class PaperVersionFetcher implements VersionFetcher {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -160,24 +164,32 @@ index 96142deb42700f888ea08689ab62c27ef2b881fd..44dda308913d8d25e53d8d0fc7e50c0c
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java
|
diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java
|
||||||
index c366d84518979e842a6f10f969a5951539ecac93..570b379596cc3088745d3f42b3d917f94c2d9c29 100644
|
index c366d84518979e842a6f10f969a5951539ecac93..246c5d1abc797b7679820b54ab0b4bafd858ce42 100644
|
||||||
--- a/src/main/java/net/minecraft/CrashReport.java
|
--- a/src/main/java/net/minecraft/CrashReport.java
|
||||||
+++ b/src/main/java/net/minecraft/CrashReport.java
|
+++ b/src/main/java/net/minecraft/CrashReport.java
|
||||||
@@ -37,7 +37,7 @@ public class CrashReport {
|
@@ -22,6 +22,7 @@ import org.slf4j.Logger;
|
||||||
|
|
||||||
|
public class CrashReport {
|
||||||
|
|
||||||
|
+ private static final String PROJECT_NAME = "Plazma"; // Plazma - Rebranding
|
||||||
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss", Locale.ROOT);
|
||||||
|
private final String title;
|
||||||
|
@@ -37,7 +38,7 @@ public class CrashReport {
|
||||||
io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(cause); // Paper
|
io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(cause); // Paper
|
||||||
this.title = message;
|
this.title = message;
|
||||||
this.exception = cause;
|
this.exception = cause;
|
||||||
- this.systemReport.setDetail("CraftBukkit Information", new org.bukkit.craftbukkit.CraftCrashReport()); // CraftBukkit
|
- this.systemReport.setDetail("CraftBukkit Information", new org.bukkit.craftbukkit.CraftCrashReport()); // CraftBukkit
|
||||||
+ this.systemReport.setDetail("Plazma Information", new org.bukkit.craftbukkit.CraftCrashReport()); // CraftBukkit // Plazma - Rebrand
|
+ this.systemReport.setDetail(PROJECT_NAME + " Information", new org.bukkit.craftbukkit.CraftCrashReport()); // CraftBukkit // Plazma - Rebranding
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getTitle() {
|
public String getTitle() {
|
||||||
@@ -127,7 +127,7 @@ public class CrashReport {
|
@@ -127,7 +128,7 @@ public class CrashReport {
|
||||||
stringbuilder.append("---- Minecraft Crash Report ----\n");
|
stringbuilder.append("---- Minecraft Crash Report ----\n");
|
||||||
// Purpur start
|
// Purpur start
|
||||||
stringbuilder.append("// ");
|
stringbuilder.append("// ");
|
||||||
- stringbuilder.append("// DO NOT REPORT THIS TO PAPER! REPORT TO PURPUR INSTEAD!");
|
- stringbuilder.append("// DO NOT REPORT THIS TO PAPER! REPORT TO PURPUR INSTEAD!");
|
||||||
+ stringbuilder.append("// DO NOT REPORT THIS TO PAPER OR PURPUR! REPORT TO PLAZMA INSTEAD!"); // Plazma - Rebrand
|
+ stringbuilder.append("// DO NOT REPORT THIS TO PAPER OR PURPUR! REPORT TO " + PROJECT_NAME.toUpperCase(Locale.ROOT) + " INSTEAD!"); // Plazma - Rebranding
|
||||||
// Purpur end
|
// Purpur end
|
||||||
stringbuilder.append("// ");
|
stringbuilder.append("// ");
|
||||||
stringbuilder.append(CrashReport.getErrorComment());
|
stringbuilder.append(CrashReport.getErrorComment());
|
||||||
@@ -222,35 +234,44 @@ index 411f1f8c6be072cfc5ba88cbec38dbc4300a41d1..0fb3eeab083a0b1e9b495bd2c5c556fc
|
|||||||
Main.LOGGER.error(awtException);
|
Main.LOGGER.error(awtException);
|
||||||
return;
|
return;
|
||||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
index dfeae138e830e95ab823b6349a91160b02622208..c7f09b129920b95d2885dee469dc0bdacd49b8b7 100644
|
index dfeae138e830e95ab823b6349a91160b02622208..b797f719acb2258bee1cc93394561f14a9df5296 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -496,8 +496,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -198,6 +198,8 @@ import co.aikar.timings.MinecraftTimings; // Paper
|
||||||
|
public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements ServerInfo, CommandSource, AutoCloseable {
|
||||||
|
|
||||||
|
private static MinecraftServer SERVER; // Paper
|
||||||
|
+ private static final String BRANDING = "Plazma"; // Plazma - Rebranding
|
||||||
|
+ private static final String GETTING_STARTED = "https://docs.plazmamc.org/plazma/administration/getting-started"; // Plazma - Rebranding
|
||||||
|
public static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
public static final net.kyori.adventure.text.logger.slf4j.ComponentLogger COMPONENT_LOGGER = net.kyori.adventure.text.logger.slf4j.ComponentLogger.logger(LOGGER.getName()); // Paper
|
||||||
|
public static final String VANILLA_BRAND = "vanilla";
|
||||||
|
@@ -496,8 +498,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
|
|
||||||
if (!newWorld.isDirectory() && oldWorld.isDirectory() && oldLevelDat.isFile()) {
|
if (!newWorld.isDirectory() && oldWorld.isDirectory() && oldLevelDat.isFile()) {
|
||||||
MinecraftServer.LOGGER.info("---- Migration of old " + worldType + " folder required ----");
|
MinecraftServer.LOGGER.info("---- Migration of old " + worldType + " folder required ----");
|
||||||
- MinecraftServer.LOGGER.info("Unfortunately due to the way that Minecraft implemented multiworld support in 1.6, Bukkit requires that you move your " + worldType + " folder to a new location in order to operate correctly.");
|
- MinecraftServer.LOGGER.info("Unfortunately due to the way that Minecraft implemented multiworld support in 1.6, Bukkit requires that you move your " + worldType + " folder to a new location in order to operate correctly.");
|
||||||
- MinecraftServer.LOGGER.info("We will move this folder for you, but it will mean that you need to move it back should you wish to stop using Bukkit in the future.");
|
- MinecraftServer.LOGGER.info("We will move this folder for you, but it will mean that you need to move it back should you wish to stop using Bukkit in the future.");
|
||||||
+ MinecraftServer.LOGGER.info("Unfortunately due to the way that Minecraft implemented multiworld support in 1.6, Plazma requires that you move your " + worldType + " folder to a new location in order to operate correctly."); // Plazma - Rebrand
|
+ MinecraftServer.LOGGER.info("Unfortunately due to the way that Minecraft implemented multiworld support in 1.6, " + BRANDING + " requires that you move your " + worldType + " folder to a new location in order to operate correctly."); // Plazma - Rebrand
|
||||||
+ MinecraftServer.LOGGER.info("We will move this folder for you, but it will mean that you need to move it back should you wish to stop using Plazma in the future."); // Plazma - Rebrand
|
+ MinecraftServer.LOGGER.info("We will move this folder for you, but it will mean that you need to move it back should you wish to stop using " + BRANDING + " in the future."); // Plazma - Rebrand
|
||||||
MinecraftServer.LOGGER.info("Attempting to move " + oldWorld + " to " + newWorld + "...");
|
MinecraftServer.LOGGER.info("Attempting to move " + oldWorld + " to " + newWorld + "...");
|
||||||
|
|
||||||
if (newWorld.exists()) {
|
if (newWorld.exists()) {
|
||||||
@@ -963,7 +963,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -963,7 +965,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
shutdownThread = Thread.currentThread();
|
shutdownThread = Thread.currentThread();
|
||||||
org.spigotmc.WatchdogThread.doStop(); // Paper
|
org.spigotmc.WatchdogThread.doStop(); // Paper
|
||||||
if (!isSameThread()) {
|
if (!isSameThread()) {
|
||||||
- MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PURPUR)"); // Purpur
|
- MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PURPUR)"); // Purpur
|
||||||
+ MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PLAZMA)"); // Purpur // Plazma - Rebrand
|
+ MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO " + BRANDING.toUpperCase(Locale.ROOT) + ")"); // Purpur // Plazma - Rebrand
|
||||||
while (this.getRunningThread().isAlive()) {
|
while (this.getRunningThread().isAlive()) {
|
||||||
this.getRunningThread().stop();
|
this.getRunningThread().stop();
|
||||||
try {
|
try {
|
||||||
@@ -1183,7 +1183,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -1183,7 +1185,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
LOGGER.info("*************************************************************************************");
|
LOGGER.info("*************************************************************************************");
|
||||||
LOGGER.info("This is the first time you're starting this server.");
|
LOGGER.info("This is the first time you're starting this server.");
|
||||||
LOGGER.info("It's recommended you read our 'Getting Started' documentation for guidance.");
|
LOGGER.info("It's recommended you read our 'Getting Started' documentation for guidance.");
|
||||||
- LOGGER.info("View this and more helpful information here: https://docs.papermc.io/paper/next-steps");
|
- LOGGER.info("View this and more helpful information here: https://docs.papermc.io/paper/next-steps");
|
||||||
+ LOGGER.info("View this and more helpful information here: https://docs.plazmamc.org/plazma/administration/getting-started"); // Plazma - Rebrand
|
+ LOGGER.info("View this and more helpful information here: " + GETTING_STARTED); // Plazma - Rebrand
|
||||||
LOGGER.info("*************************************************************************************");
|
LOGGER.info("*************************************************************************************");
|
||||||
}
|
}
|
||||||
// Paper end - Add onboarding message for initial server start
|
// Paper end - Add onboarding message for initial server start
|
||||||
@@ -287,36 +308,59 @@ index 842f382de43df5d5c321422372ec30ccdd7859d7..d43ebcf4448240f86eca1a4127b53485
|
|||||||
public final boolean enforceWhitelist = this.get("enforce-whitelist", false);
|
public final boolean enforceWhitelist = this.get("enforce-whitelist", false);
|
||||||
public final Difficulty difficulty;
|
public final Difficulty difficulty;
|
||||||
diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
|
diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
|
||||||
index 8f74c2ec5252b6265549589310d742337c91cb2c..e34c3d00887240cc0f78f6b95da4116a22438626 100644
|
index 8f74c2ec5252b6265549589310d742337c91cb2c..6a6a772c1d0bc9b4889014407454a89120399351 100644
|
||||||
--- a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
|
--- a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
|
||||||
+++ b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
|
+++ b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java
|
||||||
@@ -56,7 +56,7 @@ public class MinecraftServerGui extends JComponent {
|
@@ -37,8 +37,11 @@ public class MinecraftServerGui extends JComponent {
|
||||||
|
|
||||||
|
private static final Font MONOSPACED = new Font("Monospaced", 0, 12);
|
||||||
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
|
- private static final String TITLE = "Minecraft server";
|
||||||
|
- private static final String SHUTDOWN_TITLE = "Minecraft server - shutting down!";
|
||||||
|
+ // Plazma start - Rebranding
|
||||||
|
+ private static final String TITLE = "Plazma Minecraft server";
|
||||||
|
+ private static final String SHUTDOWN_TITLE = "Plazma Minecraft server - shutting down!";
|
||||||
|
+ private static final String GETTING_STARTED = "https://docs.plazmamc.org/plazma/administration/getting-started";
|
||||||
|
+ // Plazma end - Rebranding
|
||||||
|
private final DedicatedServer server;
|
||||||
|
private Thread logAppenderThread;
|
||||||
|
private final Collection<Runnable> finalizers = Lists.newArrayList();
|
||||||
|
@@ -56,7 +59,7 @@ public class MinecraftServerGui extends JComponent {
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
- final JFrame jframe = new JFrame("Purpur Minecraft server"); // Purpur
|
- final JFrame jframe = new JFrame("Purpur Minecraft server"); // Purpur
|
||||||
+ final JFrame jframe = new JFrame("Plazma Minecraft server"); // Purpur // Plazma - Rebrand
|
+ final JFrame jframe = new JFrame(TITLE); // Purpur // Plazma - Rebrand
|
||||||
final MinecraftServerGui servergui = new MinecraftServerGui(server);
|
final MinecraftServerGui servergui = new MinecraftServerGui(server);
|
||||||
|
|
||||||
jframe.setDefaultCloseOperation(2);
|
jframe.setDefaultCloseOperation(2);
|
||||||
@@ -64,7 +64,7 @@ public class MinecraftServerGui extends JComponent {
|
@@ -64,7 +67,7 @@ public class MinecraftServerGui extends JComponent {
|
||||||
jframe.pack();
|
jframe.pack();
|
||||||
jframe.setLocationRelativeTo((Component) null);
|
jframe.setLocationRelativeTo((Component) null);
|
||||||
jframe.setVisible(true);
|
jframe.setVisible(true);
|
||||||
- jframe.setName("Purpur Minecraft server"); // Paper - Improve ServerGUI // Purpur
|
- jframe.setName("Purpur Minecraft server"); // Paper - Improve ServerGUI // Purpur
|
||||||
+ jframe.setName("Plazma Minecraft server"); // Paper - Improve ServerGUI // Purpur // Plazma - Rebrand
|
+ jframe.setName(TITLE); // Paper - Improve ServerGUI // Purpur // Plazma - Rebrand
|
||||||
|
|
||||||
// Paper start - Improve ServerGUI
|
// Paper start - Improve ServerGUI
|
||||||
try {
|
try {
|
||||||
@@ -76,7 +76,7 @@ public class MinecraftServerGui extends JComponent {
|
@@ -76,7 +79,7 @@ public class MinecraftServerGui extends JComponent {
|
||||||
jframe.addWindowListener(new WindowAdapter() {
|
jframe.addWindowListener(new WindowAdapter() {
|
||||||
public void windowClosing(WindowEvent windowevent) {
|
public void windowClosing(WindowEvent windowevent) {
|
||||||
if (!servergui.isClosing.getAndSet(true)) {
|
if (!servergui.isClosing.getAndSet(true)) {
|
||||||
- jframe.setTitle("Purpur Minecraft server - shutting down!"); // Purpur
|
- jframe.setTitle("Purpur Minecraft server - shutting down!"); // Purpur
|
||||||
+ jframe.setTitle("Plazma Minecraft server - shutting down!"); // Purpur // Plazma - Rebrand
|
+ jframe.setTitle(SHUTDOWN_TITLE); // Purpur // Plazma - Rebrand
|
||||||
server.halt(true);
|
server.halt(true);
|
||||||
servergui.runFinalizers();
|
servergui.runFinalizers();
|
||||||
}
|
}
|
||||||
|
@@ -123,7 +126,7 @@ public class MinecraftServerGui extends JComponent {
|
||||||
|
|
||||||
|
// Paper start - Add onboarding message for initial server start
|
||||||
|
private JComponent buildOnboardingPanel() {
|
||||||
|
- String onboardingLink = "https://docs.papermc.io/paper/next-steps";
|
||||||
|
+ String onboardingLink = GETTING_STARTED; // Plazma - Rebranding
|
||||||
|
JPanel jPanel = new JPanel();
|
||||||
|
|
||||||
|
javax.swing.JLabel jLabel = new javax.swing.JLabel("If you need help setting up your server you can visit:");
|
||||||
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
|
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
|
||||||
index f6e3b745fc417354380d4a969f83aee430bad785..ce0686759f0c32e9ffcb26f99503215a49873b91 100644
|
index f6e3b745fc417354380d4a969f83aee430bad785..ce0686759f0c32e9ffcb26f99503215a49873b91 100644
|
||||||
--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
|
--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
|
||||||
@@ -446,48 +490,66 @@ index f49108ed94f7787347c5e0a721646083d6dffafc..9311fcb675d20ee77d225e3cffe1d6ce
|
|||||||
serverModName = getString("settings.server-mod-name", serverModName);
|
serverModName = getString("settings.server-mod-name", serverModName);
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
|
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
|
||||||
index a353eb9f45af7b7f9bfd92a4a89403335b841840..29a4709c1085d133bd7753ac9744f6c9701ac345 100644
|
index a353eb9f45af7b7f9bfd92a4a89403335b841840..effcdfcc5d817e2c4b77862978ab8545068bc0c8 100644
|
||||||
--- a/src/main/java/org/spigotmc/WatchdogThread.java
|
--- a/src/main/java/org/spigotmc/WatchdogThread.java
|
||||||
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
|
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
|
||||||
@@ -155,14 +155,14 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
|
@@ -11,6 +11,8 @@ import org.bukkit.Bukkit;
|
||||||
|
public final class WatchdogThread extends io.papermc.paper.util.TickThread // Paper - rewrite chunk system
|
||||||
|
{
|
||||||
|
|
||||||
|
+ private static final String BRANDING = "Plazma"; // Plazma - Rebranding
|
||||||
|
+ private static final String REPOSITORY = "https://git.plazmamc.org/1.20.6"; // Plazma - Rebranding
|
||||||
|
public static final boolean DISABLE_WATCHDOG = Boolean.getBoolean("disable.watchdog"); // Paper
|
||||||
|
private static WatchdogThread instance;
|
||||||
|
private long timeoutTime;
|
||||||
|
@@ -96,7 +98,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
|
||||||
|
|
||||||
|
private WatchdogThread(long timeoutTime, boolean restart)
|
||||||
|
{
|
||||||
|
- super( "Watchdog Thread" ); // Purpur - use a generic name
|
||||||
|
+ super( BRANDING + " Watchdog Thread" ); // Purpur - use a generic name // Plazma - Rebranding; nah we dont
|
||||||
|
this.timeoutTime = timeoutTime;
|
||||||
|
this.restart = restart;
|
||||||
|
earlyWarningEvery = Math.min(io.papermc.paper.configuration.GlobalConfiguration.get().watchdog.earlyWarningEvery, timeoutTime); // Paper
|
||||||
|
@@ -155,14 +157,14 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
|
||||||
if (isLongTimeout) {
|
if (isLongTimeout) {
|
||||||
// Paper end
|
// Paper end
|
||||||
log.log( Level.SEVERE, "------------------------------" );
|
log.log( Level.SEVERE, "------------------------------" );
|
||||||
- log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Purpur bug." ); // Paper // Purpur
|
- log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Purpur bug." ); // Paper // Purpur
|
||||||
+ log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Plazma bug." ); // Paper // Purpur // Plazma - Rebrand
|
+ log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a " + BRANDING + " bug." ); // Paper // Purpur // Plazma - Rebrand
|
||||||
log.log( Level.SEVERE, "If you see a plugin in the Server thread dump below, then please report it to that author" );
|
log.log( Level.SEVERE, "If you see a plugin in the Server thread dump below, then please report it to that author" );
|
||||||
log.log( Level.SEVERE, "\t *Especially* if it looks like HTTP or MySQL operations are occurring" );
|
log.log( Level.SEVERE, "\t *Especially* if it looks like HTTP or MySQL operations are occurring" );
|
||||||
log.log( Level.SEVERE, "If you see a world save or edit, then it means you did far more than your server can handle at once" );
|
log.log( Level.SEVERE, "If you see a world save or edit, then it means you did far more than your server can handle at once" );
|
||||||
log.log( Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes" );
|
log.log( Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes" );
|
||||||
- log.log( Level.SEVERE, "If you are unsure or still think this is a Purpur bug, please report this to https://github.com/PurpurMC/Purpur/issues" ); // Purpur
|
- log.log( Level.SEVERE, "If you are unsure or still think this is a Purpur bug, please report this to https://github.com/PurpurMC/Purpur/issues" ); // Purpur
|
||||||
+ log.log( Level.SEVERE, "If you are unsure or still think this is a Plazma bug, please report this to https://github.com/PlazmaMC/PlazmaBukkit/issues" ); // Purpur // Plazma - Rebrand
|
+ log.log( Level.SEVERE, "If you are unsure or still think this is a " + BRANDING + " bug, please report this to " + REPOSITORY ); // Purpur // Plazma - Rebrand
|
||||||
log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
|
log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" );
|
||||||
- log.log( Level.SEVERE, "Purpur version: " + Bukkit.getServer().getVersion() ); // Purpur
|
- log.log( Level.SEVERE, "Purpur version: " + Bukkit.getServer().getVersion() ); // Purpur
|
||||||
+ log.log( Level.SEVERE, "Plazma version: " + Bukkit.getServer().getVersion() ); // Purpur // Plazma - Rebrand
|
+ log.log( Level.SEVERE, "Plazma version: " + Bukkit.getServer().getVersion() ); // Purpur // Plazma - Rebrand
|
||||||
//
|
//
|
||||||
if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
|
if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
|
||||||
{
|
{
|
||||||
@@ -184,12 +184,12 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
|
@@ -184,12 +186,12 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
|
||||||
// Paper end
|
// Paper end
|
||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
- log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PURPUR - THIS IS NOT A BUG OR A CRASH - " + Bukkit.getServer().getVersion() + " ---"); // Purpur
|
- log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PURPUR - THIS IS NOT A BUG OR A CRASH - " + Bukkit.getServer().getVersion() + " ---"); // Purpur
|
||||||
+ log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PLAZMA - THIS IS NOT A BUG OR A CRASH - " + Bukkit.getServer().getVersion() + " ---"); // Purpur // Plazma - Rebrand
|
+ log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO " + BRANDING.toUpperCase() + " - THIS IS NOT A BUG OR A CRASH - " + Bukkit.getServer().getVersion() + " ---"); // Purpur // Plazma - Rebrand
|
||||||
log.log(Level.SEVERE, "The server has not responded for " + (currentTime - lastTick) / 1000 + " seconds! Creating thread dump");
|
log.log(Level.SEVERE, "The server has not responded for " + (currentTime - lastTick) / 1000 + " seconds! Creating thread dump");
|
||||||
}
|
}
|
||||||
// Paper end - Different message for short timeout
|
// Paper end - Different message for short timeout
|
||||||
log.log( Level.SEVERE, "------------------------------" );
|
log.log( Level.SEVERE, "------------------------------" );
|
||||||
- log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Purpur!):" ); // Paper // Purpur
|
- log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Purpur!):" ); // Paper // Purpur
|
||||||
+ log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Plazma!):" ); // Paper // Purpur // Plazma - Rebrand
|
+ log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to " + BRANDING + "!):" ); // Paper // Purpur // Plazma - Rebrand
|
||||||
io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(isLongTimeout); // Paper - rewrite chunk system
|
io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(isLongTimeout); // Paper - rewrite chunk system
|
||||||
this.dumpTickingInfo(); // Paper - log detailed tick information
|
this.dumpTickingInfo(); // Paper - log detailed tick information
|
||||||
WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
|
WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
|
||||||
@@ -205,7 +205,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
|
@@ -205,7 +207,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
|
||||||
WatchdogThread.dumpThread( thread, log );
|
WatchdogThread.dumpThread( thread, log );
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
- log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PURPUR - THIS IS NOT A BUG OR A CRASH ---"); // Purpur
|
- log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PURPUR - THIS IS NOT A BUG OR A CRASH ---"); // Purpur
|
||||||
+ log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PLAZMA - THIS IS NOT A BUG OR A CRASH ---"); // Purpur // Plazma - Rebrand
|
+ log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO " + BRANDING.toUpperCase() + " - THIS IS NOT A BUG OR A CRASH ---"); // Purpur // Plazma - Rebrand
|
||||||
}
|
}
|
||||||
|
|
||||||
log.log( Level.SEVERE, "------------------------------" );
|
log.log( Level.SEVERE, "------------------------------" );
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Plazma Configurations
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||||
index 902c2eeedeeced8135ec97f64f08420c0996731b..41c335bc9d80abb40e58dfbc4842b66db23e0cba 100644
|
index e6b6d1f26fd673f35f66a09a64c83810e092e757..1bccc21fa2130e577bd5c64b6ca08e9b2853cc22 100644
|
||||||
--- a/build.gradle.kts
|
--- a/build.gradle.kts
|
||||||
+++ b/build.gradle.kts
|
+++ b/build.gradle.kts
|
||||||
@@ -22,6 +22,7 @@ dependencies {
|
@@ -22,6 +22,7 @@ dependencies {
|
||||||
@@ -517,10 +517,10 @@ index 83a726bcf8b7dce73a361b0d79dbd63a0afc7a12..3c893e5da90f7fcf519f190e34e2b15e
|
|||||||
+
|
+
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
index c7f09b129920b95d2885dee469dc0bdacd49b8b7..68e1c2d944272689d97e521867a3944526e05b60 100644
|
index b797f719acb2258bee1cc93394561f14a9df5296..aa02d9390a90e235476a25db31c915668ebc0ec9 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -314,6 +314,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -316,6 +316,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
public final double[] recentTps = new double[ 4 ]; // Purpur
|
public final double[] recentTps = new double[ 4 ]; // Purpur
|
||||||
// Spigot end
|
// Spigot end
|
||||||
public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
|
public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
|
||||||
@@ -528,7 +528,7 @@ index c7f09b129920b95d2885dee469dc0bdacd49b8b7..68e1c2d944272689d97e521867a39445
|
|||||||
public static long currentTickLong = 0L; // Paper - track current tick as a long
|
public static long currentTickLong = 0L; // Paper - track current tick as a long
|
||||||
public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
|
public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
|
||||||
public boolean lagging = false; // Purpur
|
public boolean lagging = false; // Purpur
|
||||||
@@ -425,6 +426,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -427,6 +428,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
|
Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
this.paperConfigurations = services.paperConfigurations(); // Paper - add paper configuration files
|
this.paperConfigurations = services.paperConfigurations(); // Paper - add paper configuration files
|
||||||
|
|||||||
@@ -1,19 +1,19 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: AlphaKR93 <dev@alpha93.kr>
|
From: AlphaKR93 <dev@alpha93.kr>
|
||||||
Date: Fri, 26 Jan 2024 15:34:53 +0900
|
Date: Tue, 7 May 2024 22:42:25 +0900
|
||||||
Subject: [PATCH] Development Build
|
Subject: [PATCH] Development Build
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
||||||
index 80159d9c8432f21aa774d3ade9e2ae84b2d5261c..f2a034a5062b58f3d6bde25150e13fe1cff3af0e 100644
|
index 0a846802f053c545992763e0447e15565204e764..31edd38bbcd117dcde867e4cf7d25f657ea16468 100644
|
||||||
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
||||||
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
|
||||||
@@ -24,7 +24,7 @@ public class PaperVersionFetcher implements VersionFetcher {
|
@@ -27,7 +27,7 @@ public class PaperVersionFetcher implements VersionFetcher {
|
||||||
private static int distance = -2; public int distance() { return distance; }
|
private static final String PROJECT_NAME = "Plazma";
|
||||||
// Purpur end
|
private static final String PROJECT_REPO = "PlazmaMC/PlazmaBukkit";
|
||||||
private static @Nullable String mcVer;
|
private static final String DOWNLOAD_PAGE = "https://docs.plazmamc.org/plazma/about/downloads";
|
||||||
- public static final boolean DEVELOPMENT = false; // Plazma
|
- public static final boolean DEVELOPMENT = false;
|
||||||
+ public static final boolean DEVELOPMENT = true; // Plazma
|
+ public static final boolean DEVELOPMENT = true;
|
||||||
|
// Plazma end
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public long getCacheTime() {
|
|
||||||
|
|||||||
@@ -137,10 +137,10 @@ index f164256d59b761264876ca0c85f812d101bfd5de..deaeb134c47da8710afa747bf980bd00
|
|||||||
final TrackedChunk chunk = this.byChunk.get(CoordinateUtils.getChunkKey(chunkX, chunkZ));
|
final TrackedChunk chunk = this.byChunk.get(CoordinateUtils.getChunkKey(chunkX, chunkZ));
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
index 2903c9a2480ac505f0931d29ac3c5013037e65f1..39f7a4d3711a182b30d5b8eb77c2354170b26720 100644
|
index aa02d9390a90e235476a25db31c915668ebc0ec9..dc64018795a213d6ddbdf2cff465108eff466d55 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -323,6 +323,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -325,6 +325,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
public volatile Thread shutdownThread; // Paper
|
public volatile Thread shutdownThread; // Paper
|
||||||
public volatile boolean abnormalExit = false; // Paper
|
public volatile boolean abnormalExit = false; // Paper
|
||||||
public static final long SERVER_INIT = System.nanoTime(); // Paper - Lag compensation
|
public static final long SERVER_INIT = System.nanoTime(); // Paper - Lag compensation
|
||||||
@@ -148,7 +148,7 @@ index 2903c9a2480ac505f0931d29ac3c5013037e65f1..39f7a4d3711a182b30d5b8eb77c23541
|
|||||||
|
|
||||||
public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
|
public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
|
||||||
AtomicReference<S> atomicreference = new AtomicReference();
|
AtomicReference<S> atomicreference = new AtomicReference();
|
||||||
@@ -1731,17 +1732,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -1733,17 +1734,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
//MinecraftTimings.bukkitSchedulerTimer.stopTiming(); // Spigot // Paper // Purpur
|
//MinecraftTimings.bukkitSchedulerTimer.stopTiming(); // Spigot // Paper // Purpur
|
||||||
// Paper start - Folia scheduler API
|
// Paper start - Folia scheduler API
|
||||||
((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick();
|
((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick();
|
||||||
@@ -175,7 +175,7 @@ index 2903c9a2480ac505f0931d29ac3c5013037e65f1..39f7a4d3711a182b30d5b8eb77c23541
|
|||||||
// Paper end - Folia scheduler API
|
// Paper end - Folia scheduler API
|
||||||
io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper
|
io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper
|
||||||
//this.profiler.push("commandFunctions"); // Purpur
|
//this.profiler.push("commandFunctions"); // Purpur
|
||||||
@@ -1808,7 +1807,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -1810,7 +1809,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
|
|
||||||
try {
|
try {
|
||||||
//worldserver.timings.doTick.startTiming(); // Spigot // Purpur
|
//worldserver.timings.doTick.startTiming(); // Spigot // Purpur
|
||||||
@@ -192,7 +192,7 @@ index 2903c9a2480ac505f0931d29ac3c5013037e65f1..39f7a4d3711a182b30d5b8eb77c23541
|
|||||||
for (final io.papermc.paper.chunk.SingleThreadChunkRegionManager regionManager : worldserver.getChunkSource().chunkMap.regionManagers) {
|
for (final io.papermc.paper.chunk.SingleThreadChunkRegionManager regionManager : worldserver.getChunkSource().chunkMap.regionManagers) {
|
||||||
regionManager.recalculateRegions();
|
regionManager.recalculateRegions();
|
||||||
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
index 8289334e77999f72214c330a3306cbfeb17afbf1..f661418d27f5692a51b880f64180866f7d19d66a 100644
|
index 5fb36396bf0391361d23007c95b05dbffa30c1b0..f116d7163c71d35668ef7a3c77a627d925bb3550 100644
|
||||||
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
@@ -224,6 +224,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
@@ -224,6 +224,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ index f626a2f28f2aebb3237cebb6afef3c4fa1a6cb37..467e17bfce31d0919d603698c9d88a04
|
|||||||
public int forkLimit() {
|
public int forkLimit() {
|
||||||
return this.forkLimit;
|
return this.forkLimit;
|
||||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
index 39f7a4d3711a182b30d5b8eb77c2354170b26720..d1dec1a4671f59fb1b7fe6a2188bd7581a33e40e 100644
|
index dc64018795a213d6ddbdf2cff465108eff466d55..56859a5aebdff201a829b40716c655a0ab7f7e72 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -104,18 +104,18 @@ import net.minecraft.util.datafix.DataFixers;
|
@@ -104,18 +104,18 @@ import net.minecraft.util.datafix.DataFixers;
|
||||||
@@ -97,7 +97,7 @@ index 39f7a4d3711a182b30d5b8eb77c2354170b26720..d1dec1a4671f59fb1b7fe6a2188bd758
|
|||||||
import net.minecraft.util.thread.ReentrantBlockableEventLoop;
|
import net.minecraft.util.thread.ReentrantBlockableEventLoop;
|
||||||
import net.minecraft.world.Difficulty;
|
import net.minecraft.world.Difficulty;
|
||||||
import net.minecraft.world.RandomSequences;
|
import net.minecraft.world.RandomSequences;
|
||||||
@@ -220,14 +220,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -222,14 +222,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
public LevelStorageSource.LevelStorageAccess storageSource;
|
public LevelStorageSource.LevelStorageAccess storageSource;
|
||||||
public final PlayerDataStorage playerDataStorage;
|
public final PlayerDataStorage playerDataStorage;
|
||||||
private final List<Runnable> tickables = Lists.newArrayList();
|
private final List<Runnable> tickables = Lists.newArrayList();
|
||||||
@@ -120,7 +120,7 @@ index 39f7a4d3711a182b30d5b8eb77c2354170b26720..d1dec1a4671f59fb1b7fe6a2188bd758
|
|||||||
private ServerConnectionListener connection;
|
private ServerConnectionListener connection;
|
||||||
public final ChunkProgressListenerFactory progressListenerFactory;
|
public final ChunkProgressListenerFactory progressListenerFactory;
|
||||||
@Nullable
|
@Nullable
|
||||||
@@ -2584,10 +2584,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -2586,10 +2586,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -133,7 +133,7 @@ index 39f7a4d3711a182b30d5b8eb77c2354170b26720..d1dec1a4671f59fb1b7fe6a2188bd758
|
|||||||
|
|
||||||
public abstract boolean isSingleplayerOwner(GameProfile profile);
|
public abstract boolean isSingleplayerOwner(GameProfile profile);
|
||||||
|
|
||||||
@@ -2831,6 +2833,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -2833,6 +2835,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
}
|
}
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
|
|
||||||
@@ -141,7 +141,7 @@ index 39f7a4d3711a182b30d5b8eb77c2354170b26720..d1dec1a4671f59fb1b7fe6a2188bd758
|
|||||||
private void startMetricsRecordingTick() {
|
private void startMetricsRecordingTick() {
|
||||||
if (false && this.willStartRecordingMetrics) { // Purpur
|
if (false && this.willStartRecordingMetrics) { // Purpur
|
||||||
this.metricsRecorder = ActiveMetricsRecorder.createStarted(new ServerMetricsSamplersProvider(Util.timeSource, this.isDedicatedServer()), Util.timeSource, Util.ioPool(), new MetricsPersister("server"), this.onMetricsRecordingStopped, (path) -> {
|
this.metricsRecorder = ActiveMetricsRecorder.createStarted(new ServerMetricsSamplersProvider(Util.timeSource, this.isDedicatedServer()), Util.timeSource, Util.ioPool(), new MetricsPersister("server"), this.onMetricsRecordingStopped, (path) -> {
|
||||||
@@ -2857,12 +2860,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -2859,12 +2862,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
}
|
}
|
||||||
|
|
||||||
public void startRecordingMetrics(Consumer<ProfileResults> resultConsumer, Consumer<Path> dumpConsumer) {
|
public void startRecordingMetrics(Consumer<ProfileResults> resultConsumer, Consumer<Path> dumpConsumer) {
|
||||||
@@ -156,7 +156,7 @@ index 39f7a4d3711a182b30d5b8eb77c2354170b26720..d1dec1a4671f59fb1b7fe6a2188bd758
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void stopRecordingMetrics() {
|
public void stopRecordingMetrics() {
|
||||||
@@ -2877,6 +2880,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -2879,6 +2882,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
//this.metricsRecorder.cancel(); // Purpur
|
//this.metricsRecorder.cancel(); // Purpur
|
||||||
//this.profiler = this.metricsRecorder.getProfiler(); // Purpur
|
//this.profiler = this.metricsRecorder.getProfiler(); // Purpur
|
||||||
}
|
}
|
||||||
@@ -164,7 +164,7 @@ index 39f7a4d3711a182b30d5b8eb77c2354170b26720..d1dec1a4671f59fb1b7fe6a2188bd758
|
|||||||
|
|
||||||
public Path getWorldPath(LevelResource worldSavePath) {
|
public Path getWorldPath(LevelResource worldSavePath) {
|
||||||
return this.storageSource.getLevelPath(worldSavePath);
|
return this.storageSource.getLevelPath(worldSavePath);
|
||||||
@@ -2927,6 +2931,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -2929,6 +2933,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
return this.isSaving;
|
return this.isSaving;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -172,7 +172,7 @@ index 39f7a4d3711a182b30d5b8eb77c2354170b26720..d1dec1a4671f59fb1b7fe6a2188bd758
|
|||||||
public boolean isTimeProfilerRunning() {
|
public boolean isTimeProfilerRunning() {
|
||||||
return false; //this.debugCommandProfilerDelayStart || this.debugCommandProfiler != null; // Purpur
|
return false; //this.debugCommandProfilerDelayStart || this.debugCommandProfiler != null; // Purpur
|
||||||
}
|
}
|
||||||
@@ -2945,6 +2950,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -2947,6 +2952,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
return methodprofilerresults;
|
return methodprofilerresults;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -180,7 +180,7 @@ index 39f7a4d3711a182b30d5b8eb77c2354170b26720..d1dec1a4671f59fb1b7fe6a2188bd758
|
|||||||
|
|
||||||
public int getMaxChainedNeighborUpdates() {
|
public int getMaxChainedNeighborUpdates() {
|
||||||
return 1000000;
|
return 1000000;
|
||||||
@@ -2996,6 +3002,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -2998,6 +3004,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -188,7 +188,7 @@ index 39f7a4d3711a182b30d5b8eb77c2354170b26720..d1dec1a4671f59fb1b7fe6a2188bd758
|
|||||||
private static class TimeProfiler {
|
private static class TimeProfiler {
|
||||||
|
|
||||||
final long startNanos;
|
final long startNanos;
|
||||||
@@ -3045,6 +3052,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -3047,6 +3054,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -361,7 +361,7 @@ index 8c587f829c5e8c6b6df3150024c4ae704988c47b..319f484b535143a94ee2da11114acacc
|
|||||||
}
|
}
|
||||||
+// Plazma end - Completely remove Mojang's Profiler
|
+// Plazma end - Completely remove Mojang's Profiler
|
||||||
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
index ddfbc49a693d3100e915f5083f1f8e99df2d4b64..6d39a0d5455fbb0af3916b751d02386af3aa3598 100644
|
index 1dc1536df986862396aa0f58e834c9c1599bf38e..2d704c3e24505314ec9754cb407fce54e914511b 100644
|
||||||
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||||
@@ -923,11 +923,13 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
@@ -923,11 +923,13 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ Subject: [PATCH] Reduce create random instance
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
index d1dec1a4671f59fb1b7fe6a2188bd7581a33e40e..ee5914eddb70adbda4c24b7c31fc4ca34ce06005 100644
|
index 56859a5aebdff201a829b40716c655a0ab7f7e72..e460bbcdc370ef300e6c4fbbacb71fe6172c944c 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -235,6 +235,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -237,6 +237,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
@Nullable
|
@Nullable
|
||||||
private ServerStatus.Favicon statusIcon;
|
private ServerStatus.Favicon statusIcon;
|
||||||
private final RandomSource random;
|
private final RandomSource random;
|
||||||
|
|||||||
@@ -94,10 +94,10 @@ index 03be23690a94a14d7343526acad67ccf53b85c70..416c0a736edf47f76a37be0bc5fe8678
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
index ee5914eddb70adbda4c24b7c31fc4ca34ce06005..b2a5d324d0f364193c7aee8ef55c50c57f17e250 100644
|
index e460bbcdc370ef300e6c4fbbacb71fe6172c944c..33530e53634385bb0ebbf74ec819adc578193b28 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -257,8 +257,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -259,8 +259,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
private final long[] tickTimesNanos;
|
private final long[] tickTimesNanos;
|
||||||
private long aggregatedTickTimesNanos;
|
private long aggregatedTickTimesNanos;
|
||||||
// Paper start - Add tick times API and /mspt command
|
// Paper start - Add tick times API and /mspt command
|
||||||
@@ -108,7 +108,7 @@ index ee5914eddb70adbda4c24b7c31fc4ca34ce06005..b2a5d324d0f364193c7aee8ef55c50c5
|
|||||||
public final TickTimes tickTimes60s = new TickTimes(1200);
|
public final TickTimes tickTimes60s = new TickTimes(1200);
|
||||||
// Paper end - Add tick times API and /mspt command
|
// Paper end - Add tick times API and /mspt command
|
||||||
@Nullable
|
@Nullable
|
||||||
@@ -1813,8 +1815,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -1815,8 +1817,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
worldserver.tick(shouldKeepTicking);
|
worldserver.tick(shouldKeepTicking);
|
||||||
long after = Util.getNanos() - before;
|
long after = Util.getNanos() - before;
|
||||||
|
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ Subject: [PATCH] Use Plazma logo instead if server favicon doesn't exist
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
index 30a8b5d434efa47380e635a7b1010df510f09891..3d2c4e7dcf8a17c68002086e87e78e6c059a427b 100644
|
index 33530e53634385bb0ebbf74ec819adc578193b28..180c4a12862ffaae217ec163ce622485496024d6 100644
|
||||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -1547,29 +1547,36 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
@@ -1549,29 +1549,36 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||||
}
|
}
|
||||||
|
|
||||||
private Optional<ServerStatus.Favicon> loadStatusIcon() {
|
private Optional<ServerStatus.Favicon> loadStatusIcon() {
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
|
|
||||||
|
val projectName = "Plazma"
|
||||||
|
|
||||||
pluginManagement {
|
pluginManagement {
|
||||||
repositories {
|
repositories {
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
@@ -22,8 +24,8 @@ dependencyResolutionManagement {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
rootProject.name = "plazma"
|
rootProject.name = projectName.lowercase()
|
||||||
for (name in listOf("Plazma-API", "Plazma-Server", "Plazma-MojangAPI")) {
|
for (name in listOf("$projectName-API", "$projectName-Server", "$projectName-MojangAPI")) {
|
||||||
val projName = name.lowercase(Locale.ENGLISH)
|
val projName = name.lowercase(Locale.ENGLISH)
|
||||||
include(projName)
|
include(projName)
|
||||||
findProject(":$projName")!!.projectDir = file(name)
|
findProject(":$projName")!!.projectDir = file(name)
|
||||||
|
|||||||
Reference in New Issue
Block a user