remove OreDictUtil

Author: gardenevery

gradle.properties

@@ -15,7 +15,7 @@ show_testing_output = false
 
 # Mod Information
 # HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
-mod_version = 1.0.2
+mod_version = 1.0.3
 root_package = aekeylegacy
 mod_id = aekeylegacy
 mod_name = AEKey Legacy

src/main/java/aekeylegacy/OreDictUtil.java

@@ -19,12 +19,12 @@
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.CapabilityDispatcher;
 import net.minecraftforge.fml.common.registry.ForgeRegistries;
+import net.minecraftforge.oredict.OreDictionary;
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 
 import aekeylegacy.AELog;
-import aekeylegacy.OreDictUtil;
 import aekeylegacy.api.storage.AEKeyFilter;
 
 public final class AEItemKey extends AEKey {
@@ -311,7 +311,20 @@ public boolean getHasSubtypes() {
 
     @Override
     public boolean isTagged(String tag) {
-        return OreDictUtil.hasTag(item, metadata, tag);
+        if (!OreDictionary.doesOreNameExist(tag)) {
+            return false;
+        }
+
+        int tagId = OreDictionary.getOreID(tag);
+        var stack = new ItemStack(item, 1, metadata);
+        int[] oreIds = OreDictionary.getOreIDs(stack);
+
+        for (int id : oreIds) {
+            if (id == tagId) {
+                return true;
+            }
+        }
+        return false;
     }
 
     /**

src/main/java/aekeylegacy/api/stacks/AEItemKey.java

@@ -24,8 +24,7 @@
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.ResourceLocation;
-
-import aekeylegacy.OreDictUtil;
+import net.minecraftforge.oredict.OreDictionary;
 
 final class AEItemKeys extends AEKeyType {
     private static final ResourceLocation ID = new ResourceLocation("ae2", "i");
@@ -55,6 +54,6 @@ public boolean supportsFuzzyRangeSearch() {
 
     @Override
     public Stream<String> getTagNames() {
-        return OreDictUtil.getOreNames();
+        return Stream.of(OreDictionary.getOreNames());
     }
 }