Repo-Mirror/matterMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Upstream (Pufferfish)

Browse Source
This commit is contained in:
Apehum
2022-12-19 21:20:32 +08:00
parent 10751f9339
commit 82b05ce532
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=su.plo.matter
version=1.19.3-R0.1-SNAPSHOT
mcVersion=1.19.3
pufferfishRef=32186919cf606b0049cc263493108f7945b9d9bf
pufferfishRef=9771bd7e692b5f4133e5846123c2f3a9c315e75f
org.gradle.jvmargs=-Xmx2G

6
patches/server/0001-Feature-Secure-Seed.patch
View File

@@ -590,7 +590,7 @@ index f7e19bb7d2ff8f8aaf061cec16462913d77c10d5..999eac6b546fd09b2f35a34545e1f714
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 098b67e6ad74be7698713623ca7fae70f19ac6b3..20cc64eb109988431cb752026c28c7f9e962d999 100644
index 277e8a03ab270eabb6b8c31d0076f3310c91eef2..71f7d110925b7243e66c01dd66ed92b85e0318dd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -260,6 +260,9 @@ import net.md_5.bungee.api.chat.BaseComponent; // Spigot
@@ -603,8 +603,8 @@ index 098b67e6ad74be7698713623ca7fae70f19ac6b3..20cc64eb109988431cb752026c28c7f9
public final class CraftServer implements Server {
private final String serverName = "Pufferfish"; // Paper // Pufferfish
private final String serverVersion;
@@ -1227,7 +1230,8 @@ public final class CraftServer implements Server {
worlddata = (PrimaryLevelData) pair.getFirst();
@@ -1228,7 +1231,8 @@ public final class CraftServer implements Server {
iregistry = pair.getSecond().dimensions();
} else {
LevelSettings worldsettings;
- WorldOptions worldoptions = new WorldOptions(creator.seed(), creator.generateStructures(), false);

20
patches/server/0003-Matter-Metrics.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Matter Metrics
diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
index f2fe6ea3719ff8b2913b7a3a939d7a5b75cb8b28..12892dfe9a03c0142444ffba0edf43058715d650 100644
index 692c962193cf9fcc6801fc93f3220bdc673d527b..67a31aabb7282fc113b4b91912350e01559a1a12 100644
--- a/src/main/java/com/destroystokyo/paper/Metrics.java
+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
@@ -593,7 +593,7 @@ public class Metrics {
@@ -17,13 +17,19 @@ index f2fe6ea3719ff8b2913b7a3a939d7a5b75cb8b28..12892dfe9a03c0142444ffba0edf4305
metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
String minecraftVersion = Bukkit.getVersion();
@@ -603,7 +603,8 @@ public class Metrics {
metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : "offline"));
- metrics.addCustomChart(new Metrics.SimplePie("pufferfish_version", () -> (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown"));
@@ -607,11 +607,13 @@ public class Metrics {
final String implVersion = org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion();
if (implVersion != null) {
final String buildOrHash = implVersion.substring(implVersion.lastIndexOf('-') + 1);
- paperVersion = "git-Pufferfish-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Pufferfish
+ paperVersion = "git-Matter-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Matter
} else {
paperVersion = "unknown";
}
- metrics.addCustomChart(new Metrics.SimplePie("pufferfish_version", () -> paperVersion)); // Pufferfish
+
+ metrics.addCustomChart(new Metrics.SimplePie("matter_type", () -> "Pufferfish")); // Matter
+ metrics.addCustomChart(new Metrics.SimplePie("matter_version", () -> (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown"));
+ metrics.addCustomChart(new Metrics.SimplePie("matter_version", () -> paperVersion)); // Matter
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>();