SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.16.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-08-12 07:00:00 +10:00
parent 5e5f7f19dc
commit 6a9e00d4b6
208 changed files with 2144 additions and 2455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
paper-server/src/test/java/org/bukkit/BiomeTest.java
View File

@@ -1,7 +1,7 @@
package org.bukkit;
import net.minecraft.server.BiomeBase;
import net.minecraft.server.IRegistry;
import net.minecraft.server.RegistryGeneration;
import org.bukkit.block.Biome;
import org.bukkit.craftbukkit.block.CraftBlock;
import org.bukkit.support.AbstractTestingBase;
@@ -19,7 +19,7 @@ public class BiomeTest extends AbstractTestingBase {
@Test
public void testMinecraftToBukkit() {
for (Object biome : IRegistry.BIOME) {
for (Object biome : RegistryGeneration.WORLDGEN_BIOME) {
Assert.assertNotNull("No Bukkit mapping for " + biome, CraftBlock.biomeBaseToBiome((BiomeBase) biome));
}
}

2
paper-server/src/test/java/org/bukkit/MaterialTest.java
View File

@@ -70,6 +70,6 @@ public class MaterialTest extends AbstractTestingBase {
.sorted(Comparator.comparingInt(Material::getId))
.forEach(expectedOrder::add);
assertArrayEquals(Material.values(), expectedOrder.toArray());
assertArrayEquals(expectedOrder.toArray(), Material.values());
}
}

2
paper-server/src/test/java/org/bukkit/craftbukkit/legacy/LegacyTest.java
View File

@@ -62,6 +62,8 @@ public class LegacyTest extends AbstractTestingBase {
Material.GILDED_BLACKSTONE, Material.LODESTONE, Material.PIGLIN_BANNER_PATTERN, Material.POLISHED_BLACKSTONE, Material.POLISHED_BLACKSTONE_BRICKS, Material.POLISHED_BLACKSTONE_BRICK_SLAB, Material.POLISHED_BLACKSTONE_BRICK_STAIRS,
Material.POLISHED_BLACKSTONE_BRICK_WALL, Material.POLISHED_BLACKSTONE_BUTTON, Material.POLISHED_BLACKSTONE_PRESSURE_PLATE, Material.POLISHED_BLACKSTONE_SLAB, Material.POLISHED_BLACKSTONE_STAIRS, Material.POLISHED_BLACKSTONE_WALL, Material.QUARTZ_BRICKS,
Material.SOUL_CAMPFIRE, Material.STRIDER_SPAWN_EGG, Material.WARPED_FUNGUS_ON_A_STICK, Material.ZOGLIN_SPAWN_EGG, Material.CHAIN, Material.MUSIC_DISC_PIGSTEP,
// 1.16.2
Material.PIGLIN_BRUTE_SPAWN_EGG,
//
Material.LEGACY_AIR, Material.LEGACY_DEAD_BUSH, Material.LEGACY_BURNING_FURNACE, Material.LEGACY_WALL_SIGN, Material.LEGACY_REDSTONE_TORCH_OFF, Material.LEGACY_SKULL, Material.LEGACY_REDSTONE_COMPARATOR_ON, Material.LEGACY_WALL_BANNER, Material.LEGACY_MONSTER_EGG));

2
paper-server/src/test/java/org/bukkit/support/AbstractTestingBase.java
View File

@@ -42,7 +42,7 @@ public abstract class AbstractTestingBase {
// Register vanilla pack
resourceManager.a(MoreExecutors.directExecutor(), MoreExecutors.directExecutor(), Collections.singletonList(new ResourcePackVanilla("minecraft")), CompletableFuture.completedFuture(Unit.INSTANCE)).join();
// Bind tags
TAG_REGISTRY.bind();
TAG_REGISTRY.a().bind();
DummyServer.setup();
DummyEnchantments.setup();