Skip to content

[2.2.0] Dont run gametests if none are found #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 27, 2024
Merged

[2.2.0] Dont run gametests if none are found #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
226d8b9
[2.2.0] Dont run gametests if none are found
3arthqu4ke Jul 27, 2024
566b659
[2.2.0] Fix 1.20.6 not stopping after gametests
3arthqu4ke Jul 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion 1_20/1_20_6/src/main/java/me/earth/mc_runtime_test/McGameTestRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.player.Player;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;

import java.util.Collection;
Expand All @@ -27,7 +28,7 @@ public class McGameTestRunner {
* @param playerUUID the uuid of the player.
* @param server the server to run the tests on.
*/
public static MultipleTestTracker runGameTests(UUID playerUUID, MinecraftServer server) throws ExecutionException, InterruptedException, TimeoutException {
public static @Nullable MultipleTestTracker runGameTests(UUID playerUUID, MinecraftServer server) throws ExecutionException, InterruptedException, TimeoutException {
return server.submit(() -> {
Player player = Objects.requireNonNull(server.getPlayerList().getPlayer(playerUUID));
ServerLevel level = (ServerLevel) player.level();
Expand All @@ -37,6 +38,8 @@ public static MultipleTestTracker runGameTests(UUID playerUUID, MinecraftServer
if (testFunctions.size() < McRuntimeTest.MIN_GAME_TESTS_TO_FIND) {
LOGGER.error("Failed to find the minimum amount of gametests, expected " + McRuntimeTest.MIN_GAME_TESTS_TO_FIND + ", but found " + testFunctions.size());
throw new IllegalStateException("Failed to find the minimum amount of gametests, expected " + McRuntimeTest.MIN_GAME_TESTS_TO_FIND + ", but found " + testFunctions.size());
} else if (testFunctions.isEmpty()) {
return null;
}

GameTestRegistry.forgetFailedTests();
Expand Down
7 changes: 6 additions & 1 deletion 1_20/1_20_6/src/main/java/me/earth/mc_runtime_test/mixin/MixinMinecraft.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ private void tickHook(CallbackInfo ci) throws ExecutionException, InterruptedExc
if (McRuntimeTest.RUN_GAME_TESTS) {
LOGGER.info("Running game tests...");
mcRuntimeTest$testTracker = McGameTestRunner.runGameTests(player.getUUID(), Objects.requireNonNull(singleplayerServer));
if (mcRuntimeTest$testTracker == null) {
mcRuntimeTest$testTracker = new MultipleTestTracker();
LOGGER.info("No tests found, Successfully finished.");
mcRuntime$stop();
}
} else {
LOGGER.info("Successfully finished.");
mcRuntime$stop();
Expand Down Expand Up @@ -120,8 +125,8 @@ private void tickHook(CallbackInfo ci) throws ExecutionException, InterruptedExc
private void mcRuntime$stop() {
IntegratedServer server = singleplayerServer;
if (server != null) {
this.disconnect();
server.halt(true);
this.disconnect();
}

running = false;
Expand Down
5 changes: 4 additions & 1 deletion 1_21/src/main/java/me/earth/mc_runtime_test/McGameTestRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.player.Player;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;

import java.util.Collection;
Expand All @@ -27,7 +28,7 @@ public class McGameTestRunner {
* @param playerUUID the uuid of the player.
* @param server the server to run the tests on.
*/
public static MultipleTestTracker runGameTests(UUID playerUUID, MinecraftServer server) throws ExecutionException, InterruptedException, TimeoutException {
public static @Nullable MultipleTestTracker runGameTests(UUID playerUUID, MinecraftServer server) throws ExecutionException, InterruptedException, TimeoutException {
return server.submit(() -> {
Player player = Objects.requireNonNull(server.getPlayerList().getPlayer(playerUUID));
ServerLevel level = (ServerLevel) player.level();
Expand All @@ -37,6 +38,8 @@ public static MultipleTestTracker runGameTests(UUID playerUUID, MinecraftServer
if (testFunctions.size() < McRuntimeTest.MIN_GAME_TESTS_TO_FIND) {
LOGGER.error("Failed to find the minimum amount of gametests, expected " + McRuntimeTest.MIN_GAME_TESTS_TO_FIND + ", but found " + testFunctions.size());
throw new IllegalStateException("Failed to find the minimum amount of gametests, expected " + McRuntimeTest.MIN_GAME_TESTS_TO_FIND + ", but found " + testFunctions.size());
} else if (testFunctions.isEmpty()) {
return null;
}

GameTestRegistry.forgetFailedTests();
Expand Down
7 changes: 6 additions & 1 deletion 1_21/src/main/java/me/earth/mc_runtime_test/mixin/MixinMinecraft.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@ private void tickHook(CallbackInfo ci) throws ExecutionException, InterruptedExc
if (McRuntimeTest.RUN_GAME_TESTS) {
LOGGER.info("Running game tests...");
mcRuntimeTest$testTracker = McGameTestRunner.runGameTests(player.getUUID(), Objects.requireNonNull(singleplayerServer));
if (mcRuntimeTest$testTracker == null) {
mcRuntimeTest$testTracker = new MultipleTestTracker();
LOGGER.info("No tests found, Successfully finished.");
mcRuntime$stop();
}
} else {
LOGGER.info("Successfully finished.");
mcRuntime$stop();
Expand Down Expand Up @@ -121,8 +126,8 @@ private void tickHook(CallbackInfo ci) throws ExecutionException, InterruptedExc
private void mcRuntime$stop() {
IntegratedServer server = singleplayerServer;
if (server != null) {
disconnect();
server.halt(true);
disconnect();
}

running = false;
Expand Down