Skip to content

added click-3x3 feature (closes #719) #720

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

Open
RealRTTV wants to merge 3 commits into
base: fabric
Choose a base branch
from
Open

added click-3x3 feature (closes #719) #720

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ac2d02
added click-3x3 feature
RealRTTV Mar 15, 2025
a9aee76
Fixed MinesweeperCommand.java Spacing
RealRTTV Mar 20, 2025
045d92f
Update MinesweeperCommand.java
RealRTTV Mar 20, 2025
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
61 changes: 33 additions & 28 deletions src/main/java/net/earthcomputer/clientcommands/command/MinesweeperCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.screens.Screen;
Expand All @@ -19,6 +20,7 @@
import org.joml.Vector2i;

import java.util.Random;
import java.util.stream.Stream;

import static com.mojang.brigadier.arguments.IntegerArgumentType.*;
import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.*;
Expand Down Expand Up @@ -219,13 +221,18 @@ public boolean mouseReleased(double mouseX, double mouseY, int button) {
int tileY = Mth.floorDiv((int) (mouseY - topLeftY - 12), 16);

if (isWithinBounds(tileX, tileY) && gameActive()) {
byte tile = getTile(tileX, tileY);
if (button == InputConstants.MOUSE_BUTTON_LEFT) {
if (ticksPlaying == 0) {
generateMines(tileX, tileY);
ticksPlaying = 1;
}

click(tileX, tileY);
if (isCovered(tile)) {
click(tileX, tileY);
} else {
click3x3(tileX, tileY);
}

assert minecraft != null && minecraft.player != null;
if (emptyTilesRemaining <= 0) {
Expand Down Expand Up @@ -290,6 +297,14 @@ private boolean isWithinBounds(int x, int y) {
return 0 <= x && x < boardWidth && 0 <= y && y < boardHeight;
}

private Stream<Vector2i> getNeighbours(int x, int y) {
return Stream.of(
new Vector2i(x - 1, y - 1), new Vector2i(x, y - 1), new Vector2i(x + 1, y - 1),
new Vector2i(x - 1, y), new Vector2i(x + 1, y),
Copy link
Collaborator

@xpple xpple Mar 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
new Vector2i(x - 1, y), new Vector2i(x + 1, y),
new Vector2i(x - 1, y), new Vector2i(x + 1, y),

What is this ungodly amount of whitespace for?

Copy link
Contributor Author

@RealRTTV RealRTTV Mar 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The neighbour tiles are the 8 surrounding, I divided the lines such that the position of the Vector2i is also the position relative to the x and y coordinates of the tile to get the neighbours of, although now I see that IntelliJ screwed me up a lil bit with the x: and y: so I'll edit it to be corrected for when not viewing with those parameter hints.

new Vector2i(x - 1, y + 1), new Vector2i(x, y + 1), new Vector2i(x + 1, y + 1)
).filter(pos -> isWithinBounds(pos.x, pos.y));
}

private void click(int x, int y) {
byte tile = getTile(x, y);
if (!isCovered(tile) || isFlagged(tile)) {
Expand All @@ -307,41 +322,31 @@ private void click(int x, int y) {
uncover(x, y);
emptyTilesRemaining--;
// we need to leave room for the current tile in the queue
int[] queue = new int[emptyTilesRemaining + 1];
int queueIdx = 0;
queue[0] = y * boardWidth + x;
while (queueIdx >= 0) {
int idx = queue[queueIdx--];
IntArrayList queue = new IntArrayList(emptyTilesRemaining + 1);
queue.add(y * boardWidth + x);
while (!queue.isEmpty()) {
int idx = queue.popInt();
int xPart = idx % boardWidth;
int yPart = idx / boardWidth;
for (Vector2i possibleNeighbour : new Vector2i[]{
new Vector2i(xPart - 1, yPart - 1),
new Vector2i(xPart, yPart - 1),
new Vector2i(xPart + 1, yPart - 1),

new Vector2i(xPart - 1, yPart),
new Vector2i(xPart + 1, yPart),

new Vector2i(xPart - 1, yPart + 1),
new Vector2i(xPart, yPart + 1),
new Vector2i(xPart + 1, yPart + 1),
}) {
if (isWithinBounds(possibleNeighbour.x, possibleNeighbour.y)) {
byte value = getTile(possibleNeighbour.x, possibleNeighbour.y);
uncover(possibleNeighbour.x, possibleNeighbour.y);
if (isCovered(value)) {
emptyTilesRemaining--;
// if it's an empty tile, we put it in the queue to go activate all its neighbours
if (tileType(value) == EMPTY_TILE_TYPE) {
queue[++queueIdx] = possibleNeighbour.y * boardWidth + possibleNeighbour.x;
}
getNeighbours(xPart, yPart).forEach(neighbour -> {
byte value = getTile(neighbour.x, neighbour.y);
uncover(neighbour.x, neighbour.y);
if (isCovered(value)) {
emptyTilesRemaining--;
// if it's an empty tile, we put it in the queue to go activate all its neighbours
if (tileType(value) == EMPTY_TILE_TYPE) {
queue.add(neighbour.y * boardWidth + neighbour.x);
}
}
}
});
}
}
}

private void click3x3(int x, int y) {
getNeighbours(x, y).forEach(neighbour -> click(neighbour.x, neighbour.y));
}

private void flag(int x, int y) {
if (!isCovered(getTile(x, y))) {
return;
Expand Down