From 6d367e08a32c01c0f567156446d0257a6608366d Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Tue, 19 Jan 2021 21:15:18 +0000 Subject: [PATCH] ./gradlew checkstyleMain Every time I forget to run this before pushing, I get very sad. --- .../shared/turtle/core/TurtleCompareCommand.java | 2 -- src/test/java/dan200/computercraft/ingame/mod/TestRunner.kt | 4 ++-- .../resources/data/computercraft/lua/rom/autorun/cctest.lua | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleCompareCommand.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleCompareCommand.java index 4ab393971..3d7fd5881 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleCompareCommand.java +++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleCompareCommand.java @@ -15,10 +15,8 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import javax.annotation.Nonnull; -import java.lang.reflect.Method; import java.util.List; public class TurtleCompareCommand implements ITurtleCommand diff --git a/src/test/java/dan200/computercraft/ingame/mod/TestRunner.kt b/src/test/java/dan200/computercraft/ingame/mod/TestRunner.kt index 4c2c8be8f..de0c0b47f 100644 --- a/src/test/java/dan200/computercraft/ingame/mod/TestRunner.kt +++ b/src/test/java/dan200/computercraft/ingame/mod/TestRunner.kt @@ -4,7 +4,6 @@ import dan200.computercraft.ingame.api.TestContext import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch -import net.minecraft.test.TestCollection import net.minecraft.test.TestTrackerHolder import java.lang.reflect.Method import java.util.* @@ -50,7 +49,8 @@ internal object MainThread : AbstractCoroutineContextElement(ContinuationInterce } } - override fun interceptContinuation(continuation: Continuation): Continuation = MainThreadInterception(continuation) + override fun interceptContinuation(continuation: Continuation): Continuation = + MainThreadInterception(continuation) private class MainThreadInterception(val cont: Continuation) : Continuation { override val context: CoroutineContext get() = cont.context diff --git a/src/test/resources/data/computercraft/lua/rom/autorun/cctest.lua b/src/test/resources/data/computercraft/lua/rom/autorun/cctest.lua index 197748f4d..1b4f6d778 100644 --- a/src/test/resources/data/computercraft/lua/rom/autorun/cctest.lua +++ b/src/test/resources/data/computercraft/lua/rom/autorun/cctest.lua @@ -1,6 +1,6 @@ --- Extend the test API with some convenience functions. -- --- It's much easier to declare these in Lua rather than Java.. +-- It's much easier to declare these in Lua rather than Java. function test.assert(ok, ...) if ok then return ... end