From 42b9f5a66da1e319fa576c46c10f66b6fc97b4fa Mon Sep 17 00:00:00 2001 From: Bjarne Koll <git@lynxplay.dev> Date: Fri, 22 Sep 2023 14:33:54 +0200 Subject: [PATCH] Port sidebar slots patch --- ...Add-missing-team-sidebar-display-slots.patch | 17 +++++++++-------- .../Add-ItemFactory-getSpawnEgg-API.patch | 0 .../Add-back-EntityPortalExitEvent.patch | 0 ...-to-find-targets-for-lightning-strikes.patch | 0 .../{ => server}/Add-more-advancement-API.patch | 0 .../Get-entity-default-attributes.patch | 0 .../{ => server}/Left-handed-API.patch | 0 7 files changed, 9 insertions(+), 8 deletions(-) rename patches/{unapplied => server}/Add-missing-team-sidebar-display-slots.patch (87%) rename patches/unapplied/{ => server}/Add-ItemFactory-getSpawnEgg-API.patch (100%) rename patches/unapplied/{ => server}/Add-back-EntityPortalExitEvent.patch (100%) rename patches/unapplied/{ => server}/Add-methods-to-find-targets-for-lightning-strikes.patch (100%) rename patches/unapplied/{ => server}/Add-more-advancement-API.patch (100%) rename patches/unapplied/{ => server}/Get-entity-default-attributes.patch (100%) rename patches/unapplied/{ => server}/Left-handed-API.patch (100%) diff --git a/patches/unapplied/Add-missing-team-sidebar-display-slots.patch b/patches/server/Add-missing-team-sidebar-display-slots.patch similarity index 87% rename from patches/unapplied/Add-missing-team-sidebar-display-slots.patch rename to patches/server/Add-missing-team-sidebar-display-slots.patch index 6a62331692..a3f781d9f3 100644 --- a/patches/unapplied/Add-missing-team-sidebar-display-slots.patch +++ b/patches/server/Add-missing-team-sidebar-display-slots.patch @@ -17,10 +17,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public final class CraftScoreboardTranslations { - static final int MAX_DISPLAY_SLOT = 19; -+ static final int MAX_DISPLAY_SLOT = Scoreboard.getDisplaySlotNames().length; // Paper ++ static final int MAX_DISPLAY_SLOT = net.minecraft.world.scores.DisplaySlot.values().length; // Paper // TODO - revisit this. + @Deprecated // Paper static final ImmutableBiMap<DisplaySlot, String> SLOTS = ImmutableBiMap.<DisplaySlot, String>builder() - .put(DisplaySlot.BELOW_NAME, "belowName") + .put(DisplaySlot.BELOW_NAME, "below_name") .put(DisplaySlot.PLAYER_LIST, "list") .put(DisplaySlot.SIDEBAR, "sidebar") - .put(DisplaySlot.SIDEBAR_BLACK, "sidebar.team.black") @@ -43,16 +43,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 private CraftScoreboardTranslations() {} - public static DisplaySlot toBukkitSlot(int i) { -+ if (true) return org.bukkit.scoreboard.DisplaySlot.NAMES.value(Scoreboard.getDisplaySlotName(i)); // Paper - return CraftScoreboardTranslations.SLOTS.inverse().get(Scoreboard.getDisplaySlotName(i)); + static DisplaySlot toBukkitSlot(net.minecraft.world.scores.DisplaySlot minecraft) { ++ if (true) return org.bukkit.scoreboard.DisplaySlot.NAMES.value(minecraft.getSerializedName()); // Paper + return CraftScoreboardTranslations.SLOTS.inverse().get(minecraft.getSerializedName()); } - public static int fromBukkitSlot(DisplaySlot slot) { -+ if (true) return Scoreboard.getDisplaySlotByName(slot.getId()); // Paper - return Scoreboard.getDisplaySlotByName(CraftScoreboardTranslations.SLOTS.get(slot)); + static net.minecraft.world.scores.DisplaySlot fromBukkitSlot(DisplaySlot slot) { +- return net.minecraft.world.scores.DisplaySlot.CODEC.byName(CraftScoreboardTranslations.SLOTS.get(slot)); ++ return net.minecraft.world.scores.DisplaySlot.CODEC.byName(slot.getId()); // Paper } + static RenderType toBukkitRender(ObjectiveCriteria.RenderType display) { diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java diff --git a/patches/unapplied/Add-ItemFactory-getSpawnEgg-API.patch b/patches/unapplied/server/Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/unapplied/Add-ItemFactory-getSpawnEgg-API.patch rename to patches/unapplied/server/Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/unapplied/Add-back-EntityPortalExitEvent.patch b/patches/unapplied/server/Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/unapplied/Add-back-EntityPortalExitEvent.patch rename to patches/unapplied/server/Add-back-EntityPortalExitEvent.patch diff --git a/patches/unapplied/Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/server/Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/unapplied/Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/unapplied/server/Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/unapplied/Add-more-advancement-API.patch b/patches/unapplied/server/Add-more-advancement-API.patch similarity index 100% rename from patches/unapplied/Add-more-advancement-API.patch rename to patches/unapplied/server/Add-more-advancement-API.patch diff --git a/patches/unapplied/Get-entity-default-attributes.patch b/patches/unapplied/server/Get-entity-default-attributes.patch similarity index 100% rename from patches/unapplied/Get-entity-default-attributes.patch rename to patches/unapplied/server/Get-entity-default-attributes.patch diff --git a/patches/unapplied/Left-handed-API.patch b/patches/unapplied/server/Left-handed-API.patch similarity index 100% rename from patches/unapplied/Left-handed-API.patch rename to patches/unapplied/server/Left-handed-API.patch