Skip to content

Commit

Permalink
Async entity tracker
Browse files Browse the repository at this point in the history
  • Loading branch information
semenishchev committed Dec 7, 2024
1 parent 766dc04 commit b5b5a8a
Show file tree
Hide file tree
Showing 6 changed files with 921 additions and 12 deletions.
2 changes: 1 addition & 1 deletion build-data/dev-imports.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
# datafixerupper com/mojang/datafixers/util/Either.java
# To import classes from the vanilla Minecraft jar use `minecraft` as the artifactId:
# minecraft net.minecraft.world.level.entity.LevelEntityGetterAdapter
# minecraft net/minecraft/world/level/entity/LevelEntityGetter.java
# minecraft net/minecraft/world/level/entity/LevelEntityGetter.java
19 changes: 19 additions & 0 deletions patches/api/0001-Rebrand.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: SashaSemenishchev <sashasemenishchev@gmail.com>
Date: Sat, 7 Dec 2024 18:27:38 +0100
Subject: [PATCH] Rebrand


diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
index c880d0010849ab733ad13bbd18fab3c864d0cf61..a972645d975844ddcbe5f7a8949f6ba35a333456 100644
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
@@ -259,7 +259,7 @@ public class VersionCommand extends BukkitCommand {
// Purpur start
int distance = getVersionFetcher().distance();
final Component message = Component.join(net.kyori.adventure.text.JoinConfiguration.separator(Component.newline()),
- ChatColor.parseMM("<grey>Current Purpur Version: %s%s*", distance == 0 ? "<green>" : distance > 0 ? "<yellow>" : "<red>", Bukkit.getVersion()),
+ ChatColor.parseMM("<grey>Current Purpurleaf Version: %s%s*", distance == 0 ? "<green>" : distance > 0 ? "<yellow>" : "<red>", Bukkit.getVersion()),
// Purpur end
msg
);
27 changes: 26 additions & 1 deletion patches/server/0001-Rebrand.patch
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,19 @@ index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..b2c19f1c1650fb10d904797691c624f4

metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
String minecraftVersion = Bukkit.getVersion();
diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
index 6d36fc6d8e22d9b68dea3830f6ecc8763184c343..c818edd61a4721bbee6cf10c556dbb2e02ff0268 100644
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
@@ -52,7 +52,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("PurpurMC/Purpur", build); // Purpur
+ updateMessage = getUpdateStatusMessage("semenishchev/PurpurLeaf", build); // PurpurLeaf // Purpur
}
final @Nullable Component history = this.getHistory();

diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
index 90b3526479320064378f2cde6c2f2b8e48a59ba6..4fd0b966566e503a2691aa28fb05b6ba20738243 100644
--- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
Expand All @@ -64,7 +77,7 @@ index 90b3526479320064378f2cde6c2f2b8e48a59ba6..4fd0b966566e503a2691aa28fb05b6ba
.completer(new ConsoleCommandCompleter(this.server))
.option(LineReader.Option.COMPLETE_IN_WORD, true);
diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
index 3099c21ee589acf6edff5903a23673adf489024f..f1fa4647263408b71b4fb391ecec8df70bd9f123 100644
index 3099c21ee589acf6edff5903a23673adf489024f..5244a9e31f0a468b9f654cf1f5e2a311733a2204 100644
--- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
+++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
@@ -32,7 +32,7 @@ public record ServerBuildInfoImpl(
Expand All @@ -76,6 +89,18 @@ index 3099c21ee589acf6edff5903a23673adf489024f..f1fa4647263408b71b4fb391ecec8df7

private static final String BUILD_DEV = "DEV";

@@ -49,10 +49,7 @@ public record ServerBuildInfoImpl(
.orElse(BRAND_PURPUR_NAME), // Purpur
SharedConstants.getCurrentVersion().getId(),
SharedConstants.getCurrentVersion().getName(),
- getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER)
- .map(Integer::parseInt)
- .map(OptionalInt::of)
- .orElse(OptionalInt.empty()),
+ OptionalInt.empty(), // PurpurLeaf - no build number for now. Will be later
getManifestAttribute(manifest, ATTRIBUTE_BUILD_TIME)
.map(Instant::parse)
.orElse(Main.BOOT_TIME),
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..870b42b0fabcbe3a8fe9df921227237cc36b26d2 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ index 7aadcaa1785c6560eb1ce2f1179225facca47d84..5c00b440c7e7c759f806e0304166bceb
for (final Entity passenger : from) {
into.add(passenger);
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 5057d9d433ba002a22d22adfaf7323b2cfaee9af..8e0b19009ee4a5650316e12971fde9a6253031fa 100644
index 5057d9d433ba002a22d22adfaf7323b2cfaee9af..7a9e492c254d285ec1a15311ed220678764056f3 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -116,9 +116,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
Expand All @@ -367,7 +367,7 @@ index 5057d9d433ba002a22d22adfaf7323b2cfaee9af..8e0b19009ee4a5650316e12971fde9a6
private boolean tickingBlockEntities;
public final Thread thread;
private final boolean isDebug;
@@ -233,6 +233,53 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -233,6 +233,50 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
return (CraftServer) Bukkit.getServer();
}

Expand Down Expand Up @@ -400,15 +400,12 @@ index 5057d9d433ba002a22d22adfaf7323b2cfaee9af..8e0b19009ee4a5650316e12971fde9a6
+
+ @Override
+ public final me.mrfunny.purpurleaf.data.ChunkData moonrise$requestChunkData(final long chunkKey) {
+ return this.chunkData.compute(chunkKey, (keyInMap, valueInMap) -> {
+ if (valueInMap == null) {
+ me.mrfunny.purpurleaf.data.ChunkData ret = new me.mrfunny.purpurleaf.data.ChunkData();
+ ret.increaseRef();
+ return ret;
+ } else {
+ valueInMap.increaseRef();
+ return valueInMap;
+ return this.chunkData.compute(chunkKey, (keyInMap, val) -> {
+ if (val == null) {
+ val = new me.mrfunny.purpurleaf.data.ChunkData();
+ }
+ val.increaseRef();
+ return val;
+ });
+ }
+ @Nullable
Expand Down
Loading

0 comments on commit b5b5a8a

Please sign in to comment.