Skip to content

Show progress bar without commands enabled #482

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
brandyballoon wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Show progress bar without commands enabled #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91addb6
Show progress bar without commands enabled
brandyballoon Jun 27, 2026
9a41a45
Revert "Show progress bar without commands enabled"
brandyballoon Jun 27, 2026
3d0f70a
Show progress bar in single player with commands off
brandyballoon Jun 27, 2026
fb6d9f4
Show progress bar if chunky.progressbar permission is set
brandyballoon Jun 27, 2026
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
28 changes: 26 additions & 2 deletions fabric/src/main/java/org/popcraft/chunky/listeners/bossbar/BossBarTaskUpdateListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.popcraft.chunky.listeners.bossbar;

import me.lucko.fabric.api.permissions.v0.Permissions;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.Identifier;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerBossEvent;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.permissions.Permissions;
import net.minecraft.world.BossEvent;
import net.minecraft.world.level.Level;
import org.popcraft.chunky.Chunky;
Expand All @@ -19,6 +19,19 @@
import java.util.function.Consumer;

public class BossBarTaskUpdateListener implements Consumer<GenerationTaskUpdateEvent> {
private static final boolean HAS_PERMISSIONS;

static {
boolean hasPermissions;
try {
Class.forName("me.lucko.fabric.api.permissions.v0.Permissions");
hasPermissions = true;
} catch (ClassNotFoundException e) {
hasPermissions = false;
}
HAS_PERMISSIONS = hasPermissions;
}

private final Map<Identifier, ServerBossEvent> bossBars;

public BossBarTaskUpdateListener(final Map<Identifier, ServerBossEvent> bossBars) {
Expand All @@ -41,7 +54,7 @@ public void accept(final GenerationTaskUpdateEvent event) {
}
final MinecraftServer server = fabricWorld.getWorld().getServer();
for (final ServerPlayer player : server.getPlayerList().getPlayers()) {
if (player.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER)) {
if (hasBossBarPermission(server, player)) {
bossBar.addPlayer(player);
} else {
bossBar.removePlayer(player);
Expand All @@ -61,6 +74,17 @@ public void accept(final GenerationTaskUpdateEvent event) {
}
}

private static boolean hasBossBarPermission(final MinecraftServer server, final ServerPlayer player) {
if (server != null && server.isSingleplayer()) {
return true;
}
if (HAS_PERMISSIONS) {
return (Permissions.check(player, "chunky.command", 2)
|| Permissions.check(player, "chunky.progressbar", 2));
}
return player.permissions().hasPermission(net.minecraft.server.permissions.Permissions.COMMANDS_GAMEMASTER);
}

private ServerBossEvent createNewBossBar(final Identifier worldIdentifier) {
final ServerBossEvent bossBar = new ServerBossEvent(
UUID.randomUUID(),
Expand Down
9 changes: 8 additions & 1 deletion forge/src/main/java/org/popcraft/chunky/listeners/bossbar/BossBarTaskUpdateListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void accept(final GenerationTaskUpdateEvent event) {
}
final MinecraftServer server = forgeWorld.getWorld().getServer();
for (final ServerPlayer player : server.getPlayerList().getPlayers()) {
if (player.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER)) {
if (hasBossBarPermission(server, player)) {
bossBar.addPlayer(player);
} else {
bossBar.removePlayer(player);
Expand All @@ -61,6 +61,13 @@ public void accept(final GenerationTaskUpdateEvent event) {
}
}

private static boolean hasBossBarPermission(final MinecraftServer server, final ServerPlayer player) {
if (server != null && server.isSingleplayer()) {
return true;
}
return player.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER);
}

private ServerBossEvent createNewBossBar(final Identifier worldIdentifier) {
final ServerBossEvent bossBar = new ServerBossEvent(
UUID.randomUUID(),
Expand Down
9 changes: 8 additions & 1 deletion neoforge/src/main/java/org/popcraft/chunky/listeners/bossbar/BossBarTaskUpdateListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void accept(final GenerationTaskUpdateEvent event) {
}
final MinecraftServer server = neoForgeWorld.getWorld().getServer();
for (final ServerPlayer player : server.getPlayerList().getPlayers()) {
if (player.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER)) {
if (hasBossBarPermission(server, player)) {
bossBar.addPlayer(player);
} else {
bossBar.removePlayer(player);
Expand All @@ -61,6 +61,13 @@ public void accept(final GenerationTaskUpdateEvent event) {
}
}

private static boolean hasBossBarPermission(final MinecraftServer server, final ServerPlayer player) {
if (server != null && server.isSingleplayer()) {
return true;
}
return player.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER);
}

private ServerBossEvent createNewBossBar(final Identifier worldIdentifier) {
final ServerBossEvent bossBar = new ServerBossEvent(
UUID.randomUUID(),
Expand Down