Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/build-native.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- 'blocksumo/**'
- 'battle/**'
- 'minesweeper/**'
- 'holeymoley/**'
- 'parkourtag/**'
- 'lazertag/**'
- 'lobby/**'
Expand Down
2 changes: 1 addition & 1 deletion battle/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repositories {
dependencies {
implementation(project(":core"))

implementation("com.github.vibenilla:pvp:133ae66") {
implementation("com.github.vibenilla:pvp:d5ecbaf") {
exclude(group = "net.minestom", module = "minestom")
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
import org.jetbrains.annotations.NotNull;

public final class PlayerTeams {
public static final @NotNull Team ALIVE = MinecraftServer.getTeamManager().createBuilder("alive")
public static final @NotNull Team ALIVE = MinecraftServer.getTeamManager().createBuilder("battle_alive")
.teamColor(TeamColor.RED)
.nameTagVisibility(TeamsPacket.NameTagVisibility.ALWAYS)
.updateTeamPacket()
.build();
public static final @NotNull Team DEAD = MinecraftServer.getTeamManager().createBuilder("dead")
public static final @NotNull Team DEAD = MinecraftServer.getTeamManager().createBuilder("battle_dead")
.teamColor(TeamColor.GRAY)
.prefix(Component.text("☠ ", NamedTextColor.GRAY))
.nameTagVisibility(TeamsPacket.NameTagVisibility.NEVER)
Expand Down
1 change: 1 addition & 0 deletions fatserver/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ dependencies {
implementation(project(":blocksumo"))
implementation(project(":lazertag"))
implementation(project(":minesweeper"))
implementation(project(":holeymoley"))
}

java {
Expand Down
4 changes: 3 additions & 1 deletion fatserver/src/main/java/dev/emortal/fatserver/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import dev.emortal.minestom.battle.BattleModule;
import dev.emortal.minestom.blocksumo.BlockSumoModule;
import dev.emortal.minestom.core.EmortalServer;
import dev.emortal.minestom.holeymoley.HoleyMoleyModule;
import dev.emortal.minestom.marathon.MarathonModule;
import dev.emortal.minestom.minesweeper.MinesweeperModule;
import dev.emortal.minestom.parkourtag.ParkourTagModule;
Expand All @@ -15,7 +16,8 @@ void main() {
new BattleModule(),
new BlockSumoModule(),
// new LazerTagModule(), Has 60 TPS so cannot be used in fat server
new MinesweeperModule()
new MinesweeperModule(),
new HoleyMoleyModule()
);
}
}
9 changes: 9 additions & 0 deletions holeymoley/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM eclipse-temurin:25-jre-alpine

RUN mkdir /app
WORKDIR /app

COPY build/libs/*-all.jar /app/holeymoley.jar

ENTRYPOINT ["java"]
CMD ["-jar", "/app/holeymoley.jar"]
43 changes: 43 additions & 0 deletions holeymoley/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
plugins {
java
id("com.gradleup.shadow") version "9.5.1"
}

group = "dev.emortal.minestom.holeymoley"
version = "1.0-SNAPSHOT"

repositories {
maven("https://jitpack.io")
}

dependencies {
implementation(project(":core"))

implementation("com.github.vibenilla:pvp:d5ecbaf") {
exclude(group = "net.minestom", module = "minestom")
}
}

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(25))
}
}

tasks {
shadowJar {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
mergeServiceFiles()

manifest {
attributes(
"Main-Class" to "dev.emortal.minestom.holeymoley.Main",
"Multi-Release" to true
)
}
}

build {
dependsOn(shadowJar)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package dev.emortal.minestom.holeymoley;

import dev.emortal.minestom.core.Module;
import dev.emortal.minestom.core.game.GameCreator;
import dev.emortal.minestom.core.map.MapManager;
import dev.emortal.minestom.holeymoley.game.HoleyMoleyGame;
import dev.emortal.minestom.holeymoley.map.HoleyMoleyMapManager;
import io.github.togar2.pvp.MinestomPvP;

public class HoleyMoleyModule implements Module {
public static final int MAP_RADIUS = 25;

@Override
public String getId() {
return "holeymoley";
}

@Override
public int getMinPlayers() {
return 2;
}

@Override
public int getMaxPlayers() {
return 20;
}

@Override
public GameCreator getGameCreator() {
return HoleyMoleyGame::new;
}

@Override
public MapManager getMapManager() {
return new HoleyMoleyMapManager(MAP_RADIUS);
}

@Override
public void preRegister() {
MinestomPvP.init();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package dev.emortal.minestom.holeymoley;

import dev.emortal.minestom.core.EmortalServer;

public final class Main {
void main() {
EmortalServer.start(new HoleyMoleyModule());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package dev.emortal.minestom.holeymoley.chest;

import net.kyori.adventure.key.Key;
import net.minestom.server.instance.block.Block;
import net.minestom.server.instance.block.BlockHandler;
import net.minestom.server.inventory.Inventory;
import net.minestom.server.inventory.InventoryType;
import net.minestom.server.item.ItemStack;
import org.jetbrains.annotations.NotNull;

import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicInteger;

public final class ChestBlockHandler implements BlockHandler {

private final Inventory inventory = new Inventory(InventoryType.CHEST_3_ROW, "");
private final AtomicInteger playersInside = new AtomicInteger(0);

public ChestBlockHandler() {
super();
this.refillInventory();
}

public @NotNull Inventory getInventory() {
return this.inventory;
}

public int addPlayerInside() {
return this.playersInside.incrementAndGet();
}

public int removePlayerInside() {
return this.playersInside.decrementAndGet();
}

@Override
public @NotNull Key getKey() {
return Block.CHEST.key();
}

public void refillInventory() {
this.inventory.clear();
for (int i = 0; i < 7; i++) {
addRandomly(this.inventory, Items.random());
}
}

private static void addRandomly(@NotNull Inventory inventory, @NotNull ItemStack itemStack) {
ThreadLocalRandom random = ThreadLocalRandom.current();

while (true) {
int randomSlot = random.nextInt(inventory.getSize());
if (inventory.getItemStack(randomSlot) == ItemStack.AIR) {
inventory.setItemStack(randomSlot, itemStack);
break;
}
}
}
}
Loading