Fix Accessor Mixin causing NPE with /test runclosest

src/main/java/mctester/common/test/creation/TestConfig.java

@@ -102,4 +102,14 @@ public TestConfig variant(int variant) {
         this.variant = variant;
         return this;
     }
+
+    public TestConfig manualOnly(boolean manualOnly) {
+        this.manualOnly = manualOnly;
+        return this;
+    }
+
+    public TestConfig skyAccess(boolean skyAccess) {
+        this.skyAccess = skyAccess;
+        return this;
+    }
 }

src/main/java/mctester/common/util/GameTestUtil.java

@@ -1,6 +1,6 @@
 package mctester.common.util;
 
-import mctester.mixin.accessor.GameTestAccessor;
+import mctester.mixin.accessor.GameTestStateAccessor;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.StructureBlockBlockEntity;
 import net.minecraft.entity.Entity;
@@ -22,11 +22,11 @@
 
 public class GameTestUtil {
     public static BlockBox getTestBlockBox(GameTestState gameTest) {
-        return getTestBlockBox(((GameTestAccessor) gameTest).getStructureBlockBlockEntity());
+        return getTestBlockBox(gameTest.getStructureBlockBlockEntity());
     }
 
     public static Box getTestBox(GameTestState gameTest) {
-        return getTestBox(((GameTestAccessor) gameTest).getStructureBlockBlockEntity());
+        return getTestBox(gameTest.getStructureBlockBlockEntity());
     }
 
     private static BlockBox getTestBlockBox(StructureBlockBlockEntity structureBlockEntity) {

src/main/java/mctester/mixin/GameTestMixin.java → src/main/java/mctester/mixin/GameTestStateMixin.java

@@ -12,7 +12,7 @@
 import java.util.function.LongConsumer;
 
 @Mixin(GameTestState.class)
-public class GameTestMixin implements GameTestHelper.GameTestAccess {
+public class GameTestStateMixin implements GameTestHelper.GameTestAccess {
     @Unique
     private final GameTestHelper gameTestHelper = new GameTestHelper((GameTestState) (Object) this);
     @Shadow

src/main/java/mctester/mixin/accessor/GameTestStateAccessor.java

@@ -0,0 +1,9 @@
+package mctester.mixin.accessor;
+
+import net.minecraft.test.GameTestState;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(GameTestState.class)
+public interface GameTestStateAccessor {
+
+}

src/main/java/mctester/mixin/fixes/function_lookup/TestCommandMixin.java

@@ -1,29 +1,9 @@
 package mctester.mixin.fixes.function_lookup;
 
-import net.minecraft.block.entity.StructureBlockBlockEntity;
 import net.minecraft.server.command.TestCommand;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(TestCommand.class)
 public class TestCommandMixin {
 
-//    @Redirect(
-//            method = "run(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/test/TestSet;Z)V",
-//            at = @At(
-//                    value = "INVOKE",
-//                    target = "Lnet/minecraft/block/entity/StructureBlockBlockEntity;getMetadata()Ljava/lang/String;"
-//            )
-//    )
-//    private static String getTestFunctionIdentifier(StructureBlockBlockEntity structureBlockBlockEntity) {
-//        String retval = structureBlockBlockEntity.getMetadata();
-//        if (retval.isEmpty()) {
-//            retval = structureBlockBlockEntity.getTemplateName();
-//            if (retval.startsWith("minecraft:")) {
-//                retval = retval.substring("minecraft:".length());
-//            }
-//        }
-//        return retval;
-//    } //TODO check if this is still needed
 }

src/main/resources/mctester.mixins.json

@@ -4,9 +4,9 @@
   "package": "mctester.mixin",
   "compatibilityLevel": "JAVA_16",
   "mixins": [
-    "GameTestMixin",
+    "GameTestStateMixin",
     "accessor.BrainAccessor",
-    "accessor.GameTestAccessor",
+    "accessor.GameTestStateAccessor",
     "accessor.GoalSelectorAccessor",
     "accessor.MobEntityAccessor",
     "accessor.TestContextAccessor",