initial 1.21 support

.github/workflows/build.yml

@@ -2,15 +2,15 @@ name: Patch and Build
 
 on:
   push:
-    branches: [ "1.20.6" ]
+    branches: [ "1.21" ]
   workflow_dispatch:
   #workflow_run:
     #workflows: ["Automatically update Folia commit"]
    # types:
      # - completed
 
 jobs:
-  compile_1_20_6_core_jar:
+  compile_1_21_core_jar:
     runs-on: windows-latest
 
     permissions:
@@ -41,16 +41,15 @@ jobs:
         run: ./gradlew applyPatches
 
       - name: Build
-        run: ./gradlew createReobfBundlerJar
+        run: ./gradlew createReobfPaperclipJar createMojmapPaperclipJar
 
       - name: Make release
-        uses: softprops/action-gh-release@v1
+        uses: marvinpinto/action-automatic-releases@master
         with:
-          name: "1.20.6 build"
+          title: "Foldenor 1.21 release"
           body: |
             Foldenor build
-            Version: 1.20.6
-          tag_name: "1.20.6_${{github.run_number}}"
+            Version: 1.21
+          tag_name: "1.21"
           files: build/libs/*
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"

build.gradle.kts

@@ -1,25 +1,24 @@
-import io.papermc.paperweight.util.constants.PAPERCLIP_CONFIG
 
 plugins {
     java
     `maven-publish`
-    id("io.papermc.paperweight.patcher") version "1.6.4-SNAPSHOT"
+    id("io.papermc.paperweight.patcher") version "1.7.1"
 }
 
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
 
 repositories {
     mavenCentral()
     maven(paperMavenPublicUrl) {
-        content { onlyForConfigurations(PAPERCLIP_CONFIG) }
+        content { onlyForConfigurations(configurations.paperclip.name) }
     }
     maven("https://maven.nostal.ink/repository/maven-snapshots/")
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.10.2:fat")
+    remapper("net.fabricmc:tiny-remapper:0.10.3:fat")
     decompiler("org.vineflower:vineflower:1.10.1")
-    paperclip("cn.dreeam:quantumleaper:1.0.0-SNAPSHOT")
+    paperclip("io.papermc:paperclip:3.0.3")
 }
 
 allprojects {
@@ -30,13 +29,9 @@ allprojects {
         toolchain {
             languageVersion.set(JavaLanguageVersion.of(21))
         }
-
-        //Just need for test for jitpack
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
     }
 
-    publishing {
+    /*publishing {
         repositories {
             maven {
                 name = "githubPackage"
@@ -52,7 +47,7 @@ allprojects {
                 from(components["java"])
             }
         }
-    }
+    }*/
 }
 
 subprojects {
@@ -70,7 +65,6 @@ subprojects {
     repositories {
         mavenCentral()
         maven(paperMavenPublicUrl)
-        maven("https://jitpack.io")
     }
 }
 

gradle.properties

@@ -1,8 +1,8 @@
 group=dev.edenor.foldenor
 
-version=1.20.6-R0.1-SNAPSHOT
-mcVersion=1.20.6
-foliaRef=78f49e0ce3b65afb8b5c949f55c3a2ffa669dfad
+version=1.21-R0.1-SNAPSHOT
+mcVersion=1.21
+foliaRef=388cdacd1b373031caec202fca400f3fd7898285
 
 org.gradle.caching=true
 org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

patches/api/0001-Add-deprecated-tag-to-getScheduler-function.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add-deprecated-tag-to-getScheduler-function
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b4327a55c422380ca6b3a1dc47c3adbe76de4655..3b9e51b24b029327e09d074706c138f1f7801288 100644
+index 886920b33b37bdefc301f898ad0003e40eff6443..725c3644d941b18ef2288498f27e221d1366c832 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -782,8 +782,10 @@ public final class Bukkit {
+@@ -783,8 +783,10 @@ public final class Bukkit {
       * Gets the scheduler for managing scheduled events.
       *
       * @return a scheduling service for this server

patches/server/0001-Rebranding.patch

@@ -1,31 +1,41 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AltronMaxX <max06112004@gmail.com>
-Date: Thu, 22 Jun 2023 13:31:13 +0400
+Date: Wed, 31 Jul 2024 14:12:20 +0400
 Subject: [PATCH] Rebranding
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index b1d621ed91c74790fd5b66339c044ec444de62ef..4f982050dc499c2d037c389c3b25338a01b16ba5 100644
+index f0a90d13a17160cd363d54d494add4f6433b4758..0a9bcd472022cd7ea57110dd24928d5be021d649 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -13,7 +13,7 @@ val alsoShade: Configuration by configurations.creating
+@@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
+ val alsoShade: Configuration by configurations.creating
 
  dependencies {
-     // Folia start
--    implementation(project(":folia-api"))
-+    implementation(project(":foldenor-api"))
-     implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
-         exclude("io.papermc.paper", "paper-api")
-     }
-@@ -83,7 +83,7 @@ tasks.jar {
+-    implementation(project(":folia-api")) // Folia
++    implementation(project(":foldenor-api")) // Folia
+     // Paper start
+     implementation("org.jline:jline-terminal-jansi:3.21.0")
+     implementation("net.minecrell:terminalconsoleappender:1.3.0")
+@@ -84,14 +84,14 @@ tasks.jar {
+         val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
-             "Implementation-Title" to "CraftBukkit",
--            "Implementation-Version" to "git-Folia-$implementationVersion", // Folia
-+            "Implementation-Version" to "git-Foldenor-$implementationVersion", // Folia
+-            "Implementation-Title" to "Folia", // Folia
++            "Implementation-Title" to "Foldenor", // Folia
+             "Implementation-Version" to implementationVersion,
              "Implementation-Vendor" to date, // Paper
-             "Specification-Title" to "Bukkit",
+             "Specification-Title" to "Folia", // Folia
              "Specification-Version" to project.version,
+-            "Specification-Vendor" to "Paper Team",
+-            "Brand-Id" to "papermc:folia", // Folia
+-            "Brand-Name" to "Folia", // Folia
++            "Specification-Vendor" to "Edenor-Minecraft",
++            "Brand-Id" to "edenor-minecraft:foldenor", // Folia
++            "Brand-Name" to "Foldenor", // Folia
+             "Build-Number" to (build ?: ""),
+             "Build-Time" to Instant.now().toString(),
+             "Git-Branch" to gitBranch, // Paper
 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
 index cb60d58d4a7556dd896f31d0cd249f860bb3ef84..04403a5dadc5a4d2d5503a57c49011cba90b1105 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
@@ -49,76 +59,72 @@ index cb60d58d4a7556dd896f31d0cd249f860bb3ef84..04403a5dadc5a4d2d5503a57c49011cb
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index e2f704c115fd6e00960bb56bb0779f1100c89c17..d77980fe69758834ffded0d24c2436e6cb3263d7 100644
+index 29bd788ae8bc61c1e62a4f84b9e259931a7041ce..af641e981757dc132e1a4e1d846cf5d9007b5035 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-@@ -20,7 +20,7 @@ import java.util.stream.StreamSupport;
- public class PaperVersionFetcher implements VersionFetcher {
-     private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end
-     private static final String GITHUB_BRANCH_NAME = "master";
+@@ -35,7 +35,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+     private static final Logger LOGGER = LogUtils.getClassLogger();
+     private static final int DISTANCE_ERROR = -1;
+     private static final int DISTANCE_UNKNOWN = -2;
 -    private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/paper";
 +    private static final String DOWNLOAD_PAGE = "https://github.com/Edenor-Minecraft/Foldenor";
-     private static @Nullable String mcVer;
 
      @Override
-@@ -31,8 +31,8 @@ public class PaperVersionFetcher implements VersionFetcher {
-     @Nonnull
-     @Override
-     public Component getVersionMessage(@Nonnull String serverVersion) {
--        String[] parts = serverVersion.substring("git-Folia-".length()).split("[-\\s]"); // Folia
--        final Component updateMessage = getUpdateStatusMessage("PaperMC/Folia", GITHUB_BRANCH_NAME, parts[0]); // Folia
-+        String[] parts = serverVersion.substring("git-Foldenor-".length()).split("[-\\s]"); // Folia
-+        final Component updateMessage = getUpdateStatusMessage("Edenor-Minecraft/Foldenor", GITHUB_BRANCH_NAME, parts[0]); // Folia
-         final Component history = getHistory();
+     public long getCacheTime() {
+@@ -49,7 +49,7 @@ public class PaperVersionFetcher implements VersionFetcher {
+         if (build.buildNumber().isEmpty() && build.gitCommit().isEmpty()) {
+             updateMessage = text("You are running a development version without access to version information", color(0xFF5300));
+         } else {
+-            updateMessage = getUpdateStatusMessage("PaperMC/Folia", build); // Folia
++            updateMessage = getUpdateStatusMessage("Edenor-Minecraft/Foldenor", build); // Folia
+         }
+         final @Nullable Component history = this.getHistory();
+
+@@ -60,15 +60,15 @@ public class PaperVersionFetcher implements VersionFetcher {
+         int distance = DISTANCE_ERROR;
 
-         return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
-@@ -45,7 +45,7 @@ public class PaperVersionFetcher implements VersionFetcher {
-                 String result = matcher.group();
-                 mcVer = result.substring(0, result.length() - 2); // strip 'R' anchor and trailing '-'
-             } else {
--                org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to PaperMC!");
-+                org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to Foldenor!");
-                 org.bukkit.Bukkit.getLogger().warning("Pattern: " + VER_PATTERN.toString());
-                 org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
+         final OptionalInt buildNumber = build.buildNumber();
+-        if (buildNumber.isPresent()) {
+-            distance = fetchDistanceFromSiteApi(build, buildNumber.getAsInt());
+-        } else {
++        //if (buildNumber.isPresent()) {
++            //distance = fetchDistanceFromSiteApi(build, buildNumber.getAsInt());
++        //} else {
+             final Optional<String> gitBranch = build.gitBranch();
+             final Optional<String> gitCommit = build.gitCommit();
+             if (gitBranch.isPresent() && gitCommit.isPresent()) {
+                 distance = fetchDistanceFromGitHub(repo, gitBranch.get(), gitCommit.get());
              }
-diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java
-index 4f3cc14d48690bb183d09bb7a5ba1e23e8a0c08a..b51283f1722f0973888b7094ca5eaeec6c78dae8 100644
---- a/src/main/java/net/minecraft/CrashReport.java
-+++ b/src/main/java/net/minecraft/CrashReport.java
-@@ -125,6 +125,7 @@ public class CrashReport {
-         StringBuilder stringbuilder = new StringBuilder();
+-        }
++        //}
 
-         stringbuilder.append("---- Minecraft Crash Report ----\n");
-+        stringbuilder.append("// DO NOT REPORT THIS TO FOLIA! REPORT TO FOLDENOR INSTEAD!");
-         stringbuilder.append("// ");
-         stringbuilder.append(CrashReport.getErrorComment());
-         stringbuilder.append("\n\n");
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 49a121862fbb823a00753d99d24d04c87479fcd1..967aa20540b284023a36d27201d90b9c8af824bc 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2020,7 +2020,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         return switch (distance) {
+             case DISTANCE_ERROR -> text("Error obtaining version information", NamedTextColor.YELLOW);
+diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
+index e741201fdbea0dbbc0e42313ebd33368014c9dc4..357f38b144f21c0d0920bb8008afbda7c4ba41eb 100644
+--- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
++++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
+@@ -30,7 +30,7 @@ public record ServerBuildInfoImpl(
+     private static final String ATTRIBUTE_GIT_BRANCH = "Git-Branch";
+     private static final String ATTRIBUTE_GIT_COMMIT = "Git-Commit";
 
-     @DontObfuscate
-     public String getServerModName() {
--        return "Folia"; // Paper // Folia - Folia
-+        return "Foldenor"; // Paper // Folia - Folia
-     }
+-    private static final String BRAND_PAPER_NAME = "Paper";
++    private static final String BRAND_PAPER_NAME = "Foldenor";
 
-     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 57963e9e427e2533ae9cdbd1e98ff3dfadbdebac..4c8598c74f1f56389997e7ea7954318178c4ca69 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -268,7 +268,7 @@ import javax.annotation.Nullable; // Paper
- import javax.annotation.Nonnull; // Paper
+     private static final String BUILD_DEV = "DEV";
 
- 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");
+@@ -42,9 +42,9 @@ public record ServerBuildInfoImpl(
+         this(
+             getManifestAttribute(manifest, ATTRIBUTE_BRAND_ID)
+                 .map(Key::key)
+-                .orElse(Key.key("papermc", "folia")), // Folia
++                .orElse(Key.key("edenor-minecraft", "foldenor")), // Folia
+             getManifestAttribute(manifest, ATTRIBUTE_BRAND_NAME)
+-                .orElse("Folia"), // Folia
++                .orElse("Foldenor"), // Folia
+             SharedConstants.getCurrentVersion().getId(),
+             SharedConstants.getCurrentVersion().getName(),
+             getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER)
 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