Skip to content

Commit f5fe7fb

Browse files
froobynoobyfroobynooby
committed
Update upstream
1 parent 7b361d8 commit f5fe7fb

5 files changed

+28
-53
lines changed

‎build.gradle.kts

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
java
55
`maven-publish`
66
id("com.github.johnrengelman.shadow") version "8.1.0" apply false
7-
id("io.papermc.paperweight.patcher") version "1.6.3"
7+
id("io.papermc.paperweight.patcher") version "1.7.1"
88
}
99

1010
repositories {
@@ -110,7 +110,6 @@ paperweight {
110110

111111
tasks.generateDevelopmentBundle {
112112
apiCoordinates.set("com.froobworld.nabulus:nabulus-api")
113-
mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi")
114113
libraryRepositories.set(
115114
listOf(
116115
"https://repo.maven.apache.org/maven2/",

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group=com.froobworld.nabulus
22
version=1.20.6-R0.1-SNAPSHOT
33

44
mcVersion=1.20.6
5-
paperRef=8748ae16aca495c0b6bfdc0c72e47ea64e4e6475
5+
paperRef=377733d44c0f1d476cada93ebae2478a1c495b23
66

77
org.gradle.caching=true
88
org.gradle.parallel=true

‎patches/server/0001-Nabulus-branding.patch

+18-42
Original file line numberDiff line numberDiff line change
@@ -5,69 +5,45 @@ Subject: [PATCH] Nabulus branding
55

66

77
diff --git a/build.gradle.kts b/build.gradle.kts
8-
index 5d448d8a7cf6626a11791f30ad52baf41a099272..a92d0b9a398e7c18d1fc767d6788fdc9559587a9 100644
8+
index 4998aff0b7cb084dcda15c6a18bbe45e99b6000a..567602f8396ef015bc46875f7a3f7277d8692e8f 100644
99
--- a/build.gradle.kts
1010
+++ b/build.gradle.kts
11-
@@ -12,8 +12,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
11+
@@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
1212
val alsoShade: Configuration by configurations.creating
1313

1414
dependencies {
1515
- implementation(project(":paper-api"))
16-
- implementation(project(":paper-mojangapi"))
17-
+ // Nabulus start
18-
+ implementation(project(":nabulus-api"))
19-
+ implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") {
20-
+ exclude("io.papermc.paper", "paper-api")
21-
+ }
22-
+ // Nabulus end
16+
+ implementation(project(":nabulus-api")) // Nabulus
2317
// Paper start
2418
implementation("org.jline:jline-terminal-jansi:3.21.0")
2519
implementation("net.minecrell:terminalconsoleappender:1.3.0")
26-
@@ -79,7 +83,7 @@ tasks.jar {
20+
@@ -80,14 +80,14 @@ tasks.jar {
21+
val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
2722
attributes(
2823
"Main-Class" to "org.bukkit.craftbukkit.Main",
29-
"Implementation-Title" to "CraftBukkit",
30-
- "Implementation-Version" to "git-Paper-$implementationVersion",
31-
+ "Implementation-Version" to "git-Nabulus-$implementationVersion", // Nabulus
24+
- "Implementation-Title" to "Paper",
25+
+ "Implementation-Title" to "Nabulus", // Nabulus
26+
"Implementation-Version" to implementationVersion,
3227
"Implementation-Vendor" to date, // Paper
33-
"Specification-Title" to "Bukkit",
28+
"Specification-Title" to "Paper",
3429
"Specification-Version" to project.version,
35-
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
36-
index 8dc2f9df367c849ca333bf1a1fd92ff91617b548..df8df79e524e438494ef3418748d375407bb12db 100644
37-
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
38-
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
39-
@@ -1924,7 +1924,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
40-
41-
@DontObfuscate
42-
public String getServerModName() {
43-
- return "Paper"; // Paper
44-
+ return "Nabulus"; // Paper // Nabulus
45-
}
46-
47-
public SystemReport fillSystemReport(SystemReport details) {
48-
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
49-
index 05e304f9fc8d0291fa779da589bd060ef4165b49..ca1a97011bd43bf914f16eb42aee8ed181a7602a 100644
50-
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
51-
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
52-
@@ -268,7 +268,7 @@ import javax.annotation.Nullable; // Paper
53-
import javax.annotation.Nonnull; // Paper
54-
55-
public final class CraftServer implements Server {
56-
- private final String serverName = "Paper"; // Paper
57-
+ private final String serverName = "Nabulus"; // Paper // Nabulus
58-
private final String serverVersion;
59-
private final String bukkitVersion = Versioning.getBukkitVersion();
60-
private final Logger logger = Logger.getLogger("Minecraft");
30+
"Specification-Vendor" to "Paper Team",
31+
"Brand-Id" to "papermc:paper",
32+
- "Brand-Name" to "Paper",
33+
+ "Brand-Name" to "Nabulus", // Nabulus
34+
"Build-Number" to (build ?: ""),
35+
"Build-Time" to Instant.now().toString(),
36+
"Git-Branch" to gitBranch, // Paper
6137
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
62-
index 774556a62eb240da42e84db4502e2ed43495be17..a455b7f67351e90d99ac551650f4915f913d4133 100644
38+
index 774556a62eb240da42e84db4502e2ed43495be17..df1fe60f2f26b1dae0a724cb55a2337d75c7d7a4 100644
6339
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
6440
+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
6541
@@ -11,7 +11,7 @@ public final class Versioning {
6642
public static String getBukkitVersion() {
6743
String result = "Unknown-Version";
6844

6945
- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties");
70-
+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.froobworld.nabulus/nabulus-api/pom.properties");
46+
+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.froobworld.nabulus/nabulus-api/pom.properties"); // Nabulus
7147
Properties properties = new Properties();
7248

7349
if (stream != null) {

‎patches/server/0002-Separate-creative-levels.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ index c1510d9167f466d3b7e3756353224f12f3876442..d4f0561741e71e10bf08448a02373207
1717
WalkerUtils.convert(MCTypeRegistry.ENTITY, data, "ShoulderEntityLeft", fromVersion, toVersion);
1818
WalkerUtils.convert(MCTypeRegistry.ENTITY, data, "ShoulderEntityRight", fromVersion, toVersion);
1919
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
20-
index 8437316888c6056060a2780652147590b6fe7443..958be8c6dadfea073a12a2c949475390bd24f9a4 100644
20+
index a645ad66af061966c5e47cae677026b35a55c486..4e5fa4f4a4a1c4dd6d430d6ca715864b2e4f0617 100644
2121
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
2222
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
2323
@@ -706,6 +706,7 @@ public class ServerPlayer extends Player {
@@ -87,10 +87,10 @@ index a2142930b4d4b05987c90496fb9d733d99040aa0..34073b0a94feecaea9fcef58063b0330
8787
entityplayer1.setMainArm(entityplayer.getMainArm());
8888
Iterator iterator = entityplayer.getTags().iterator();
8989
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
90-
index 2bc85351e6e52f90da5fdb29d8d042a06132d742..86aab21566f3f48b5d0fe43d9cbcb16f6fd349c7 100644
90+
index 25ea45a528612d1a2a2d77293b3802f473a52f38..db86b4001be9435df8f622fcea5b4ab3707afb5e 100644
9191
--- a/src/main/java/net/minecraft/world/entity/Entity.java
9292
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
93-
@@ -3698,6 +3698,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
93+
@@ -3704,6 +3704,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
9494
}
9595
// Paper end - Fix item duplication and teleport issues
9696
if (this.level() instanceof ServerLevel && !this.isRemoved()) {
@@ -102,7 +102,7 @@ index 2bc85351e6e52f90da5fdb29d8d042a06132d742..86aab21566f3f48b5d0fe43d9cbcb16f
102102
this.level().getProfiler().push("changeDimension");
103103
// CraftBukkit start
104104
// this.unRide();
105-
@@ -3792,6 +3797,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
105+
@@ -3798,6 +3803,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
106106
if (destination == null) {
107107
return null;
108108
}
@@ -115,7 +115,7 @@ index 2bc85351e6e52f90da5fdb29d8d042a06132d742..86aab21566f3f48b5d0fe43d9cbcb16f
115115
boolean flag1 = destination.getTypeKey() == LevelStem.END; // targetIsEnd
116116
// CraftBukkit end
117117
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
118-
index 093d1388ff90ad59110a37536b6639f939549068..2cbb63c8ef638a4e570a9436ee5fe1aba60fe150 100644
118+
index 686374e89e41b0917791264f3281f7384835bca8..bb7fe5a69e36f3f4260ef437b6652f432d57be81 100644
119119
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
120120
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
121121
@@ -200,6 +200,40 @@ public abstract class Player extends LivingEntity {

‎patches/server/0003-Show-hidden-players-in-playerlist-and-tab-suggestion.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ index 34073b0a94feecaea9fcef58063b0330eb765234..d54a16d5a547eb96edd618b449d2ea8e
5757
}).collect(Collectors.toList())));
5858
}
5959
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
60-
index f9a6b74d868f4639c5aa01920b99a3a8d7ee9418..9957f7e3b37572bdb518dc1cc37966df58a907f3 100644
60+
index af015237214cebc4d1c4bb9e9c5f939d433e365c..e36e04603e2d14e1e386d90f818db63032702043 100644
6161
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
6262
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
63-
@@ -2571,7 +2571,7 @@ public final class CraftServer implements Server {
63+
@@ -2552,7 +2552,7 @@ public final class CraftServer implements Server {
6464
PlayerChatTabCompleteEvent event = new PlayerChatTabCompleteEvent(player, message, completions);
6565
String token = event.getLastToken();
6666
for (Player p : this.getOnlinePlayers()) {
@@ -70,7 +70,7 @@ index f9a6b74d868f4639c5aa01920b99a3a8d7ee9418..9957f7e3b37572bdb518dc1cc37966df
7070
}
7171
}
7272
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
73-
index 5f896948d158651cd9837364759dbfbcce6b7d21..01b1f37a5c2c01ff3f16915e199fb6a7d3eccac1 100644
73+
index 7e6116963d835d4606ef3d93b69d3e44b61288e1..7e1831ecb674518e55dff1ee2287f55ff6f47cbc 100644
7474
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
7575
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
7676
@@ -549,7 +549,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

0 commit comments

Comments
 (0)