Update to Minecraft 1.13-pre7

2 files changed, 56 insertions, 0 deletions

diff --git a/src/main/java/org/bukkit/craftbukkit/tag/CraftBlockTag.java b/src/main/java/org/bukkit/craftbukkit/tag/CraftBlockTag.java
new file mode 100644
index 00000000..4b3ac51a
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/tag/CraftBlockTag.java
@@ -0,0 +1,28 @@
+package org.bukkit.craftbukkit.tag;
+
+import java.util.Collections;
+import java.util.Set;
+import java.util.stream.Collectors;
+import net.minecraft.server.Block;
+import org.bukkit.Material;
+import org.bukkit.Tag;
+import org.bukkit.craftbukkit.util.CraftMagicNumbers;
+
+public class CraftBlockTag implements Tag<Material> {
+
+    private final net.minecraft.server.Tag<Block> handle;
+
+    public CraftBlockTag(net.minecraft.server.Tag<Block> handle) {
+        this.handle = handle;
+    }
+
+    @Override
+    public boolean isTagged(Material item) {
+        return handle.isTagged(CraftMagicNumbers.getBlock(item));
+    }
+
+    @Override
+    public Set<Material> getValues() {
+        return Collections.unmodifiableSet(handle.a().stream().map((block) -> CraftMagicNumbers.getMaterial(block)).collect(Collectors.toSet()));
+    }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/tag/CraftItemTag.java b/src/main/java/org/bukkit/craftbukkit/tag/CraftItemTag.java
new file mode 100644
index 00000000..b6b90e3e
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/tag/CraftItemTag.java
@@ -0,0 +1,28 @@
+package org.bukkit.craftbukkit.tag;
+
+import java.util.Collections;
+import java.util.Set;
+import java.util.stream.Collectors;
+import net.minecraft.server.Item;
+import org.bukkit.Material;
+import org.bukkit.Tag;
+import org.bukkit.craftbukkit.util.CraftMagicNumbers;
+
+public class CraftItemTag implements Tag<Material> {
+
+    private final net.minecraft.server.Tag<Item> handle;
+
+    public CraftItemTag(net.minecraft.server.Tag<Item> handle) {
+        this.handle = handle;
+    }
+
+    @Override
+    public boolean isTagged(Material item) {
+        return handle.isTagged(CraftMagicNumbers.getItem(item));
+    }
+
+    @Override
+    public Set<Material> getValues() {
+        return Collections.unmodifiableSet(handle.a().stream().map((item) -> CraftMagicNumbers.getMaterial(item)).collect(Collectors.toSet()));
+    }
+}