dwa

adapters/bukkit/plugin/src/main/java/art/arcane/iris/core/commands/CommandIris.java

@@ -975,8 +975,7 @@ public class CommandIris implements DirectorExecutor {
                 try {
                     IrisData data = IrisData.get(pack);
                     for (String key : data.getDimensionLoader().getPossibleKeys()) {
-                        options.add(key);
-                        options.add(pack.getName() + ":" + key);
+                        options.add(packDimensionOption(pack.getName(), key));
                     }
                 } catch (Throwable ex) {
                     Iris.warn("Failed to read dimension keys from pack %s: %s%s",
@@ -990,6 +989,12 @@ public class CommandIris implements DirectorExecutor {
             return new KList<>(options);
         }
 
+        static String packDimensionOption(String packName, String dimensionKey) {
+            return packName.equalsIgnoreCase(dimensionKey)
+                    ? packName
+                    : packName + ":" + dimensionKey;
+        }
+
         @Override
         public String toString(String value) {
             return value == null ? "" : value;

adapters/bukkit/plugin/src/test/java/art/arcane/iris/core/commands/CommandIrisPackDimensionTypeHandlerTest.java

@@ -0,0 +1,21 @@
+package art.arcane.iris.core.commands;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class CommandIrisPackDimensionTypeHandlerTest {
+    @Test
+    public void matchingPackAndDimensionUsesBarePackName() {
+        assertEquals("overworld",
+                CommandIris.PackDimensionTypeHandler.packDimensionOption("overworld", "overworld"));
+        assertEquals("OverWorld",
+                CommandIris.PackDimensionTypeHandler.packDimensionOption("OverWorld", "overworld"));
+    }
+
+    @Test
+    public void differingDimensionUsesExplicitPackReference() {
+        assertEquals("custom_pack:dimensions/sky",
+                CommandIris.PackDimensionTypeHandler.packDimensionOption("custom_pack", "dimensions/sky"));
+    }
+}