diff --git a/build-data/dev-imports.txt b/build-data/dev-imports.txt index 1d9862a..ff6c20a 100644 --- a/build-data/dev-imports.txt +++ b/build-data/dev-imports.txt @@ -5,10 +5,4 @@ # authlib com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java # datafixerupper com.mojang.datafixers.DataFixerBuilder # 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 -# To import minecraft data files, like the default chat type, use `mc_data` as the prefix: -# mc_data chat_type/chat.json -# mc_data dimension_type/overworld.json # diff --git a/divinemc-api/build.gradle.kts.patch b/divinemc-api/build.gradle.kts.patch index 0f1675d..6747a6c 100644 --- a/divinemc-api/build.gradle.kts.patch +++ b/divinemc-api/build.gradle.kts.patch @@ -2,7 +2,7 @@ +++ b/purpur-api/build.gradle.kts @@ -13,8 +_,8 @@ // Keep in sync with paper-server adventure-text-serializer-ansi dep - val adventureVersion = "4.23.0" + val adventureVersion = "4.24.0" val bungeeCordChatVersion = "1.21-R0.2-deprecated+build.21" -val slf4jVersion = "2.0.16" -val log4jVersion = "2.24.1" diff --git a/divinemc-server/build.gradle.kts.patch b/divinemc-server/build.gradle.kts.patch index 7ca219c..d5623c9 100644 --- a/divinemc-server/build.gradle.kts.patch +++ b/divinemc-server/build.gradle.kts.patch @@ -95,7 +95,7 @@ + implementation("org.jline:jline-terminal-ffm:3.29.0") // use ffm on java 22+ // DivineMC - Bump dependencies + implementation("org.jline:jline-terminal-jni:3.29.0") // fall back to jni on java 21 // DivineMC - Bump dependencies implementation("net.minecrell:terminalconsoleappender:1.3.0") - implementation("net.kyori:adventure-text-serializer-ansi:4.23.0") // Keep in sync with adventureVersion from Paper-API build file + implementation("net.kyori:adventure-text-serializer-ansi") runtimeConfiguration(sourceSets.main.map { it.runtimeClasspath }) @@ -170,16 +_,16 @@ all its classes to check if they are plugins. diff --git a/divinemc-server/paper-patches/features/0010-Smooth-teleport-API.patch b/divinemc-server/paper-patches/features/0010-Smooth-teleport-API.patch index 3191dc7..cd59101 100644 --- a/divinemc-server/paper-patches/features/0010-Smooth-teleport-API.patch +++ b/divinemc-server/paper-patches/features/0010-Smooth-teleport-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Smooth teleport API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 54fbe5006c2c240937efb6fc89cf08b72637b9e5..54e6b59eac5b9a80c11de787631ce130cddf54f9 100644 +index 4e24a177aed7eda0899b4a1a1e308f02a16c5718..f62e0cd8f7910444439ff3285f2455eb928d4c03 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1404,6 +1404,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa +@@ -1405,6 +1405,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa // Paper end - Teleportation API } diff --git a/divinemc-server/paper-patches/features/0011-SparklyPaper-Optimize-canSee-checks.patch b/divinemc-server/paper-patches/features/0011-SparklyPaper-Optimize-canSee-checks.patch index dea3c6c..e184f3d 100644 --- a/divinemc-server/paper-patches/features/0011-SparklyPaper-Optimize-canSee-checks.patch +++ b/divinemc-server/paper-patches/features/0011-SparklyPaper-Optimize-canSee-checks.patch @@ -14,10 +14,10 @@ This seems stupid, but it does seem that it improves the performance a bit, and We also create a "canSee" method tailored for "ChunkMap#updatePlayer()", a method without the equals check (the "updatePlayer()" already checks if the entity is the same entity) because the CraftPlayer's `equals()` check is a *bit* expensive compared to only checking the object's identity, and because the identity has already been check, we don't need to check it twice. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 54e6b59eac5b9a80c11de787631ce130cddf54f9..c5e5e64889e4bfc0dfe66869468aa6d22ce78cba 100644 +index f62e0cd8f7910444439ff3285f2455eb928d4c03..8d967f179e7b36517ecc6f29381bf69e57eb7a85 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -219,7 +219,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa +@@ -220,7 +220,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa private long lastPlayed = 0; private boolean hasPlayedBefore = false; private final ConversationTracker conversationTracker = new ConversationTracker(); @@ -26,7 +26,7 @@ index 54e6b59eac5b9a80c11de787631ce130cddf54f9..c5e5e64889e4bfc0dfe66869468aa6d2 private final Set unlistedEntities = new HashSet<>(); // Paper - Add Listing API for Player private static final WeakHashMap> pluginWeakReferences = new WeakHashMap<>(); private int hash = 0; -@@ -2303,9 +2303,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa +@@ -2304,9 +2304,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa @Override public boolean canSee(org.bukkit.entity.Entity entity) { diff --git a/divinemc-server/paper-patches/features/0014-Petal-Multithreaded-Tracker.patch b/divinemc-server/paper-patches/features/0014-Petal-Multithreaded-Tracker.patch index 6d4327c..58694ba 100644 --- a/divinemc-server/paper-patches/features/0014-Petal-Multithreaded-Tracker.patch +++ b/divinemc-server/paper-patches/features/0014-Petal-Multithreaded-Tracker.patch @@ -32,10 +32,10 @@ index d7398b1ecf2660c29fb7d106b48fe02d3736603e..ab499a7eaccdc1578ec64f90f54f79b0 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c5e5e64889e4bfc0dfe66869468aa6d22ce78cba..0e05edf0ba921db65aee98a56340f1b363c80627 100644 +index 8d967f179e7b36517ecc6f29381bf69e57eb7a85..8e376ae6d3a8cadd3e7ac15f8d2c5666694461a0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2897,7 +2897,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa +@@ -2904,7 +2904,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa Iterator iterator = collection.iterator(); while (iterator.hasNext()) { AttributeInstance genericInstance = iterator.next(); diff --git a/gradle.properties b/gradle.properties index 898895d..5dcab65 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.bxteam.divinemc version=1.21.8-R0.1-SNAPSHOT mcVersion=1.21.8 -purpurRef=520a7e500d5b83622c2dcf1c80fdd0c046f79ed5 +purpurRef=c29e75fe5eca43efd7f348b01b34798995e2c2e1 experimental=false #org.gradle.configuration-cache=true