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
19 changes: 19 additions & 0 deletions build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
plugins {
java
`maven-publish`
id("com.gradleup.shadow") version "9.2.2"
}

repositories {
mavenLocal()

maven {
url = uri("https://repo.papermc.io/repository/maven-public/")
}
Expand All@@ -13,6 +16,10 @@ repositories {
}

mavenCentral()

maven {
url = uri("https://repo.infernalsuite.com/repository/maven-snapshots/")
}
}

dependencies {
Expand All@@ -21,6 +28,8 @@ dependencies {
compileOnly("io.papermc.paper:paper-api:26.1.2.build.+")
implementation("org.apache.commons:commons-lang3:3.20.0")
compileOnly("dev.plex:api:2.0-SNAPSHOT")
compileOnly("com.infernalsuite.asp:api:4.0.0-SNAPSHOT")
implementation("com.infernalsuite.asp:file-loader:4.0.0-SNAPSHOT")
implementation("org.jetbrains:annotations:26.1.0")
}

Expand All@@ -45,6 +54,16 @@ tasks.getByName<Jar>("jar") {
archiveVersion.set("")
}

tasks.shadowJar {
archiveBaseName.set("Module-Guilds")
archiveClassifier.set("")
archiveVersion.set("")
}

tasks.build {
dependsOn(tasks.shadowJar)
}

tasks {
compileJava {
options.encoding = Charsets.UTF_8.name()
Expand Down
15 changes: 14 additions & 1 deletion src/main/java/dev/plex/Guilds.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,14 @@
import dev.plex.config.ModuleConfig;
import dev.plex.guild.GuildHolder;
import dev.plex.handler.ChatHandlerImpl;
import dev.plex.handler.GuildMenuListener;
import dev.plex.handler.GuildWorldProtectionListener;
import dev.plex.handler.RankPermissionMenuListener;
import dev.plex.module.PlexModule;
import dev.plex.api.storage.ModuleStorage;
import dev.plex.storage.GuildRepository;
import dev.plex.storage.JdbiGuildRepository;
import dev.plex.world.GuildWorldService;
import lombok.Getter;

import java.sql.SQLException;
Expand All@@ -18,6 +22,10 @@ public class Guilds extends PlexModule
{
private static Guilds module;
private final GuildHolder guildHolder = new GuildHolder();
private final GuildMenuListener guildMenuListener = new GuildMenuListener();
private final GuildWorldProtectionListener guildWorldProtectionListener = new GuildWorldProtectionListener();
private final RankPermissionMenuListener rankPermissionMenuListener = new RankPermissionMenuListener();
private final GuildWorldService guildWorldService = new GuildWorldService();

private GuildRepository guildRepository;

Expand All@@ -36,10 +44,11 @@ public void load()
@Override
public void enable()
{
guildWorldService.enable();
ModuleStorage storage = api().storage().forModule(this);
try
{
storage.migrations().run(List.of("001_initial_schema"));
storage.migrations().run(List.of("001_initial_schema", "002_guild_world_permissions"));
}
catch (SQLException e)
{
Expand All@@ -62,11 +71,15 @@ public void enable()
guildHolder.replaceAll(guilds);
});
registerListener(new ChatHandlerImpl());
registerListener(guildMenuListener);
registerListener(guildWorldProtectionListener);
registerListener(rankPermissionMenuListener);
}

@Override
public void disable()
{
guildWorldService.disable();
guildHolder.clear();
}

Expand Down
13 changes: 12 additions & 1 deletion src/main/java/dev/plex/command/GuildCommand.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,18 +40,29 @@ public GuildCommand()
this.registerSubCommand(new ChatSubCommand());
this.registerSubCommand(new SetHomeSubCommand());
this.registerSubCommand(new HomeSubCommand());
this.registerSubCommand(new WorldSubCommand());
this.registerSubCommand(new PermissionsSubCommand());
this.registerSubCommand(new OwnerSubCommand());
this.registerSubCommand(new InviteSubCommand());
this.registerSubCommand(new AcceptSubCommand());
this.registerSubCommand(new DenySubCommand());
this.registerSubCommand(new MenuSubCommand());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
if (args.length == 0)
{
return getSubs();
if (player == null)
{
return getSubs();
}
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(
guild -> Guilds.get().getGuildMenuListener().openHome(player, guild),
() -> player.sendMessage(messageComponent("guildNotFound"))
);
return null;
}
if (args[0].equalsIgnoreCase("help"))
{
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/dev/plex/command/sub/CreateSubCommand.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,9 @@ protected Component execute(@NotNull CommandSender commandSender, @Nullable Play
{
return messageComponent("alreadyInGuild");
}
Guilds.get().getGuildRepository().createGuild(player, StringUtils.join(args, " ")).whenComplete((guild, throwable) ->
Guilds.get().getGuildRepository().createGuild(player, StringUtils.join(args, " "))
.thenCompose(guild -> Guilds.get().getGuildWorldService().ensureWorld(guild).thenApply(world -> guild))
.whenComplete((guild, throwable) ->
{
if (throwable != null)
{
Expand Down
34 changes: 34 additions & 0 deletions src/main/java/dev/plex/command/sub/MenuSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class MenuSubCommand extends GuildSubCommand
{
public MenuSubCommand()
{
super(command("menu")
.description("Opens the guild management menu")
.usage("/guild <command>")
.aliases("gui,panel")
.permission("plex.guilds.menu")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(
guild -> Guilds.get().getGuildMenuListener().openHome(player, guild),
() -> send(player, messageComponent("guildNotFound"))
);
return null;
}
}
39 changes: 39 additions & 0 deletions src/main/java/dev/plex/command/sub/PermissionsSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class PermissionsSubCommand extends GuildSubCommand
{
public PermissionsSubCommand()
{
super(command("permissions")
.description("Opens the rank permissions GUI")
.usage("/guild <command>")
.aliases("perms")
.permission("plex.guilds.permissions")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(guild ->
{
if (!guild.isOwner(player.getUniqueId()))
{
send(player, messageComponent("guildNotOwner"));
return;
}
Guilds.get().getRankPermissionMenuListener().openRankList(player, guild);
}, () -> send(player, messageComponent("guildNotFound")));
return null;
}
}
55 changes: 55 additions & 0 deletions src/main/java/dev/plex/command/sub/WorldSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class WorldSubCommand extends GuildSubCommand
{
public WorldSubCommand()
{
super(command("world")
.description("Teleports to your guild world")
.usage("/guild <command>")
.aliases("base")
.permission("plex.guilds.world")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(guild ->
{
send(player, messageComponent("guildWorldLoading"));
Guilds.get().getGuildWorldService().ensureWorld(guild).whenComplete((world, throwable) ->
{
if (throwable != null)
{
Guilds.get().api().scheduler().executeGlobal(() ->
{
throwable.printStackTrace();
send(player, messageComponent("guildWorldLoadFailed"));
});
return;
}
Guilds.get().api().scheduler().executeEntity(player, () -> teleport(player, world), 1L);
});
}, () -> send(player, messageComponent("guildNotFound")));
return null;
}

private void teleport(Player player, World world)
{
Location spawnLocation = world.getSpawnLocation().toCenterLocation();
player.teleportAsync(spawnLocation);
}
}
17 changes: 17 additions & 0 deletions src/main/java/dev/plex/gui/GuildMenuInventoryHolder.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
package dev.plex.gui;

import dev.plex.guild.Guild;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.jetbrains.annotations.NotNull;

import java.util.UUID;

public record GuildMenuInventoryHolder(Guild guild, GuildMenuView view, UUID memberUuid) implements InventoryHolder
{
@Override
public @NotNull Inventory getInventory()
{
throw new UnsupportedOperationException();
}
}
8 changes: 8 additions & 0 deletions src/main/java/dev/plex/gui/GuildMenuView.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
package dev.plex.gui;

public enum GuildMenuView
{
HOME,
MEMBERS,
MEMBER
}
15 changes: 15 additions & 0 deletions src/main/java/dev/plex/gui/RankPermissionInventoryHolder.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
package dev.plex.gui;

import dev.plex.guild.Guild;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.jetbrains.annotations.NotNull;

public record RankPermissionInventoryHolder(Guild guild, String rankName) implements InventoryHolder
{
@Override
public @NotNull Inventory getInventory()
{
throw new UnsupportedOperationException();
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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
19 changes: 19 additions & 0 deletions build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
plugins {
java
`maven-publish`
id("com.gradleup.shadow") version "9.2.2"
}

repositories {
mavenLocal()

maven {
url = uri("https://repo.papermc.io/repository/maven-public/")
}
Expand All@@ -13,6 +16,10 @@ repositories {
}

mavenCentral()

maven {
url = uri("https://repo.infernalsuite.com/repository/maven-snapshots/")
}
}

dependencies {
Expand All@@ -21,6 +28,8 @@ dependencies {
compileOnly("io.papermc.paper:paper-api:26.1.2.build.+")
implementation("org.apache.commons:commons-lang3:3.20.0")
compileOnly("dev.plex:api:2.0-SNAPSHOT")
compileOnly("com.infernalsuite.asp:api:4.0.0-SNAPSHOT")
implementation("com.infernalsuite.asp:file-loader:4.0.0-SNAPSHOT")
implementation("org.jetbrains:annotations:26.1.0")
}

Expand All@@ -45,6 +54,16 @@ tasks.getByName<Jar>("jar") {
archiveVersion.set("")
}

tasks.shadowJar {
archiveBaseName.set("Module-Guilds")
archiveClassifier.set("")
archiveVersion.set("")
}

tasks.build {
dependsOn(tasks.shadowJar)
}

tasks {
compileJava {
options.encoding = Charsets.UTF_8.name()
Expand Down
15 changes: 14 additions & 1 deletion src/main/java/dev/plex/Guilds.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,14 @@
import dev.plex.config.ModuleConfig;
import dev.plex.guild.GuildHolder;
import dev.plex.handler.ChatHandlerImpl;
import dev.plex.handler.GuildMenuListener;
import dev.plex.handler.GuildWorldProtectionListener;
import dev.plex.handler.RankPermissionMenuListener;
import dev.plex.module.PlexModule;
import dev.plex.api.storage.ModuleStorage;
import dev.plex.storage.GuildRepository;
import dev.plex.storage.JdbiGuildRepository;
import dev.plex.world.GuildWorldService;
import lombok.Getter;

import java.sql.SQLException;
Expand All@@ -18,6 +22,10 @@ public class Guilds extends PlexModule
{
private static Guilds module;
private final GuildHolder guildHolder = new GuildHolder();
private final GuildMenuListener guildMenuListener = new GuildMenuListener();
private final GuildWorldProtectionListener guildWorldProtectionListener = new GuildWorldProtectionListener();
private final RankPermissionMenuListener rankPermissionMenuListener = new RankPermissionMenuListener();
private final GuildWorldService guildWorldService = new GuildWorldService();

private GuildRepository guildRepository;

Expand All@@ -36,10 +44,11 @@ public void load()
@Override
public void enable()
{
guildWorldService.enable();
ModuleStorage storage = api().storage().forModule(this);
try
{
storage.migrations().run(List.of("001_initial_schema"));
storage.migrations().run(List.of("001_initial_schema", "002_guild_world_permissions"));
}
catch (SQLException e)
{
Expand All@@ -62,11 +71,15 @@ public void enable()
guildHolder.replaceAll(guilds);
});
registerListener(new ChatHandlerImpl());
registerListener(guildMenuListener);
registerListener(guildWorldProtectionListener);
registerListener(rankPermissionMenuListener);
}

@Override
public void disable()
{
guildWorldService.disable();
guildHolder.clear();
}

Expand Down
13 changes: 12 additions & 1 deletion src/main/java/dev/plex/command/GuildCommand.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,18 +40,29 @@ public GuildCommand()
this.registerSubCommand(new ChatSubCommand());
this.registerSubCommand(new SetHomeSubCommand());
this.registerSubCommand(new HomeSubCommand());
this.registerSubCommand(new WorldSubCommand());
this.registerSubCommand(new PermissionsSubCommand());
this.registerSubCommand(new OwnerSubCommand());
this.registerSubCommand(new InviteSubCommand());
this.registerSubCommand(new AcceptSubCommand());
this.registerSubCommand(new DenySubCommand());
this.registerSubCommand(new MenuSubCommand());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
if (args.length == 0)
{
return getSubs();
if (player == null)
{
return getSubs();
}
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(
guild -> Guilds.get().getGuildMenuListener().openHome(player, guild),
() -> player.sendMessage(messageComponent("guildNotFound"))
);
return null;
}
if (args[0].equalsIgnoreCase("help"))
{
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/dev/plex/command/sub/CreateSubCommand.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,9 @@ protected Component execute(@NotNull CommandSender commandSender, @Nullable Play
{
return messageComponent("alreadyInGuild");
}
Guilds.get().getGuildRepository().createGuild(player, StringUtils.join(args, " ")).whenComplete((guild, throwable) ->
Guilds.get().getGuildRepository().createGuild(player, StringUtils.join(args, " "))
.thenCompose(guild -> Guilds.get().getGuildWorldService().ensureWorld(guild).thenApply(world -> guild))
.whenComplete((guild, throwable) ->
{
if (throwable != null)
{
Expand Down
34 changes: 34 additions & 0 deletions src/main/java/dev/plex/command/sub/MenuSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class MenuSubCommand extends GuildSubCommand
{
public MenuSubCommand()
{
super(command("menu")
.description("Opens the guild management menu")
.usage("/guild <command>")
.aliases("gui,panel")
.permission("plex.guilds.menu")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(
guild -> Guilds.get().getGuildMenuListener().openHome(player, guild),
() -> send(player, messageComponent("guildNotFound"))
);
return null;
}
}
39 changes: 39 additions & 0 deletions src/main/java/dev/plex/command/sub/PermissionsSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class PermissionsSubCommand extends GuildSubCommand
{
public PermissionsSubCommand()
{
super(command("permissions")
.description("Opens the rank permissions GUI")
.usage("/guild <command>")
.aliases("perms")
.permission("plex.guilds.permissions")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(guild ->
{
if (!guild.isOwner(player.getUniqueId()))
{
send(player, messageComponent("guildNotOwner"));
return;
}
Guilds.get().getRankPermissionMenuListener().openRankList(player, guild);
}, () -> send(player, messageComponent("guildNotFound")));
return null;
}
}
55 changes: 55 additions & 0 deletions src/main/java/dev/plex/command/sub/WorldSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class WorldSubCommand extends GuildSubCommand
{
public WorldSubCommand()
{
super(command("world")
.description("Teleports to your guild world")
.usage("/guild <command>")
.aliases("base")
.permission("plex.guilds.world")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(guild ->
{
send(player, messageComponent("guildWorldLoading"));
Guilds.get().getGuildWorldService().ensureWorld(guild).whenComplete((world, throwable) ->
{
if (throwable != null)
{
Guilds.get().api().scheduler().executeGlobal(() ->
{
throwable.printStackTrace();
send(player, messageComponent("guildWorldLoadFailed"));
});
return;
}
Guilds.get().api().scheduler().executeEntity(player, () -> teleport(player, world), 1L);
});
}, () -> send(player, messageComponent("guildNotFound")));
return null;
}

private void teleport(Player player, World world)
{
Location spawnLocation = world.getSpawnLocation().toCenterLocation();
player.teleportAsync(spawnLocation);
}
}
17 changes: 17 additions & 0 deletions src/main/java/dev/plex/gui/GuildMenuInventoryHolder.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
package dev.plex.gui;

import dev.plex.guild.Guild;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.jetbrains.annotations.NotNull;

import java.util.UUID;

public record GuildMenuInventoryHolder(Guild guild, GuildMenuView view, UUID memberUuid) implements InventoryHolder
{
@Override
public @NotNull Inventory getInventory()
{
throw new UnsupportedOperationException();
}
}
8 changes: 8 additions & 0 deletions src/main/java/dev/plex/gui/GuildMenuView.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
package dev.plex.gui;

public enum GuildMenuView
{
HOME,
MEMBERS,
MEMBER
}
15 changes: 15 additions & 0 deletions src/main/java/dev/plex/gui/RankPermissionInventoryHolder.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
package dev.plex.gui;

import dev.plex.guild.Guild;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.jetbrains.annotations.NotNull;

public record RankPermissionInventoryHolder(Guild guild, String rankName) implements InventoryHolder
{
@Override
public @NotNull Inventory getInventory()
{
throw new UnsupportedOperationException();
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
19 changes: 19 additions & 0 deletions build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
plugins {
java
`maven-publish`
id("com.gradleup.shadow") version "9.2.2"
}

repositories {
mavenLocal()

maven {
url = uri("https://repo.papermc.io/repository/maven-public/")
}
Expand All@@ -13,6 +16,10 @@ repositories {
}

mavenCentral()

maven {
url = uri("https://repo.infernalsuite.com/repository/maven-snapshots/")
}
}

dependencies {
Expand All@@ -21,6 +28,8 @@ dependencies {
compileOnly("io.papermc.paper:paper-api:26.1.2.build.+")
implementation("org.apache.commons:commons-lang3:3.20.0")
compileOnly("dev.plex:api:2.0-SNAPSHOT")
compileOnly("com.infernalsuite.asp:api:4.0.0-SNAPSHOT")
implementation("com.infernalsuite.asp:file-loader:4.0.0-SNAPSHOT")
implementation("org.jetbrains:annotations:26.1.0")
}

Expand All@@ -45,6 +54,16 @@ tasks.getByName<Jar>("jar") {
archiveVersion.set("")
}

tasks.shadowJar {
archiveBaseName.set("Module-Guilds")
archiveClassifier.set("")
archiveVersion.set("")
}

tasks.build {
dependsOn(tasks.shadowJar)
}

tasks {
compileJava {
options.encoding = Charsets.UTF_8.name()
Expand Down
15 changes: 14 additions & 1 deletion src/main/java/dev/plex/Guilds.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,14 @@
import dev.plex.config.ModuleConfig;
import dev.plex.guild.GuildHolder;
import dev.plex.handler.ChatHandlerImpl;
import dev.plex.handler.GuildMenuListener;
import dev.plex.handler.GuildWorldProtectionListener;
import dev.plex.handler.RankPermissionMenuListener;
import dev.plex.module.PlexModule;
import dev.plex.api.storage.ModuleStorage;
import dev.plex.storage.GuildRepository;
import dev.plex.storage.JdbiGuildRepository;
import dev.plex.world.GuildWorldService;
import lombok.Getter;

import java.sql.SQLException;
Expand All@@ -18,6 +22,10 @@ public class Guilds extends PlexModule
{
private static Guilds module;
private final GuildHolder guildHolder = new GuildHolder();
private final GuildMenuListener guildMenuListener = new GuildMenuListener();
private final GuildWorldProtectionListener guildWorldProtectionListener = new GuildWorldProtectionListener();
private final RankPermissionMenuListener rankPermissionMenuListener = new RankPermissionMenuListener();
private final GuildWorldService guildWorldService = new GuildWorldService();

private GuildRepository guildRepository;

Expand All@@ -36,10 +44,11 @@ public void load()
@Override
public void enable()
{
guildWorldService.enable();
ModuleStorage storage = api().storage().forModule(this);
try
{
storage.migrations().run(List.of("001_initial_schema"));
storage.migrations().run(List.of("001_initial_schema", "002_guild_world_permissions"));
}
catch (SQLException e)
{
Expand All@@ -62,11 +71,15 @@ public void enable()
guildHolder.replaceAll(guilds);
});
registerListener(new ChatHandlerImpl());
registerListener(guildMenuListener);
registerListener(guildWorldProtectionListener);
registerListener(rankPermissionMenuListener);
}

@Override
public void disable()
{
guildWorldService.disable();
guildHolder.clear();
}

Expand Down
13 changes: 12 additions & 1 deletion src/main/java/dev/plex/command/GuildCommand.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,18 +40,29 @@ public GuildCommand()
this.registerSubCommand(new ChatSubCommand());
this.registerSubCommand(new SetHomeSubCommand());
this.registerSubCommand(new HomeSubCommand());
this.registerSubCommand(new WorldSubCommand());
this.registerSubCommand(new PermissionsSubCommand());
this.registerSubCommand(new OwnerSubCommand());
this.registerSubCommand(new InviteSubCommand());
this.registerSubCommand(new AcceptSubCommand());
this.registerSubCommand(new DenySubCommand());
this.registerSubCommand(new MenuSubCommand());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
if (args.length == 0)
{
return getSubs();
if (player == null)
{
return getSubs();
}
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(
guild -> Guilds.get().getGuildMenuListener().openHome(player, guild),
() -> player.sendMessage(messageComponent("guildNotFound"))
);
return null;
}
if (args[0].equalsIgnoreCase("help"))
{
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/dev/plex/command/sub/CreateSubCommand.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,9 @@ protected Component execute(@NotNull CommandSender commandSender, @Nullable Play
{
return messageComponent("alreadyInGuild");
}
Guilds.get().getGuildRepository().createGuild(player, StringUtils.join(args, " ")).whenComplete((guild, throwable) ->
Guilds.get().getGuildRepository().createGuild(player, StringUtils.join(args, " "))
.thenCompose(guild -> Guilds.get().getGuildWorldService().ensureWorld(guild).thenApply(world -> guild))
.whenComplete((guild, throwable) ->
{
if (throwable != null)
{
Expand Down
34 changes: 34 additions & 0 deletions src/main/java/dev/plex/command/sub/MenuSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class MenuSubCommand extends GuildSubCommand
{
public MenuSubCommand()
{
super(command("menu")
.description("Opens the guild management menu")
.usage("/guild <command>")
.aliases("gui,panel")
.permission("plex.guilds.menu")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(
guild -> Guilds.get().getGuildMenuListener().openHome(player, guild),
() -> send(player, messageComponent("guildNotFound"))
);
return null;
}
}
39 changes: 39 additions & 0 deletions src/main/java/dev/plex/command/sub/PermissionsSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class PermissionsSubCommand extends GuildSubCommand
{
public PermissionsSubCommand()
{
super(command("permissions")
.description("Opens the rank permissions GUI")
.usage("/guild <command>")
.aliases("perms")
.permission("plex.guilds.permissions")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(guild ->
{
if (!guild.isOwner(player.getUniqueId()))
{
send(player, messageComponent("guildNotOwner"));
return;
}
Guilds.get().getRankPermissionMenuListener().openRankList(player, guild);
}, () -> send(player, messageComponent("guildNotFound")));
return null;
}
}
55 changes: 55 additions & 0 deletions src/main/java/dev/plex/command/sub/WorldSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class WorldSubCommand extends GuildSubCommand
{
public WorldSubCommand()
{
super(command("world")
.description("Teleports to your guild world")
.usage("/guild <command>")
.aliases("base")
.permission("plex.guilds.world")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(guild ->
{
send(player, messageComponent("guildWorldLoading"));
Guilds.get().getGuildWorldService().ensureWorld(guild).whenComplete((world, throwable) ->
{
if (throwable != null)
{
Guilds.get().api().scheduler().executeGlobal(() ->
{
throwable.printStackTrace();
send(player, messageComponent("guildWorldLoadFailed"));
});
return;
}
Guilds.get().api().scheduler().executeEntity(player, () -> teleport(player, world), 1L);
});
}, () -> send(player, messageComponent("guildNotFound")));
return null;
}

private void teleport(Player player, World world)
{
Location spawnLocation = world.getSpawnLocation().toCenterLocation();
player.teleportAsync(spawnLocation);
}
}
17 changes: 17 additions & 0 deletions src/main/java/dev/plex/gui/GuildMenuInventoryHolder.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
package dev.plex.gui;

import dev.plex.guild.Guild;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.jetbrains.annotations.NotNull;

import java.util.UUID;

public record GuildMenuInventoryHolder(Guild guild, GuildMenuView view, UUID memberUuid) implements InventoryHolder
{
@Override
public @NotNull Inventory getInventory()
{
throw new UnsupportedOperationException();
}
}
8 changes: 8 additions & 0 deletions src/main/java/dev/plex/gui/GuildMenuView.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
package dev.plex.gui;

public enum GuildMenuView
{
HOME,
MEMBERS,
MEMBER
}
15 changes: 15 additions & 0 deletions src/main/java/dev/plex/gui/RankPermissionInventoryHolder.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
package dev.plex.gui;

import dev.plex.guild.Guild;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.jetbrains.annotations.NotNull;

public record RankPermissionInventoryHolder(Guild guild, String rankName) implements InventoryHolder
{
@Override
public @NotNull Inventory getInventory()
{
throw new UnsupportedOperationException();
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
19 changes: 19 additions & 0 deletions build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
plugins {
java
`maven-publish`
id("com.gradleup.shadow") version "9.2.2"
}

repositories {
mavenLocal()

maven {
url = uri("https://repo.papermc.io/repository/maven-public/")
}
Expand All@@ -13,6 +16,10 @@ repositories {
}

mavenCentral()

maven {
url = uri("https://repo.infernalsuite.com/repository/maven-snapshots/")
}
}

dependencies {
Expand All@@ -21,6 +28,8 @@ dependencies {
compileOnly("io.papermc.paper:paper-api:26.1.2.build.+")
implementation("org.apache.commons:commons-lang3:3.20.0")
compileOnly("dev.plex:api:2.0-SNAPSHOT")
compileOnly("com.infernalsuite.asp:api:4.0.0-SNAPSHOT")
implementation("com.infernalsuite.asp:file-loader:4.0.0-SNAPSHOT")
implementation("org.jetbrains:annotations:26.1.0")
}

Expand All@@ -45,6 +54,16 @@ tasks.getByName<Jar>("jar") {
archiveVersion.set("")
}

tasks.shadowJar {
archiveBaseName.set("Module-Guilds")
archiveClassifier.set("")
archiveVersion.set("")
}

tasks.build {
dependsOn(tasks.shadowJar)
}

tasks {
compileJava {
options.encoding = Charsets.UTF_8.name()
Expand Down
15 changes: 14 additions & 1 deletion src/main/java/dev/plex/Guilds.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,14 @@
import dev.plex.config.ModuleConfig;
import dev.plex.guild.GuildHolder;
import dev.plex.handler.ChatHandlerImpl;
import dev.plex.handler.GuildMenuListener;
import dev.plex.handler.GuildWorldProtectionListener;
import dev.plex.handler.RankPermissionMenuListener;
import dev.plex.module.PlexModule;
import dev.plex.api.storage.ModuleStorage;
import dev.plex.storage.GuildRepository;
import dev.plex.storage.JdbiGuildRepository;
import dev.plex.world.GuildWorldService;
import lombok.Getter;

import java.sql.SQLException;
Expand All@@ -18,6 +22,10 @@ public class Guilds extends PlexModule
{
private static Guilds module;
private final GuildHolder guildHolder = new GuildHolder();
private final GuildMenuListener guildMenuListener = new GuildMenuListener();
private final GuildWorldProtectionListener guildWorldProtectionListener = new GuildWorldProtectionListener();
private final RankPermissionMenuListener rankPermissionMenuListener = new RankPermissionMenuListener();
private final GuildWorldService guildWorldService = new GuildWorldService();

private GuildRepository guildRepository;

Expand All@@ -36,10 +44,11 @@ public void load()
@Override
public void enable()
{
guildWorldService.enable();
ModuleStorage storage = api().storage().forModule(this);
try
{
storage.migrations().run(List.of("001_initial_schema"));
storage.migrations().run(List.of("001_initial_schema", "002_guild_world_permissions"));
}
catch (SQLException e)
{
Expand All@@ -62,11 +71,15 @@ public void enable()
guildHolder.replaceAll(guilds);
});
registerListener(new ChatHandlerImpl());
registerListener(guildMenuListener);
registerListener(guildWorldProtectionListener);
registerListener(rankPermissionMenuListener);
}

@Override
public void disable()
{
guildWorldService.disable();
guildHolder.clear();
}

Expand Down
13 changes: 12 additions & 1 deletion src/main/java/dev/plex/command/GuildCommand.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,18 +40,29 @@ public GuildCommand()
this.registerSubCommand(new ChatSubCommand());
this.registerSubCommand(new SetHomeSubCommand());
this.registerSubCommand(new HomeSubCommand());
this.registerSubCommand(new WorldSubCommand());
this.registerSubCommand(new PermissionsSubCommand());
this.registerSubCommand(new OwnerSubCommand());
this.registerSubCommand(new InviteSubCommand());
this.registerSubCommand(new AcceptSubCommand());
this.registerSubCommand(new DenySubCommand());
this.registerSubCommand(new MenuSubCommand());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
if (args.length == 0)
{
return getSubs();
if (player == null)
{
return getSubs();
}
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(
guild -> Guilds.get().getGuildMenuListener().openHome(player, guild),
() -> player.sendMessage(messageComponent("guildNotFound"))
);
return null;
}
if (args[0].equalsIgnoreCase("help"))
{
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/dev/plex/command/sub/CreateSubCommand.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,9 @@ protected Component execute(@NotNull CommandSender commandSender, @Nullable Play
{
return messageComponent("alreadyInGuild");
}
Guilds.get().getGuildRepository().createGuild(player, StringUtils.join(args, " ")).whenComplete((guild, throwable) ->
Guilds.get().getGuildRepository().createGuild(player, StringUtils.join(args, " "))
.thenCompose(guild -> Guilds.get().getGuildWorldService().ensureWorld(guild).thenApply(world -> guild))
.whenComplete((guild, throwable) ->
{
if (throwable != null)
{
Expand Down
34 changes: 34 additions & 0 deletions src/main/java/dev/plex/command/sub/MenuSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class MenuSubCommand extends GuildSubCommand
{
public MenuSubCommand()
{
super(command("menu")
.description("Opens the guild management menu")
.usage("/guild <command>")
.aliases("gui,panel")
.permission("plex.guilds.menu")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(
guild -> Guilds.get().getGuildMenuListener().openHome(player, guild),
() -> send(player, messageComponent("guildNotFound"))
);
return null;
}
}
39 changes: 39 additions & 0 deletions src/main/java/dev/plex/command/sub/PermissionsSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class PermissionsSubCommand extends GuildSubCommand
{
public PermissionsSubCommand()
{
super(command("permissions")
.description("Opens the rank permissions GUI")
.usage("/guild <command>")
.aliases("perms")
.permission("plex.guilds.permissions")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(guild ->
{
if (!guild.isOwner(player.getUniqueId()))
{
send(player, messageComponent("guildNotOwner"));
return;
}
Guilds.get().getRankPermissionMenuListener().openRankList(player, guild);
}, () -> send(player, messageComponent("guildNotFound")));
return null;
}
}
55 changes: 55 additions & 0 deletions src/main/java/dev/plex/command/sub/WorldSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class WorldSubCommand extends GuildSubCommand
{
public WorldSubCommand()
{
super(command("world")
.description("Teleports to your guild world")
.usage("/guild <command>")
.aliases("base")
.permission("plex.guilds.world")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(guild ->
{
send(player, messageComponent("guildWorldLoading"));
Guilds.get().getGuildWorldService().ensureWorld(guild).whenComplete((world, throwable) ->
{
if (throwable != null)
{
Guilds.get().api().scheduler().executeGlobal(() ->
{
throwable.printStackTrace();
send(player, messageComponent("guildWorldLoadFailed"));
});
return;
}
Guilds.get().api().scheduler().executeEntity(player, () -> teleport(player, world), 1L);
});
}, () -> send(player, messageComponent("guildNotFound")));
return null;
}

private void teleport(Player player, World world)
{
Location spawnLocation = world.getSpawnLocation().toCenterLocation();
player.teleportAsync(spawnLocation);
}
}
17 changes: 17 additions & 0 deletions src/main/java/dev/plex/gui/GuildMenuInventoryHolder.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
package dev.plex.gui;

import dev.plex.guild.Guild;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.jetbrains.annotations.NotNull;

import java.util.UUID;

public record GuildMenuInventoryHolder(Guild guild, GuildMenuView view, UUID memberUuid) implements InventoryHolder
{
@Override
public @NotNull Inventory getInventory()
{
throw new UnsupportedOperationException();
}
}
8 changes: 8 additions & 0 deletions src/main/java/dev/plex/gui/GuildMenuView.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
package dev.plex.gui;

public enum GuildMenuView
{
HOME,
MEMBERS,
MEMBER
}
15 changes: 15 additions & 0 deletions src/main/java/dev/plex/gui/RankPermissionInventoryHolder.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
package dev.plex.gui;

import dev.plex.guild.Guild;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.jetbrains.annotations.NotNull;

public record RankPermissionInventoryHolder(Guild guild, String rankName) implements InventoryHolder
{
@Override
public @NotNull Inventory getInventory()
{
throw new UnsupportedOperationException();
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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
19 changes: 19 additions & 0 deletions build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
plugins {
java
`maven-publish`
id("com.gradleup.shadow") version "9.2.2"
}

repositories {
mavenLocal()

maven {
url = uri("https://repo.papermc.io/repository/maven-public/")
}
Expand All@@ -13,6 +16,10 @@ repositories {
}

mavenCentral()

maven {
url = uri("https://repo.infernalsuite.com/repository/maven-snapshots/")
}
}

dependencies {
Expand All@@ -21,6 +28,8 @@ dependencies {
compileOnly("io.papermc.paper:paper-api:26.1.2.build.+")
implementation("org.apache.commons:commons-lang3:3.20.0")
compileOnly("dev.plex:api:2.0-SNAPSHOT")
compileOnly("com.infernalsuite.asp:api:4.0.0-SNAPSHOT")
implementation("com.infernalsuite.asp:file-loader:4.0.0-SNAPSHOT")
implementation("org.jetbrains:annotations:26.1.0")
}

Expand All@@ -45,6 +54,16 @@ tasks.getByName<Jar>("jar") {
archiveVersion.set("")
}

tasks.shadowJar {
archiveBaseName.set("Module-Guilds")
archiveClassifier.set("")
archiveVersion.set("")
}

tasks.build {
dependsOn(tasks.shadowJar)
}

tasks {
compileJava {
options.encoding = Charsets.UTF_8.name()
Expand Down
15 changes: 14 additions & 1 deletion src/main/java/dev/plex/Guilds.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,14 @@
import dev.plex.config.ModuleConfig;
import dev.plex.guild.GuildHolder;
import dev.plex.handler.ChatHandlerImpl;
import dev.plex.handler.GuildMenuListener;
import dev.plex.handler.GuildWorldProtectionListener;
import dev.plex.handler.RankPermissionMenuListener;
import dev.plex.module.PlexModule;
import dev.plex.api.storage.ModuleStorage;
import dev.plex.storage.GuildRepository;
import dev.plex.storage.JdbiGuildRepository;
import dev.plex.world.GuildWorldService;
import lombok.Getter;

import java.sql.SQLException;
Expand All@@ -18,6 +22,10 @@ public class Guilds extends PlexModule
{
private static Guilds module;
private final GuildHolder guildHolder = new GuildHolder();
private final GuildMenuListener guildMenuListener = new GuildMenuListener();
private final GuildWorldProtectionListener guildWorldProtectionListener = new GuildWorldProtectionListener();
private final RankPermissionMenuListener rankPermissionMenuListener = new RankPermissionMenuListener();
private final GuildWorldService guildWorldService = new GuildWorldService();

private GuildRepository guildRepository;

Expand All@@ -36,10 +44,11 @@ public void load()
@Override
public void enable()
{
guildWorldService.enable();
ModuleStorage storage = api().storage().forModule(this);
try
{
storage.migrations().run(List.of("001_initial_schema"));
storage.migrations().run(List.of("001_initial_schema", "002_guild_world_permissions"));
}
catch (SQLException e)
{
Expand All@@ -62,11 +71,15 @@ public void enable()
guildHolder.replaceAll(guilds);
});
registerListener(new ChatHandlerImpl());
registerListener(guildMenuListener);
registerListener(guildWorldProtectionListener);
registerListener(rankPermissionMenuListener);
}

@Override
public void disable()
{
guildWorldService.disable();
guildHolder.clear();
}

Expand Down
13 changes: 12 additions & 1 deletion src/main/java/dev/plex/command/GuildCommand.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,18 +40,29 @@ public GuildCommand()
this.registerSubCommand(new ChatSubCommand());
this.registerSubCommand(new SetHomeSubCommand());
this.registerSubCommand(new HomeSubCommand());
this.registerSubCommand(new WorldSubCommand());
this.registerSubCommand(new PermissionsSubCommand());
this.registerSubCommand(new OwnerSubCommand());
this.registerSubCommand(new InviteSubCommand());
this.registerSubCommand(new AcceptSubCommand());
this.registerSubCommand(new DenySubCommand());
this.registerSubCommand(new MenuSubCommand());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
if (args.length == 0)
{
return getSubs();
if (player == null)
{
return getSubs();
}
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(
guild -> Guilds.get().getGuildMenuListener().openHome(player, guild),
() -> player.sendMessage(messageComponent("guildNotFound"))
);
return null;
}
if (args[0].equalsIgnoreCase("help"))
{
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/dev/plex/command/sub/CreateSubCommand.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,9 @@ protected Component execute(@NotNull CommandSender commandSender, @Nullable Play
{
return messageComponent("alreadyInGuild");
}
Guilds.get().getGuildRepository().createGuild(player, StringUtils.join(args, " ")).whenComplete((guild, throwable) ->
Guilds.get().getGuildRepository().createGuild(player, StringUtils.join(args, " "))
.thenCompose(guild -> Guilds.get().getGuildWorldService().ensureWorld(guild).thenApply(world -> guild))
.whenComplete((guild, throwable) ->
{
if (throwable != null)
{
Expand Down
34 changes: 34 additions & 0 deletions src/main/java/dev/plex/command/sub/MenuSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class MenuSubCommand extends GuildSubCommand
{
public MenuSubCommand()
{
super(command("menu")
.description("Opens the guild management menu")
.usage("/guild <command>")
.aliases("gui,panel")
.permission("plex.guilds.menu")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(
guild -> Guilds.get().getGuildMenuListener().openHome(player, guild),
() -> send(player, messageComponent("guildNotFound"))
);
return null;
}
}
39 changes: 39 additions & 0 deletions src/main/java/dev/plex/command/sub/PermissionsSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class PermissionsSubCommand extends GuildSubCommand
{
public PermissionsSubCommand()
{
super(command("permissions")
.description("Opens the rank permissions GUI")
.usage("/guild <command>")
.aliases("perms")
.permission("plex.guilds.permissions")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(guild ->
{
if (!guild.isOwner(player.getUniqueId()))
{
send(player, messageComponent("guildNotOwner"));
return;
}
Guilds.get().getRankPermissionMenuListener().openRankList(player, guild);
}, () -> send(player, messageComponent("guildNotFound")));
return null;
}
}
55 changes: 55 additions & 0 deletions src/main/java/dev/plex/command/sub/WorldSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class WorldSubCommand extends GuildSubCommand
{
public WorldSubCommand()
{
super(command("world")
.description("Teleports to your guild world")
.usage("/guild <command>")
.aliases("base")
.permission("plex.guilds.world")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(guild ->
{
send(player, messageComponent("guildWorldLoading"));
Guilds.get().getGuildWorldService().ensureWorld(guild).whenComplete((world, throwable) ->
{
if (throwable != null)
{
Guilds.get().api().scheduler().executeGlobal(() ->
{
throwable.printStackTrace();
send(player, messageComponent("guildWorldLoadFailed"));
});
return;
}
Guilds.get().api().scheduler().executeEntity(player, () -> teleport(player, world), 1L);
});
}, () -> send(player, messageComponent("guildNotFound")));
return null;
}

private void teleport(Player player, World world)
{
Location spawnLocation = world.getSpawnLocation().toCenterLocation();
player.teleportAsync(spawnLocation);
}
}
17 changes: 17 additions & 0 deletions src/main/java/dev/plex/gui/GuildMenuInventoryHolder.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
package dev.plex.gui;

import dev.plex.guild.Guild;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.jetbrains.annotations.NotNull;

import java.util.UUID;

public record GuildMenuInventoryHolder(Guild guild, GuildMenuView view, UUID memberUuid) implements InventoryHolder
{
@Override
public @NotNull Inventory getInventory()
{
throw new UnsupportedOperationException();
}
}
8 changes: 8 additions & 0 deletions src/main/java/dev/plex/gui/GuildMenuView.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
package dev.plex.gui;

public enum GuildMenuView
{
HOME,
MEMBERS,
MEMBER
}
15 changes: 15 additions & 0 deletions src/main/java/dev/plex/gui/RankPermissionInventoryHolder.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
package dev.plex.gui;

import dev.plex.guild.Guild;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.jetbrains.annotations.NotNull;

public record RankPermissionInventoryHolder(Guild guild, String rankName) implements InventoryHolder
{
@Override
public @NotNull Inventory getInventory()
{
throw new UnsupportedOperationException();
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
19 changes: 19 additions & 0 deletions build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
plugins {
java
`maven-publish`
id("com.gradleup.shadow") version "9.2.2"
}

repositories {
mavenLocal()

maven {
url = uri("https://repo.papermc.io/repository/maven-public/")
}
Expand All@@ -13,6 +16,10 @@ repositories {
}

mavenCentral()

maven {
url = uri("https://repo.infernalsuite.com/repository/maven-snapshots/")
}
}

dependencies {
Expand All@@ -21,6 +28,8 @@ dependencies {
compileOnly("io.papermc.paper:paper-api:26.1.2.build.+")
implementation("org.apache.commons:commons-lang3:3.20.0")
compileOnly("dev.plex:api:2.0-SNAPSHOT")
compileOnly("com.infernalsuite.asp:api:4.0.0-SNAPSHOT")
implementation("com.infernalsuite.asp:file-loader:4.0.0-SNAPSHOT")
implementation("org.jetbrains:annotations:26.1.0")
}

Expand All@@ -45,6 +54,16 @@ tasks.getByName<Jar>("jar") {
archiveVersion.set("")
}

tasks.shadowJar {
archiveBaseName.set("Module-Guilds")
archiveClassifier.set("")
archiveVersion.set("")
}

tasks.build {
dependsOn(tasks.shadowJar)
}

tasks {
compileJava {
options.encoding = Charsets.UTF_8.name()
Expand Down
15 changes: 14 additions & 1 deletion src/main/java/dev/plex/Guilds.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,14 @@
import dev.plex.config.ModuleConfig;
import dev.plex.guild.GuildHolder;
import dev.plex.handler.ChatHandlerImpl;
import dev.plex.handler.GuildMenuListener;
import dev.plex.handler.GuildWorldProtectionListener;
import dev.plex.handler.RankPermissionMenuListener;
import dev.plex.module.PlexModule;
import dev.plex.api.storage.ModuleStorage;
import dev.plex.storage.GuildRepository;
import dev.plex.storage.JdbiGuildRepository;
import dev.plex.world.GuildWorldService;
import lombok.Getter;

import java.sql.SQLException;
Expand All@@ -18,6 +22,10 @@ public class Guilds extends PlexModule
{
private static Guilds module;
private final GuildHolder guildHolder = new GuildHolder();
private final GuildMenuListener guildMenuListener = new GuildMenuListener();
private final GuildWorldProtectionListener guildWorldProtectionListener = new GuildWorldProtectionListener();
private final RankPermissionMenuListener rankPermissionMenuListener = new RankPermissionMenuListener();
private final GuildWorldService guildWorldService = new GuildWorldService();

private GuildRepository guildRepository;

Expand All@@ -36,10 +44,11 @@ public void load()
@Override
public void enable()
{
guildWorldService.enable();
ModuleStorage storage = api().storage().forModule(this);
try
{
storage.migrations().run(List.of("001_initial_schema"));
storage.migrations().run(List.of("001_initial_schema", "002_guild_world_permissions"));
}
catch (SQLException e)
{
Expand All@@ -62,11 +71,15 @@ public void enable()
guildHolder.replaceAll(guilds);
});
registerListener(new ChatHandlerImpl());
registerListener(guildMenuListener);
registerListener(guildWorldProtectionListener);
registerListener(rankPermissionMenuListener);
}

@Override
public void disable()
{
guildWorldService.disable();
guildHolder.clear();
}

Expand Down
13 changes: 12 additions & 1 deletion src/main/java/dev/plex/command/GuildCommand.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,18 +40,29 @@ public GuildCommand()
this.registerSubCommand(new ChatSubCommand());
this.registerSubCommand(new SetHomeSubCommand());
this.registerSubCommand(new HomeSubCommand());
this.registerSubCommand(new WorldSubCommand());
this.registerSubCommand(new PermissionsSubCommand());
this.registerSubCommand(new OwnerSubCommand());
this.registerSubCommand(new InviteSubCommand());
this.registerSubCommand(new AcceptSubCommand());
this.registerSubCommand(new DenySubCommand());
this.registerSubCommand(new MenuSubCommand());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
if (args.length == 0)
{
return getSubs();
if (player == null)
{
return getSubs();
}
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(
guild -> Guilds.get().getGuildMenuListener().openHome(player, guild),
() -> player.sendMessage(messageComponent("guildNotFound"))
);
return null;
}
if (args[0].equalsIgnoreCase("help"))
{
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/dev/plex/command/sub/CreateSubCommand.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,9 @@ protected Component execute(@NotNull CommandSender commandSender, @Nullable Play
{
return messageComponent("alreadyInGuild");
}
Guilds.get().getGuildRepository().createGuild(player, StringUtils.join(args, " ")).whenComplete((guild, throwable) ->
Guilds.get().getGuildRepository().createGuild(player, StringUtils.join(args, " "))
.thenCompose(guild -> Guilds.get().getGuildWorldService().ensureWorld(guild).thenApply(world -> guild))
.whenComplete((guild, throwable) ->
{
if (throwable != null)
{
Expand Down
34 changes: 34 additions & 0 deletions src/main/java/dev/plex/command/sub/MenuSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class MenuSubCommand extends GuildSubCommand
{
public MenuSubCommand()
{
super(command("menu")
.description("Opens the guild management menu")
.usage("/guild <command>")
.aliases("gui,panel")
.permission("plex.guilds.menu")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(
guild -> Guilds.get().getGuildMenuListener().openHome(player, guild),
() -> send(player, messageComponent("guildNotFound"))
);
return null;
}
}
39 changes: 39 additions & 0 deletions src/main/java/dev/plex/command/sub/PermissionsSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class PermissionsSubCommand extends GuildSubCommand
{
public PermissionsSubCommand()
{
super(command("permissions")
.description("Opens the rank permissions GUI")
.usage("/guild <command>")
.aliases("perms")
.permission("plex.guilds.permissions")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(guild ->
{
if (!guild.isOwner(player.getUniqueId()))
{
send(player, messageComponent("guildNotOwner"));
return;
}
Guilds.get().getRankPermissionMenuListener().openRankList(player, guild);
}, () -> send(player, messageComponent("guildNotFound")));
return null;
}
}
55 changes: 55 additions & 0 deletions src/main/java/dev/plex/command/sub/WorldSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class WorldSubCommand extends GuildSubCommand
{
public WorldSubCommand()
{
super(command("world")
.description("Teleports to your guild world")
.usage("/guild <command>")
.aliases("base")
.permission("plex.guilds.world")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(guild ->
{
send(player, messageComponent("guildWorldLoading"));
Guilds.get().getGuildWorldService().ensureWorld(guild).whenComplete((world, throwable) ->
{
if (throwable != null)
{
Guilds.get().api().scheduler().executeGlobal(() ->
{
throwable.printStackTrace();
send(player, messageComponent("guildWorldLoadFailed"));
});
return;
}
Guilds.get().api().scheduler().executeEntity(player, () -> teleport(player, world), 1L);
});
}, () -> send(player, messageComponent("guildNotFound")));
return null;
}

private void teleport(Player player, World world)
{
Location spawnLocation = world.getSpawnLocation().toCenterLocation();
player.teleportAsync(spawnLocation);
}
}
17 changes: 17 additions & 0 deletions src/main/java/dev/plex/gui/GuildMenuInventoryHolder.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
package dev.plex.gui;

import dev.plex.guild.Guild;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.jetbrains.annotations.NotNull;

import java.util.UUID;

public record GuildMenuInventoryHolder(Guild guild, GuildMenuView view, UUID memberUuid) implements InventoryHolder
{
@Override
public @NotNull Inventory getInventory()
{
throw new UnsupportedOperationException();
}
}
8 changes: 8 additions & 0 deletions src/main/java/dev/plex/gui/GuildMenuView.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
package dev.plex.gui;

public enum GuildMenuView
{
HOME,
MEMBERS,
MEMBER
}
15 changes: 15 additions & 0 deletions src/main/java/dev/plex/gui/RankPermissionInventoryHolder.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
package dev.plex.gui;

import dev.plex.guild.Guild;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.jetbrains.annotations.NotNull;

public record RankPermissionInventoryHolder(Guild guild, String rankName) implements InventoryHolder
{
@Override
public @NotNull Inventory getInventory()
{
throw new UnsupportedOperationException();
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
19 changes: 19 additions & 0 deletions build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
plugins {
java
`maven-publish`
id("com.gradleup.shadow") version "9.2.2"
}

repositories {
mavenLocal()

maven {
url = uri("https://repo.papermc.io/repository/maven-public/")
}
Expand All@@ -13,6 +16,10 @@ repositories {
}

mavenCentral()

maven {
url = uri("https://repo.infernalsuite.com/repository/maven-snapshots/")
}
}

dependencies {
Expand All@@ -21,6 +28,8 @@ dependencies {
compileOnly("io.papermc.paper:paper-api:26.1.2.build.+")
implementation("org.apache.commons:commons-lang3:3.20.0")
compileOnly("dev.plex:api:2.0-SNAPSHOT")
compileOnly("com.infernalsuite.asp:api:4.0.0-SNAPSHOT")
implementation("com.infernalsuite.asp:file-loader:4.0.0-SNAPSHOT")
implementation("org.jetbrains:annotations:26.1.0")
}

Expand All@@ -45,6 +54,16 @@ tasks.getByName<Jar>("jar") {
archiveVersion.set("")
}

tasks.shadowJar {
archiveBaseName.set("Module-Guilds")
archiveClassifier.set("")
archiveVersion.set("")
}

tasks.build {
dependsOn(tasks.shadowJar)
}

tasks {
compileJava {
options.encoding = Charsets.UTF_8.name()
Expand Down
15 changes: 14 additions & 1 deletion src/main/java/dev/plex/Guilds.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,14 @@
import dev.plex.config.ModuleConfig;
import dev.plex.guild.GuildHolder;
import dev.plex.handler.ChatHandlerImpl;
import dev.plex.handler.GuildMenuListener;
import dev.plex.handler.GuildWorldProtectionListener;
import dev.plex.handler.RankPermissionMenuListener;
import dev.plex.module.PlexModule;
import dev.plex.api.storage.ModuleStorage;
import dev.plex.storage.GuildRepository;
import dev.plex.storage.JdbiGuildRepository;
import dev.plex.world.GuildWorldService;
import lombok.Getter;

import java.sql.SQLException;
Expand All@@ -18,6 +22,10 @@ public class Guilds extends PlexModule
{
private static Guilds module;
private final GuildHolder guildHolder = new GuildHolder();
private final GuildMenuListener guildMenuListener = new GuildMenuListener();
private final GuildWorldProtectionListener guildWorldProtectionListener = new GuildWorldProtectionListener();
private final RankPermissionMenuListener rankPermissionMenuListener = new RankPermissionMenuListener();
private final GuildWorldService guildWorldService = new GuildWorldService();

private GuildRepository guildRepository;

Expand All@@ -36,10 +44,11 @@ public void load()
@Override
public void enable()
{
guildWorldService.enable();
ModuleStorage storage = api().storage().forModule(this);
try
{
storage.migrations().run(List.of("001_initial_schema"));
storage.migrations().run(List.of("001_initial_schema", "002_guild_world_permissions"));
}
catch (SQLException e)
{
Expand All@@ -62,11 +71,15 @@ public void enable()
guildHolder.replaceAll(guilds);
});
registerListener(new ChatHandlerImpl());
registerListener(guildMenuListener);
registerListener(guildWorldProtectionListener);
registerListener(rankPermissionMenuListener);
}

@Override
public void disable()
{
guildWorldService.disable();
guildHolder.clear();
}

Expand Down
13 changes: 12 additions & 1 deletion src/main/java/dev/plex/command/GuildCommand.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,18 +40,29 @@ public GuildCommand()
this.registerSubCommand(new ChatSubCommand());
this.registerSubCommand(new SetHomeSubCommand());
this.registerSubCommand(new HomeSubCommand());
this.registerSubCommand(new WorldSubCommand());
this.registerSubCommand(new PermissionsSubCommand());
this.registerSubCommand(new OwnerSubCommand());
this.registerSubCommand(new InviteSubCommand());
this.registerSubCommand(new AcceptSubCommand());
this.registerSubCommand(new DenySubCommand());
this.registerSubCommand(new MenuSubCommand());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
if (args.length == 0)
{
return getSubs();
if (player == null)
{
return getSubs();
}
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(
guild -> Guilds.get().getGuildMenuListener().openHome(player, guild),
() -> player.sendMessage(messageComponent("guildNotFound"))
);
return null;
}
if (args[0].equalsIgnoreCase("help"))
{
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/dev/plex/command/sub/CreateSubCommand.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,9 @@ protected Component execute(@NotNull CommandSender commandSender, @Nullable Play
{
return messageComponent("alreadyInGuild");
}
Guilds.get().getGuildRepository().createGuild(player, StringUtils.join(args, " ")).whenComplete((guild, throwable) ->
Guilds.get().getGuildRepository().createGuild(player, StringUtils.join(args, " "))
.thenCompose(guild -> Guilds.get().getGuildWorldService().ensureWorld(guild).thenApply(world -> guild))
.whenComplete((guild, throwable) ->
{
if (throwable != null)
{
Expand Down
34 changes: 34 additions & 0 deletions src/main/java/dev/plex/command/sub/MenuSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class MenuSubCommand extends GuildSubCommand
{
public MenuSubCommand()
{
super(command("menu")
.description("Opens the guild management menu")
.usage("/guild <command>")
.aliases("gui,panel")
.permission("plex.guilds.menu")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(
guild -> Guilds.get().getGuildMenuListener().openHome(player, guild),
() -> send(player, messageComponent("guildNotFound"))
);
return null;
}
}
39 changes: 39 additions & 0 deletions src/main/java/dev/plex/command/sub/PermissionsSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class PermissionsSubCommand extends GuildSubCommand
{
public PermissionsSubCommand()
{
super(command("permissions")
.description("Opens the rank permissions GUI")
.usage("/guild <command>")
.aliases("perms")
.permission("plex.guilds.permissions")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(guild ->
{
if (!guild.isOwner(player.getUniqueId()))
{
send(player, messageComponent("guildNotOwner"));
return;
}
Guilds.get().getRankPermissionMenuListener().openRankList(player, guild);
}, () -> send(player, messageComponent("guildNotFound")));
return null;
}
}
55 changes: 55 additions & 0 deletions src/main/java/dev/plex/command/sub/WorldSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class WorldSubCommand extends GuildSubCommand
{
public WorldSubCommand()
{
super(command("world")
.description("Teleports to your guild world")
.usage("/guild <command>")
.aliases("base")
.permission("plex.guilds.world")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(guild ->
{
send(player, messageComponent("guildWorldLoading"));
Guilds.get().getGuildWorldService().ensureWorld(guild).whenComplete((world, throwable) ->
{
if (throwable != null)
{
Guilds.get().api().scheduler().executeGlobal(() ->
{
throwable.printStackTrace();
send(player, messageComponent("guildWorldLoadFailed"));
});
return;
}
Guilds.get().api().scheduler().executeEntity(player, () -> teleport(player, world), 1L);
});
}, () -> send(player, messageComponent("guildNotFound")));
return null;
}

private void teleport(Player player, World world)
{
Location spawnLocation = world.getSpawnLocation().toCenterLocation();
player.teleportAsync(spawnLocation);
}
}
17 changes: 17 additions & 0 deletions src/main/java/dev/plex/gui/GuildMenuInventoryHolder.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
package dev.plex.gui;

import dev.plex.guild.Guild;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.jetbrains.annotations.NotNull;

import java.util.UUID;

public record GuildMenuInventoryHolder(Guild guild, GuildMenuView view, UUID memberUuid) implements InventoryHolder
{
@Override
public @NotNull Inventory getInventory()
{
throw new UnsupportedOperationException();
}
}
8 changes: 8 additions & 0 deletions src/main/java/dev/plex/gui/GuildMenuView.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
package dev.plex.gui;

public enum GuildMenuView
{
HOME,
MEMBERS,
MEMBER
}
15 changes: 15 additions & 0 deletions src/main/java/dev/plex/gui/RankPermissionInventoryHolder.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
package dev.plex.gui;

import dev.plex.guild.Guild;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.jetbrains.annotations.NotNull;

public record RankPermissionInventoryHolder(Guild guild, String rankName) implements InventoryHolder
{
@Override
public @NotNull Inventory getInventory()
{
throw new UnsupportedOperationException();
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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
19 changes: 19 additions & 0 deletions build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
plugins {
java
`maven-publish`
id("com.gradleup.shadow") version "9.2.2"
}

repositories {
mavenLocal()

maven {
url = uri("https://repo.papermc.io/repository/maven-public/")
}
Expand All@@ -13,6 +16,10 @@ repositories {
}

mavenCentral()

maven {
url = uri("https://repo.infernalsuite.com/repository/maven-snapshots/")
}
}

dependencies {
Expand All@@ -21,6 +28,8 @@ dependencies {
compileOnly("io.papermc.paper:paper-api:26.1.2.build.+")
implementation("org.apache.commons:commons-lang3:3.20.0")
compileOnly("dev.plex:api:2.0-SNAPSHOT")
compileOnly("com.infernalsuite.asp:api:4.0.0-SNAPSHOT")
implementation("com.infernalsuite.asp:file-loader:4.0.0-SNAPSHOT")
implementation("org.jetbrains:annotations:26.1.0")
}

Expand All@@ -45,6 +54,16 @@ tasks.getByName<Jar>("jar") {
archiveVersion.set("")
}

tasks.shadowJar {
archiveBaseName.set("Module-Guilds")
archiveClassifier.set("")
archiveVersion.set("")
}

tasks.build {
dependsOn(tasks.shadowJar)
}

tasks {
compileJava {
options.encoding = Charsets.UTF_8.name()
Expand Down
15 changes: 14 additions & 1 deletion src/main/java/dev/plex/Guilds.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,10 +4,14 @@
import dev.plex.config.ModuleConfig;
import dev.plex.guild.GuildHolder;
import dev.plex.handler.ChatHandlerImpl;
import dev.plex.handler.GuildMenuListener;
import dev.plex.handler.GuildWorldProtectionListener;
import dev.plex.handler.RankPermissionMenuListener;
import dev.plex.module.PlexModule;
import dev.plex.api.storage.ModuleStorage;
import dev.plex.storage.GuildRepository;
import dev.plex.storage.JdbiGuildRepository;
import dev.plex.world.GuildWorldService;
import lombok.Getter;

import java.sql.SQLException;
Expand All@@ -18,6 +22,10 @@ public class Guilds extends PlexModule
{
private static Guilds module;
private final GuildHolder guildHolder = new GuildHolder();
private final GuildMenuListener guildMenuListener = new GuildMenuListener();
private final GuildWorldProtectionListener guildWorldProtectionListener = new GuildWorldProtectionListener();
private final RankPermissionMenuListener rankPermissionMenuListener = new RankPermissionMenuListener();
private final GuildWorldService guildWorldService = new GuildWorldService();

private GuildRepository guildRepository;

Expand All@@ -36,10 +44,11 @@ public void load()
@Override
public void enable()
{
guildWorldService.enable();
ModuleStorage storage = api().storage().forModule(this);
try
{
storage.migrations().run(List.of("001_initial_schema"));
storage.migrations().run(List.of("001_initial_schema", "002_guild_world_permissions"));
}
catch (SQLException e)
{
Expand All@@ -62,11 +71,15 @@ public void enable()
guildHolder.replaceAll(guilds);
});
registerListener(new ChatHandlerImpl());
registerListener(guildMenuListener);
registerListener(guildWorldProtectionListener);
registerListener(rankPermissionMenuListener);
}

@Override
public void disable()
{
guildWorldService.disable();
guildHolder.clear();
}

Expand Down
13 changes: 12 additions & 1 deletion src/main/java/dev/plex/command/GuildCommand.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,18 +40,29 @@ public GuildCommand()
this.registerSubCommand(new ChatSubCommand());
this.registerSubCommand(new SetHomeSubCommand());
this.registerSubCommand(new HomeSubCommand());
this.registerSubCommand(new WorldSubCommand());
this.registerSubCommand(new PermissionsSubCommand());
this.registerSubCommand(new OwnerSubCommand());
this.registerSubCommand(new InviteSubCommand());
this.registerSubCommand(new AcceptSubCommand());
this.registerSubCommand(new DenySubCommand());
this.registerSubCommand(new MenuSubCommand());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
if (args.length == 0)
{
return getSubs();
if (player == null)
{
return getSubs();
}
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(
guild -> Guilds.get().getGuildMenuListener().openHome(player, guild),
() -> player.sendMessage(messageComponent("guildNotFound"))
);
return null;
}
if (args[0].equalsIgnoreCase("help"))
{
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/dev/plex/command/sub/CreateSubCommand.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,9 @@ protected Component execute(@NotNull CommandSender commandSender, @Nullable Play
{
return messageComponent("alreadyInGuild");
}
Guilds.get().getGuildRepository().createGuild(player, StringUtils.join(args, " ")).whenComplete((guild, throwable) ->
Guilds.get().getGuildRepository().createGuild(player, StringUtils.join(args, " "))
.thenCompose(guild -> Guilds.get().getGuildWorldService().ensureWorld(guild).thenApply(world -> guild))
.whenComplete((guild, throwable) ->
{
if (throwable != null)
{
Expand Down
34 changes: 34 additions & 0 deletions src/main/java/dev/plex/command/sub/MenuSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class MenuSubCommand extends GuildSubCommand
{
public MenuSubCommand()
{
super(command("menu")
.description("Opens the guild management menu")
.usage("/guild <command>")
.aliases("gui,panel")
.permission("plex.guilds.menu")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(
guild -> Guilds.get().getGuildMenuListener().openHome(player, guild),
() -> send(player, messageComponent("guildNotFound"))
);
return null;
}
}
39 changes: 39 additions & 0 deletions src/main/java/dev/plex/command/sub/PermissionsSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class PermissionsSubCommand extends GuildSubCommand
{
public PermissionsSubCommand()
{
super(command("permissions")
.description("Opens the rank permissions GUI")
.usage("/guild <command>")
.aliases("perms")
.permission("plex.guilds.permissions")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(guild ->
{
if (!guild.isOwner(player.getUniqueId()))
{
send(player, messageComponent("guildNotOwner"));
return;
}
Guilds.get().getRankPermissionMenuListener().openRankList(player, guild);
}, () -> send(player, messageComponent("guildNotFound")));
return null;
}
}
55 changes: 55 additions & 0 deletions src/main/java/dev/plex/command/sub/WorldSubCommand.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
package dev.plex.command.sub;

import dev.plex.Guilds;
import dev.plex.command.source.RequiredCommandSource;
import net.kyori.adventure.text.Component;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class WorldSubCommand extends GuildSubCommand
{
public WorldSubCommand()
{
super(command("world")
.description("Teleports to your guild world")
.usage("/guild <command>")
.aliases("base")
.permission("plex.guilds.world")
.source(RequiredCommandSource.IN_GAME)
.build());
}

@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
assert player != null;
Guilds.get().getGuildHolder().getGuild(player.getUniqueId()).ifPresentOrElse(guild ->
{
send(player, messageComponent("guildWorldLoading"));
Guilds.get().getGuildWorldService().ensureWorld(guild).whenComplete((world, throwable) ->
{
if (throwable != null)
{
Guilds.get().api().scheduler().executeGlobal(() ->
{
throwable.printStackTrace();
send(player, messageComponent("guildWorldLoadFailed"));
});
return;
}
Guilds.get().api().scheduler().executeEntity(player, () -> teleport(player, world), 1L);
});
}, () -> send(player, messageComponent("guildNotFound")));
return null;
}

private void teleport(Player player, World world)
{
Location spawnLocation = world.getSpawnLocation().toCenterLocation();
player.teleportAsync(spawnLocation);
}
}
17 changes: 17 additions & 0 deletions src/main/java/dev/plex/gui/GuildMenuInventoryHolder.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
package dev.plex.gui;

import dev.plex.guild.Guild;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.jetbrains.annotations.NotNull;

import java.util.UUID;

public record GuildMenuInventoryHolder(Guild guild, GuildMenuView view, UUID memberUuid) implements InventoryHolder
{
@Override
public @NotNull Inventory getInventory()
{
throw new UnsupportedOperationException();
}
}
8 changes: 8 additions & 0 deletions src/main/java/dev/plex/gui/GuildMenuView.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
package dev.plex.gui;

public enum GuildMenuView
{
HOME,
MEMBERS,
MEMBER
}
15 changes: 15 additions & 0 deletions src/main/java/dev/plex/gui/RankPermissionInventoryHolder.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
package dev.plex.gui;

import dev.plex.guild.Guild;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.jetbrains.annotations.NotNull;

public record RankPermissionInventoryHolder(Guild guild, String rankName) implements InventoryHolder
{
@Override
public @NotNull Inventory getInventory()
{
throw new UnsupportedOperationException();
}
}
Loading
Loading