Repo-Mirror/SparklyPaperMC
9
0
Fork 0
mirror of https://github.com/SparklyPower/SparklyPaper.git synced 2025-12-19 15:09:27 +00:00
Code Issues Releases Activity

Update to match Paperweight's v2-fork branch

Browse Source
This commit is contained in:
MrPowerGamerBR
2025-01-17 01:59:00 -03:00
parent 45cb49a445
commit 6a7d3ce2fa
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle.kts
View File

@@ -26,11 +26,6 @@ paperweight {
patchesDir = file("sparklypaper-api/paper-patches")
outputDir = file("paper-api")
}
patchDir("paperApiGenerator") {
upstreamPath = "paper-api-generator"
patchesDir = file("sparklypaper-api-generator/paper-patches")
outputDir = file("paper-api-generator")
}
}
}

9
sparklypaper-api/build.gradle.kts.patch
View File

@@ -1,5 +1,14 @@
--- a/paper-api/build.gradle.kts
+++ b/paper-api/build.gradle.kts
@@ -93,7 +_,7 @@
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}
-val generatedApiPath: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
+val generatedApiPath: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath()
idea {
module {
generatedSourceDirs.add(generatedApiPath.toFile())
@@ -103,6 +_,18 @@
main {
java {

6
sparklypaper-server/build.gradle.kts.patch
View File

@@ -9,7 +9,7 @@
`maven-publish`
id("io.papermc.paperweight.core")
}
@@ -21,6 +_,21 @@
@@ -21,6 +_,17 @@
// macheOldPath = file("F:\\Projects\\PaperTooling\\mache\\versions\\1.21.4\\src\\main\\java")
// gitFilePatches = true
@@ -23,10 +23,6 @@
+ }
+
+ activeFork = fork
+
+ paper {
+ paperServerDir = upstreamsDirectory().map { it.dir("paper/paper-server") }
+ }
+
spigot {
buildDataRef = "3edaf46ec1eed4115ce1b18d2846cded42577e42"

6
sparklypaper-server/paper-patches/features/0004-Skip-EntityScheduler-s-executeTick-checks-if-there-i.patch
View File

@@ -73,10 +73,10 @@ index c03608fec96b51e1867f43d8f42e5aefb1520e46..15b21fa3907db1b77ed5b5d1050a37f4
throw new IllegalStateException("Ticking retired scheduler");
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 4562bee2e2795801862bae03d783799fc076b73e..7107acb0a4ad4c84f78185bb8da2db8506c352d1 100644
index 6d81a19741868983c54aff6c2c4c0e2bf690ba0d..6a9bd024e855925d4cfdfa84ee70e822166db24a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -74,7 +74,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -75,7 +75,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
private final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(CraftEntity.DATA_TYPE_REGISTRY);
protected net.kyori.adventure.pointer.Pointers adventure$pointers; // Paper - implement pointers
// Paper start - Folia shedulers
@@ -85,7 +85,7 @@ index 4562bee2e2795801862bae03d783799fc076b73e..7107acb0a4ad4c84f78185bb8da2db85
private final io.papermc.paper.threadedregions.scheduler.FoliaEntityScheduler apiScheduler = new io.papermc.paper.threadedregions.scheduler.FoliaEntityScheduler(this);
@Override
@@ -87,6 +87,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -88,6 +88,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
this.server = server;
this.entity = entity;
this.entityType = CraftEntityType.minecraftToBukkit(entity.getType());