From 352b58fb7c00c192c5f63fd88b67251345927f0f Mon Sep 17 00:00:00 2001 From: TheTrouper <93684527+thetrouper@users.noreply.github.com> Date: Wed, 28 Feb 2024 17:34:31 -0600 Subject: [PATCH] Added a bypass for dupeban --- .../trouper/ultradupe/cmds/DupeCommand.java | 2 +- .../ultradupe/cmds/MultiplyCommand.java | 2 +- .../ultradupe/cmds/UltraDupeCommand.java | 12 +++++---- .../ultradupe/data/DupeBanStorage.java | 4 --- .../ultradupe/data/GUIs/DupeBanGUI.java | 25 +++++++++++++++---- 5 files changed, 29 insertions(+), 16 deletions(-) diff --git a/src/main/java/me/trouper/ultradupe/cmds/DupeCommand.java b/src/main/java/me/trouper/ultradupe/cmds/DupeCommand.java index b019949..f68822a 100644 --- a/src/main/java/me/trouper/ultradupe/cmds/DupeCommand.java +++ b/src/main/java/me/trouper/ultradupe/cmds/DupeCommand.java @@ -6,9 +6,9 @@ import io.github.itzispyder.pdk.commands.CustomCommand; import io.github.itzispyder.pdk.commands.Permission; import io.github.itzispyder.pdk.commands.completions.CompletionBuilder; import io.github.itzispyder.pdk.utils.SchedulerUtils; +import io.github.itzispyder.pdk.utils.misc.SoundPlayer; import me.trouper.ultradupe.UltraDupe; import me.trouper.ultradupe.server.functions.DupeBanCheck; -import me.trouper.ultradupe.server.sound.SoundPlayer; import me.trouper.ultradupe.server.util.Text; import net.kyori.adventure.text.Component; import org.bukkit.Sound; diff --git a/src/main/java/me/trouper/ultradupe/cmds/MultiplyCommand.java b/src/main/java/me/trouper/ultradupe/cmds/MultiplyCommand.java index 96a8879..b78bd88 100644 --- a/src/main/java/me/trouper/ultradupe/cmds/MultiplyCommand.java +++ b/src/main/java/me/trouper/ultradupe/cmds/MultiplyCommand.java @@ -6,9 +6,9 @@ import io.github.itzispyder.pdk.commands.CustomCommand; import io.github.itzispyder.pdk.commands.Permission; import io.github.itzispyder.pdk.commands.completions.CompletionBuilder; import io.github.itzispyder.pdk.utils.SchedulerUtils; +import io.github.itzispyder.pdk.utils.misc.SoundPlayer; import me.trouper.ultradupe.UltraDupe; import me.trouper.ultradupe.server.functions.DupeBanCheck; -import me.trouper.ultradupe.server.sound.SoundPlayer; import me.trouper.ultradupe.server.util.Text; import net.kyori.adventure.text.Component; import org.bukkit.Sound; diff --git a/src/main/java/me/trouper/ultradupe/cmds/UltraDupeCommand.java b/src/main/java/me/trouper/ultradupe/cmds/UltraDupeCommand.java index a907a55..60f3ff8 100644 --- a/src/main/java/me/trouper/ultradupe/cmds/UltraDupeCommand.java +++ b/src/main/java/me/trouper/ultradupe/cmds/UltraDupeCommand.java @@ -5,14 +5,11 @@ import io.github.itzispyder.pdk.commands.CommandRegistry; import io.github.itzispyder.pdk.commands.CustomCommand; import io.github.itzispyder.pdk.commands.Permission; import io.github.itzispyder.pdk.commands.completions.CompletionBuilder; -import io.github.itzispyder.pdk.utils.SchedulerUtils; import me.trouper.ultradupe.UltraDupe; -import me.trouper.ultradupe.server.functions.DupeBanCheck; -import me.trouper.ultradupe.server.sound.SoundPlayer; +import me.trouper.ultradupe.data.GUIs.DupeBanGUI; import me.trouper.ultradupe.server.util.Text; import net.kyori.adventure.text.Component; import org.bukkit.Material; -import org.bukkit.Sound; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -31,6 +28,10 @@ public class UltraDupeCommand implements CustomCommand { Player p = (Player) sender; switch (args.get(0).toString()) { + case "gui" -> { + DupeBanGUI.isInGUI.add(p.getUniqueId()); + p.openInventory(DupeBanGUI.home.getInventory()); + } case "dupebans" -> { switch (args.get(1).toString()) { case "item" -> handleItemEdit(p,args); @@ -65,7 +66,8 @@ public class UltraDupeCommand implements CustomCommand { .then(b.arg("material") .then(b.arg("add", "remove"))) ).then(b.arg("toggle") - .then(b.arg("debug","bypass"))); + .then(b.arg("debug","bypass")) + ).then(b.arg("gui")); } private void handleItemEdit(Player p, Args args) { diff --git a/src/main/java/me/trouper/ultradupe/data/DupeBanStorage.java b/src/main/java/me/trouper/ultradupe/data/DupeBanStorage.java index 70450dc..95bfbcf 100644 --- a/src/main/java/me/trouper/ultradupe/data/DupeBanStorage.java +++ b/src/main/java/me/trouper/ultradupe/data/DupeBanStorage.java @@ -23,8 +23,4 @@ public class DupeBanStorage implements JsonSerializable { Material.NETHERITE_INGOT, Material.TOTEM_OF_UNDYING ); - public List bannedItems = Arrays.asList( - GuiItems.backArrow, - GuiItems.nextArrow - ); } diff --git a/src/main/java/me/trouper/ultradupe/data/GUIs/DupeBanGUI.java b/src/main/java/me/trouper/ultradupe/data/GUIs/DupeBanGUI.java index 75cc205..2f9d8a1 100644 --- a/src/main/java/me/trouper/ultradupe/data/GUIs/DupeBanGUI.java +++ b/src/main/java/me/trouper/ultradupe/data/GUIs/DupeBanGUI.java @@ -1,8 +1,11 @@ package me.trouper.ultradupe.data.GUIs; import io.github.itzispyder.pdk.Global; +import io.github.itzispyder.pdk.plugin.builders.ItemBuilder; import io.github.itzispyder.pdk.plugin.gui.CustomGui; import io.github.itzispyder.pdk.utils.misc.SoundPlayer; +import me.trouper.ultradupe.UltraDupe; +import me.trouper.ultradupe.server.util.Text; import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.entity.Player; @@ -17,7 +20,7 @@ public class DupeBanGUI implements Global { public static List isInGUI = new ArrayList<>(); public static final CustomGui home = CustomGui.create() - .title(g.color("A88FF&lUʺCFF&llỒFF<≚FF&lr◣FF&la&#A59DFF&lD&#B4A1FF&lu&#C3A5FF&lp&#D2A9FF&le &7&l | &#FF5A5A&l&nP&#F25C62&l&nr&#E65E6B&l&ne&#D95F73&l&nm&#CC617B&l&ni&#BF6383&l&nu&#B3658C&l&nm &#A66794&l&nD𘕩C&l&nuC6AA4&l&np̦CAD&l&ne ˠEB5&l&nBᨎBD&l&naᝓC5&l&nnD73CE&l&ns ࿫D6&l&nEറDE&l&nd੷E6&l&niA7AEF&l&nt�D7CF7&l&noEFF&l&nr")) + .title(g.color("A88FF&lUʺCFF&llỒFF<≚FF&lr◣FF&la&#A59DFF&lD&#B4A1FF&lu&#C3A5FF&lp&#D2A9FF&le &7&l | &#D589FFD&#CB99FFu&#C2A9FFp&#B8B9FFe &#AFCAFFB&#A5DAFFa CEAFFn`F3FBs ]F5F2E[F7EAdEF9E1iCFBD9tYFDD0oWFFC8r")) .size(54) .defineMain(e -> { e.setCancelled(true); @@ -31,11 +34,23 @@ public class DupeBanGUI implements Global { deny.play((Player) e.getWhoClicked()); } }) - .onDefine(e -> { - + .onDefine(i -> { + int pointer = 0; + for (Material bannedMaterial : UltraDupe.dupeBanStorage.bannedMaterials) { + if (pointer > 44) return; + i.setItem(pointer, ItemBuilder.create() + .material(bannedMaterial) + .lore("") + .lore(Global.instance.color("&7(Light click to remove)")) + .build()); + pointer++; + } }) - .define(54,GuiItems.nextArrow,event -> { - + .define(45,GuiItems.backArrow,event-> { + event.getWhoClicked().sendMessage(Text.prefix("You clicked back")); + }) + .define(53,GuiItems.nextArrow,event -> { + event.getWhoClicked().sendMessage(Text.prefix("You clicked next")); }) .build();