diff --git a/gradle.properties b/gradle.properties index 2497fd0..84921b5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.samsuik.sakura version=1.21.5-R0.1-SNAPSHOT mcVersion=1.21.5 -paperRef=a25258190b600c170334dd5071c4cbd6d203ec3c +paperRef=2ba1675c7506cadd8a540ea452e5dafb79ae8947 org.gradle.jvmargs=-Xmx2G org.gradle.vfs.watch=false diff --git a/sakura-api/paper-patches/files/src/main/java/org/bukkit/command/defaults/VersionCommand.java.patch b/sakura-api/paper-patches/files/src/main/java/org/bukkit/command/defaults/VersionCommand.java.patch index 79bd217..8b38c85 100644 --- a/sakura-api/paper-patches/files/src/main/java/org/bukkit/command/defaults/VersionCommand.java.patch +++ b/sakura-api/paper-patches/files/src/main/java/org/bukkit/command/defaults/VersionCommand.java.patch @@ -10,9 +10,9 @@ +import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; +// Sakura end - customise version command + @Deprecated(forRemoval = true) public class VersionCommand extends BukkitCommand { - private VersionFetcher versionFetcher; // Paper - version command 2.0 -@@ -42,6 +_,15 @@ +@@ -43,6 +_,15 @@ return versionFetcher; } @@ -28,7 +28,7 @@ public VersionCommand(@NotNull String name) { super(name); -@@ -53,11 +_,16 @@ +@@ -54,11 +_,16 @@ @Override public boolean execute(@NotNull CommandSender sender, @NotNull String currentAlias, @NotNull String[] args) { diff --git a/sakura-api/paper-patches/files/src/main/java/org/bukkit/entity/Entity.java.patch b/sakura-api/paper-patches/files/src/main/java/org/bukkit/entity/Entity.java.patch index 7a96a73..b5497dc 100644 --- a/sakura-api/paper-patches/files/src/main/java/org/bukkit/entity/Entity.java.patch +++ b/sakura-api/paper-patches/files/src/main/java/org/bukkit/entity/Entity.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -38,6 +_,22 @@ +@@ -39,6 +_,22 @@ */ public interface Entity extends Metadatable, CommandSender, Nameable, PersistentDataHolder, net.kyori.adventure.text.event.HoverEventSource, net.kyori.adventure.sound.Sound.Emitter, DataComponentView { // Paper diff --git a/sakura-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/FishingHook.java.patch b/sakura-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/FishingHook.java.patch index 14a9ff9..0ef4bdb 100644 --- a/sakura-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/FishingHook.java.patch +++ b/sakura-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/FishingHook.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/entity/projectile/FishingHook.java +++ b/net/minecraft/world/entity/projectile/FishingHook.java -@@ -284,6 +_,12 @@ +@@ -287,6 +_,12 @@ if (!this.level().isClientSide) { this.setHookedEntity(result.getEntity()); } @@ -13,7 +13,7 @@ } @Override -@@ -585,7 +_,7 @@ +@@ -588,7 +_,7 @@ public void pullEntity(Entity entity) { Entity owner = this.getOwner(); diff --git a/sakura-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch b/sakura-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch index 07d5899..350878a 100644 --- a/sakura-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch +++ b/sakura-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch @@ -29,7 +29,7 @@ public static @Nullable BlockPos lastPhysicsProblem; // Spigot private int tileTickPosition; @@ -827,6 +_,7 @@ - org.bukkit.World.Environment env, // CraftBukkit + org.bukkit.World.Environment environment, // Paper java.util.function.Function paperWorldConfigCreator, // Paper - create paper world config + java.util.function.Supplier sakuraWorldConfigCreator, // Sakura - sakura configuration files @@ -41,6 +41,6 @@ this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) levelData).getLevelName()); // Spigot this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config + this.sakuraConfig = sakuraWorldConfigCreator.get(); // Sakura - sakura configuration files - this.generator = gen; - this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); + this.generator = generator; + this.world = new CraftWorld((ServerLevel) this, generator, biomeProvider, environment); diff --git a/sakura-server/paper-patches/features/0001-Client-Visibility-Settings.patch b/sakura-server/paper-patches/features/0001-Client-Visibility-Settings.patch index 795ba24..0f2cc84 100644 --- a/sakura-server/paper-patches/features/0001-Client-Visibility-Settings.patch +++ b/sakura-server/paper-patches/features/0001-Client-Visibility-Settings.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Client Visibility Settings diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 9615467faa2aeb6cd54a3f54ef519daed76194f4..ca3498b8b0a60d83321cdcfdb89a3ab6578f45d3 100644 +index 8419ab4504de0a11149d01ca2bc5185af8821b18..9c15d1509252eb288c5265fc7989405544e1e157 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2374,6 +2374,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2376,6 +2376,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { handle.expToDrop = data.getIntOr("expToDrop", 0); handle.keepLevel = data.getBooleanOr("keepLevel", false); }); @@ -19,7 +19,7 @@ index 9615467faa2aeb6cd54a3f54ef519daed76194f4..ca3498b8b0a60d83321cdcfdb89a3ab6 } public void setExtraData(CompoundTag tag) { -@@ -2403,6 +2407,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2405,6 +2409,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { paper.putLong("LastLogin", handle.loginTime); paper.putLong("LastSeen", System.currentTimeMillis()); // Paper end @@ -31,7 +31,7 @@ index 9615467faa2aeb6cd54a3f54ef519daed76194f4..ca3498b8b0a60d83321cdcfdb89a3ab6 } @Override -@@ -3063,6 +3072,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3071,6 +3080,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.getHandle().allowsListing(); } diff --git a/sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch b/sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch index 13ad288..838bc65 100644 --- a/sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch +++ b/sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -99,6 +_,18 @@ +@@ -100,6 +_,18 @@ this.entityType = CraftEntityType.minecraftToBukkit(entity.getType()); } diff --git a/sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch b/sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch index 0f3fc0c..4a35a4b 100644 --- a/sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch +++ b/sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -231,6 +_,18 @@ +@@ -235,6 +_,18 @@ this.firstPlayed = System.currentTimeMillis(); }