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

Update to Minecraft 1.14-pre5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
paper-server/src/test/java/org/bukkit/craftbukkit/inventory/InventoryWrapperTest.java
View File

@@ -10,7 +10,7 @@ public class InventoryWrapperTest {
@Test
public void test() {
Inventory raw = new CraftInventoryCustom(null, 9);
Inventory raw = new CraftInventoryCustom(null, 27);
raw.addItem(new ItemStack(Material.STONE));
Assert.assertTrue(raw.contains(Material.STONE));

4
paper-server/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java
View File

@@ -10,8 +10,8 @@ import java.util.HashSet;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import net.minecraft.server.IAnimal;
import net.minecraft.server.IAttribute;
import net.minecraft.server.IDynamicTexture;
import org.bukkit.support.AbstractTestingBase;
import org.junit.Test;
@@ -20,7 +20,7 @@ public class ItemFactoryTest extends AbstractTestingBase {
@Test
public void testKnownAttributes() throws Throwable {
final ZipInputStream nmsZipStream = new ZipInputStream(IAnimal.class/* Magic class that isn't imported! */.getProtectionDomain().getCodeSource().getLocation().openStream());
final ZipInputStream nmsZipStream = new ZipInputStream(IDynamicTexture.class/* Magic class that isn't imported! */.getProtectionDomain().getCodeSource().getLocation().openStream());
final Collection<String> names = new HashSet<String>();
for (ZipEntry clazzEntry; (clazzEntry = nmsZipStream.getNextEntry()) != null; ) {
final String entryName = clazzEntry.getName();

11
paper-server/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
View File

@@ -27,6 +27,7 @@ import org.bukkit.attribute.Attribute;
import org.bukkit.attribute.AttributeModifier;
import org.bukkit.block.banner.Pattern;
import org.bukkit.block.banner.PatternType;
import org.bukkit.craftbukkit.block.data.CraftBlockData;
import org.bukkit.craftbukkit.inventory.ItemStackTest.StackProvider;
import org.bukkit.craftbukkit.inventory.ItemStackTest.StackWrapper;
import org.bukkit.craftbukkit.inventory.ItemStackTest.BukkitWrapper;
@@ -36,6 +37,7 @@ import org.bukkit.entity.EntityType;
import org.bukkit.entity.TropicalFish;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.BannerMeta;
import org.bukkit.inventory.meta.BlockDataMeta;
import org.bukkit.inventory.meta.BlockStateMeta;
import org.bukkit.inventory.meta.BookMeta;
import org.bukkit.inventory.meta.EnchantmentStorageMeta;
@@ -188,7 +190,7 @@ public class ItemMetaTest extends AbstractTestingBase {
public void testBlockStateMeta() {
List<Block> queue = new ArrayList<>();
for (Item item : (Iterable<Item>) IRegistry.ITEM) { // Eclipse fail
for (Item item : IRegistry.ITEM) {
if (item instanceof ItemBlock) {
queue.add(((ItemBlock) item).getBlock());
}
@@ -370,6 +372,13 @@ public class ItemMetaTest extends AbstractTestingBase {
assertThat(itemMeta2.equals(notEqualMeta2), is(false));
}
@Test
public void testBlockData() {
BlockDataMeta itemMeta = (BlockDataMeta) Bukkit.getItemFactory().getItemMeta(Material.CHEST);
itemMeta.setBlockData(CraftBlockData.newData(null, "minecraft:chest[waterlogged=true]"));
assertThat(itemMeta.getBlockData(Material.CHEST), is(CraftBlockData.newData(null, "minecraft:chest[waterlogged=true]")));
}
private void downCastTest(final StackWrapper provider) {
final String name = provider.toString();
final ItemStack blank = new ItemStack(Material.STONE);