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

Upstream (Pufferfish)

Browse Source
This commit is contained in:
Apehum
2022-06-21 21:30:55 +08:00
parent 9762e3fe5a
commit c013f3a0f8
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -3,7 +3,7 @@ version = 1.19-R0.1-SNAPSHOT
mcVersion = 1.19 mcVersion = 1.19
packageVersion = 1_19_R1 packageVersion = 1_19_R1
pufferfishRef = b4104a648d34dd3d1307ccdcee4c7ffaeef62fbd pufferfishRef = 8780a38aa7e655e7118ddb5459e7c4faf9fc61ea
org.gradle.jvmargs=-Xmx2G org.gradle.jvmargs=-Xmx2G

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

@@ -57,7 +57,7 @@ index 378cc1f9e19eb9b18037ab8af92f65897e15a405..33cb2fc823624b40a32c6f5513abb073
} }
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 8043a1aa9d785c78e220ea54a6ffa7388f2d501e..253698b4006ec45fa09198b8e39fddf33af3882b 100644 index d0cfbaf3fd5573f33ad3afc47a35157c0da5233a..2b6d13c7a8ba48b452165e2eedeeeeb809d012ff 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -170,6 +170,10 @@ import org.bukkit.event.world.TimeSkipEvent; @@ -170,6 +170,10 @@ import org.bukkit.event.world.TimeSkipEvent;
@@ -135,7 +135,7 @@ index 8d7d10f620b30c35d2ef580ea914f2c62054a785..c06ee8618b58806e7114f0c253dcc48e
for (int i = 0; i < sectionArray.length; ++i) { for (int i = 0; i < sectionArray.length; ++i) {
if (sectionArray[i] == null) { 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 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 cdfe2589ca598263d58a11a978e176ab3ecb87e6..805510b9eeec2c48bfe2aae680483b1286daca24 100644 index 264ca51c2f2a5ff69688372b71ad7355366bac1a..bd7db5094a6cba22868678c223870ba201aa43e8 100644
--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
@@ -86,6 +86,11 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemp @@ -86,6 +86,11 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemp
@@ -168,7 +168,7 @@ index cdfe2589ca598263d58a11a978e176ab3ecb87e6..805510b9eeec2c48bfe2aae680483b12
double d0 = randomsource.nextDouble() * 3.141592653589793D * 2.0D; double d0 = randomsource.nextDouble() * 3.141592653589793D * 2.0D;
int l = 0; int l = 0;
int i1 = 0; int i1 = 0;
@@ -514,8 +513,12 @@ public abstract class ChunkGenerator { @@ -515,8 +514,12 @@ public abstract class ChunkGenerator {
return structure.step().ordinal(); return structure.step().ordinal();
})); }));
List<FeatureSorter.StepFeatureData> list = (List) this.featuresPerStep.get(); List<FeatureSorter.StepFeatureData> list = (List) this.featuresPerStep.get();
@@ -182,7 +182,7 @@ index cdfe2589ca598263d58a11a978e176ab3ecb87e6..805510b9eeec2c48bfe2aae680483b12
Set<Holder<Biome>> set = new ObjectArraySet(); Set<Holder<Biome>> set = new ObjectArraySet();
ChunkPos.rangeClosed(sectionposition.chunk(), 1).forEach((chunkcoordintpair1) -> { ChunkPos.rangeClosed(sectionposition.chunk(), 1).forEach((chunkcoordintpair1) -> {
@@ -774,9 +777,11 @@ public abstract class ChunkGenerator { @@ -775,9 +778,11 @@ public abstract class ChunkGenerator {
ArrayList<StructureSet.StructureSelectionEntry> arraylist = new ArrayList(list.size()); ArrayList<StructureSet.StructureSelectionEntry> arraylist = new ArrayList(list.size());
arraylist.addAll(list); arraylist.addAll(list);
@@ -632,10 +632,10 @@ index 947b0b10fb965f30513fd0df5bc0910fb9cb9a71..05d7e197da45579a28ef0180d6f43a5a
@Override @Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7899ae5e60ee2b30c6d4d7056c59bb38cc05b7c8..c8ce729ea50ed2f4bdd2cafdadb7278cfef1f5a2 100644 index ba0412e8462372f5743e9282de6a50a45ee25add..5849c00a036b047903f6b7396f848a3e4970e204 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -238,6 +238,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor; @@ -240,6 +240,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;
import org.yaml.snakeyaml.error.MarkedYAMLException; import org.yaml.snakeyaml.error.MarkedYAMLException;
import net.md_5.bungee.api.chat.BaseComponent; // Spigot import net.md_5.bungee.api.chat.BaseComponent; // Spigot
@@ -643,7 +643,7 @@ index 7899ae5e60ee2b30c6d4d7056c59bb38cc05b7c8..c8ce729ea50ed2f4bdd2cafdadb7278c
import javax.annotation.Nullable; // Paper import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper import javax.annotation.Nonnull; // Paper
@@ -1193,7 +1194,8 @@ public final class CraftServer implements Server { @@ -1200,7 +1201,8 @@ public final class CraftServer implements Server {
LevelSettings worldSettings; LevelSettings worldSettings;
// See MinecraftServer.a(String, String, long, WorldType, JsonElement) // See MinecraftServer.a(String, String, long, WorldType, JsonElement)
if (worlddata == null) { if (worlddata == null) {

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

@@ -40,7 +40,7 @@ index b0390eedb507d27426d1e1d73bd4ab63aec89ebe..1533dadb02f9d189be0e6725c73a28f2
.completer(new ConsoleCommandCompleter(this.server)) .completer(new ConsoleCommandCompleter(this.server))
.option(LineReader.Option.COMPLETE_IN_WORD, true); .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 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 99751fc36a332f2f9115b56ed6ca66ab037825d3..00398a8df97697896465f5b0d3b92a02c399eb5f 100644 index e96ff8b13b1237d7c70359b78e4d72938877191f..9d6af37c47261045d6c22e35a3b2b836ca486d90 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
@@ -1656,7 +1656,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa @@ -1656,7 +1656,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -53,10 +53,10 @@ index 99751fc36a332f2f9115b56ed6ca66ab037825d3..00398a8df97697896465f5b0d3b92a02
public SystemReport fillSystemReport(SystemReport details) { 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 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c8ce729ea50ed2f4bdd2cafdadb7278cfef1f5a2..3c333590af07c829cb3e2d188ad3957eee80a0bc 100644 index 5849c00a036b047903f6b7396f848a3e4970e204..26f1f100f041ab76e12bf0bd5c9a440c8bdb56e9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -244,7 +244,7 @@ import javax.annotation.Nullable; // Paper @@ -246,7 +246,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server { public final class CraftServer implements Server {
@@ -66,7 +66,7 @@ index c8ce729ea50ed2f4bdd2cafdadb7278cfef1f5a2..3c333590af07c829cb3e2d188ad3957e
private final String bukkitVersion = Versioning.getBukkitVersion(); private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft"); private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index fbd604602024522bdd73aa1bde6fe2ccec63e442..04edfb423e0ac4dab32dfd21a3b65859030124c1 100644 index 1b9e91b20dd9a9375a0a2a6a4d7a0bcdce9e7b1a..3a42439e21d40b469fdbd0cff69c58305d71bb96 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java --- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -270,7 +270,7 @@ public class Main { @@ -270,7 +270,7 @@ public class Main {