Skip to content

Commit

Permalink
1.20.6 wip
Browse files Browse the repository at this point in the history
  • Loading branch information
AltronMaxX committed May 12, 2024
1 parent 595e9be commit efc9a01
Show file tree
Hide file tree
Showing 39 changed files with 186 additions and 4,068 deletions.
15 changes: 8 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import io.papermc.paperweight.util.constants.PAPERCLIP_CONFIG
plugins {
java
`maven-publish`
id("com.github.johnrengelman.shadow") version "8.1.1" apply false
id("io.papermc.paperweight.patcher") version "1.5.13"
id("io.papermc.paperweight.patcher") version "1.6.4-SNAPSHOT"
}

val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
Expand All @@ -14,12 +13,13 @@ repositories {
maven(paperMavenPublicUrl) {
content { onlyForConfigurations(PAPERCLIP_CONFIG) }
}
maven("https://maven.nostal.ink/repository/maven-snapshots/")
}

dependencies {
remapper("net.fabricmc:tiny-remapper:0.10.1:fat")
decompiler("org.vineflower:vineflower:1.9.3")
paperclip("io.papermc:paperclip:3.0.4-SNAPSHOT")
remapper("net.fabricmc:tiny-remapper:0.10.2:fat")
decompiler("org.vineflower:vineflower:1.10.1")
paperclip("cn.dreeam:quantumleaper:1.0.0-SNAPSHOT")
}

allprojects {
Expand Down Expand Up @@ -58,7 +58,7 @@ allprojects {
subprojects {
tasks.withType<JavaCompile> {
options.encoding = Charsets.UTF_8.name()
options.release.set(17)
options.release.set(21)
}
tasks.withType<Javadoc> {
options.encoding = Charsets.UTF_8.name()
Expand All @@ -85,7 +85,8 @@ paperweight {
ref.set(providers.gradleProperty("foliaRef"))

withStandardPatcher {
baseName("Folia")
apiSourceDirPath.set("folia-api")
serverSourceDirPath.set("folia-server")

apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
apiOutputDir.set(layout.projectDirectory.dir("Foldenor-api"))
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
group=dev.edenor.foldenor

version=1.20.4-R0.1-SNAPSHOT
mcVersion=1.20.4
foliaRef=4b4e25c6bc724f44891f2ef14e6a0d46b3a0be6b
version=1.20.6-R0.1-SNAPSHOT
mcVersion=1.20.6
foliaRef=b1bfe7b55f33db5a9d68169f7e0a3503cad066ff

org.gradle.caching=true
org.gradle.parallel=true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 4d6de4f2c67b1f122768806443766bd20c5ae617..dd677c37f0517f25978d11f375b4754d288e2cac 100644
index b4327a55c422380ca6b3a1dc47c3adbe76de4655..3b9e51b24b029327e09d074706c138f1f7801288 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -780,8 +780,10 @@ public final class Bukkit {
@@ -782,8 +782,10 @@ public final class Bukkit {
* Gets the scheduler for managing scheduled events.
*
* @return a scheduling service for this server
Expand Down
16 changes: 8 additions & 8 deletions patches/server/0001-Rebranding.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Rebranding


diff --git a/build.gradle.kts b/build.gradle.kts
index 905262067dabc7cbe5b08639fcefd3a996a937e0..0b66ac537a56f907022f615c47ea970c7b26bbf3 100644
index b1d621ed91c74790fd5b66339c044ec444de62ef..4f982050dc499c2d037c389c3b25338a01b16ba5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating
@@ -13,7 +13,7 @@ val alsoShade: Configuration by configurations.creating

dependencies {
// Folia start
Expand All @@ -17,7 +17,7 @@ index 905262067dabc7cbe5b08639fcefd3a996a937e0..0b66ac537a56f907022f615c47ea970c
implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
exclude("io.papermc.paper", "paper-api")
}
@@ -75,7 +75,7 @@ tasks.jar {
@@ -83,7 +83,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
Expand Down Expand Up @@ -82,7 +82,7 @@ index e2f704c115fd6e00960bb56bb0779f1100c89c17..d77980fe69758834ffded0d24c2436e6
org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
}
diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java
index 99c5038672b09d0874125e3df280174c1e8151e6..0cc595adcfe1af04ce1b5c2c2987ba62814ecb59 100644
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 {
Expand All @@ -94,10 +94,10 @@ index 99c5038672b09d0874125e3df280174c1e8151e6..0cc595adcfe1af04ce1b5c2c2987ba62
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 d6a7188227cee9072976db98613324ee2d3dcdc8..8cc74922fb00a1975dfb9bd2af8972c7afcfdb14 100644
index 49a121862fbb823a00753d99d24d04c87479fcd1..967aa20540b284023a36d27201d90b9c8af824bc 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1963,7 +1963,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2020,7 +2020,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

@DontObfuscate
public String getServerModName() {
Expand All @@ -107,10 +107,10 @@ index d6a7188227cee9072976db98613324ee2d3dcdc8..8cc74922fb00a1975dfb9bd2af8972c7

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 9dd9e86a5f7f30ce37b906ebfe4bccad0e52577f..0e5af78778cab677c24b508f293cfbdaffb433d6 100644
index 57963e9e427e2533ae9cdbd1e98ff3dfadbdebac..4c8598c74f1f56389997e7ea7954318178c4ca69 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -266,7 +266,7 @@ import javax.annotation.Nullable; // Paper
@@ -268,7 +268,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper

public final class CraftServer implements Server {
Expand Down
Loading

0 comments on commit efc9a01

Please sign in to comment.