From 48d9044366933e5aacfae2b26b1b7b0454a31c9d Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Mon, 24 Aug 2020 23:01:45 -0400
Subject: [PATCH] Fix ItemTypes

---
 .../java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
index 0cf9837e9..a1e683b82 100644
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
@@ -49,10 +49,8 @@ import com.sk89q.worldedit.world.block.BlockCategory;
 import com.sk89q.worldedit.world.entity.EntityType;
 import com.sk89q.worldedit.world.gamemode.GameModes;
 import com.sk89q.worldedit.world.item.ItemCategory;
-import com.sk89q.worldedit.world.item.ItemType;
 import com.sk89q.worldedit.world.weather.WeatherTypes;
 import io.papermc.lib.PaperLib;
-import java.util.Optional;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -91,6 +89,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 
@@ -275,10 +274,11 @@ public class WorldEditPlugin extends JavaPlugin { //implements TabCompleter
                 biomeType.setLegacyId(bukkitAdapter.getInternalBiomeId(biomeType));
             }
         }
+        /*
+
         // Block & Item
         for (Material material : Material.values()) {
             if (material.isBlock() && !material.isLegacy()) {
-/*
                 BlockType.REGISTRY.register(material.getKey().toString(), new BlockType(material.getKey().toString(), blockState -> {
                     // TODO Use something way less hacky than this.
                     ParserContext context = new ParserContext();
@@ -300,12 +300,13 @@ public class WorldEditPlugin extends JavaPlugin { //implements TabCompleter
                         return blockState;
                     }
                 }));
-*/
             }
             if (material.isItem() && !material.isLegacy()) {
                 ItemType.REGISTRY.register(material.getKey().toString(), new ItemType(material.getKey().toString()));
             }
         }
+*/
+
         // Entity
         for (org.bukkit.entity.EntityType entityType : org.bukkit.entity.EntityType.values()) {
             String mcid = entityType.getName();