Skip to content
Merged
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
14 changes: 0 additions & 14 deletions agones/build.gradle.kts

This file was deleted.

46 changes: 0 additions & 46 deletions agones/src/main/java/net/onelitefeather/agones/AgonesAPI.java

This file was deleted.

58 changes: 0 additions & 58 deletions agones/src/main/java/net/onelitefeather/agones/AgonesAPIImpl.java

This file was deleted.

1 change: 0 additions & 1 deletion game/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ dependencies {
implementation(platform(libs.mycelium.bom))
implementation(platform(libs.aonyx.bom))
implementation(project(":common"))
implementation(project(":agones"))
implementation(libs.minestom)
implementation(libs.aves)
implementation(libs.xerus)
Expand Down
3 changes: 0 additions & 3 deletions game/src/main/java/net/onelitefeather/cygnus/Cygnus.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,9 @@
import net.minestom.server.event.player.PlayerDisconnectEvent;
import net.minestom.server.event.player.PlayerEntityInteractEvent;
import net.minestom.server.event.player.PlayerSpawnEvent;
import net.minestom.server.event.server.ServerTickMonitorEvent;
import net.minestom.server.instance.InstanceContainer;
import net.minestom.server.listener.EntityActionListener;
import net.minestom.server.network.packet.client.play.ClientEntityActionPacket;
import net.onelitefeather.agones.AgonesAPI;
import net.onelitefeather.cygnus.ambient.AmbientProvider;
import net.onelitefeather.cygnus.command.StartCommand;
import net.onelitefeather.cygnus.common.ListenerHandling;
Expand Down Expand Up @@ -138,7 +136,6 @@ private void initListener() {
);
manager.addListener(PlayerChatEvent.class, new PlayerChatListener());
registerCancelListener(manager);
manager.addListener(ServerTickMonitorEvent.class, event -> AgonesAPI.instance().alive());
}

private void registerGameListener() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package net.onelitefeather.cygnus;

import net.minestom.server.MinecraftServer;
import net.onelitefeather.agones.AgonesAPI;

public final class CygnusLoader {

public static void main(String[] args) {
MinecraftServer server = MinecraftServer.init();
MinecraftServer.getSchedulerManager().buildShutdownTask(AgonesAPI.instance()::shutdown);
new Cygnus();
server.start("0.0.0.0", 25565);
}
Expand Down
16 changes: 0 additions & 16 deletions game/src/main/java/net/onelitefeather/cygnus/phase/GamePhase.java
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
package net.onelitefeather.cygnus.phase;

import agones.dev.sdk.Sdk;
import net.theevilreaper.aves.util.functional.VoidConsumer;
import net.theevilreaper.xerus.api.phase.TickDirection;
import net.theevilreaper.xerus.api.phase.TimedPhase;
import net.minestom.server.MinecraftServer;
import net.minestom.server.event.player.PlayerTickEvent;
import net.onelitefeather.agones.AgonesAPI;
import net.onelitefeather.cygnus.event.GameFinishEvent;
import net.onelitefeather.cygnus.listener.player.CygnusPlayerTickListener;
import net.onelitefeather.cygnus.view.GameView;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.time.temporal.ChronoUnit;
import java.util.HashSet;
import java.util.concurrent.CompletableFuture;

/**
* @author theEvilReaper
Expand All @@ -25,7 +20,6 @@
**/
public final class GamePhase extends TimedPhase {

private static final Logger LOGGER = LoggerFactory.getLogger(GamePhase.class);
private final GameView gameView;
private final Runnable startRunnable;
private final VoidConsumer updateWorldTime;
Expand Down Expand Up @@ -70,19 +64,9 @@ public void setFinishEvent(@NotNull GameFinishEvent finishEvent) {
public void onStart() {
super.onStart();
addListener(PlayerTickEvent.class, new CygnusPlayerTickListener());
AgonesAPI.instance().allocateFuture()
.exceptionallyCompose(this::allocateFuture)
.exceptionallyCompose(this::allocateFuture)
.exceptionallyCompose(this::allocateFuture)
.thenRun(() -> LOGGER.info("GameServer allocated"));
this.startRunnable.run();
}

private CompletableFuture<Sdk.Empty> allocateFuture(Throwable throwable) {
LOGGER.error("Failed to allocate the GameServer", throwable);
return AgonesAPI.instance().allocateFuture();
}

@Override
protected void onFinish() {
finishEvent = finishEvent == null ? new GameFinishEvent(GameFinishEvent.Reason.TIME_OVER) : finishEvent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@
import net.minestom.server.entity.Player;
import net.minestom.server.network.ConnectionManager;
import net.minestom.server.timer.Task;
import net.onelitefeather.agones.AgonesAPI;
import org.jetbrains.annotations.NotNull;

import java.time.Duration;
import java.time.temporal.ChronoUnit;

import static net.onelitefeather.cygnus.common.config.GameConfig.FORCE_START_TIME;
Expand Down Expand Up @@ -90,7 +88,6 @@ public void checkStopCondition() {
public void start() {
super.start();
setLevel();
AgonesAPI.instance().reserve(Duration.ofMinutes(5));
}

@Override
Expand Down
1 change: 0 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,3 @@ dependencyResolutionManagement {
include("common")
include("setup")
include("game")
include("agones")
Loading