Skip to content

Commit

Permalink
Rewrite Foldenor
Browse files Browse the repository at this point in the history
  • Loading branch information
AltronMaxX committed Sep 16, 2023
1 parent 63e1abf commit cf1b5dd
Show file tree
Hide file tree
Showing 64 changed files with 2,131 additions and 6,242 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group=dev.edenor.foldenor

version=1.20.1-R0.1
mcVersion=1.20.1
foliaRef=372d479cc173cd9d0f91265ebb4b198354717e47
foliaRef=016b3e5115e6e77461572101628f0d93b79a7730

org.gradle.caching=true
org.gradle.parallel=true
Expand Down
30 changes: 28 additions & 2 deletions patches/server/0001-Rebranding.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Rebranding


diff --git a/build.gradle.kts b/build.gradle.kts
index 93f9abd2169a48a4fd32f712c68be7b49b034e83..4d01623cd1b10679a09efdc444220dd4b5adb5e4 100644
index 9ee90bc753e65f9dd532f28ec75cc16bf16486c8..95c176522ffa263b27ce3ce6a613ea9cd4c45480 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating
Expand All @@ -27,7 +27,7 @@ index 93f9abd2169a48a4fd32f712c68be7b49b034e83..4d01623cd1b10679a09efdc444220dd4
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
index 58dc84b7b3b04c2d0b00fc5fac5303d3378b3467..d7261da5f872bedcf7db5425e6ff126eea1670e7 100644
index cb60d58d4a7556dd896f31d0cd249f860bb3ef84..3d1ed00e576f6e6663dc172d2dbab9a837974c48 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 {
Expand Down Expand Up @@ -80,6 +80,32 @@ index e2f704c115fd6e00960bb56bb0779f1100c89c17..d77980fe69758834ffded0d24c2436e6
org.bukkit.Bukkit.getLogger().warning("Pattern: " + VER_PATTERN.toString());
org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 75eb95c330d6ab7ac1e4a69da13695bbd40f894e..f997a8c44c5930f84c938f6792b8df2b04e9b2f9 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1811,7 +1811,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

@DontObfuscate
public String getServerModName() {
- return "Folia"; // Folia - Folia > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
+ return "Foldenor"; // Folia - Folia > // 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 a8bf1f542ab20eb7c40c80b5e42b55982677373d..05b840b157cf209125fb768162c294c5833d301b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -265,7 +265,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper

public final class CraftServer implements Server {
- private final String serverName = "Folia"; // Folia // Paper
+ private final String serverName = "Foldenor"; // Folia // Paper
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/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index e9b6ca3aa25e140467ae866d572483050ea3fa0e..85c419af128d3b08e7f81c07a33b647496010460 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
Expand Down
28 changes: 0 additions & 28 deletions patches/server/0002-Enable-Function-And-Datapack-Commands.patch

This file was deleted.

Loading

0 comments on commit cf1b5dd

Please sign in to comment.