Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-19 14:59:30 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d683970 Add FishHookStateChangeEvent (#12165)
PaperMC/Paper@369ad17 Cached tag parser for itemstack reading (#12547)
PaperMC/Paper@841d634 Fix ItemStack#addUnsafeEnchantment ignored for missing enchantment component (#12549)
PaperMC/Paper@c000b35 fix(bukkit-brig-forwarding-map): Invert isEmpty method (#12555)
PaperMC/Paper@28d7df7 Backport HeroesOfTheVillage datafixer fix
PaperMC/Paper@f1dbed0 Implement BlocksAttack DamageReduction and ItemDamage (#12538)
PaperMC/Paper@cc38032 Deprecate TeleportCause CHORUS_FRUIT for CONSUMABLE_EFFECT (#12546)
PaperMC/Paper@3587867 [ci skip] Fix format and mentions for ItemDamageFunction (#12560)
PaperMC/Paper@7171d29 [ci skip] Mention CAN_PLACE/CAN_BREAK component in ItemMeta (#12559)
PaperMC/Paper@6f73e62 Add getPickItemStack (#12552)
PaperMC/Paper@ce0fa4c Replace old version command with brigadier equivalent (#12502)
PaperMC/Paper@fa360aa Add some missing annotations and an incorrect one (#12204)
PaperMC/Paper@113b18e Update paperweight and Gradle wrapper (#12573)
PaperMC/Paper@f303a07 fix: Don't hardcode checks for translation registries (#12571)
PaperMC/Paper@87349c3 Fix CombatTracker stale on death (#12562)
PaperMC/Paper@b70bca6 Revert "fix: Don't hardcode checks for translation registries (#12571)"
PaperMC/Paper@3efaf47 Add API for client-side signs (#11903)
PaperMC/Paper@a3909f5 [ci skip] Fix bad format for jd @link (#12581)
PaperMC/Paper@7774243 Add plugin details to zip file errors (#12580)
PaperMC/Paper@220b57a Fixs and Improvements for EndermanEscapeEvent (#12570)
PaperMC/Paper@b8fe22c Do not call EntityRemoveEvent during worldgen (#12588)
PaperMC/Paper@ee3b405 Replace spigot check with generation check
PaperMC/Paper@84ee424 Add Map filled event (#12574)
PaperMC/Paper@b9d6ba2 Expose more data for MusicInstrument (#12415)
PaperMC/Paper@a033e3b Fix ancient player custom name converter
PaperMC/Paper@4765010 Improve error messages when PluginRemapper fails to initialize (#12598)
PaperMC/Paper@6f31535 Add MCUtil#toLocation from Folia
PaperMC/Paper@2ba1675 Replace deprecated Thread#getId usage with Thread#threadId
This commit is contained in:
Samsuik
2025-05-29 21:31:01 +01:00
parent 2965eb547a
commit 83fcc2fce0
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -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

6
sakura-api/paper-patches/files/src/main/java/org/bukkit/command/defaults/VersionCommand.java.patch
View File

@@ -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) {

2
sakura-api/paper-patches/files/src/main/java/org/bukkit/entity/Entity.java.patch
View File

@@ -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.text.event.HoverEvent.ShowEntity>, net.kyori.adventure.sound.Sound.Emitter, DataComponentView { // Paper

4
sakura-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/FishingHook.java.patch
View File

@@ -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();

6
sakura-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch
View File

@@ -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<org.spigotmc.SpigotWorldConfig, // Spigot - create per world config
io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, // Paper - create paper world config
+ java.util.function.Supplier<me.samsuik.sakura.configuration.WorldConfiguration> 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);

8
sakura-server/paper-patches/features/0001-Client-Visibility-Settings.patch
View File

@@ -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();
}

2
sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch
View File

@@ -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());
}

2
sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch
View File

@@ -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();
}