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
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

plugins {
id("java")
id("com.github.johnrengelman.shadow") version "7.1.0"
id("com.gradleup.shadow") version "9.0.0-rc2"
}

tasks {
Expand All @@ -20,12 +20,12 @@ repositories {
}

dependencies {
implementation("com.github.Minestom:Minestom:cb3892255e")
implementation("net.minestom:minestom:2025.07.27-1.21.8")
implementation("de.articdive:jnoise-pipeline:4.0.0")
implementation("io.prometheus:simpleclient:0.16.0")
implementation("io.prometheus:simpleclient_hotspot:0.16.0")
implementation("io.prometheus:simpleclient_httpserver:0.16.0")
implementation("net.kyori:adventure-text-minimessage:4.12.0")
implementation("net.kyori:adventure-text-minimessage:4.23.0")
}

tasks.withType<JavaCompile> {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
8 changes: 4 additions & 4 deletions src/main/java/net/minestom/arena/Items.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@

public final class Items {
public static final ItemStack CLOSE = ItemUtils.stripItalics(ItemStack.builder(Material.BARRIER)
.displayName(Component.text("Close", NamedTextColor.RED))
.customName(Component.text("Close", NamedTextColor.RED))
.lore(Component.text("Close this page", NamedTextColor.GRAY))
.build());
public static final ItemStack CONTINUE = ItemUtils.stripItalics(ItemStack.builder(Material.FEATHER)
.displayName(Component.text("Continue", NamedTextColor.GOLD))
.customName(Component.text("Continue", NamedTextColor.GOLD))
.lore(Component.text("Continue to the next stage", NamedTextColor.GRAY))
.build());
public static final ItemStack BACK = ItemUtils.stripItalics(ItemStack.builder(Material.ARROW)
.displayName(Component.text("Back", NamedTextColor.AQUA))
.customName(Component.text("Back", NamedTextColor.AQUA))
.lore(Component.text("Go back to the previous page", NamedTextColor.GRAY))
.build());
public static final ItemStack COIN = ItemUtils.stripItalics(ItemStack.builder(Material.SUNFLOWER)
.displayName(Component.text("Coin"))
.customName(Component.text("Coin"))
.build());

private Items() {}
Expand Down
14 changes: 10 additions & 4 deletions src/main/java/net/minestom/arena/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import net.minestom.arena.group.GroupCommand;
import net.minestom.arena.group.GroupEvent;
import net.minestom.arena.lobby.Lobby;
import net.minestom.arena.utils.FullbrightDimension;
import net.minestom.arena.utils.ResourceUtils;
import net.minestom.server.MinecraftServer;
import net.minestom.server.adventure.audience.Audiences;
Expand All @@ -16,18 +17,20 @@
import net.minestom.server.entity.GameMode;
import net.minestom.server.entity.Player;
import net.minestom.server.event.GlobalEventHandler;
import net.minestom.server.event.player.AsyncPlayerConfigurationEvent;
import net.minestom.server.event.player.PlayerChatEvent;
import net.minestom.server.event.player.PlayerDisconnectEvent;
import net.minestom.server.event.player.PlayerLoginEvent;
import net.minestom.server.event.player.PlayerSpawnEvent;
import net.minestom.server.event.server.ServerTickMonitorEvent;
import net.minestom.server.extras.MojangAuth;
import net.minestom.server.extras.lan.OpenToLAN;
import net.minestom.server.extras.velocity.VelocityProxy;
import net.minestom.server.monitoring.TickMonitor;
import net.minestom.server.registry.RegistryKey;
import net.minestom.server.sound.SoundEvent;
import net.minestom.server.timer.TaskSchedule;
import net.minestom.server.utils.MathUtils;
import net.minestom.server.world.DimensionType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -43,6 +46,9 @@ public static void main(String[] args) {
MinecraftServer minecraftServer = MinecraftServer.init();
if (CONFIG.prometheus().enabled()) Metrics.init();

// Register fullbright dimension before server start
RegistryKey<DimensionType> instance = FullbrightDimension.INSTANCE;

try {
ResourceUtils.extractResource("lobby");
} catch (Exception e) {
Expand All @@ -69,7 +75,7 @@ public static void main(String[] args) {
ServerList.hook(handler);

// Login
handler.addListener(PlayerLoginEvent.class, event -> {
handler.addListener(AsyncPlayerConfigurationEvent.class, event -> {
final Player player = event.getPlayer();
event.setSpawningInstance(Lobby.INSTANCE);
player.setRespawnPoint(new Pos(0.5, 16, 0.5));
Expand Down Expand Up @@ -101,9 +107,9 @@ public static void main(String[] args) {

// Chat
handler.addListener(PlayerChatEvent.class, chatEvent -> {
chatEvent.setChatFormat((event) -> Component.text(event.getEntity().getUsername())
chatEvent.setFormattedMessage(Component.text(chatEvent.getEntity().getUsername())
.append(Component.text(" | ", NamedTextColor.DARK_GRAY)
.append(Component.text(event.getMessage(), NamedTextColor.WHITE))));
.append(Component.text(chatEvent.getRawMessage(), NamedTextColor.WHITE))));
});

// Monitoring
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/minestom/arena/Metrics.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import net.minestom.server.entity.Player;
import net.minestom.server.event.entity.EntitySpawnEvent;
import net.minestom.server.event.instance.RemoveEntityFromInstanceEvent;
import net.minestom.server.event.player.AsyncPlayerConfigurationEvent;
import net.minestom.server.event.player.PlayerDisconnectEvent;
import net.minestom.server.event.player.PlayerLoginEvent;
import net.minestom.server.event.player.PlayerPacketEvent;
import net.minestom.server.event.player.PlayerPacketOutEvent;

Expand Down Expand Up @@ -62,7 +62,7 @@ public static void init() {
MinecraftServer.getGlobalEventHandler()
.addListener(PlayerPacketEvent.class, e -> Metrics.PACKETS.labels("in").inc())
.addListener(PlayerPacketOutEvent.class, e -> Metrics.PACKETS.labels("out").inc())
.addListener(PlayerLoginEvent.class, e -> Metrics.ONLINE_PLAYERS.inc())
.addListener(AsyncPlayerConfigurationEvent.class, e -> Metrics.ONLINE_PLAYERS.inc())
.addListener(PlayerDisconnectEvent.class, e -> Metrics.ONLINE_PLAYERS.dec())
.addListener(EntitySpawnEvent.class, e -> {
if (!(e.getEntity() instanceof Player)) Metrics.ENTITIES.inc();
Expand Down
31 changes: 17 additions & 14 deletions src/main/java/net/minestom/arena/ServerList.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,35 @@
import net.minestom.server.event.Event;
import net.minestom.server.event.EventNode;
import net.minestom.server.event.server.ServerListPingEvent;
import net.minestom.server.ping.ResponseData;
import net.minestom.server.ping.Status;

import java.io.InputStream;
import java.util.Base64;
import java.util.List;

final class ServerList {
private static final String FAVICON = favicon();
private static Component motd = motd();
private static final byte[] FAVICON = favicon();
private static Component MOTD = motd();

public static void hook(EventNode<Event> eventNode) {
eventNode.addListener(ServerListPingEvent.class, event -> {
final ResponseData responseData = event.getResponseData();
responseData.setDescription(motd);
if (FAVICON != null)
responseData.setFavicon(FAVICON);
responseData.setMaxPlayer(100);
responseData.addEntries(MinecraftServer.getConnectionManager().getOnlinePlayers());
}).addListener(ConfigurationReloadedEvent.class, e -> motd = motd());
int onlinePlayers = MinecraftServer.getConnectionManager().getOnlinePlayers().size();

Status.Builder builder = Status.builder()
.description(MOTD)
.favicon(FAVICON)
.playerInfo(onlinePlayers, 100);

if (FAVICON != null) builder.favicon(FAVICON);

event.setStatus(builder.build());
}).addListener(ConfigurationReloadedEvent.class, e -> MOTD = motd());
}

private static String favicon() {
String favicon = null;
private static byte[] favicon() {
byte[] favicon = null;
try (InputStream stream = Main.class.getResourceAsStream("/favicon.png")) {
if (stream != null)
favicon = "data:image/png;base64," + Base64.getEncoder().encodeToString(stream.readAllBytes());
favicon = stream.readAllBytes();
} catch (Exception e) {
e.printStackTrace();
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/minestom/arena/SimpleCommands.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ private static List<Command> commands() {
leave.setDefaultExecutor((sender, context) -> {
final Player player = (Player) sender;
player.setInstance(Lobby.INSTANCE);
player.setHealth(player.getMaxHealth());
player.heal();
GroupManager.removePlayer(player);
});

Expand Down
11 changes: 6 additions & 5 deletions src/main/java/net/minestom/arena/feature/BowFeature.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
import net.minestom.server.entity.Player;
import net.minestom.server.event.EventListener;
import net.minestom.server.event.EventNode;
import net.minestom.server.event.item.ItemUpdateStateEvent;
import net.minestom.server.event.player.PlayerItemAnimationEvent;
import net.minestom.server.event.item.PlayerBeginItemUseEvent;
import net.minestom.server.event.item.PlayerCancelItemUseEvent;
import net.minestom.server.event.trait.InstanceEvent;
import net.minestom.server.item.ItemAnimation;
import net.minestom.server.item.Material;
import net.minestom.server.tag.Tag;
import net.minestom.server.utils.MathUtils;
Expand All @@ -26,11 +27,11 @@ record BowFeature(@NotNull BiFunction<Entity, Double, EntityProjectile> projecti

@Override
public void hook(@NotNull EventNode<InstanceEvent> node) {
node.addListener(EventListener.builder(PlayerItemAnimationEvent.class)
node.addListener(EventListener.builder(PlayerBeginItemUseEvent.class)
.handler(event -> event.getPlayer().setTag(CHARGE_SINCE_TAG, System.currentTimeMillis()))
.filter(event -> event.getItemAnimationType() == PlayerItemAnimationEvent.ItemAnimationType.BOW)
.filter(event -> event.getAnimation() == ItemAnimation.BOW)
.build()
).addListener(EventListener.builder(ItemUpdateStateEvent.class)
).addListener(EventListener.builder(PlayerCancelItemUseEvent.class)
.handler(event -> {
final Player player = event.getPlayer();
final double chargedFor = (System.currentTimeMillis() - player.getTag(CHARGE_SINCE_TAG)) / 1000D;
Expand Down
41 changes: 20 additions & 21 deletions src/main/java/net/minestom/arena/feature/CombatFeature.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,14 @@

import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import net.minestom.server.coordinate.Pos;
import net.minestom.server.entity.Entity;
import net.minestom.server.entity.EntityProjectile;
import net.minestom.server.entity.LivingEntity;
import net.minestom.server.entity.Player;
import net.minestom.server.entity.damage.DamageType;
import net.minestom.server.entity.hologram.Hologram;
import net.minestom.server.entity.*;
import net.minestom.server.entity.damage.Damage;
import net.minestom.server.entity.metadata.display.AbstractDisplayMeta;
import net.minestom.server.entity.metadata.display.TextDisplayMeta;
import net.minestom.server.event.EventNode;
import net.minestom.server.event.entity.EntityAttackEvent;
import net.minestom.server.event.entity.projectile.ProjectileCollideWithEntityEvent;
import net.minestom.server.event.trait.InstanceEvent;
import net.minestom.server.instance.Instance;
import net.minestom.server.tag.Tag;
import net.minestom.server.utils.MathUtils;
import net.minestom.server.utils.time.TimeUnit;
Expand Down Expand Up @@ -49,7 +45,7 @@ public void hook(@NotNull EventNode<InstanceEvent> node) {

float damage = (float) damageFunction.applyAsDouble(projectile, target);

target.damage(DamageType.fromProjectile(projectile.getShooter(), projectile), damage);
target.damage(Damage.fromProjectile(projectile.getShooter(), projectile, damage));
target.setTag(INVULNERABLE_UNTIL_TAG, now + invulnerabilityFunction.applyAsLong(target));

takeKnockbackFromArrow(target, projectile);
Expand All @@ -72,7 +68,7 @@ public void hook(@NotNull EventNode<InstanceEvent> node) {

float damage = (float) damageFunction.applyAsDouble(event.getEntity(), target);

target.damage(DamageType.fromEntity(event.getEntity()), damage);
target.damage(Damage.fromEntity(event.getEntity(), damage));
target.setTag(INVULNERABLE_UNTIL_TAG, now + invulnerabilityFunction.applyAsLong(target));

takeKnockback(target, event.getEntity());
Expand All @@ -96,27 +92,30 @@ private static void takeKnockbackFromArrow(Entity target, EntityProjectile sourc
private static void spawnHologram(Entity target, float damage) {
damage = MathUtils.round(damage, 2);

new DamageHologram(
target.getInstance(),
target.getPosition().add(0, target.getEyeHeight(), 0),
Component.text(damage, NamedTextColor.RED)
);
Entity hologram = new DamageHologram(Component.text(damage, NamedTextColor.RED));
hologram.setInstance(target.getInstance(), target.getPosition().add(0, target.getEyeHeight(), 0));
}

private static final class DamageHologram extends Hologram {
private DamageHologram(Instance instance, Pos spawnPosition, Component text) {
super(instance, spawnPosition, text, true, true);
getEntity().getEntityMeta().setHasNoGravity(false);
private static final class DamageHologram extends Entity {
private DamageHologram(Component text) {
super(EntityType.TEXT_DISPLAY);

setNoGravity(true);

editEntityMeta(TextDisplayMeta.class, meta -> {
meta.setBillboardRenderConstraints(AbstractDisplayMeta.BillboardConstraints.CENTER);
meta.setText(text);
});

Random random = ThreadLocalRandom.current();
getEntity().setVelocity(getPosition()
setVelocity(getPosition()
.direction()
.withX(random.nextDouble(2))
.withY(3)
.withZ(random.nextDouble(2))
.normalize().mul(3));

getEntity().scheduleRemove(Duration.of(15, TimeUnit.SERVER_TICK));
scheduleRemove(Duration.of(15, TimeUnit.SERVER_TICK));
}
}
}
Loading