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

Upstream (Pufferfish)

Browse Source
This commit is contained in:
Apehum
2022-02-14 20:14:21 +08:00
parent 6e492dc864
commit dd2637db6c
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -3,7 +3,7 @@ version = 1.18-R0.1-SNAPSHOT
mcVersion = 1.18
packageVersion = 1_18_R1
pufferfishRef = 110966ec14ddce354d8f1d3c28939025cfa86ab3
pufferfishRef = 22f20b245fa30e93d3e0ff695b8e719d201c88c2
org.gradle.jvmargs=-Xmx2G

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Feature Secure Seed
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index f51fcaba69c9ddc27130ab615526e05b1b4f0e07..1ab2bf2e1b0c77b4b8813da91f614d1c795f7107 100644
index addf249717b5271b664f4a9d28dd6cc177db5688..9bfe55ca3fdad698399022640068e3b85788d990 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -49,6 +49,8 @@ import net.minecraft.world.level.storage.LevelStorageSource;
@@ -15,9 +15,9 @@ index f51fcaba69c9ddc27130ab615526e05b1b4f0e07..1ab2bf2e1b0c77b4b8813da91f614d1c
+import su.plo.matter.Globals;
+
import java.util.function.Function; // Paper
import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; // Paper
public class ServerChunkCache extends ChunkSource {
@@ -1142,6 +1144,8 @@ public class ServerChunkCache extends ChunkSource {
@@ -1148,6 +1150,8 @@ public class ServerChunkCache extends ChunkSource {
}
public ChunkGenerator getGenerator() {
@@ -96,7 +96,7 @@ index 5aeaaae6f15050a2da271fe196d0a234ecafc8a1..ea720517a1adfb164d540c2743aaec2a
for (int i = 0; i < sectionArray.length; ++i) {
if (sectionArray[i] == null) {
diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
index e4591c0b3c8547cc6f4e2a0891fc378ee4334d9e..d05d67240a368e3a7352fe59a5803893f5bd6eba 100644
index 0009af6e9c6a48a63736ada2653665f74ac396ca..c018017b99122885cc7eeb235a0d2a2300671991 100644
--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
@@ -68,6 +68,8 @@ import net.minecraft.world.level.levelgen.placement.PlacedFeature;

10
patches/server/0002-Matter-Branding.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Matter Branding
diff --git a/build.gradle.kts b/build.gradle.kts
index 0f194168f5fca8eb768bca3ce953f28097fed578..56a25753f797bff2ac3f27c4236455880f92eda4 100644
index 86548210e50879504f646ef3aa46927998f2d775..c033c5e34893b039d369449e562578ee3f798492 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,7 +18,7 @@ repositories {
@@ -17,7 +17,7 @@ index 0f194168f5fca8eb768bca3ce953f28097fed578..56a25753f797bff2ac3f27c423645588
// Pufferfish start
implementation("io.papermc.paper:paper-mojangapi:1.18.1-R0.1-SNAPSHOT") {
exclude("io.papermc.paper", "paper-api")
@@ -80,7 +80,7 @@ tasks.jar {
@@ -87,7 +87,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -40,10 +40,10 @@ index e0b1f0671d16ddddcb6725acd25a1d1d69e42701..63384b9353e71e9d310528235f1a39d5
.completer(new ConsoleCommandCompleter(this.server))
.option(LineReader.Option.COMPLETE_IN_WORD, true);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1e7ae166a1d53fce28297e2eaebd11ec28a57a55..3bb5e5824597e7d5e760c66a67914337d70dbef7 100644
index 3ec35d19f63832ee465a54518219184a14bb08e2..a5f7e77ab5c7ff9048418a40149c6c2c033c8f10 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1711,7 +1711,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1715,7 +1715,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -53,7 +53,7 @@ index 1e7ae166a1d53fce28297e2eaebd11ec28a57a55..3bb5e5824597e7d5e760c66a67914337
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 041ebfefca8f944f457a269f0e0b450b21949e73..09383bbee44367af4d8bead8b2270322ac236f3b 100644
index 868e148e6a8cd85ef89b79ad539dd5f3bce0a7c7..ba9206bd634d1d4f1a488787848f363e960272ab 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -254,7 +254,7 @@ import javax.annotation.Nullable; // Paper