Update to Minecraft 1.13-pre7

1 files changed, 3 insertions, 35 deletions

diff --git a/src/test/java/org/bukkit/MaterialTest.java b/src/test/java/org/bukkit/MaterialTest.java
index 61c68711..692bb920 100644
--- a/src/test/java/org/bukkit/MaterialTest.java
+++ b/src/test/java/org/bukkit/MaterialTest.java
@@ -15,31 +15,6 @@ public class MaterialTest {
     }
 
     @Test
-    public void getById() throws Throwable {
-        for (Material material : Material.values()) {
-            if (material.getClass().getField(material.name()).getAnnotation(Deprecated.class) != null) {
-                continue;
-            }
-            assertThat(Material.getMaterial(material.getId()), is(material));
-        }
-    }
-
-    @Test
-    public void isBlock() {
-        for (Material material : Material.values()) {
-            if (material.getId() > 255) continue;
-
-            assertTrue(String.format("[%d] %s", material.getId(), material.toString()), material.isBlock());
-        }
-    }
-
-    @Test
-    public void getByOutOfRangeId() {
-        assertThat(Material.getMaterial(Integer.MAX_VALUE), is(nullValue()));
-        assertThat(Material.getMaterial(Integer.MIN_VALUE), is(nullValue()));
-    }
-
-    @Test
     public void getByNameNull() {
         assertThat(Material.getMaterial(null), is(nullValue()));
     }
@@ -47,6 +22,9 @@ public class MaterialTest {
     @Test
     public void getData() {
         for (Material material : Material.values()) {
+            if (!material.isLegacy()) {
+                continue;
+            }
             Class<? extends MaterialData> clazz = material.getData();
 
             assertThat(material.getNewData((byte) 0), is(instanceOf(clazz)));
@@ -59,16 +37,6 @@ public class MaterialTest {
     }
 
     @Test
-    public void matchMaterialById() throws Throwable {
-        for (Material material : Material.values()) {
-            if (material.getClass().getField(material.name()).getAnnotation(Deprecated.class) != null) {
-                continue;
-            }
-            assertThat(Material.matchMaterial(String.valueOf(material.getId())), is(material));
-        }
-    }
-
-    @Test
     public void matchMaterialByName() {
         for (Material material : Material.values()) {
             assertThat(Material.matchMaterial(material.toString()), is(material));