Skip to content

Commit cda5a84

Browse files
authored
Merge pull request #615 from IntelligenceModding/revert-612-peripheral-tests
Revert "Implement game tests for more peripherals"
2 parents 7421144 + 0a0e10d commit cda5a84

22 files changed

+1
-2428
lines changed

src/testMod/java/dan200/computercraft/gametest/core/TestAPI.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
import dan200.computercraft.api.lua.LuaFunction;
1313
import dan200.computercraft.gametest.api.ComputerState;
1414
import dan200.computercraft.gametest.api.TestExtensionsKt;
15-
import dan200.computercraft.shared.computer.core.ServerContext;
16-
import de.srendi.advancedperipherals.common.util.LuaConverter;
1715
import net.minecraft.gametest.framework.GameTestSequence;
18-
import net.minecraftforge.server.ServerLifecycleHooks;
1916

2017
import java.util.Optional;
2118

@@ -83,14 +80,4 @@ public final void ok(Optional<String> marker) throws LuaException {
8380
public final void log(String message) {
8481
ComputerCraft.log.info("[Computer '{}'] {}", label, message);
8582
}
86-
87-
@LuaFunction
88-
public final Object getComputerPosition() {
89-
return ServerContext.get(ServerLifecycleHooks.getCurrentServer()).registry().getComputers().stream()
90-
.filter(computer -> computer.getLabel() != null && computer.getLabel().equals(label))
91-
.findFirst()
92-
.map(computer -> LuaConverter.posToObject(computer.getPosition()))
93-
.orElse(null);
94-
}
95-
9683
}

src/testMod/java/dan200/computercraft/gametest/core/TestEvents.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/testMod/java/dan200/computercraft/gametest/core/TestMod.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,8 @@
3232
import java.util.Locale;
3333
import java.util.function.Consumer;
3434

35-
@Mod(TestMod.MOD_ID)
35+
@Mod("advancedperipheralstest")
3636
public class TestMod {
37-
38-
public static final String MOD_ID = "advancedperipheralstest";
39-
4037
public TestMod() {
4138
TestHooks.init();
4239

src/testMod/kotlin/de/srendi/advancedperipherals/test/ModIntegrTest.kt

Lines changed: 0 additions & 79 deletions
This file was deleted.

src/testMod/kotlin/de/srendi/advancedperipherals/test/PeripheralTest.kt

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,4 @@ class PeripheralTest {
3737
thenComputerOk();
3838
}
3939

40-
@GameTest
41-
fun nbtStorage(context: GameTestHelper) = context.sequence {
42-
thenComputerOk();
43-
}
44-
45-
@GameTest(timeoutTicks = 300)
46-
fun rsIntegrator(context: GameTestHelper) = context.sequence {
47-
thenComputerOk();
48-
}
49-
50-
@GameTest(timeoutTicks = 300)
51-
fun geoScanner(context: GameTestHelper) = context.sequence {
52-
thenComputerOk();
53-
}
54-
5540
}

src/testMod/resources/data/advancedperipheralstest/computer/tests/modintegrtest.botaniaflower.lua

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/testMod/resources/data/advancedperipheralstest/computer/tests/modintegrtest.botaniamanapool.lua

Lines changed: 0 additions & 40 deletions
This file was deleted.

src/testMod/resources/data/advancedperipheralstest/computer/tests/modintegrtest.botaniaspreader.lua

Lines changed: 0 additions & 66 deletions
This file was deleted.

src/testMod/resources/data/advancedperipheralstest/computer/tests/modintegrtest.minecraftbeacon.lua

Lines changed: 0 additions & 34 deletions
This file was deleted.

src/testMod/resources/data/advancedperipheralstest/computer/tests/modintegrtest.minecraftnoteblock.lua

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)