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

Update to 1.18.2

Browse Source
This commit is contained in:
Apehum
2022-03-22 02:33:58 +08:00
parent a0d0d1a2c8
commit 1e27754941
4 changed files with 441 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-data/dev-imports.txt
View File

@@ -7,4 +7,4 @@
# datafixerupper com/mojang/datafixers/util/Either.java
# To import classes from the vanilla Minecraft jar use `minecraft` as the artifactId:
# minecraft net.minecraft.world.level.entity.LevelEntityGetterAdapter
# minecraft net/minecraft/world/level/entity/LevelEntityGetter.java
# minecraft net/minecraft/world/level/entity/LevelEntityGetter.java

8
gradle.properties
View File

@@ -1,9 +1,9 @@
group = su.plo.matter
version = 1.18-R0.1-SNAPSHOT
version = 1.18.2-R0.1-SNAPSHOT
mcVersion = 1.18
packageVersion = 1_18_R1
pufferfishRef = a786526baaf6b52a42f3c46cebb1e0c1d37dc7b8
mcVersion = 1.18.2
packageVersion = 1_18_R2
pufferfishRef = cc7a8cdc2e01f2d0772d191a6d5f82b096be1150
org.gradle.jvmargs=-Xmx2G

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

File diff suppressed because it is too large Load Diff

16
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 86548210e50879504f646ef3aa46927998f2d775..c033c5e34893b039d369449e562578ee3f798492 100644
index ecb65e75d19d2f7b72410c89251e56566b7b6dc0..5f783d01fac3852f9871f3285c3ba7e29e221814 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,7 +18,7 @@ repositories {
@@ -15,7 +15,7 @@ index 86548210e50879504f646ef3aa46927998f2d775..c033c5e34893b039d369449e562578ee
- implementation(project(":pufferfish-api")) // Pufferfish // Paper
+ implementation(project(":matter-api")) // Matter // Pufferfish // Paper
// Pufferfish start
implementation("io.papermc.paper:paper-mojangapi:1.18.1-R0.1-SNAPSHOT") {
implementation("io.papermc.paper:paper-mojangapi:1.18.2-R0.1-SNAPSHOT") {
exclude("io.papermc.paper", "paper-api")
@@ -87,7 +87,7 @@ tasks.jar {
attributes(
@@ -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 a31f8bf3f4183a7a02f58f2321dbeaf427017b1c..a61e8bf20c6d4895684bf358463694da42b55ea0 100644
index d3319f194b23e0c27181828d3d5a2b8830124818..2b1b095275b3ba8ff9ff1509c57a53485c6c2ad3 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1712,7 +1712,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1685,7 +1685,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -53,10 +53,10 @@ index a31f8bf3f4183a7a02f58f2321dbeaf427017b1c..a61e8bf20c6d4895684bf358463694da
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 e62a643990929dccf1c022a3c9eca12d08d5ca7d..de8772b324eaf8289086603abe28c1c8cd329e9a 100644
index 9cf16088f3a632054c30216840df0c6c2174e1a6..095eda3681ea5973fef35fb31a01c1aa45556917 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -251,7 +251,7 @@ import javax.annotation.Nullable; // Paper
@@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
@@ -66,10 +66,10 @@ index e62a643990929dccf1c022a3c9eca12d08d5ca7d..de8772b324eaf8289086603abe28c1c8
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 98d396658bd7547e6b6f850529cab216e83c6c62..2e584a84154c029b6552529d904dd9432a1eb205 100644
index 7e06f263cf618b82f77101ef86d819d5dc37a24e..cb5b5e36fa365607c19d49f3a4d81f142b6e0760 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -421,7 +421,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -430,7 +430,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {