diff options
Diffstat (limited to 'patches/server/0002-Remap-fixes.patch')
| -rw-r--r-- | patches/server/0002-Remap-fixes.patch | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/patches/server/0002-Remap-fixes.patch b/patches/server/0002-Remap-fixes.patch index 684c2c5fcb..d128af05d7 100644 --- a/patches/server/0002-Remap-fixes.patch +++ b/patches/server/0002-Remap-fixes.patch @@ -74,7 +74,7 @@ index 9051f0186c09eeb8ecccf62b0116f6da1800a1df..b231f90317fe7df9133674b12d478735 private Optional<ResourceLocation> randomSequence; diff --git a/src/test/java/org/bukkit/DyeColorsTest.java b/src/test/java/org/bukkit/DyeColorsTest.java -index dfc3e4f5a5cfee0456097a44d579587719a231a7..9342abe7853a611776684c1eb0b24164148cb5f2 100644 +index e96d821da0698dd42651500fb97a0856a9e9ce02..fb7d40181abdaa5b2ce607db47c09d0d0a19c86d 100644 --- a/src/test/java/org/bukkit/DyeColorsTest.java +++ b/src/test/java/org/bukkit/DyeColorsTest.java @@ -3,7 +3,6 @@ package org.bukkit; @@ -82,10 +82,10 @@ index dfc3e4f5a5cfee0456097a44d579587719a231a7..9342abe7853a611776684c1eb0b24164 import static org.hamcrest.Matchers.*; -import net.minecraft.world.item.DyeColor; - import org.bukkit.support.AbstractTestingBase; + import org.bukkit.support.environment.Normal; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -@@ -14,7 +13,7 @@ public class DyeColorsTest extends AbstractTestingBase { +@@ -15,7 +14,7 @@ public class DyeColorsTest { @EnumSource(DyeColor.class) public void checkColor(DyeColor dye) { Color color = dye.getColor(); @@ -94,7 +94,7 @@ index dfc3e4f5a5cfee0456097a44d579587719a231a7..9342abe7853a611776684c1eb0b24164 Color nmsColor = Color.fromARGB(nmsColorArray); assertThat(color, is(nmsColor)); } -@@ -23,7 +22,7 @@ public class DyeColorsTest extends AbstractTestingBase { +@@ -24,7 +23,7 @@ public class DyeColorsTest { @EnumSource(org.bukkit.DyeColor.class) public void checkFireworkColor(org.bukkit.DyeColor dye) { Color color = dye.getFireworkColor(); @@ -104,10 +104,10 @@ index dfc3e4f5a5cfee0456097a44d579587719a231a7..9342abe7853a611776684c1eb0b24164 } } diff --git a/src/test/java/org/bukkit/ParticleTest.java b/src/test/java/org/bukkit/ParticleTest.java -index 9c9f5dd2351b3067b54d6cc5bdb572c46b12aaa8..307e8a3694c6f0b48d2df9792c3e5fdbaae1fd8e 100644 +index 688c5bae8146f6fc8cddb2632e9cbf304f0745fb..1b0df6220682328b8f1d03416cb8df2f6662a1cf 100644 --- a/src/test/java/org/bukkit/ParticleTest.java +++ b/src/test/java/org/bukkit/ParticleTest.java -@@ -250,7 +250,7 @@ public class ParticleTest extends AbstractTestingBase { +@@ -251,7 +251,7 @@ public class ParticleTest { Check in CraftParticle if the conversion is still correct. """, bukkit.getKey())); @@ -117,7 +117,7 @@ index 9c9f5dd2351b3067b54d6cc5bdb572c46b12aaa8..307e8a3694c6f0b48d2df9792c3e5fdb Could not encoded particle param for particle %s. This can indicated, that the wrong particle param is created in CraftParticle. diff --git a/src/test/java/org/bukkit/entity/EntityTypesTest.java b/src/test/java/org/bukkit/entity/EntityTypesTest.java -index 32df0090aab65b551b524603cce0b96e461cc358..952924abae79cc504342bbdb6f6953ab8a6cc295 100644 +index 9df52ab0f04758dd04f45f6029fe120ac1a933af..d513d926ddabd61a03172adb846afb7674ed402e 100644 --- a/src/test/java/org/bukkit/entity/EntityTypesTest.java +++ b/src/test/java/org/bukkit/entity/EntityTypesTest.java @@ -6,7 +6,6 @@ import java.util.Set; @@ -125,10 +125,10 @@ index 32df0090aab65b551b524603cce0b96e461cc358..952924abae79cc504342bbdb6f6953ab import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.EntityType; - import org.bukkit.support.AbstractTestingBase; + import org.bukkit.support.environment.AllFeatures; import org.junit.jupiter.api.Test; -@@ -16,8 +15,8 @@ public class EntityTypesTest extends AbstractTestingBase { +@@ -17,8 +16,8 @@ public class EntityTypesTest { public void testMaps() { Set<EntityType> allBukkit = Arrays.stream(EntityType.values()).filter((b) -> b.getName() != null).collect(Collectors.toSet()); @@ -140,7 +140,7 @@ index 32df0090aab65b551b524603cce0b96e461cc358..952924abae79cc504342bbdb6f6953ab org.bukkit.entity.EntityType bukkit = org.bukkit.entity.EntityType.fromName(key.getPath()); assertNotNull(bukkit, "Missing nms->bukkit " + key); diff --git a/src/test/java/org/bukkit/entity/PandaGeneTest.java b/src/test/java/org/bukkit/entity/PandaGeneTest.java -index 5818bfa69a8573a2a8f350066f829d587cbc546b..8e421a1bee0c526e3024eab9ba4cc0b320842de2 100644 +index 4a3ac959f0dcc35f80371443383be1f8b42b6d95..e8520f541fda2d1cd9677f3fc7d7d295743f88b2 100644 --- a/src/test/java/org/bukkit/entity/PandaGeneTest.java +++ b/src/test/java/org/bukkit/entity/PandaGeneTest.java @@ -2,7 +2,6 @@ package org.bukkit.entity; @@ -149,9 +149,9 @@ index 5818bfa69a8573a2a8f350066f829d587cbc546b..8e421a1bee0c526e3024eab9ba4cc0b3 -import net.minecraft.world.entity.animal.Panda; import org.bukkit.craftbukkit.entity.CraftPanda; + import org.bukkit.support.environment.Normal; import org.junit.jupiter.api.Test; - -@@ -10,8 +9,8 @@ public class PandaGeneTest { +@@ -12,8 +11,8 @@ public class PandaGeneTest { @Test public void testBukkit() { @@ -162,7 +162,7 @@ index 5818bfa69a8573a2a8f350066f829d587cbc546b..8e421a1bee0c526e3024eab9ba4cc0b3 assertNotNull(nms, "NMS gene null for " + gene); assertEquals(gene.isRecessive(), nms.isRecessive(), "Recessive status did not match " + gene); -@@ -21,7 +20,7 @@ public class PandaGeneTest { +@@ -23,7 +22,7 @@ public class PandaGeneTest { @Test public void testNMS() { @@ -172,10 +172,10 @@ index 5818bfa69a8573a2a8f350066f829d587cbc546b..8e421a1bee0c526e3024eab9ba4cc0b3 assertNotNull(bukkit, "Bukkit gene null for " + gene); diff --git a/src/test/java/org/bukkit/registry/RegistryConstantsTest.java b/src/test/java/org/bukkit/registry/RegistryConstantsTest.java -index 6c84f1289c84d0aca1935c473ffa63dae1b52598..ebcb65cb74acdb9d1bcf2b4b3551a2dc6d809bc9 100644 +index a382ca7c6e0f96e5d8be37fa8139360db13f9c2f..8fb906c77070eedec8cde263154eaf4610ad3197 100644 --- a/src/test/java/org/bukkit/registry/RegistryConstantsTest.java +++ b/src/test/java/org/bukkit/registry/RegistryConstantsTest.java -@@ -29,17 +29,17 @@ public class RegistryConstantsTest extends AbstractTestingBase { +@@ -31,17 +31,17 @@ public class RegistryConstantsTest { @Test public void testTrimMaterial() { @@ -197,10 +197,10 @@ index 6c84f1289c84d0aca1935c473ffa63dae1b52598..ebcb65cb74acdb9d1bcf2b4b3551a2dc for (Field field : clazz.getFields()) { diff --git a/src/test/java/org/bukkit/registry/RegistryLoadOrderTest.java b/src/test/java/org/bukkit/registry/RegistryLoadOrderTest.java -index 31062b6d9ad685ea3750c6b5ddc6b295bb263e0a..5842cb5a6f3da42b8c40e6cbd5c5366572bf7684 100644 +index 52f057a3b81ae798a8ff354a90e2cc64264c0398..0c704fb9e73229f5632f1f48e59fccc0daf9ec26 100644 --- a/src/test/java/org/bukkit/registry/RegistryLoadOrderTest.java +++ b/src/test/java/org/bukkit/registry/RegistryLoadOrderTest.java -@@ -24,7 +24,7 @@ public class RegistryLoadOrderTest extends AbstractTestingBase { +@@ -25,7 +25,7 @@ public class RegistryLoadOrderTest { private static boolean initInterface = false; private static boolean initAbstract = false; |