nachonekoawa/Lophine
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update upstream (Luminol)

Browse Source
This commit is contained in:
Helvetica Volubi
2025-06-08 23:46:08 +08:00
parent e4a0c78d7e
commit 044d3f9f78
6 changed files with 23 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lophine-server/minecraft-patches/features/0007-Add-config-to-enable-Raytracing-tracker.patch
+2 -2
View File
@@ -18,7 +18,7 @@ index ee53f78396f4377d3e5c2998826f231208066ef6..607091ecbd4a7261f2c0d839ee4dd1d2
double rangeY = level.paperConfig().entities.trackingRangeY.get(this.entity, -1);
if (rangeY != -1) {
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index 14e58b4093b4eafb989f9b1d498579bd25ab6c1e..2e906ba62380ed3999ed5747a88073b313b60bae 100644
index 0814ad6820b08a856f7bd261e96143568e772ac4..b7ef7df56e94b6af9398d0a4768747a35ac6f4fd 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -140,7 +140,7 @@ import net.minecraft.world.scores.ScoreHolder;
@@ -30,7 +30,7 @@ index 14e58b4093b4eafb989f9b1d498579bd25ab6c1e..2e906ba62380ed3999ed5747a88073b3
// CraftBukkit start
private static final org.slf4j.Logger LOGGER = com.mojang.logging.LogUtils.getLogger();
private static final int CURRENT_LEVEL = 2;
@@ -6102,4 +6102,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -6107,4 +6107,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
// Paper end - Expose entity id counter
public boolean shouldTickHot() { return this.tickCount > 20 * 10 && this.isAlive(); } // KioCG
lophine-server/src/build.gradle.kts.patch
-72
View File
@@ -1,72 +0,0 @@
--- a/luminol-server/build.gradle.kts
+++ b/luminol-server/build.gradle.kts
@@ -54,7 +_,23 @@
}
}
- activeFork = luminol
+ val lophine = forks.register("lophine") {
+ forks = luminol
+ upstream.patchRepo("paperServer") {
+ upstreamRepo = luminol.patchedRepo("paperServer")
+ patchesDir = rootDirectory.dir("lophine-server/paper-patches")
+ outputDir = rootDirectory.dir("paper-server")
+ }
+
+ upstream.patchDir("luminolServer") {
+ upstreamPath = "luminol-server"
+ excludes = setOf("src/minecraft", "paper-patches", "minecraft-patches", "build.gradle.kts", "build.gradle.kts.patch")
+ patchesDir = rootDirectory.dir("lophine-server/luminol-patches")
+ outputDir = rootDirectory.dir("luminol-server")
+ }
+ }
+
+ activeFork = lophine
spigot {
buildDataRef = "702e1a0a5072b2c4082371d5228cb30525687efc"
@@ -142,12 +_,16 @@
resources { srcDir("../paper-server/src/main/resources") }
java { srcDir("../folia-server/src/main/java") }
resources { srcDir("../folia-server/src/main/resources") }
+ java { srcDir("../luminol-server/src/main/java") }
+ resources { srcDir("../luminol-server/src/main/resources") }
}
test {
java { srcDir("../paper-server/src/test/java") }
resources { srcDir("../paper-server/src/test/resources") }
java { srcDir("../folia-server/src/test/java") }
resources { srcDir("../folia-server/src/test/resources") }
+ java { srcDir("../luminol-server/src/main/java") }
+ resources { srcDir("../luminol-server/src/main/resources") }
}
}
val log4jPlugins = sourceSets.create("log4jPlugins") {
@@ -174,7 +_,7 @@
}
dependencies {
- implementation(project(":luminol-api")) // Luminol
+ implementation(project(":lophine-api")) // Lophine
implementation("com.electronwill.night-config:toml:3.8.2") // Luminol - Night config
// Abomination start
implementation("com.github.luben:zstd-jni:1.5.4-1")
@@ -264,14 +_,14 @@
val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
- "Implementation-Title" to "Luminol",
+ "Implementation-Title" to "Lophine",
"Implementation-Version" to implementationVersion,
"Implementation-Vendor" to date,
- "Specification-Title" to "Luminol",
+ "Specification-Title" to "Lophine",
"Specification-Version" to project.version,
"Specification-Vendor" to "Luminol Team",
- "Brand-Id" to "luminolmc:luminol",
- "Brand-Name" to "Luminol",
+ "Brand-Id" to "luminolmc:lophine",
+ "Brand-Name" to "Lophine",
"Build-Number" to (build ?: ""),
"Build-Time" to buildTime.toString(),
"Git-Branch" to gitBranch,