[ci skip] cleanup some ATs (#9840)

7 files changed, 6 insertions, 14 deletions

diff --git a/patches/server/0018-Rewrite-chunk-system.patch b/patches/server/0018-Rewrite-chunk-system.patch
index 58f69d3445..a5d84c29d9 100644
--- a/patches/server/0018-Rewrite-chunk-system.patch
+++ b/patches/server/0018-Rewrite-chunk-system.patch
@@ -149,7 +149,6 @@ In stress testing, these changes lowered the locking overhead to only 5%
 from ~70%, which completely fix the original problem as described.
 
 == AT ==
-public net.minecraft.server.level.ChunkMap setViewDistance(I)V
 public net.minecraft.server.level.ChunkHolder pos
 public net.minecraft.server.level.ChunkMap overworldDataStorage
 public-f net.minecraft.world.level.chunk.storage.RegionFileStorage
diff --git a/patches/server/0288-Add-PlayerConnectionCloseEvent.patch b/patches/server/0288-Add-PlayerConnectionCloseEvent.patch
index 5246a24d7d..0a1aca76e9 100644
--- a/patches/server/0288-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/server/0288-Add-PlayerConnectionCloseEvent.patch
@@ -36,7 +36,6 @@ is undefined.
 == AT ==
 public net.minecraft.server.network.ServerLoginPacketListenerImpl$State
 public net.minecraft.server.network.ServerLoginPacketListenerImpl state
-public net.minecraft.server.network.ServerLoginPacketListenerImpl gameProfile
 
 diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
 index 6fcbf8205e1852d5193a42bfe1154f62ab01e7ad..25881c890c643ce90bdcda6b094d912bafb0ed75 100644
diff --git a/patches/server/0325-Flat-bedrock-generator-settings.patch b/patches/server/0325-Flat-bedrock-generator-settings.patch
index 2bf8b308aa..3ca530eeff 100644
--- a/patches/server/0325-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0325-Flat-bedrock-generator-settings.patch
@@ -15,7 +15,6 @@ public net.minecraft.world.level.levelgen.SurfaceRules$LazyYCondition
 public net.minecraft.world.level.levelgen.SurfaceRules$LazyCondition
 public net.minecraft.world.level.levelgen.SurfaceRules$VerticalGradientConditionSource
 public net.minecraft.world.level.levelgen.SurfaceRules$SurfaceRule
-public net.minecraft.world.level.levelgen.SurfaceSystem getOrCreateRandomFactory(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/world/level/levelgen/PositionalRandomFactory;
 
 Co-authored-by: Noah van der Aa <[email protected]>
 
@@ -136,7 +135,7 @@ index 902156477bdfc9917105f1229f760c26e5af302a..58609a0911c4e32b6f80f050cd3d23f7
  
          for (int j = -8; j <= 8; ++j) {
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/WorldGenerationContext.java b/src/main/java/net/minecraft/world/level/levelgen/WorldGenerationContext.java
-index b99283c31193e2110f6e3f39c23dbfc2442bab2b..1c9d9ecdafb2bd04348045ba0404da052dcd6437 100644
+index a0aa1087f5cb4d2d50c127447745a9e25c5079d6..192bcd833bf910b9372f8a05eea0de832ada431b 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/WorldGenerationContext.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/WorldGenerationContext.java
 @@ -6,10 +6,13 @@ import net.minecraft.world.level.chunk.ChunkGenerator;
@@ -169,7 +168,7 @@ index b99283c31193e2110f6e3f39c23dbfc2442bab2b..1c9d9ecdafb2bd04348045ba0404da05
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/carver/CarvingContext.java b/src/main/java/net/minecraft/world/level/levelgen/carver/CarvingContext.java
-index a745458ea3581ea91a68c863e3fd0a0292d73a61..f84ee8afe95f912a972e37fbae7a06ecdd3aba06 100644
+index df7183f221f0a5bc6fba7a5857c16555411bcff0..bef1f5ebf284bffc863e4174b3fb259956bf3303 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/carver/CarvingContext.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/carver/CarvingContext.java
 @@ -21,8 +21,8 @@ public class CarvingContext extends WorldGenerationContext {
@@ -184,7 +183,7 @@ index a745458ea3581ea91a68c863e3fd0a0292d73a61..f84ee8afe95f912a972e37fbae7a06ec
          this.noiseChunk = chunkNoiseSampler;
          this.randomState = noiseConfig;
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/placement/PlacementContext.java b/src/main/java/net/minecraft/world/level/levelgen/placement/PlacementContext.java
-index 640c2683c842655bbaee8f293f1c2613ef44844e..53d818b0cc602f827d0b907e293515f6810c6792 100644
+index 9915ddef87c759df442a8c7b6960a88e3657ba44..d167caddd99604494f8d67b169d50b3abbb2a276 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/placement/PlacementContext.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/placement/PlacementContext.java
 @@ -18,7 +18,7 @@ public class PlacementContext extends WorldGenerationContext {
diff --git a/patches/server/0627-Missing-Entity-API.patch b/patches/server/0627-Missing-Entity-API.patch
index c4be6e1e34..df472c2f75 100644
--- a/patches/server/0627-Missing-Entity-API.patch
+++ b/patches/server/0627-Missing-Entity-API.patch
@@ -14,8 +14,6 @@ public net.minecraft.world.entity.animal.Bee setRolling(Z)V
 public net.minecraft.world.entity.animal.Bee numCropsGrownSincePollination
 public net.minecraft.world.entity.animal.Bee ticksWithoutNectarSinceExitingHive
 public net.minecraft.world.entity.monster.piglin.Piglin isChargingCrossbow()Z
-public net.minecraft.world.entity.animal.MushroomCow effect
-public net.minecraft.world.entity.animal.MushroomCow effectDuration
 public net.minecraft.world.entity.ambient.Bat targetPosition
 public net.minecraft.world.entity.monster.Ravager attackTick
 public net.minecraft.world.entity.monster.Ravager stunnedTick
@@ -23,7 +21,6 @@ public net.minecraft.world.entity.monster.Ravager roarTick
 public net.minecraft.world.entity.vehicle.MinecartTNT explode(D)V
 public net.minecraft.world.entity.vehicle.MinecartTNT fuse
 public net.minecraft.world.entity.monster.Endermite life
-public net.minecraft.world.entity.vehicle.MinecartHopper cooldownTime
 public net.minecraft.world.entity.projectile.AbstractArrow soundEvent
 public net.minecraft.world.entity.monster.Phantom anchorPoint
 public net.minecraft.world.entity.npc.WanderingTrader getWanderTarget()Lnet/minecraft/core/BlockPos;
@@ -111,7 +108,7 @@ index 0000000000000000000000000000000000000000..41bf71d116ffc5431586ce54abba7f8d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/entity/animal/AbstractSchoolingFish.java b/src/main/java/net/minecraft/world/entity/animal/AbstractSchoolingFish.java
-index 39ed3ca76d6b64ef3917280ec822721cc02afada..86b437836cb4b1f6e8ca9acd5f1f93b925cf9e51 100644
+index afac0fd1d5c7f732ec0614bd64a224e2a890e45c..235e86549b691c0698f13c8438b35e76d528f0b5 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/AbstractSchoolingFish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/AbstractSchoolingFish.java
 @@ -52,6 +52,7 @@ public abstract class AbstractSchoolingFish extends AbstractFish {
diff --git a/patches/server/0727-Collision-optimisations.patch b/patches/server/0727-Collision-optimisations.patch
index fa06465fd9..c8215111b7 100644
--- a/patches/server/0727-Collision-optimisations.patch
+++ b/patches/server/0727-Collision-optimisations.patch
@@ -2204,7 +2204,7 @@ index d0a8092bf57a29ab7c00ec0ddf52a9fdb2a33267..392406722b0a040c1d41fdc1154d75d3
      private Direction(int id, int idOpposite, int idHorizontal, String name, Direction.AxisDirection direction, Direction.Axis axis, Vec3i vector) {
          this.data3d = id;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index b5b86613aea368c524ed2544b9836a834ed833ad..f5fb414087d4346e7d83b8f3ed847731cb03052d 100644
+index c9eb785457b606d8f7c4fe3f824fd6d0a1d1070e..19f94236df83d73686aded9658a6469b3840c0c3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -462,7 +462,7 @@ public class ServerPlayer extends Player {
diff --git a/patches/server/0833-More-Teleport-API.patch b/patches/server/0833-More-Teleport-API.patch
index d0377d5188..56e6375cd1 100644
--- a/patches/server/0833-More-Teleport-API.patch
+++ b/patches/server/0833-More-Teleport-API.patch
@@ -3,8 +3,6 @@ From: Owen1212055 <[email protected]>
 Date: Sun, 5 Sep 2021 12:15:59 -0400
 Subject: [PATCH] More Teleport API
 
-== AT ==
-public net.minecraft.server.network.ServerGamePacketListenerImpl internalTeleport(DDDFFLjava/util/Set;Z)V
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 index b1be147250d3850930e103a2fa2823a6c992f0dd..675467a6552cfc1f951e7c81a9be0d423cae8c44 100644
@@ -74,7 +72,7 @@ index c924ee182c150feca61deab9b8cc54806a23c49a..6fdde2f766b91833dc2318526f84e96c
          // Let the server handle cross world teleports
          if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 16f3381e9cc42c7747199e7c178bd071b798f0e4..842471eb7dd0d68368e551220922b05b26e476e2 100644
+index 86f9950c6188f407b547cb19330444c5e29f5838..0fc4a90383a5b332cad58ec55e30dc363aed16ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1212,13 +1212,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/1039-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/1040-Fix-NPE-in-SculkBloomEvent-world-access.patch
index b586dbf7f6..b586dbf7f6 100644
--- a/patches/server/1039-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/1040-Fix-NPE-in-SculkBloomEvent-world-access.patch