API patches

1 files changed, 0 insertions, 174 deletions

diff --git a/patches/server/0002-Remap-fixes.patch b/patches/server/0002-Remap-fixes.patch
deleted file mode 100644
index 2b81da438a..0000000000
--- a/patches/server/0002-Remap-fixes.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kyle Wood <[email protected]>
-Date: Fri, 11 Jun 2021 05:25:03 -0500
-Subject: [PATCH] Remap fixes
-
-
-diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
-index 700fd7f0ef6ba5798389b41a52f887e76917893d..eabf34265470e68b56c0d8787a7acffcf9b49e83 100644
---- a/src/main/java/net/minecraft/core/BlockPos.java
-+++ b/src/main/java/net/minecraft/core/BlockPos.java
-@@ -270,9 +270,11 @@ public class BlockPos extends Vec3i {
- 
-     public static Iterable<BlockPos> withinManhattan(BlockPos center, int rangeX, int rangeY, int rangeZ) {
-         int i = rangeX + rangeY + rangeZ;
--        int j = center.getX();
--        int k = center.getY();
--        int l = center.getZ();
-+        // Paper start - rename variables to fix conflict with anonymous class (remap fix)
-+        int centerX = center.getX();
-+        int centerY = center.getY();
-+        int centerZ = center.getZ();
-+        // Paper end
-         return () -> {
-             return new AbstractIterator<BlockPos>() {
-                 private final BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos();
-@@ -287,7 +289,7 @@ public class BlockPos extends Vec3i {
-                 protected BlockPos computeNext() {
-                     if (this.zMirror) {
-                         this.zMirror = false;
--                        this.cursor.setZ(l - (this.cursor.getZ() - l));
-+                        this.cursor.setZ(centerZ - (this.cursor.getZ() - centerZ)); // Paper - remap fix
-                         return this.cursor;
-                     } else {
-                         BlockPos blockPos;
-@@ -313,7 +315,7 @@ public class BlockPos extends Vec3i {
-                             int k = this.currentDepth - Math.abs(i) - Math.abs(j);
-                             if (k <= rangeZ) {
-                                 this.zMirror = k != 0;
--                                blockPos = this.cursor.set(j + i, k + j, l + k);
-+                                blockPos = this.cursor.set(centerX + i, centerY + j, centerZ + k); // Paper - remap fix
-                             }
-                         }
- 
-diff --git a/src/main/java/net/minecraft/server/commands/SummonCommand.java b/src/main/java/net/minecraft/server/commands/SummonCommand.java
-index da83a40a74b291879d236ffccf36ee7a626a811e..556c4fe8d0d044c2995533f4f20cbde7283a2711 100644
---- a/src/main/java/net/minecraft/server/commands/SummonCommand.java
-+++ b/src/main/java/net/minecraft/server/commands/SummonCommand.java
-@@ -53,9 +53,9 @@ public class SummonCommand {
- 
-             nbttagcompound1.putString("id", entity.toString());
-             ServerLevel worldserver = source.getLevel();
--            Entity entity1 = EntityType.loadEntityRecursive(nbttagcompound1, worldserver, (entity1) -> {
--                entity1.moveTo(pos.x, pos.y, pos.z, entity1.getYRot(), entity1.getXRot());
--                return entity1;
-+            Entity entity1 = EntityType.loadEntityRecursive(nbttagcompound1, worldserver, (loadedEntity) -> { // Paper - remap fix
-+                loadedEntity.moveTo(pos.x, pos.y, pos.z, loadedEntity.getYRot(), loadedEntity.getXRot()); // Paper - remap fix
-+                return loadedEntity; // Paper - remap fix
-             });
- 
-             if (entity1 == null) {
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java b/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
-index b2e9418aaf2b2c87f396304287595e519e72e3ad..098253e92bd95159de93fbbdf95daee341fc5752 100644
---- a/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java
-@@ -174,11 +174,11 @@ public class BehaviorUtils {
- 
-         return optional.map((uuid) -> {
-             return ((ServerLevel) entity.level).getEntity(uuid);
--        }).map((entity) -> {
-+        }).map((entity1) -> { // Paper - remap fix
-             LivingEntity entityliving1;
- 
--            if (entity instanceof LivingEntity) {
--                LivingEntity entityliving2 = (LivingEntity) entity;
-+            if (entity1 instanceof LivingEntity) { // Paper - remap fix
-+                LivingEntity entityliving2 = (LivingEntity) entity1; // Paper - remap fix
- 
-                 entityliving1 = entityliving2;
-             } else {
-diff --git a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-index 228e402a4efb6289fba58df3c0eac4cc608d4596..17c72a767e7b749ed78a9b54af19bae5381b296c 100644
---- a/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-+++ b/src/main/java/net/minecraft/world/item/crafting/RecipeManager.java
-@@ -192,7 +192,7 @@ public class RecipeManager extends SimpleJsonResourceReloadListener {
-         Builder<ResourceLocation, Recipe<?>> builder = ImmutableMap.builder();
- 
-         recipes.forEach((irecipe) -> {
--            Map<ResourceLocation, Recipe<?>> map1 = (Map) map.computeIfAbsent(irecipe.getType(), (recipes) -> {
-+            Map<ResourceLocation, Recipe<?>> map1 = (Map) map.computeIfAbsent(irecipe.getType(), (recipes_) -> { // Paper - remap fix
-                 return new Object2ObjectLinkedOpenHashMap<>(); // CraftBukkit
-             });
-             ResourceLocation minecraftkey = irecipe.getId();
-diff --git a/src/test/java/org/bukkit/DyeColorsTest.java b/src/test/java/org/bukkit/DyeColorsTest.java
-index ad52c3fc6210939a39ef77a382c640a24ee44838..6b7dd01778f0a5d3a96d2d04af4b525d17efbfba 100644
---- a/src/test/java/org/bukkit/DyeColorsTest.java
-+++ b/src/test/java/org/bukkit/DyeColorsTest.java
-@@ -4,7 +4,6 @@ import static org.hamcrest.Matchers.*;
- import static org.junit.Assert.*;
- import java.util.ArrayList;
- import java.util.List;
--import net.minecraft.world.item.DyeColor;
- import org.bukkit.support.AbstractTestingBase;
- import org.junit.Test;
- import org.junit.runner.RunWith;
-@@ -29,7 +28,7 @@ public class DyeColorsTest extends AbstractTestingBase {
-     @Test
-     public void checkColor() {
-         Color color = this.dye.getColor();
--        float[] nmsColorArray = DyeColor.byId(this.dye.getWoolData()).getTextureDiffuseColors();
-+        float[] nmsColorArray = net.minecraft.world.item.DyeColor.byId(this.dye.getWoolData()).getTextureDiffuseColors(); // Paper - remap fix
-         Color nmsColor = Color.fromRGB((int) (nmsColorArray[0] * 255), (int) (nmsColorArray[1] * 255), (int) (nmsColorArray[2] * 255));
-         assertThat(color, is(nmsColor));
-     }
-@@ -37,7 +36,7 @@ public class DyeColorsTest extends AbstractTestingBase {
-     @Test
-     public void checkFireworkColor() {
-         Color color = this.dye.getFireworkColor();
--        int nmsColor = DyeColor.byId(this.dye.getWoolData()).getFireworkColor();
-+        int nmsColor = net.minecraft.world.item.DyeColor.byId(this.dye.getWoolData()).getFireworkColor(); // Paper - remap fix
-         assertThat(color, is(Color.fromRGB(nmsColor)));
-     }
- }
-diff --git a/src/test/java/org/bukkit/entity/EntityTypesTest.java b/src/test/java/org/bukkit/entity/EntityTypesTest.java
-index 8c4ad718e113f24a30fd11b345d34d6ca1ef73b0..1e84f541683ddb619c2a8dfcd2a141fba2bd851d 100644
---- a/src/test/java/org/bukkit/entity/EntityTypesTest.java
-+++ b/src/test/java/org/bukkit/entity/EntityTypesTest.java
-@@ -5,7 +5,6 @@ import java.util.Set;
- import java.util.stream.Collectors;
- import net.minecraft.core.Registry;
- import net.minecraft.resources.ResourceLocation;
--import net.minecraft.world.entity.EntityType;
- import org.bukkit.support.AbstractTestingBase;
- import org.junit.Assert;
- import org.junit.Test;
-@@ -16,8 +15,8 @@ public class EntityTypesTest extends AbstractTestingBase {
-     public void testMaps() {
-         Set<EntityType> allBukkit = Arrays.stream(EntityType.values()).filter((b) -> b.getName() != null).collect(Collectors.toSet());
- 
--        for (EntityType<?> nms : Registry.ENTITY_TYPE) {
--            ResourceLocation key = EntityType.getKey(nms);
-+        for (net.minecraft.world.entity.EntityType<?> nms : Registry.ENTITY_TYPE) { // Paper - remap fix
-+            ResourceLocation key = net.minecraft.world.entity.EntityType.getKey(nms); // Paper - remap fix
- 
-             org.bukkit.entity.EntityType bukkit = org.bukkit.entity.EntityType.fromName(key.getPath());
-             Assert.assertNotNull("Missing nms->bukkit " + key, bukkit);
-diff --git a/src/test/java/org/bukkit/entity/PandaGeneTest.java b/src/test/java/org/bukkit/entity/PandaGeneTest.java
-index 76e2ad676ae68846bdff3c3ef711751445fb0f3c..feee17192bca55a9cf1b2fc5b9609b888db77763 100644
---- a/src/test/java/org/bukkit/entity/PandaGeneTest.java
-+++ b/src/test/java/org/bukkit/entity/PandaGeneTest.java
-@@ -1,6 +1,5 @@
- package org.bukkit.entity;
- 
--import net.minecraft.world.entity.animal.Panda;
- import org.bukkit.craftbukkit.entity.CraftPanda;
- import org.junit.Assert;
- import org.junit.Test;
-@@ -10,7 +9,7 @@ public class PandaGeneTest {
-     @Test
-     public void testBukkit() {
-         for (Panda.Gene gene : Panda.Gene.values()) {
--            Panda.Gene nms = CraftPanda.toNms(gene);
-+            net.minecraft.world.entity.animal.Panda.Gene nms = CraftPanda.toNms(gene); // Paper - remap fix
- 
-             Assert.assertNotNull("NMS gene null for " + gene, nms);
-             Assert.assertEquals("Recessive status did not match " + gene, gene.isRecessive(), nms.isRecessive());
-@@ -20,7 +19,7 @@ public class PandaGeneTest {
- 
-     @Test
-     public void testNMS() {
--        for (Panda.Gene gene : Panda.Gene.values()) {
-+        for (net.minecraft.world.entity.animal.Panda.Gene gene : net.minecraft.world.entity.animal.Panda.Gene.values()) { // Paper - remap fix
-             org.bukkit.entity.Panda.Gene bukkit = CraftPanda.fromNms(gene);
- 
-             Assert.assertNotNull("Bukkit gene null for " + gene, bukkit);