From 559a7e5e296fb3a3cc6603fcf82ec950cc151fa2 Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Tue, 29 Jul 2025 03:12:44 +0300 Subject: [PATCH] Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@520a7e50 Updated Upstream (Paper) --- ...03-Completely-remove-Mojang-profiler.patch | 34 +++++++++---------- .../features/0008-Smooth-teleport-API.patch | 8 ++--- ...23-Option-to-disable-disconnect.spam.patch | 4 +-- .../0036-Implement-NoChatReports.patch | 6 ++-- .../features/0038-Virtual-Threads.patch | 6 ++-- .../0043-Dynamic-Activation-of-Brain.patch | 8 ++--- ...-SparklyPaper-Parallel-world-ticking.patch | 22 ++++++------ .../features/0060-Leaves-Protocol-Core.patch | 12 +++---- ...-Do-not-send-spectator-change-packet.patch | 6 ++-- .../server/level/ServerPlayer.java.patch | 2 +- .../server/players/PlayerList.java.patch | 2 +- .../net/minecraft/world/entity/Mob.java.patch | 2 +- .../features/0002-Configuration.patch | 6 ++-- .../features/0004-Delete-ReloadCommand.patch | 4 +-- .../features/0010-Smooth-teleport-API.patch | 4 +-- ...-SparklyPaper-Optimize-canSee-checks.patch | 14 ++++---- .../features/0013-Implement-Secure-Seed.patch | 4 +-- .../0014-Petal-Multithreaded-Tracker.patch | 4 +-- ...-SparklyPaper-Parallel-world-ticking.patch | 18 +++++----- .../features/0019-Leaves-Protocol-Core.patch | 6 ++-- .../bukkit/craftbukkit/CraftServer.java.patch | 2 +- .../bxteam/divinemc/config/DivineConfig.java | 7 ++-- gradle.properties | 2 +- .../main/java/org/bxteam/shuttle/Shuttle.java | 1 + 24 files changed, 91 insertions(+), 93 deletions(-) diff --git a/divinemc-server/minecraft-patches/features/0003-Completely-remove-Mojang-profiler.patch b/divinemc-server/minecraft-patches/features/0003-Completely-remove-Mojang-profiler.patch index 97de523..dcd2196 100644 --- a/divinemc-server/minecraft-patches/features/0003-Completely-remove-Mojang-profiler.patch +++ b/divinemc-server/minecraft-patches/features/0003-Completely-remove-Mojang-profiler.patch @@ -213,7 +213,7 @@ index 18071dcc69cc28471dddb7de94e803ec1e5fc2e4..aa25f5ebaf7d1b22825b962b02dcae02 } } diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 2d01252a66e59f69ff69055b83d7e881f2f3e5cd..824f9200b66639ad1e3e821c8ae2ea4c66fe0b30 100644 +index e04be8b21514db5b7ecb2419b4b37caf29960c5a..f74804d3152f04e9343ef0fe6a5cfc6cb0187ee7 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -114,19 +114,8 @@ import net.minecraft.util.TimeUtil; @@ -479,7 +479,7 @@ index 2d01252a66e59f69ff69055b83d7e881f2f3e5cd..824f9200b66639ad1e3e821c8ae2ea4c } public boolean isLevelEnabled(Level level) { -@@ -2640,55 +2574,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop CODEC = Codec.STRING.comapFlatMap(string -> { diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java -index ac35fc08574a72be356c48fb6e1cfafe36cd0860..dcd004749846aa9e650be438b0f097e414c2ec76 100644 +index 104a9ec97bd39e15f6707f19865fa6fcf47f6e4f..46adbe6ccf1e4291e33a52a6612f624558c18f96 100644 --- a/net/minecraft/server/dedicated/DedicatedServer.java +++ b/net/minecraft/server/dedicated/DedicatedServer.java @@ -623,6 +623,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -287,7 +287,7 @@ index 667ef5b2ab50eeb0491f7fe0bc8913ec29a4603a..a7c4fad2b1cb0cbac742a18d37d688bb if (packet == null || this.processedDisconnect) { // Spigot return; diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index 2db120cd68447a4adc6f4ed6334fa52b8b55effc..84250c9786f4886fe4ab2e42808f8162da3f45d8 100644 +index 1e4ebfa25e63c148fe7bf6cf5789e602d8e5ca83..259572797f17c3c660de9fd42bb1cebe600fbf27 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java @@ -276,7 +276,7 @@ public abstract class PlayerList { @@ -299,7 +299,7 @@ index 2db120cd68447a4adc6f4ed6334fa52b8b55effc..84250c9786f4886fe4ab2e42808f8162 ) ); player.getBukkitEntity().sendSupportedChannels(); // CraftBukkit -@@ -1333,6 +1333,7 @@ public abstract class PlayerList { +@@ -1331,6 +1331,7 @@ public abstract class PlayerList { } public boolean verifyChatTrusted(PlayerChatMessage message) { diff --git a/divinemc-server/minecraft-patches/features/0038-Virtual-Threads.patch b/divinemc-server/minecraft-patches/features/0038-Virtual-Threads.patch index 00f9a8a..77becb1 100644 --- a/divinemc-server/minecraft-patches/features/0038-Virtual-Threads.patch +++ b/divinemc-server/minecraft-patches/features/0038-Virtual-Threads.patch @@ -36,10 +36,10 @@ index 758ce439d2e10e6ef42a58d147a77093667e0acd..de622982f864d96a5b76efcd69f1836e new java.util.concurrent.LinkedBlockingQueue<>(), new com.google.common.util.concurrent.ThreadFactoryBuilder() diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index dd88e4d0f72a482e4feea38bc194fc16799adf02..2baa4dc93bcc448ce65bae50ca39d41e562e2211 100644 +index 9dd56cdd243b63d36e2d6a1b0e2aa48aa766c3b6..a5130d66312717737e7b3a6e6f5fac3e4c0a62d7 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -2640,8 +2640,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop states = new java.util.ArrayList<>(level.capturedBlockStates.values()); level.capturedBlockStates.clear(); diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index a0cad0bdb8245b19f4ff983245d61d7b237a4042..c56fa00f9443b6a3a44f0b89da9dcfb6a4faf1c8 100644 +index cd084854b4c9938f5d18b9c16fbfa763323f8d8f..a67f276b4b3692207f093930c00eac67553be3b4 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -290,6 +290,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop, AutoCl diff --git a/divinemc-server/minecraft-patches/features/0060-Leaves-Protocol-Core.patch b/divinemc-server/minecraft-patches/features/0060-Leaves-Protocol-Core.patch index 7520e1a..f37d273 100644 --- a/divinemc-server/minecraft-patches/features/0060-Leaves-Protocol-Core.patch +++ b/divinemc-server/minecraft-patches/features/0060-Leaves-Protocol-Core.patch @@ -54,7 +54,7 @@ index 62b9d9486c15a1ec6527f786df4e9fc483390bcb..36d8b93182cc44e3bea245800ea9e271 int i = buffer.readableBytes(); if (i >= 0 && i <= maxSize) { diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 008530bf0f09180ba365fc514b51d22630564de2..7bc07d120ca3b8cffa6b1147f1687b5a4023b709 100644 +index 89c1fa23b7ce507f86c69c8dcc8f0de38bfa8e99..ce422e12d985a274816abf2841bb3a939568b13b 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java @@ -1788,6 +1788,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop> pluginWeakReferences = new WeakHashMap<>(); - private static final net.kyori.adventure.text.Component DEFAULT_KICK_COMPONENT = net.kyori.adventure.text.Component.translatable("multiplayer.disconnect.kicked"); +@@ -219,7 +219,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa + private long lastPlayed = 0; + private boolean hasPlayedBefore = false; private final ConversationTracker conversationTracker = new ConversationTracker(); - private final Map>> invertedVisibilityEntities = new HashMap<>(); + private final Map>> invertedVisibilityEntities = new it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap<>(); // DivineMC - SparklyPaper: Optimize "canSee" checks private final Set unlistedEntities = new HashSet<>(); // Paper - Add Listing API for Player - private long firstPlayed = 0; - private long lastPlayed = 0; -@@ -2353,9 +2353,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa + private static final WeakHashMap> pluginWeakReferences = new WeakHashMap<>(); + private int hash = 0; +@@ -2303,9 +2303,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/0013-Implement-Secure-Seed.patch b/divinemc-server/paper-patches/features/0013-Implement-Secure-Seed.patch index 61ae37b..2ff1191 100644 --- a/divinemc-server/paper-patches/features/0013-Implement-Secure-Seed.patch +++ b/divinemc-server/paper-patches/features/0013-Implement-Secure-Seed.patch @@ -25,10 +25,10 @@ index 400e632208d133a3f49fc7f14bceb48a1026769b..a1c7ba0fdb505d09407cca94e890dedd @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 172fd6f12793565fda9a240ef045775a80e264cb..bf549edfc876f1d831b550864b3f54278bcdd20c 100644 +index 4ae2ede15d7b69ce3ba7a920ecb7c2c84952de0f..c70526274391debfa694dbd82ed613d99bca37d1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1346,7 +1346,11 @@ public final class CraftServer implements Server { +@@ -1349,7 +1349,11 @@ public final class CraftServer implements Server { registryAccess = levelDataAndDimensions.dimensions().dimensionsRegistryAccess(); } else { LevelSettings levelSettings; 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 9eedcad..6d4327c 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 5164bdd2567d0055e7717701fa5028652759476b..b84c9ed7b10f2c40f04bed19cbc1109814632972 100644 +index c5e5e64889e4bfc0dfe66869468aa6d22ce78cba..0e05edf0ba921db65aee98a56340f1b363c80627 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2952,7 +2952,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa +@@ -2897,7 +2897,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa Iterator iterator = collection.iterator(); while (iterator.hasNext()) { AttributeInstance genericInstance = iterator.next(); diff --git a/divinemc-server/paper-patches/features/0017-SparklyPaper-Parallel-world-ticking.patch b/divinemc-server/paper-patches/features/0017-SparklyPaper-Parallel-world-ticking.patch index 53561aa..a582560 100644 --- a/divinemc-server/paper-patches/features/0017-SparklyPaper-Parallel-world-ticking.patch +++ b/divinemc-server/paper-patches/features/0017-SparklyPaper-Parallel-world-ticking.patch @@ -248,10 +248,10 @@ index ab499a7eaccdc1578ec64f90f54f79b0da3c0e96..6bcb8069de18e8a0f4ee9d5c71b6bdd1 } else if (!event.isAsynchronous() && !this.server.isPrimaryThread() && !this.server.isStopping()) { // DivineMC start - Multithreaded Tracker diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index cd43af3f442f7d8af1a4552a0eff33958873a366..cf4967875c2d9e87da86645e5a1f0cbaef6d1321 100644 +index 405b0164a67fe75ec6c5aee4d7302f53df9556f8..189fda8d7a8618e0922e272c1fe59753dd01babc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -469,7 +469,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -470,7 +470,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { @Override public boolean unloadChunkRequest(int x, int z) { @@ -266,7 +266,7 @@ index cd43af3f442f7d8af1a4552a0eff33958873a366..cf4967875c2d9e87da86645e5a1f0cba if (this.isChunkLoaded(x, z)) { this.world.getChunkSource().removeTicketWithRadius(TicketType.PLUGIN, new ChunkPos(x, z), 1); } -@@ -495,6 +501,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -496,6 +502,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @Override public boolean refreshChunk(int x, int z) { @@ -274,7 +274,7 @@ index cd43af3f442f7d8af1a4552a0eff33958873a366..cf4967875c2d9e87da86645e5a1f0cba ChunkHolder playerChunk = this.world.getChunkSource().chunkMap.getVisibleChunkIfPresent(ChunkPos.asLong(x, z)); if (playerChunk == null) return false; -@@ -545,7 +552,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -546,7 +553,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { @Override public boolean loadChunk(int x, int z, boolean generate) { @@ -289,7 +289,7 @@ index cd43af3f442f7d8af1a4552a0eff33958873a366..cf4967875c2d9e87da86645e5a1f0cba warnUnsafeChunk("loading a faraway chunk", x, z); // Paper ChunkAccess chunk = this.world.getChunkSource().getChunk(x, z, generate || isChunkGenerated(x, z) ? ChunkStatus.FULL : ChunkStatus.EMPTY, true); // Paper -@@ -773,6 +786,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -774,6 +787,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @Override public boolean generateTree(Location loc, TreeType type, BlockChangeDelegate delegate) { @@ -297,7 +297,7 @@ index cd43af3f442f7d8af1a4552a0eff33958873a366..cf4967875c2d9e87da86645e5a1f0cba this.world.captureTreeGeneration = true; this.world.captureBlockStates = true; boolean grownTree = this.generateTree(loc, type); -@@ -888,6 +902,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -889,6 +903,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { } public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks, Entity source, Consumer configurator) { // Paper end - expand explosion API @@ -305,7 +305,7 @@ index cd43af3f442f7d8af1a4552a0eff33958873a366..cf4967875c2d9e87da86645e5a1f0cba net.minecraft.world.level.Level.ExplosionInteraction explosionType; if (!breakBlocks) { explosionType = net.minecraft.world.level.Level.ExplosionInteraction.NONE; // Don't break blocks -@@ -979,6 +994,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -980,6 +995,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @Override public int getHighestBlockYAt(int x, int z, org.bukkit.HeightMap heightMap) { @@ -313,7 +313,7 @@ index cd43af3f442f7d8af1a4552a0eff33958873a366..cf4967875c2d9e87da86645e5a1f0cba warnUnsafeChunk("getting a faraway chunk", x >> 4, z >> 4); // Paper // Transient load for this tick return this.world.getChunk(x >> 4, z >> 4).getHeight(CraftHeightMap.toNMS(heightMap), x, z); -@@ -1009,6 +1025,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -1010,6 +1026,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @Override public void setBiome(int x, int y, int z, Holder bb) { BlockPos pos = new BlockPos(x, 0, z); @@ -321,7 +321,7 @@ index cd43af3f442f7d8af1a4552a0eff33958873a366..cf4967875c2d9e87da86645e5a1f0cba if (this.world.hasChunkAt(pos)) { net.minecraft.world.level.chunk.LevelChunk chunk = this.world.getChunkAt(pos); -@@ -2317,6 +2334,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -2318,6 +2335,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @Override public void sendGameEvent(Entity sourceEntity, org.bukkit.GameEvent gameEvent, Vector position) { diff --git a/divinemc-server/paper-patches/features/0019-Leaves-Protocol-Core.patch b/divinemc-server/paper-patches/features/0019-Leaves-Protocol-Core.patch index f005be4..439443a 100644 --- a/divinemc-server/paper-patches/features/0019-Leaves-Protocol-Core.patch +++ b/divinemc-server/paper-patches/features/0019-Leaves-Protocol-Core.patch @@ -7,10 +7,10 @@ Original project: https://github.com/LeavesMC/Leaves Original license: GPLv3 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index bf549edfc876f1d831b550864b3f54278bcdd20c..bf53f7343f5c8dd6f3bd995cfcebe7b88472659b 100644 +index c70526274391debfa694dbd82ed613d99bca37d1..d0d7885a7be04ff25b2e3716587df18ee337ff59 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -510,6 +510,7 @@ public final class CraftServer implements Server { +@@ -511,6 +511,7 @@ public final class CraftServer implements Server { this.potionBrewer = new io.papermc.paper.potion.PaperPotionBrewer(console); // Paper - custom potion mixes datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper this.spark = new io.papermc.paper.SparksFly(this); // Paper - spark @@ -18,7 +18,7 @@ index bf549edfc876f1d831b550864b3f54278bcdd20c..bf53f7343f5c8dd6f3bd995cfcebe7b8 } public boolean getCommandBlockOverride(String command) { -@@ -1099,6 +1100,7 @@ public final class CraftServer implements Server { +@@ -1102,6 +1103,7 @@ public final class CraftServer implements Server { org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur - Purpur config files this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); diff --git a/divinemc-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch b/divinemc-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch index 2c9b388..4b34233 100644 --- a/divinemc-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch +++ b/divinemc-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -974,7 +_,7 @@ +@@ -975,7 +_,7 @@ @Override public List getWorlds() { diff --git a/divinemc-server/src/main/java/org/bxteam/divinemc/config/DivineConfig.java b/divinemc-server/src/main/java/org/bxteam/divinemc/config/DivineConfig.java index 999fa57..1edea08 100644 --- a/divinemc-server/src/main/java/org/bxteam/divinemc/config/DivineConfig.java +++ b/divinemc-server/src/main/java/org/bxteam/divinemc/config/DivineConfig.java @@ -198,7 +198,6 @@ public class DivineConfig { @Experimental("Regionized Chunk Ticking") public static boolean enableRegionizedChunkTicking = false; public static int regionizedChunkTickingExecutorThreadCount = 4; - public static boolean regionizedChunkTickingUseVirtualThreads = false; public static int regionizedChunkTickingExecutorThreadPriority = Thread.NORM_PRIORITY + 2; // Async pathfinding settings @@ -259,14 +258,12 @@ public class DivineConfig { regionizedChunkTickingExecutorThreadCount = getInt(ConfigCategory.ASYNC.key("regionized-chunk-ticking.executor-thread-count"), regionizedChunkTickingExecutorThreadCount, "The amount of threads to allocate to regionized chunk ticking."); - regionizedChunkTickingUseVirtualThreads = getBoolean(ConfigCategory.ASYNC.key("regionized-chunk-ticking.use-virtual-threads"), regionizedChunkTickingUseVirtualThreads, - "If enabled, regionized chunk ticking will use virtual threads for the executor that was introduced in Java 21."); regionizedChunkTickingExecutorThreadPriority = getInt(ConfigCategory.ASYNC.key("regionized-chunk-ticking.executor-thread-priority"), regionizedChunkTickingExecutorThreadPriority, "Configures the thread priority of the executor"); if (regionizedChunkTickingExecutorThreadCount < 1 || regionizedChunkTickingExecutorThreadCount > 10) { - LOGGER.warn("Invalid regionized chunk ticking thread count: {}, resetting to default (5)", regionizedChunkTickingExecutorThreadCount); - regionizedChunkTickingExecutorThreadCount = 5; + LOGGER.warn("Invalid regionized chunk ticking thread count: {}, resetting to default (4)", regionizedChunkTickingExecutorThreadCount); + regionizedChunkTickingExecutorThreadCount = 4; } } diff --git a/gradle.properties b/gradle.properties index 6ecc8d1..898895d 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=6c88d74021b955d3ed95668182b676afe41c47ac +purpurRef=520a7e500d5b83622c2dcf1c80fdd0c046f79ed5 experimental=false #org.gradle.configuration-cache=true diff --git a/shuttle/src/main/java/org/bxteam/shuttle/Shuttle.java b/shuttle/src/main/java/org/bxteam/shuttle/Shuttle.java index b6358cd..715c958 100644 --- a/shuttle/src/main/java/org/bxteam/shuttle/Shuttle.java +++ b/shuttle/src/main/java/org/bxteam/shuttle/Shuttle.java @@ -105,6 +105,7 @@ public final class Shuttle { Files.createDirectories(outputDir); } } + private void executePatchingPhase(Provider versionProvider) throws IOException { new PatchBuilder().start(versionProvider); }