make cast list not null

add toString to instances
ghzdude · Mar 4, 2025 · 83a4325 · 83a4325
1 parent 707a57e
commit 83a4325
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/AbilityInstances.java b/src/main/java/gregtech/api/metatileentity/multiblock/AbilityInstances.java
@@ -119,4 +119,9 @@ public Object remove(int index) {
     public int size() {
         return instances.size();
     }
+
+    @Override
+    public String toString() {
+        return String.format("key{%s, %s}", this.key, super.toString());
+    }
 }
diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockAbility.java b/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockAbility.java
@@ -8,6 +8,7 @@
 import net.minecraftforge.items.IItemHandlerModifiable;
 
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -114,10 +115,11 @@ public boolean checkType(Object o) {
     }
 
     @SuppressWarnings("unchecked")
-    public <R> List<R> castList(AbilityInstances instances) {
+    public @NotNull <R> List<R> castList(AbilityInstances instances) {
         if (instances.isKey(this)) {
             return (List<R>) instances;
         }
-        return null;
+        throw new IllegalArgumentException("Cannot cast instances of " + instances + " because they are not of " +
+                this.clazz.getSimpleName() + "!");
     }
 }