From 5bbf80e30adc9cf04d83d80bf2051454d88bd1e8 Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Sat, 25 Jun 2022 23:07:49 +0200
Subject: [PATCH] Add deprecated annot

---
 ...ceOrbs-API-for-Reason-Source-Triggering-play.patch | 11 ++++++-----
 patches/server/0167-PlayerPickupExperienceEvent.patch |  4 ++--
 ...MC-135506-Experience-should-save-as-Integers.patch |  6 +++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index 8d803c97b08c..3f61e57d61ae 100644
--- a/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -21,10 +21,10 @@ index cd3b4c97374d44f5a0e710e03f4ac38938757e25..b18bb06caf5f034dffbb72120c8f21da
  
                  return true;
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index b3433ce9c722bdab81848a6c2d121ca510c48509..227aca795efc99c4f81dfb30c00d31d2d7524542 100644
+index b3433ce9c722bdab81848a6c2d121ca510c48509..2ccc8fb14c68dbdaf9c43bfaa173e65ddc08d47a 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -37,13 +37,63 @@ public class ExperienceOrb extends Entity {
+@@ -37,13 +37,64 @@ public class ExperienceOrb extends Entity {
      public int value;
      private int count;
      private Player followingPlayer;
@@ -67,6 +67,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..227aca795efc99c4f81dfb30c00d31d2
 +        nbttagcompound.put("Paper.ExpData", comp);
 +    }
  
++    @Deprecated
      public ExperienceOrb(Level world, double x, double y, double z, int amount) {
 +        this(world, x, y, z, amount, null, null);
 +    }
@@ -90,7 +91,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..227aca795efc99c4f81dfb30c00d31d2
      }
  
      public ExperienceOrb(EntityType<? extends ExperienceOrb> type, Level world) {
-@@ -153,12 +203,20 @@ public class ExperienceOrb extends Entity {
+@@ -153,12 +204,20 @@ public class ExperienceOrb extends Entity {
      }
  
      public static void award(ServerLevel world, Vec3 pos, int amount) {
@@ -112,7 +113,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..227aca795efc99c4f81dfb30c00d31d2
              }
          }
  
-@@ -228,6 +286,7 @@ public class ExperienceOrb extends Entity {
+@@ -228,6 +287,7 @@ public class ExperienceOrb extends Entity {
          nbt.putShort("Age", (short) this.age);
          nbt.putShort("Value", (short) this.value);
          nbt.putInt("Count", this.count);
@@ -120,7 +121,7 @@ index b3433ce9c722bdab81848a6c2d121ca510c48509..227aca795efc99c4f81dfb30c00d31d2
      }
  
      @Override
-@@ -236,6 +295,7 @@ public class ExperienceOrb extends Entity {
+@@ -236,6 +296,7 @@ public class ExperienceOrb extends Entity {
          this.age = nbt.getShort("Age");
          this.value = nbt.getShort("Value");
          this.count = Math.max(nbt.getInt("Count"), 1);
diff --git a/patches/server/0167-PlayerPickupExperienceEvent.patch b/patches/server/0167-PlayerPickupExperienceEvent.patch
index 6b3e21f67753..762a8579f697 100644
--- a/patches/server/0167-PlayerPickupExperienceEvent.patch
+++ b/patches/server/0167-PlayerPickupExperienceEvent.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] PlayerPickupExperienceEvent
 Allows plugins to cancel a player picking up an experience orb
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 227aca795efc99c4f81dfb30c00d31d2d7524542..6bf6d6629dfb9338d3e34f433a5698904a2acdad 100644
+index 2ccc8fb14c68dbdaf9c43bfaa173e65ddc08d47a..8a8454ab292fe92719a81575e129a6b84232838b 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -301,7 +301,7 @@ public class ExperienceOrb extends Entity {
+@@ -302,7 +302,7 @@ public class ExperienceOrb extends Entity {
      @Override
      public void playerTouch(Player player) {
          if (!this.level.isClientSide) {
diff --git a/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch
index c0c7c171ff55..a24022fa53b8 100644
--- a/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch
+++ b/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] MC-135506: Experience should save as Integers
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 6bf6d6629dfb9338d3e34f433a5698904a2acdad..4848f26a006f4d4df620ded526134b3b39e90d29 100644
+index 8a8454ab292fe92719a81575e129a6b84232838b..9fb639be67d23e73285693329ea8187a07ebebff 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -284,7 +284,7 @@ public class ExperienceOrb extends Entity {
+@@ -285,7 +285,7 @@ public class ExperienceOrb extends Entity {
      public void addAdditionalSaveData(CompoundTag nbt) {
          nbt.putShort("Health", (short) this.health);
          nbt.putShort("Age", (short) this.age);
@@ -17,7 +17,7 @@ index 6bf6d6629dfb9338d3e34f433a5698904a2acdad..4848f26a006f4d4df620ded526134b3b
          nbt.putInt("Count", this.count);
          this.savePaperNBT(nbt); // Paper
      }
-@@ -293,7 +293,7 @@ public class ExperienceOrb extends Entity {
+@@ -294,7 +294,7 @@ public class ExperienceOrb extends Entity {
      public void readAdditionalSaveData(CompoundTag nbt) {
          this.health = nbt.getShort("Health");
          this.age = nbt.getShort("Age");