Fix usage of raw types for ITagManager

CraftTweaker · Mar 31, 2022 · cac2229 · cac2229
1 parent 618eaea
commit cac2229
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Common/src/main/java/com/blamejared/crafttweaker/api/ICraftTweakerRegistry.java b/Common/src/main/java/com/blamejared/crafttweaker/api/ICraftTweakerRegistry.java
@@ -181,7 +181,7 @@ public interface ICraftTweakerRegistry {
 
     <T> Optional<Class<T>> getTaggableElementFor(final ResourceKey<T> key);
 
-    <T> TagManagerFactory<T, ? extends ITagManager> getTaggableElementFactory(ResourceKey<Registry<T>> resourceKey);
+    <T> TagManagerFactory<T, ? extends ITagManager<?>> getTaggableElementFactory(ResourceKey<Registry<T>> resourceKey);
 
     /**
      * Gets all bracket handler possibilities that can be queried under the given {@link IScriptLoader}.

diff --git a/Common/src/main/java/com/blamejared/crafttweaker/impl/command/type/HandCommands.java b/Common/src/main/java/com/blamejared/crafttweaker/impl/command/type/HandCommands.java
@@ -5,10 +5,10 @@
 import com.blamejared.crafttweaker.api.data.base.visitor.DataToTextComponentVisitor;
 import com.blamejared.crafttweaker.api.plugin.ICommandRegistrationHandler;
 import com.blamejared.crafttweaker.api.tag.CraftTweakerTagRegistry;
-import com.blamejared.crafttweaker.api.tag.type.KnownTag;
 import com.blamejared.crafttweaker.api.tag.MCTag;
 import com.blamejared.crafttweaker.api.tag.manager.ITagManager;
 import com.blamejared.crafttweaker.api.tag.manager.type.KnownTagManager;
+import com.blamejared.crafttweaker.api.tag.type.KnownTag;
 import com.blamejared.crafttweaker.natives.block.ExpandBlock;
 import com.blamejared.crafttweaker.natives.block.ExpandBlockState;
 import com.blamejared.crafttweaker.natives.entity.attribute.ExpandAttribute;
@@ -307,7 +307,7 @@ private static void sendVanillaBlockTagsInformation(final Player player, final B
         sendVanillaTagsInformation(player, new TranslatableComponent("crafttweaker.command.hand.header.tags.block"), CraftTweakerTagRegistry.INSTANCE.tagManager(Registry.BLOCK_REGISTRY), item.getBlock());
     }
 
-    private static <T> void sendVanillaTagsInformation(final Player player, final MutableComponent header, final ITagManager manager, final T target) {
+    private static <T> void sendVanillaTagsInformation(final Player player, final MutableComponent header, final ITagManager<?> manager, final T target) {
 
         Holder<T> tHolder = Services.REGISTRY.makeHolder(manager.resourceKey(), target);
 

diff --git a/.../main/java/com/blamejared/crafttweaker/impl/registry/zencode/TaggableElementRegistry.java b/.../main/java/com/blamejared/crafttweaker/impl/registry/zencode/TaggableElementRegistry.java
@@ -43,9 +43,9 @@ public Map<ResourceKey<?>, Class<?>> getTaggableElements() {
         return ImmutableMap.copyOf(this.elementData);
     }
 
-    public <T> Optional<TagManagerFactory<T, ? extends ITagManager>> getManagerFactory(final ResourceKey<Registry<T>> key) {
+    public <T> Optional<TagManagerFactory<T, ? extends ITagManager<?>>> getManagerFactory(final ResourceKey<Registry<T>> key) {
 
-        return Optional.ofNullable(managerData.get(key)).map(it -> (TagManagerFactory<T, ? extends ITagManager>) it);
+        return Optional.ofNullable(managerData.get(key)).map(it -> (TagManagerFactory<T, ? extends ITagManager<?>>) it);
     }
 
     public Map<ResourceKey<?>, TagManagerFactory<?, ?>> getManagers() {