Deprecate Raid#getId for removal

Deprecate as raid instances are not tied to an id until the server
actually starts tracking them.

Best attempt at keeping compat by passing the id to the raid instance
once tracked, prior the API will return -1.

Author: lynxplay

paper-api/src/main/java/org/bukkit/Raid.java

@@ -137,7 +137,10 @@ public enum RaidStatus {
      * Gets the id of this raid.
      *
      * @return the raid id
+     * @deprecated Raid identifiers are magic internal values and may or may not be present.
+     * -1 is returned for raids without an assigned id.
      */
+    @Deprecated(forRemoval = true, since = "1.21.5")
     int getId();
 
     /**

paper-server/patches/sources/net/minecraft/world/entity/raid/Raid.java.patch

@@ -1,13 +1,14 @@
 --- a/net/minecraft/world/entity/raid/Raid.java
 +++ b/net/minecraft/world/entity/raid/Raid.java
-@@ -59,6 +_,11 @@
+@@ -59,6 +_,12 @@
  import net.minecraft.world.phys.Vec3;
 
  public class Raid {
 +    // Paper start
 +    private static final String PDC_NBT_KEY = "BukkitValues";
 +    private static final org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry PDC_TYPE_REGISTRY = new org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry();
 +    public final org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer persistentDataContainer;
++    public int idOrNegativeOne = -1;
 +    // Paper end
      public static final SpawnPlacementType RAVAGER_SPAWN_PLACEMENT_TYPE = SpawnPlacements.getPlacementType(EntityType.RAVAGER);
      public static final MapCodec<Raid> MAP_CODEC = RecordCodecBuilder.mapCodec(

paper-server/patches/sources/net/minecraft/world/entity/raid/Raids.java.patch

@@ -1,6 +1,14 @@
 --- a/net/minecraft/world/entity/raid/Raids.java
 +++ b/net/minecraft/world/entity/raid/Raids.java
-@@ -141,11 +_,22 @@
+@@ -57,6 +_,7 @@
+     private Raids(List<Raids.RaidWithId> raids, int nextId, int tick) {
+         for (Raids.RaidWithId raidWithId : raids) {
+             this.raidMap.put(raidWithId.id, raidWithId.raid);
++            raidWithId.raid.idOrNegativeOne = raidWithId.id; // Paper - expose id of raids while method is kept around as deprecated for removal
+         }
+ 
+         this.nextId = nextId;
+@@ -141,11 +_,23 @@
                      }
 
                      Raid raid = this.getOrCreateRaid(serverLevel, blockPos);
@@ -23,6 +31,7 @@
 +
 +                        if (!raid.isStarted() && !this.raidMap.containsValue(raid)) {
 +                            this.raidMap.put(this.getUniqueId(), raid);
++                            raid.idOrNegativeOne = this.nextId; // Paper - expose id of raids while method is kept around as deprecated for removal
 +                        }
 +                        // CraftBukkit end
                          raid.absorbRaidOmen(player);

paper-server/src/main/java/org/bukkit/craftbukkit/CraftRaid.java

@@ -105,7 +105,7 @@ public net.minecraft.world.entity.raid.Raid getHandle() {
 
     @Override
     public int getId() {
-        return this.handle.getId();
+        return this.handle.idOrNegativeOne;
     }
 
     @Override