few random compile fixes

Author: MiniDigger

Diff for: paper-server/patches/sources/net/minecraft/server/commands/SetSpawnCommand.java.patch

@@ -9,7 +9,7 @@
 -            serverPlayer.setRespawnPosition(new ServerPlayer.RespawnConfig(resourceKey, pos, angle, true), false);
 -        }
 +            // Paper start - Add PlayerSetSpawnEvent
-+            if (serverPlayer.setRespawnPosition(resourceKey, pos, angle, true, false, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.COMMAND)) {
++            if (serverPlayer.setRespawnPosition(new net.minecraft.server.level.ServerPlayer.RespawnConfig(resourceKey, pos, angle, true), false, com.destroystokyo.paper.event.player.PlayerSetSpawnEvent.Cause.COMMAND)) {
 +                actualTargets.add(serverPlayer);
 +            }
 +            // Paper end - Add PlayerSetSpawnEvent

Diff for: paper-server/patches/sources/net/minecraft/server/level/ServerPlayerGameMode.java.patch

@@ -97,7 +97,7 @@
              if (action == ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK) {
                  if (!this.level.mayInteract(this.player, pos)) {
 +                    // CraftBukkit start - fire PlayerInteractEvent
-+                    org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent(this.player, org.bukkit.event.block.Action.LEFT_CLICK_BLOCK, pos, face, this.player.getInventory().getSelected(), InteractionHand.MAIN_HAND);
++                    org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent(this.player, org.bukkit.event.block.Action.LEFT_CLICK_BLOCK, pos, face, this.player.getInventory().getSelectedItem(), InteractionHand.MAIN_HAND);
                      this.player.connection.send(new ClientboundBlockUpdatePacket(pos, this.level.getBlockState(pos)));
                      this.debugLogging(pos, false, sequence, "may not interact");
 -                    return;
@@ -109,7 +109,7 @@
 +                }
 +
 +                // CraftBukkit start
-+                org.bukkit.event.player.PlayerInteractEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent(this.player, org.bukkit.event.block.Action.LEFT_CLICK_BLOCK, pos, face, this.player.getInventory().getSelected(), InteractionHand.MAIN_HAND);
++                org.bukkit.event.player.PlayerInteractEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent(this.player, org.bukkit.event.block.Action.LEFT_CLICK_BLOCK, pos, face, this.player.getInventory().getSelectedItem(), InteractionHand.MAIN_HAND);
 +                if (event.isCancelled()) {
 +                    // Let the client know the block still exists
 +                    // this.player.connection.send(new ClientboundBlockUpdatePacket(this.level, pos)); // Paper - Don't resync blocks
@@ -153,7 +153,7 @@
 +                    return;
 +                }
 +
-+                org.bukkit.event.block.BlockDamageEvent blockEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockDamageEvent(this.player, pos, face, this.player.getInventory().getSelected(), f >= 1.0f); // Paper - Add BlockFace to BlockDamageEvent
++                org.bukkit.event.block.BlockDamageEvent blockEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockDamageEvent(this.player, pos, face, this.player.getInventory().getSelectedItem(), f >= 1.0f); // Paper - Add BlockFace to BlockDamageEvent
 +
 +                if (blockEvent.isCancelled()) {
 +                    return;
@@ -188,7 +188,7 @@
                  this.level.destroyBlockProgress(this.player.getId(), pos, -1);
                  this.debugLogging(pos, true, sequence, "aborted destroying");
 +
-+                org.bukkit.craftbukkit.event.CraftEventFactory.callBlockDamageAbortEvent(this.player, pos, this.player.getInventory().getSelected()); // CraftBukkit
++                org.bukkit.craftbukkit.event.CraftEventFactory.callBlockDamageAbortEvent(this.player, pos, this.player.getInventory().getSelectedItem()); // CraftBukkit
              }
          }
      }

Diff for: paper-server/patches/sources/net/minecraft/world/entity/projectile/ThrownTrident.java.patch

@@ -59,7 +59,7 @@
      protected void onHitEntity(EntityHitResult result) {
          Entity entity = result.getEntity();
 -        float f = 8.0F;
-+        float f = (float) this.getBaseDamage(); // Paper - Allow trident custom damage
++        float f = (float) this.baseDamage; // Paper - Allow trident custom damage
          Entity owner = this.getOwner();
          DamageSource damageSource = this.damageSources().trident(this, (Entity)(owner == null ? this : owner));
          if (this.level() instanceof ServerLevel serverLevel) {

Diff for: paper-server/patches/sources/net/minecraft/world/item/EggItem.java.patch

@@ -18,7 +18,7 @@
 -            Projectile.spawnProjectileFromRotation(ThrownEgg::new, serverLevel, itemInHand, player, 0.0F, 1.5F, 1.0F);
 -        }
 +        // Paper start
-+        final Projectile.Delayed<ThrownEgg> thrownEgg = Projectile.spawnProjectileFromRotationDelayed(ThrownEgg::new, serverLevel, itemInHand, player, 0.0F, EggItem.PROJECTILE_SHOOT_POWER, 1.0F);
++        final Projectile.Delayed<ThrownEgg> thrownEgg = Projectile.spawnProjectileFromRotationDelayed(ThrownEgg::new, level, itemInHand, player, 0.0F, EggItem.PROJECTILE_SHOOT_POWER, 1.0F);
 +        com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) player.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemInHand), (org.bukkit.entity.Projectile) thrownEgg.projectile().getBukkitEntity());
 +        if (event.callEvent() && thrownEgg.attemptSpawn()) {
 +            if (event.shouldConsume()) {

Diff for: paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java

@@ -28,7 +28,7 @@ public ItemStack[] getStorageContents() {
 
     @Override
     public ItemStack getItemInMainHand() {
-        return CraftItemStack.asCraftMirror(this.getInventory().getSelected());
+        return CraftItemStack.asCraftMirror(this.getInventory().getSelectedItem());
     }
 
     @Override

Diff for: paper-server/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java

@@ -353,7 +353,7 @@ public static void init() {
                     Optional<CompoundTag> propMap = blockTag.getElement("Properties").result();
                     if (propMap.isPresent()) {
                         CompoundTag properties = propMap.get();
-                        for (String dataKey : properties.getAllKeys()) {
+                        for (String dataKey : properties.keySet()) {
                             Property state = states.getProperty(dataKey);
 
                             if (state == null) {

Diff for: paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java

@@ -3,6 +3,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
 import com.google.gson.JsonParseException;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -147,7 +148,7 @@ private StringMessage(String message, boolean keepNewlines, boolean plain) {
                         if (!(match.startsWith("http://") || match.startsWith("https://"))) {
                             match = "http://" + match;
                         }
-                        this.modifier = this.modifier.withClickEvent(new ClickEvent(Action.OPEN_URL, match));
+                        this.modifier = this.modifier.withClickEvent(new ClickEvent.OpenUrl(new URI(match)));
                         this.appendNewComponent(matcher.end(groupId));
                         this.modifier = this.modifier.withClickEvent((ClickEvent) null);
                     }