Merge remote-tracking branch 'origin/master' into five

me4502 · me4502 · commit 9fe71c5af95c · 2026-07-11T21:28:53.000+10:00
diff --git a/build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts b/build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 crankcaseJava {
-    javaRelease = 21
+    javaRelease = 25
     disabledLints = listOf("processing", "path", "fallthrough", "serial", "overloads", "this-escape")
     disabledErrorprone = listOf(
         // We use reference equality intentionally in several places
diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/cauldron/ImprovedCauldron.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/cauldron/ImprovedCauldron.java
@@ -274,9 +274,9 @@ public boolean performCauldron(Block block, CraftBookPlayer player) {
                 return true;
             } else if (player != null) { // Spoons
                 if (isItemSpoon(BukkitAdapter.adapt(player.getItemInHand(HandSide.MAIN_HAND).getType()))) {
-                    double chance = getSpoonChance(((BukkitCraftBookPlayer) player).getPlayer().getItemInHand(), recipe.getChance());
+                    double chance = getSpoonChance(((BukkitCraftBookPlayer) player).getPlayer().getInventory().getItemInMainHand(), recipe.getChance());
                     double ran = ThreadLocalRandom.current().nextDouble();
-                    ((BukkitCraftBookPlayer) player).getPlayer().getItemInHand().setDurability((short) (((BukkitCraftBookPlayer) player).getPlayer().getItemInHand().getDurability() - (short) 1));
+                    ((BukkitCraftBookPlayer) player).getPlayer().getInventory().getItemInMainHand().setDurability((short) (((BukkitCraftBookPlayer) player).getPlayer().getInventory().getItemInMainHand().getDurability() - (short) 1));
                     if (chance <= ran) {
                         cook(block, recipe, items);
                         player.print(player.translate("mech.cauldron.cook") + " " + ChatColor.AQUA + recipe.getName());
diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/drops/CustomDrops.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/drops/CustomDrops.java
@@ -301,7 +301,7 @@ public void onBlockBreak(BlockBreakEvent event) {
                 boolean found = false;
 
                 for (ItemStack item : def.getItems()) {
-                    if (ItemUtil.areItemsIdentical(event.getPlayer().getItemInHand(), item)) {
+                    if (ItemUtil.areItemsIdentical(event.getPlayer().getInventory().getItemInMainHand(), item)) {
                         found = true;
                         break;
                     }
diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/ic/ICMechanic.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/ic/ICMechanic.java
@@ -257,7 +257,11 @@ public void onBlockRedstoneChange(final SourcedBlockRedstoneEvent event) {
                         }
                     }
                     if (cnt > 0) {
-                        ((IC) icData[2]).trigger(chipState);
+                        IC ic = (IC) icData[2];
+                        ic.trigger(chipState);
+                        try {
+                            ic.getSign().update(false);
+                        } catch (Throwable ignored) {}
                     }
                 } catch (IllegalArgumentException ex) {
                     // Exclude these exceptions so that we don't spam consoles because of Bukkit
@@ -327,10 +331,13 @@ public void onThink(SelfTriggerThinkEvent event) {
 
         final Object[] icData = setupIC(event.getBlock(), true);
 
-        if (icData != null && icData[2] instanceof SelfTriggeredIC) {
+        if (icData != null && icData[2] instanceof SelfTriggeredIC ic) {
             event.setHandled(true);
             ChipState chipState = ((ICFamily) icData[1]).detectSelfTriggered(BukkitAdapter.adapt(event.getBlock().getLocation()), ((IC) icData[2]).getSign());
-            ((SelfTriggeredIC) icData[2]).think(chipState);
+            ic.think(chipState);
+            try {
+                ic.getSign().update(false);
+            } catch (Throwable ignored) {}
         }
     }
 
diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/ic/gates/world/blocks/Pump.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/ic/gates/world/blocks/Pump.java
@@ -18,6 +18,7 @@
 import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.block.Block;
+import org.bukkit.block.data.Levelled;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.enginehub.craftbook.bukkit.BukkitChangedSign;
@@ -87,14 +88,15 @@ public boolean searchNear(InventoryHolder c, Block block, int depth) {
     }
 
     public boolean check(InventoryHolder c, Block liquid, int depth) {
-
-        if (!liquid.isLiquid()) return false;
-        if (liquid.getData() == 0x0) {
+        if (!liquid.isLiquid() || !(liquid.getBlockData() instanceof Levelled levelled)) {
+            return false;
+        }
+        if (levelled.getLevel() == 0x0) {
             if (addToChest(c, liquid)) {
                 liquid.setType(Material.AIR);
                 return true;
             }
-        } else if (searchNear(c, liquid, depth + 1)) return true;
+        } else return searchNear(c, liquid, depth + 1);
         return false;
     }
 
diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/ic/gates/world/entity/AdvancedEntitySpawner.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/ic/gates/world/entity/AdvancedEntitySpawner.java
@@ -155,7 +155,7 @@ else if (data[0].equalsIgnoreCase("r")) {
                             try {
                                 String[] potionBits = RegexUtil.SEMICOLON_PATTERN.split(data[a]);
                                 PotionEffect effect = new PotionEffect(PotionEffectType.getById(Integer.parseInt(potionBits[0])), Integer.parseInt(potionBits[1]), Integer.parseInt(potionBits[2]));
-                                ((LivingEntity) ent).addPotionEffect(effect, true);
+                                ((LivingEntity) ent).addPotionEffect(effect);
                             } catch (Exception ignored) {
                             }
                         }
@@ -173,7 +173,7 @@ else if (data[0].equalsIgnoreCase("r")) {
                         if (!(ent instanceof LivingEntity)) continue;
 
                         ItemStack slot = ItemUtil.makeItemValid(ItemSyntax.getItem(bit.replace("s:", "")));
-                        ((LivingEntity) ent).getEquipment().setItemInHand(slot);
+                        ((LivingEntity) ent).getEquipment().setItemInMainHand(slot);
                     }
                 }
                 if (upwards == null) {
diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/ic/gates/world/entity/CreatureSpawner.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/mechanics/ic/gates/world/entity/CreatureSpawner.java
@@ -103,7 +103,7 @@ public void trigger(ChipState chip) {
             for (int i = 0; i < amount; i++) {
                 Entity entity = loc.getWorld().spawn(loc, type.getEntityClass());
                 if (entity instanceof Skeleton)
-                    ((Skeleton) entity).getEquipment().setItemInHand(new ItemStack(Material.BOW, 1));
+                    ((Skeleton) entity).getEquipment().setItemInMainHand(new ItemStack(Material.BOW, 1));
                 EntityUtil.setEntityData(entity, data);
             }
         }
diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/util/jinglenote/Instrument.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/util/jinglenote/Instrument.java
@@ -16,7 +16,6 @@
 package org.enginehub.craftbook.util.jinglenote;
 
 public enum Instrument {
-
     BANJO,
     BASEDRUM,
     BASS,
@@ -32,43 +31,34 @@ public enum Instrument {
     IRON_XYLOPHONE,
     PLING,
     SNARE,
+    TRUMPET,
+    TRUMPET_DISTORTED,
+    TROMBONE,
+    TROMBONE_DISTORTED,
     XYLOPHONE;
 
     public static Instrument toMCSound(byte instrument) {
-        switch (instrument) {
-            case 1:
-                return Instrument.BASS;
-            case 2:
-                return Instrument.SNARE;
-            case 3:
-                return Instrument.HAT;
-            case 4:
-                return Instrument.BASEDRUM;
-            case 5:
-                return Instrument.GUITAR;
-            case 6:
-                return Instrument.BELL;
-            case 7:
-                return Instrument.CHIME;
-            case 8:
-                return Instrument.FLUTE;
-            case 9:
-                return Instrument.XYLOPHONE;
-            case 10:
-                return Instrument.PLING;
-            case 11:
-                return Instrument.BANJO;
-            case 12:
-                return Instrument.BIT;
-            case 13:
-                return Instrument.COW_BELL;
-            case 14:
-                return Instrument.DIDGERIDOO;
-            case 15:
-                return Instrument.IRON_XYLOPHONE;
-            case 0:
-            default:
-                return Instrument.HARP;
-        }
+        return switch (instrument) {
+            case 1 -> Instrument.BASS;
+            case 2 -> Instrument.SNARE;
+            case 3 -> Instrument.HAT;
+            case 4 -> Instrument.BASEDRUM;
+            case 5 -> Instrument.GUITAR;
+            case 6 -> Instrument.BELL;
+            case 7 -> Instrument.CHIME;
+            case 8 -> Instrument.FLUTE;
+            case 9 -> Instrument.XYLOPHONE;
+            case 10 -> Instrument.PLING;
+            case 11 -> Instrument.BANJO;
+            case 12 -> Instrument.BIT;
+            case 13 -> Instrument.COW_BELL;
+            case 14 -> Instrument.DIDGERIDOO;
+            case 15 -> Instrument.IRON_XYLOPHONE;
+            case 16 -> Instrument.TRUMPET;
+            case 17 -> Instrument.TRUMPET_DISTORTED;
+            case 18 -> Instrument.TROMBONE;
+            case 19 -> Instrument.TROMBONE_DISTORTED;
+            default -> Instrument.HARP;
+        };
     }
-}
+}
diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/util/jinglenote/MidiJingleSequencer.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/util/jinglenote/MidiJingleSequencer.java
@@ -43,22 +43,22 @@
 public final class MidiJingleSequencer implements JingleSequencer {
 
     private static final byte[] instruments = {
-        0, 0, 0, 0, 0, 0, 0, 11, // 0-7
-        6, 6, 6, 6, 9, 9, 15, 11, // 8-15
-        10, 5, 5, 10, 10, 10, 10, 10, // 16-23
+        0, 0, 0, 0, 0, 0, 0,11, // 0-7
+        6, 6, 6, 6, 9, 9,15,11, // 8-15
+        10,5, 5,10,10,10,10,10, // 16-23
         5, 5, 5, 5, 5, 5, 5, 5, // 24-31
         1, 1, 1, 1, 1, 1, 1, 1, // 32-39
-        0, 10, 10, 1, 0, 0, 0, 4, // 40-47
-        0, 0, 0, 0, 8, 8, 8, 12, // 48-55
-        8, 14, 14, 14, 14, 14, 8, 8, // 56-63
-        8, 8, 8, 14, 14, 8, 8, 8, // 64-71
-        8, 8, 8, 8, 14, 8, 8, 8, // 72-79
-        8, 14, 8, 8, 5, 8, 12, 1, // 80-87
+        0,10,10, 1, 0, 0, 0, 4, // 40-47
+        0, 0, 0, 0, 8, 8, 8,12, // 48-55
+        16,18,18,16,16,17,17,19, // 56-63
+        18,18,18,18,8, 8, 8, 8, // 64-71
+        8, 8, 8, 8,14, 8, 8, 8, // 72-79
+        8,14, 8, 8, 5, 8,12, 1, // 80-87
         1, 0, 0, 8, 0, 0, 0, 0, // 88-95
-        0, 0, 7, 0, 0, 0, 0, 12, // 96-103
-        11, 11, 3, 3, 3, 14, 10, 6, // 104-111
+        0, 0, 7, 0, 0, 0, 0,12, // 96-103
+        11,11,3, 3, 3,14,10, 6, // 104-111
         6, 3, 3, 2, 2, 2, 6, 5, // 112-119
-        1, 1, 1, 13, 13, 2, 4, 7, // 120-127
+        1, 1, 1,13,13, 2, 4, 7, // 120-127
     };
 
 
diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/util/jinglenote/bukkit/BukkitJingleNotePlayer.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/util/jinglenote/bukkit/BukkitJingleNotePlayer.java
@@ -51,80 +51,28 @@ public boolean isPlaying() {
 
     }
 
-    private static Sound BANJO;
-    private static Sound BIT;
-    private static Sound COWBELL;
-    private static Sound DIDGERIDOO;
-    private static Sound IRON_XYLOPHONE;
-
-    static {
-        try {
-            for (Sound sound : Sound.class.getEnumConstants()) {
-                switch (sound.name()) {
-                    case "BLOCK_NOTE_BLOCK_BANJO":
-                        BANJO = sound;
-                        break;
-                    case "BLOCK_NOTE_BLOCK_BIT":
-                        BIT = sound;
-                        break;
-                    case "BLOCK_NOTE_BLOCK_COW_BELL":
-                        COWBELL = sound;
-                        break;
-                    case "BLOCK_NOTE_BLOCK_DIDGERIDOO":
-                        DIDGERIDOO = sound;
-                        break;
-                    case "BLOCK_NOTE_BLOCK_IRON_XYLOPHONE":
-                        IRON_XYLOPHONE = sound;
-                        break;
-                }
-            }
-            if (BANJO == null) {
-                throw new RuntimeException();
-            }
-        } catch (Throwable t) {
-            BANJO = Sound.BLOCK_NOTE_BLOCK_GUITAR;
-            BIT = Sound.BLOCK_NOTE_BLOCK_PLING;
-            COWBELL = Sound.BLOCK_NOTE_BLOCK_BELL;
-            DIDGERIDOO = Sound.BLOCK_NOTE_BLOCK_BASS;
-            IRON_XYLOPHONE = Sound.BLOCK_NOTE_BLOCK_XYLOPHONE;
-        }
-    }
-
     private static Sound toSound(Instrument instrument) {
-        switch (instrument) {
-            case BASS:
-                return Sound.BLOCK_NOTE_BLOCK_BASS;
-            case SNARE:
-                return Sound.BLOCK_NOTE_BLOCK_SNARE;
-            case HAT:
-                return Sound.BLOCK_NOTE_BLOCK_HAT;
-            case BANJO:
-                return BANJO;
-            case BASEDRUM:
-                return Sound.BLOCK_NOTE_BLOCK_BASEDRUM;
-            case BELL:
-                return Sound.BLOCK_NOTE_BLOCK_BELL;
-            case BIT:
-                return BIT;
-            case CHIME:
-                return Sound.BLOCK_NOTE_BLOCK_CHIME;
-            case COW_BELL:
-                return COWBELL;
-            case DIDGERIDOO:
-                return DIDGERIDOO;
-            case FLUTE:
-                return Sound.BLOCK_NOTE_BLOCK_FLUTE;
-            case XYLOPHONE:
-                return Sound.BLOCK_NOTE_BLOCK_XYLOPHONE;
-            case IRON_XYLOPHONE:
-                return IRON_XYLOPHONE;
-            case PLING:
-                return Sound.BLOCK_NOTE_BLOCK_PLING;
-            case GUITAR:
-                return Sound.BLOCK_NOTE_BLOCK_GUITAR;
-            case HARP:
-            default:
-                return Sound.BLOCK_NOTE_BLOCK_HARP;
-        }
+        return switch (instrument) {
+            case BASS -> Sound.BLOCK_NOTE_BLOCK_BASS;
+            case SNARE -> Sound.BLOCK_NOTE_BLOCK_SNARE;
+            case HAT -> Sound.BLOCK_NOTE_BLOCK_HAT;
+            case BANJO -> Sound.BLOCK_NOTE_BLOCK_BANJO;
+            case BASEDRUM -> Sound.BLOCK_NOTE_BLOCK_BASEDRUM;
+            case BELL -> Sound.BLOCK_NOTE_BLOCK_BELL;
+            case BIT -> Sound.BLOCK_NOTE_BLOCK_BIT;
+            case CHIME -> Sound.BLOCK_NOTE_BLOCK_CHIME;
+            case COW_BELL -> Sound.BLOCK_NOTE_BLOCK_COW_BELL;
+            case DIDGERIDOO -> Sound.BLOCK_NOTE_BLOCK_DIDGERIDOO;
+            case FLUTE -> Sound.BLOCK_NOTE_BLOCK_FLUTE;
+            case XYLOPHONE -> Sound.BLOCK_NOTE_BLOCK_XYLOPHONE;
+            case IRON_XYLOPHONE -> Sound.BLOCK_NOTE_BLOCK_IRON_XYLOPHONE;
+            case PLING -> Sound.BLOCK_NOTE_BLOCK_PLING;
+            case GUITAR -> Sound.BLOCK_NOTE_BLOCK_GUITAR;
+            case TRUMPET -> Sound.BLOCK_NOTE_BLOCK_TRUMPET;
+            case TRUMPET_DISTORTED -> Sound.BLOCK_NOTE_BLOCK_TRUMPET_EXPOSED;
+            case TROMBONE -> Sound.BLOCK_NOTE_BLOCK_TRUMPET_OXIDIZED;
+            case TROMBONE_DISTORTED -> Sound.BLOCK_NOTE_BLOCK_TRUMPET_WEATHERED;
+            default -> Sound.BLOCK_NOTE_BLOCK_HARP;
+        };
     }
-}
+}
diff --git a/craftbook-bukkit/src/main/resources/paper-plugin.yml b/craftbook-bukkit/src/main/resources/paper-plugin.yml
@@ -2,7 +2,7 @@ name: CraftBook5
 version: "${internalVersion}"
 main: org.enginehub.craftbook.bukkit.CraftBookPlugin
 author: EngineHub
-api-version: "1.21.10"
+api-version: "26.1"
 dependencies:
   server:
     WorldEdit:
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -39,7 +39,7 @@ mockito-bom = "org.mockito:mockito-bom:5.22.0"
 mockito-core.module = "org.mockito:mockito-core"
 mockito-junit-jupiter.module = "org.mockito:mockito-junit-jupiter"
 
-paperApi = "io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT"
+paperApi = "io.papermc.paper:paper-api:26.1.2.build.+"
 vaultApi = "com.github.MilkBowl:VaultAPI:1.7.1"
 
 dummypermscompat = "com.sk89q:dummypermscompat:1.10"

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ plugins {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`crankcaseJava {`
`13`		`- javaRelease = 21`
	`13`	`+ javaRelease = 25`
`14`	`14`	`disabledLints = listOf("processing", "path", "fallthrough", "serial", "overloads", "this-escape")`
`15`	`15`	`disabledErrorprone = listOf(`
`16`	`16`	`// We use reference equality intentionally in several places`
Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ public void onBlockBreak(BlockBreakEvent event) {`
`301`	`301`	`boolean found = false;`
`302`	`302`
`303`	`303`	`for (ItemStack item : def.getItems()) {`
`304`		`- if (ItemUtil.areItemsIdentical(event.getPlayer().getItemInHand(), item)) {`
	`304`	`+ if (ItemUtil.areItemsIdentical(event.getPlayer().getInventory().getItemInMainHand(), item)) {`
`305`	`305`	`found = true;`
`306`	`306`	`break;`
`307`	`307`	`}`
Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,11 @@ public void onBlockRedstoneChange(final SourcedBlockRedstoneEvent event) {`
`257`	`257`	`}`
`258`	`258`	`}`
`259`	`259`	`if (cnt > 0) {`
`260`		`- ((IC) icData[2]).trigger(chipState);`
	`260`	`+ IC ic = (IC) icData[2];`
	`261`	`+ ic.trigger(chipState);`
	`262`	`+ try {`
	`263`	`+ ic.getSign().update(false);`
	`264`	`+ } catch (Throwable ignored) {}`
`261`	`265`	`}`
`262`	`266`	`} catch (IllegalArgumentException ex) {`
`263`	`267`	`// Exclude these exceptions so that we don't spam consoles because of Bukkit`
`@@ -327,10 +331,13 @@ public void onThink(SelfTriggerThinkEvent event) {`
`327`	`331`
`328`	`332`	`final Object[] icData = setupIC(event.getBlock(), true);`
`329`	`333`
`330`		`- if (icData != null && icData[2] instanceof SelfTriggeredIC) {`
	`334`	`+ if (icData != null && icData[2] instanceof SelfTriggeredIC ic) {`
`331`	`335`	`event.setHandled(true);`
`332`	`336`	`ChipState chipState = ((ICFamily) icData[1]).detectSelfTriggered(BukkitAdapter.adapt(event.getBlock().getLocation()), ((IC) icData[2]).getSign());`
`333`		`- ((SelfTriggeredIC) icData[2]).think(chipState);`
	`337`	`+ ic.think(chipState);`
	`338`	`+ try {`
	`339`	`+ ic.getSign().update(false);`
	`340`	`+ } catch (Throwable ignored) {}`
`334`	`341`	`}`
`335`	`342`	`}`
`336`	`343`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ else if (data[0].equalsIgnoreCase("r")) {`
`155`	`155`	`try {`
`156`	`156`	`String[] potionBits = RegexUtil.SEMICOLON_PATTERN.split(data[a]);`
`157`	`157`	`PotionEffect effect = new PotionEffect(PotionEffectType.getById(Integer.parseInt(potionBits[0])), Integer.parseInt(potionBits[1]), Integer.parseInt(potionBits[2]));`
`158`		`- ((LivingEntity) ent).addPotionEffect(effect, true);`
	`158`	`+ ((LivingEntity) ent).addPotionEffect(effect);`
`159`	`159`	`} catch (Exception ignored) {`
`160`	`160`	`}`
`161`	`161`	`}`
`@@ -173,7 +173,7 @@ else if (data[0].equalsIgnoreCase("r")) {`
`173`	`173`	`if (!(ent instanceof LivingEntity)) continue;`
`174`	`174`
`175`	`175`	`ItemStack slot = ItemUtil.makeItemValid(ItemSyntax.getItem(bit.replace("s:", "")));`
`176`		`- ((LivingEntity) ent).getEquipment().setItemInHand(slot);`
	`176`	`+ ((LivingEntity) ent).getEquipment().setItemInMainHand(slot);`
`177`	`177`	`}`
`178`	`178`	`}`
`179`	`179`	`if (upwards == null) {`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public void trigger(ChipState chip) {`
`103`	`103`	`for (int i = 0; i < amount; i++) {`
`104`	`104`	`Entity entity = loc.getWorld().spawn(loc, type.getEntityClass());`
`105`	`105`	`if (entity instanceof Skeleton)`
`106`		`- ((Skeleton) entity).getEquipment().setItemInHand(new ItemStack(Material.BOW, 1));`
	`106`	`+ ((Skeleton) entity).getEquipment().setItemInMainHand(new ItemStack(Material.BOW, 1));`
`107`	`107`	`EntityUtil.setEntityData(entity, data);`
`108`	`108`	`}`
`109`	`109`	`}`