9
0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-19 14:59:25 +00:00

Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@fc89fde5 Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2025-11-03 01:57:37 +03:00
parent b3e32e1457
commit 1d79525ed6
21 changed files with 47 additions and 47 deletions

View File

@@ -10,13 +10,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout DivineMC repository
uses: actions/checkout@main
uses: actions/checkout@v5
with:
path: 'DivineMC'
token: ${{ secrets.GITHUB_TOKEN }}
- name: Checkout Purpur repository
uses: actions/checkout@main
uses: actions/checkout@v5
with:
path: 'Purpur'
repository: "PurpurMC/Purpur"
@@ -50,7 +50,7 @@ jobs:
chmod +x gradlew
- name: Setup JDK 21
uses: actions/setup-java@main
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '21'

View File

@@ -16,7 +16,7 @@ jobs:
build_number: ${{ env.BUILD_NUMBER }}
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 0

View File

@@ -9,7 +9,7 @@ jobs:
runs-on: blacksmith-8vcpu-ubuntu-2204
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v5
- name: Setup JDK 21
uses: useblacksmith/setup-java@v5
@@ -30,7 +30,7 @@ jobs:
run: ./gradlew createMojmapPaperclipJar --stacktrace --no-daemon
- name: Upload Artifacts
uses: actions/upload-artifact@main
uses: actions/upload-artifact@v5
with:
name: DivineMC
path: divinemc-server/build/libs/divinemc-paperclip-*-mojmap.jar

View File

@@ -11,12 +11,12 @@ jobs:
if: "!contains(github.event.commits[0].message, '[ci-skip]')"
steps:
- name: Checkout repository
uses: actions/checkout@main
uses: actions/checkout@v5
with:
fetch-depth: 0
- name: Setup JDK 21
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: 21

View File

@@ -125,7 +125,7 @@
"https://www.javadocs.dev/org.slf4j/slf4j-api/$slf4jVersion/",
"https://logging.apache.org/log4j/2.x/javadoc/log4j-api/",
- "https://www.javadocs.dev/org.apache.maven.resolver/maven-resolver-api/1.7.3",
+ "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.9.22", // DivineMC - Bump dependencies
+ "https://www.javadocs.dev/org.apache.maven.resolver/maven-resolver-api/1.9.22", // DivineMC - Bump dependencies
)
options.tags("apiNote:a:API Note:")

View File

@@ -39,10 +39,10 @@ index fbee4ab2faaeba8d798aaba2e1837315ed56a184..581d71e716e8ecfe9ab2c4d3947c86c6
+ // DivineMC end - Extend Sound API
}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 84569b53a4e39a2a642a8f0638f8970fb0cb8b0f..9bf0c54bbc89a9c6aa4f00424628786679b56937 100644
index 49981db2398a3f88c1d62c91e35d637c4b92f876..38fbb90b6ebab18ee50c455951e44deb962d141f 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1361,4 +1361,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1377,4 +1377,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
void setImmuneToFire(@Nullable Boolean fireImmune);
// Purpur end - Fire Immunity API

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Paper PR: Player standing on position API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 9bf0c54bbc89a9c6aa4f00424628786679b56937..3e5a671edc77a1ba4b70e5938d9d178a8075a1a3 100644
index 38fbb90b6ebab18ee50c455951e44deb962d141f..b5f9a4ffe8cfb5e9e63b8cec94e7e96bea201576 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1307,6 +1307,33 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1323,6 +1323,33 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
void broadcastHurtAnimation(@NotNull java.util.Collection<Player> players);
// Paper end - broadcast hurt animation

View File

@@ -30,10 +30,10 @@ index bf664ec7a3974abdb7fd3266b08803a02cb05929..d21f2c33480177f4892c906b80ffe896
+ // DivineMC end - Parallel world ticking
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index d320e8b621a8725d07579fbc3182df9b4822e3fb..6128b98305ee0c843df4bfef13fcb2f6a809d416 100644
index 7f55f19173c369c73b81a5784c6bedd648527d6b..be3035da71001fba183fe0bc79fce36a817befd2 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -4722,4 +4722,23 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -4725,4 +4725,23 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
}
}
}

View File

@@ -56,10 +56,10 @@ index 80b771f69549cf460b3d1fca2de8f27152e98f42..5d5e125e55daf55764846c0d7ce2c315
// Paper start - EAR 2
public final boolean defaultActivationState;
diff --git a/net/minecraft/world/entity/EntityType.java b/net/minecraft/world/entity/EntityType.java
index 881575864f864305973033ac6e664fc47e49ca16..7d5940327c5e7a945165228d502f678a8234cd02 100644
index d6f7d96dbdff908c91fbe43432313d2221b57afc..d9d45a3e7436d5a211e3f2b6810f76e0a22766e8 100644
--- a/net/minecraft/world/entity/EntityType.java
+++ b/net/minecraft/world/entity/EntityType.java
@@ -1192,6 +1192,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
@@ -1193,6 +1193,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
private final boolean canSpawnFarFromPlayer;
private final int clientTrackingRange;
private final int updateInterval;

View File

@@ -71,10 +71,10 @@ index 56483d9e770e29526a36d4c8c5565092acb227c7..9db43874a94770d49ea5ff48a46c4657
+ // DivineMC end - Raytrace Entity Tracker
}
diff --git a/net/minecraft/world/entity/EntityType.java b/net/minecraft/world/entity/EntityType.java
index 7d5940327c5e7a945165228d502f678a8234cd02..5a4a337694c36e6342c0b0ae5034ac2f11d205a1 100644
index d9d45a3e7436d5a211e3f2b6810f76e0a22766e8..4c6ca2979a370346008b981e045625668269e380 100644
--- a/net/minecraft/world/entity/EntityType.java
+++ b/net/minecraft/world/entity/EntityType.java
@@ -1201,6 +1201,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
@@ -1202,6 +1202,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
private final float spawnDimensionsScale;
private final FeatureFlagSet requiredFeatures;
private final boolean allowedInPeaceful;

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Configuration
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0d2ba00b359ebc4f487a1029730518e741fc5f9f..916cca90459831c12b988ca10a0f53cb1befc058 100644
index d368d0d5161f6ed6d6bfdc104e8312e209b89b96..56611aa73c40432cbabbea0a6d603ec32e054848 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1008,6 +1008,7 @@ public final class CraftServer implements Server {
@@ -1007,6 +1007,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console);
org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur - Purpur config files
@@ -16,7 +16,7 @@ index 0d2ba00b359ebc4f487a1029730518e741fc5f9f..916cca90459831c12b988ca10a0f53cb
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && world.getGameRules().getBoolean(GameRules.RULE_SPAWN_MONSTERS)); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
@@ -1024,6 +1025,13 @@ public final class CraftServer implements Server {
@@ -1023,6 +1024,13 @@ public final class CraftServer implements Server {
}
world.spigotConfig.init(); // Spigot
world.purpurConfig.init(); // Purpur - Purpur config files

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Delete ReloadCommand
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 916cca90459831c12b988ca10a0f53cb1befc058..ac2e91d00fb0320f0c9a049ab980f6e2f5124dd9 100644
index 56611aa73c40432cbabbea0a6d603ec32e054848..7e8de7b6a21f3e9d7dff62d9b2fc66822969b237 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -970,11 +970,6 @@ public final class CraftServer implements Server {
@@ -969,11 +969,6 @@ public final class CraftServer implements Server {
@Override
public void reload() {

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Paper PR: Add FillBottleEvents for player and dispenser
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 691c7e393ff6a0d4b132f25b6de2b346b97f7169..c3f0f79211e8bb0d2617c77d520a37f79c2e2e7e 100644
index 09ef508247d98645591283d91a9beba90d1df7d5..5abf373c522e247440bf8f10bf10153e249bd7fc 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -2201,4 +2201,18 @@ public class CraftEventFactory {
@@ -2191,4 +2191,18 @@ public class CraftEventFactory {
event.callEvent();
return event.isAllowed();
}

View File

@@ -25,10 +25,10 @@ index 09baa8c13a56e0f503815a436042b7b79b1698e4..eb182ae056d7f17f0a49e3e7d1de3d6d
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 413b8b0d350bf7900290f36dde0d3d7c8e03fd61..560f7192b45399947e9a805d80c36a65aa0a53eb 100644
index 7e8de7b6a21f3e9d7dff62d9b2fc66822969b237..b538a051de94c421fc4abeb1d3538f381081fd81 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1255,7 +1255,11 @@ public final class CraftServer implements Server {
@@ -1254,7 +1254,11 @@ public final class CraftServer implements Server {
registryAccess = levelDataAndDimensions.dimensions().dimensionsRegistryAccess();
} else {
LevelSettings levelSettings;

View File

@@ -45,10 +45,10 @@ index c84acf874d6a9c99bdb5e0e1237130a0ae771be2..f0fa7b90efbfc23c0c68307da7a95a6c
break;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index c3f0f79211e8bb0d2617c77d520a37f79c2e2e7e..f2f2ca78174ede532ababf4c12f83e5bfc69112b 100644
index 5abf373c522e247440bf8f10bf10153e249bd7fc..ed02ded2645fb57d82b6b1164c3343f94cc7a3ed 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1807,6 +1807,26 @@ public class CraftEventFactory {
@@ -1797,6 +1797,26 @@ public class CraftEventFactory {
}
public static boolean handleBlockFormEvent(Level world, BlockPos pos, net.minecraft.world.level.block.state.BlockState state, int flags, @Nullable Entity entity, boolean checkSetResult) {

View File

@@ -223,10 +223,10 @@ index 69cdd304d255d52c9b7dc9b6a33ffdb630b79abe..73475f21a65395ab3f888d04d4860acd
+ // DivineMC end - Parallel world ticking
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 560f7192b45399947e9a805d80c36a65aa0a53eb..8889864e988e0df590a1dcf407428f0de35f4d03 100644
index b538a051de94c421fc4abeb1d3538f381081fd81..2565340258001c086aa23b018a4d7b3e4c89457b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3067,4 +3067,11 @@ public final class CraftServer implements Server {
@@ -3066,4 +3066,11 @@ public final class CraftServer implements Server {
return getServer().lagging;
}
// Purpur end - Lagging threshold
@@ -239,10 +239,10 @@ index 560f7192b45399947e9a805d80c36a65aa0a53eb..8889864e988e0df590a1dcf407428f0d
+ // DivineMC end - Parallel world ticking
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 89df0225f6544e226afe57b3dd19eadcb5631111..8480004bcefee0a5d190dcf7136df18f13bb7db2 100644
index b65a086a63a9fe1ea1810d3e4c614a6650cad50d..2136372fd19aa89476b9b54b07765c5a0e83596c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -462,7 +462,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -463,7 +463,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean unloadChunkRequest(int x, int z) {
@@ -257,7 +257,7 @@ index 89df0225f6544e226afe57b3dd19eadcb5631111..8480004bcefee0a5d190dcf7136df18f
if (this.isChunkLoaded(x, z)) {
this.world.getChunkSource().removeTicketWithRadius(TicketType.PLUGIN, new ChunkPos(x, z), 1);
}
@@ -488,6 +494,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -489,6 +495,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean refreshChunk(int x, int z) {
@@ -265,7 +265,7 @@ index 89df0225f6544e226afe57b3dd19eadcb5631111..8480004bcefee0a5d190dcf7136df18f
ChunkHolder playerChunk = this.world.getChunkSource().chunkMap.getVisibleChunkIfPresent(ChunkPos.asLong(x, z));
if (playerChunk == null) return false;
@@ -538,7 +545,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -539,7 +546,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean loadChunk(int x, int z, boolean generate) {
@@ -280,7 +280,7 @@ index 89df0225f6544e226afe57b3dd19eadcb5631111..8480004bcefee0a5d190dcf7136df18f
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
@@ -751,6 +764,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -752,6 +765,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean generateTree(Location loc, TreeType type, BlockChangeDelegate delegate) {
@@ -288,7 +288,7 @@ index 89df0225f6544e226afe57b3dd19eadcb5631111..8480004bcefee0a5d190dcf7136df18f
this.world.captureTreeGeneration = true;
this.world.captureBlockStates = true;
boolean grownTree = this.generateTree(loc, type);
@@ -852,6 +866,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -853,6 +867,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
private boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks, Entity source, Consumer<net.minecraft.world.level.ServerExplosion> configurator) {
// Paper end - expand explosion API
@@ -296,7 +296,7 @@ index 89df0225f6544e226afe57b3dd19eadcb5631111..8480004bcefee0a5d190dcf7136df18f
net.minecraft.world.level.Level.ExplosionInteraction explosionType;
if (!breakBlocks) {
explosionType = net.minecraft.world.level.Level.ExplosionInteraction.NONE; // Don't break blocks
@@ -908,6 +923,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -909,6 +924,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public int getHighestBlockYAt(int x, int z, org.bukkit.HeightMap heightMap) {
@@ -304,7 +304,7 @@ index 89df0225f6544e226afe57b3dd19eadcb5631111..8480004bcefee0a5d190dcf7136df18f
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);
@@ -923,6 +939,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -924,6 +940,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public void setBiome(int x, int y, int z, Holder<net.minecraft.world.level.biome.Biome> bb) {
BlockPos pos = new BlockPos(x, 0, z);
@@ -312,7 +312,7 @@ index 89df0225f6544e226afe57b3dd19eadcb5631111..8480004bcefee0a5d190dcf7136df18f
if (this.world.hasChunkAt(pos)) {
net.minecraft.world.level.chunk.LevelChunk chunk = this.world.getChunkAt(pos);
@@ -1902,6 +1919,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -1903,6 +1920,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public void sendGameEvent(Entity sourceEntity, org.bukkit.GameEvent gameEvent, Vector position) {
@@ -320,7 +320,7 @@ index 89df0225f6544e226afe57b3dd19eadcb5631111..8480004bcefee0a5d190dcf7136df18f
getHandle().gameEvent(sourceEntity != null ? ((CraftEntity) sourceEntity).getHandle(): null, net.minecraft.core.registries.BuiltInRegistries.GAME_EVENT.get(org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(gameEvent.getKey())).orElseThrow(), org.bukkit.craftbukkit.util.CraftVector.toBlockPos(position));
}
// Paper end
@@ -2112,4 +2130,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2113,4 +2131,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
return POINTERS_SUPPLIER.view(this);
}
// Paper end

View File

@@ -7,7 +7,7 @@ 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 560f7192b45399947e9a805d80c36a65aa0a53eb..2313e95747c1e039d75b1861df3d98890f36a9e4 100644
index 2565340258001c086aa23b018a4d7b3e4c89457b..08c425f2bb893462ffab61481a1624e04c4418cb 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -499,6 +499,7 @@ public final class CraftServer implements Server {
@@ -18,7 +18,7 @@ index 560f7192b45399947e9a805d80c36a65aa0a53eb..2313e95747c1e039d75b1861df3d9889
}
public boolean getCommandBlockOverride(String command) {
@@ -1047,6 +1048,7 @@ public final class CraftServer implements Server {
@@ -1046,6 +1047,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");

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -922,7 +_,7 @@
@@ -921,7 +_,7 @@
@Override
public List<World> getWorlds() {

View File

@@ -2,7 +2,7 @@ group = org.bxteam.divinemc
version=1.21.10-R0.1-SNAPSHOT
mcVersion=1.21.10
purpurRef=626a3cb2323d9ded16690171c0d431a2ab82b370
purpurRef=fc89fde56b69a3c0955cc0d6fb8e5470de0969fc
experimental=true
org.gradle.configuration-cache=true

Binary file not shown.

View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME