diff --git a/build.gradle.kts b/build.gradle.kts index d8eea2f..b9f606d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -38,24 +38,24 @@ subprojects { } paperweight { - serverProject.set(project(":matter-purpur-server")) + serverProject.set(project(":matter-server")) remapRepo.set("https://maven.fabricmc.net/") decompileRepo.set("https://files.minecraftforge.net/maven/") - useStandardUpstream("purpur") { - url.set(github("PurpurMC", "Purpur")) - ref.set(providers.gradleProperty("purpurRef")) + useStandardUpstream("pufferfish") { + url.set(github("pufferfish-gg", "Pufferfish")) + ref.set(providers.gradleProperty("pufferfishRef")) withStandardPatcher { - apiSourceDirPath.set("Purpur-API") - serverSourceDirPath.set("Purpur-Server") + apiSourceDirPath.set("pufferfish-api") + serverSourceDirPath.set("pufferfish-server") apiPatchDir.set(layout.projectDirectory.dir("patches/api")) serverPatchDir.set(layout.projectDirectory.dir("patches/server")) - apiOutputDir.set(layout.projectDirectory.dir("matter-purpur-api")) - serverOutputDir.set(layout.projectDirectory.dir("matter-purpur-server")) + apiOutputDir.set(layout.projectDirectory.dir("matter-api")) + serverOutputDir.set(layout.projectDirectory.dir("matter-server")) } } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 640981c..acf2ea3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ version = 1.18-R0.1-SNAPSHOT mcVersion = 1.18 packageVersion = 1_18_R1 -purpurRef = aa425ecbe841d821e67e5a9938674e66b89743ec +pufferfishRef = 0152b0b0cde3fc4af02ef32179ec2f0414b3b2bf org.gradle.jvmargs=-Xmx2G diff --git a/patches/server/0001-Feature-Secure-Seed.patch b/patches/server/0001-Feature-Secure-Seed.patch index 3a6e604..68a6b54 100644 --- a/patches/server/0001-Feature-Secure-Seed.patch +++ b/patches/server/0001-Feature-Secure-Seed.patch @@ -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 e7e110b53e79e0606262982555dd9eb096c7c4a8..bb7e77e22b58250b687d9df429a982ca038c9aa7 100644 +index 406bfe20a7b8786bbc6bee46151be91dadec6180..fc5bc5df405d2d798b657e3432e80e5ff0cc3f77 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; @@ -17,7 +17,7 @@ index e7e110b53e79e0606262982555dd9eb096c7c4a8..bb7e77e22b58250b687d9df429a982ca import java.util.function.Function; // Paper public class ServerChunkCache extends ChunkSource { -@@ -1111,6 +1113,8 @@ public class ServerChunkCache extends ChunkSource { +@@ -1146,6 +1148,8 @@ public class ServerChunkCache extends ChunkSource { } public ChunkGenerator getGenerator() { @@ -27,10 +27,10 @@ index e7e110b53e79e0606262982555dd9eb096c7c4a8..bb7e77e22b58250b687d9df429a982ca } diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java -index d49ba154d173aa7bf5a679b7bfcc55de851ea34b..c077fced547ea2c8bb9826ca353208961f020e7d 100644 +index 5722d9b30223fb229b80f54d7fb9edf41254a7f7..f0dc9c709659293d5e7b78a5e8f4fa6c5c980a5f 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java -@@ -397,7 +397,7 @@ public class Slime extends Mob implements Enemy { +@@ -336,7 +336,7 @@ public class Slime extends Mob implements Enemy { } ChunkPos chunkcoordintpair = new ChunkPos(pos); @@ -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 fe0f14b363f4e6b583cd079f2cf627605731f764..11519b8cdfa20839a8aa76cbb3e6cd4fe473fcdc 100644 +index e4591c0b3c8547cc6f4e2a0891fc378ee4334d9e..d05d67240a368e3a7352fe59a5803893f5bd6eba 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; diff --git a/patches/server/0002-Matter-Branding.patch b/patches/server/0002-Matter-Branding.patch index df39266..0586488 100644 --- a/patches/server/0002-Matter-Branding.patch +++ b/patches/server/0002-Matter-Branding.patch @@ -1,104 +1,96 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Apehum -Date: Thu, 16 Dec 2021 00:16:49 +0800 +Date: Thu, 16 Dec 2021 04:16:54 +0800 Subject: [PATCH] Matter Branding diff --git a/build.gradle.kts b/build.gradle.kts -index e5cba810a2f207d7bb57d946573acbee1e8013c7..f2015b6639f01d15f2ed2a049466d8a792c4897d 100644 +index 0ccb1848e4b717d2d16c02c955e78a3e48b65dfa..854960ffe129f0b6932e40f05d047f46628f2dc1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -19,7 +19,7 @@ repositories { +@@ -18,7 +18,7 @@ repositories { + } dependencies { - // Purpur start -- implementation(project(":purpur-api")) -+ implementation(project(":matter-purpur-api")) // Matter +- implementation(project(":pufferfish-api")) // Pufferfish // Paper ++ implementation(project(":matter-api")) // Matter // Pufferfish // Paper + // Pufferfish start implementation("io.papermc.paper:paper-mojangapi:1.18-R0.1-SNAPSHOT") { exclude("io.papermc.paper", "paper-api") - } -@@ -74,7 +74,7 @@ tasks.jar { +@@ -80,7 +80,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", -- "Implementation-Version" to "git-Purpur-$implementationVersion", // Purpur -+ "Implementation-Version" to "git-Matter-Purpur-$implementationVersion", // Purpur // Matter +- "Implementation-Version" to "git-Pufferfish-$implementationVersion", // Pufferfish ++ "Implementation-Version" to "git-Matter-$implementationVersion", // Matter // Pufferfish "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java -index 8c3c68465197fafc14849dc38a572e309931e2a2..a6d857b907ecc261a7684a1446b735b9b2256cf4 100644 +index e0b1f0671d16ddddcb6725acd25a1d1d69e42701..63384b9353e71e9d310528235f1a39d58489ae55 100644 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java @@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole { @Override protected LineReader buildReader(LineReaderBuilder builder) { builder -- .appName("Purpur") // Purpur -+ .appName("Matter-Purpur") // Purpur // Matter +- .appName("Paper") ++ .appName("Matter") // Matter .variable(LineReader.HISTORY_FILE, java.nio.file.Paths.get(".console_history")) .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 +--- 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 // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! ++ return "Matter"; // Matter - Matter > // Pufferfish - Pufferfish > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! + } + + 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 959cb69b37921c62a9012642acaf2d0295915e1f..f4a90865d62390fcda71f2339aa49b5d98a6a284 100644 +index 629af8db1547ead263c3d7aef8dfa44afbc985e8..fff944d1b4e27f96c79bdc500d22503bba746763 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -253,7 +253,7 @@ import javax.annotation.Nullable; // Paper import javax.annotation.Nonnull; // Paper public final class CraftServer implements Server { -- private final String serverName = "Purpur"; // Paper // Purpur -+ private final String serverName = "Matter-Purpur"; // Paper // Purpur // Matter +- private final String serverName = "Pufferfish"; // Paper // Pufferfish ++ private final String serverName = "Matter"; // Paper // Pufferfish // Matter private final String serverVersion; 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 90e68a8cfd00e4ad7ffaddfc8e8d5df26c49cf7a..248b62685a263a2e6d3feeaa002afcc24dee9ac2 100644 +index cfa4b75b042e2a82e10e5dc95d4c71d39f5a8d60..84404395295d13c0fb6ff659ee041739e846f14e 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -50,6 +50,7 @@ import org.bukkit.inventory.ItemStack; - import org.bukkit.material.MaterialData; - import org.bukkit.plugin.InvalidPluginException; - import org.bukkit.plugin.PluginDescriptionFile; -+import su.plo.matter.MatterVersionFetcher; - - @SuppressWarnings("deprecation") - public final class CraftMagicNumbers implements UnsafeValues { -@@ -394,7 +395,7 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -394,7 +394,7 @@ public final class CraftMagicNumbers implements UnsafeValues { @Override public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { -- return new com.destroystokyo.paper.PaperVersionFetcher(); -+ return new MatterVersionFetcher(); // Matter +- return new gg.pufferfish.pufferfish.PufferfishVersionFetcher(); // Pufferfish ++ return new su.plo.matter.MatterVersionFetcher(); // Pufferfish // Matter } @Override diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index fb87620c742ff7912f5e8ccd2a7930dd605576d9..350fcb92af9068a6b059684d80a441be7160985c 100644 +index 80553face9c70c2a3d897681e7761df85b22d464..c4831e424782b83ae81b4b948ff52c25949a19b7 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { public static String getBukkitVersion() { String result = "Unknown-Version"; -- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/org.purpurmc.purpur/purpur-api/pom.properties"); // Purpur -+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/su.plo.matter/matter-purpur-api/pom.properties"); // Purpur // Matter +- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/gg.pufferfish.pufferfish/pufferfish-api/pom.properties"); // Pufferfish ++ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/su.plo.matter/matter-api/pom.properties"); // Pufferfish // Matter Properties properties = new Properties(); if (stream != null) { -diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 141a46499eb2cba73a3f71fb50926bc08f37f9f0..5a5897d31c60aab2329a3dc50244b39a0fb962d9 100644 ---- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java -+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -209,7 +209,7 @@ public class PurpurConfig { - if (!TimingsManager.hiddenConfigs.contains("settings.seed")) TimingsManager.hiddenConfigs.add("settings.seed"); - } - -- public static String serverModName = "Purpur"; -+ public static String serverModName = "Matter-Purpur"; // Matter - private static void serverModName() { - serverModName = getString("settings.server-mod-name", serverModName); - } diff --git a/src/main/java/su/plo/matter/MatterVersionFetcher.java b/src/main/java/su/plo/matter/MatterVersionFetcher.java new file mode 100644 index 0000000000000000000000000000000000000000..4124b5dd7ee5ed1316c10d3961c9ac9c73eba276 diff --git a/patches/server/0003-Matter-Metrics.patch b/patches/server/0003-Matter-Metrics.patch index 3463789..306cf52 100644 --- a/patches/server/0003-Matter-Metrics.patch +++ b/patches/server/0003-Matter-Metrics.patch @@ -1,29 +1,29 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Apehum -Date: Thu, 16 Dec 2021 00:18:33 +0800 +Date: Thu, 16 Dec 2021 04:19:31 +0800 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 7bc497bcae6a6a752e3c432178cb1e3c633e0bec..71f8e1474919d6e805adc27c47a0b9216b72908a 100644 +index f2fe6ea3719ff8b2913b7a3a939d7a5b75cb8b28..12892dfe9a03c0142444ffba0edf43058715d650 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 { boolean logFailedRequests = config.getBoolean("logFailedRequests", false); // Only start Metrics, if it's enabled in the config if (config.getBoolean("enabled", true)) { -- Metrics metrics = new Metrics("Purpur", serverUUID, logFailedRequests, Bukkit.getLogger()); // Purpur -+ Metrics metrics = new Metrics("Matter", serverUUID, logFailedRequests, Bukkit.getLogger()); // Purpur // Matter +- Metrics metrics = new Metrics("Pufferfish", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish ++ Metrics metrics = new Metrics("Matter", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish // Matter + metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> { String minecraftVersion = Bukkit.getVersion(); - minecraftVersion = minecraftVersion.substring(minecraftVersion.indexOf("MC: ") + 4, minecraftVersion.length() - 1); -@@ -602,7 +602,8 @@ public class Metrics { +@@ -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" : (PaperConfig.isProxyOnlineMode() ? "bungee" : "offline"))); // Purpur -- metrics.addCustomChart(new Metrics.SimplePie("purpur_version", () -> (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown")); // Purpur -+ metrics.addCustomChart(new Metrics.SimplePie("matter_type", () -> "Purpur")); // Matter -+ metrics.addCustomChart(new Metrics.SimplePie("matter_version", () -> (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown")); // Purpur // Matter + 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")); ++ 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.DrilldownPie("java_version", () -> { Map> map = new HashMap<>(); diff --git a/patches/server/0004-Seed-Command.patch b/patches/server/0004-Seed-Command.patch index 4b92f8e..c74c6f0 100644 --- a/patches/server/0004-Seed-Command.patch +++ b/patches/server/0004-Seed-Command.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Apehum -Date: Thu, 16 Dec 2021 00:52:48 +0800 +Date: Thu, 16 Dec 2021 04:23:40 +0800 Subject: [PATCH] Seed Command diff --git a/readme.md b/readme.md index adac345..e4b4d1c 100644 --- a/readme.md +++ b/readme.md @@ -13,7 +13,7 @@ # Matter -Matter is a [Paper]() fork that currently only adds what we call a **secure feature seed**. Based on [Secure Seed](https://github.com/Earthcomputer/SecureSeed) mod by Earthcomputer. +Matter is a [Pufferfish](https://github.com/pufferfish-gg/Pufferfish) fork that currently only adds what we call a **secure feature seed**. Based on [Secure Seed](https://github.com/Earthcomputer/SecureSeed) mod by Earthcomputer. Terrain and biome generation remains the same, but all the ores and structures are generated with 1024-bit seed, instead of the usual 64-bit seed. This seed is almost impossible to crack, and there are no weird links between structures. Like a link between diamonds and clay. diff --git a/settings.gradle.kts b/settings.gradle.kts index 5e9d6d3..ef48f61 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,4 +8,4 @@ pluginManagement { rootProject.name = "Matter" -include("matter-purpur-api", "matter-purpur-server") \ No newline at end of file +include("matter-api", "matter-server") \ No newline at end of file