diff --git a/build.gradle.kts b/build.gradle.kts index 1efba9b5..bf7e724a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "com.hibiscusmc" -version = "2.3.2-DEV" +version = "2.4.0" allprojects { apply(plugin = "java") @@ -100,6 +100,7 @@ dependencies { implementation("com.jeff_media:SpigotUpdateChecker:3.0.0") implementation("com.owen1212055:particlehelper:1.0.0-SNAPSHOT") implementation("com.ticxo:PlayerAnimator:R1.2.6") + implementation("com.github.BG-Software-LLC:CommentedConfiguration:-SNAPSHOT") //implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.5") } @@ -141,6 +142,7 @@ tasks { relocate("com.jeff_media.updatechecker", "com.hisbiscusmc.hmccosmetics.updatechecker") relocate("com.owen1212055.particlehelper", "com.hisbiscusmc.hmccosmetics.particlehelper") relocate("com.ticxo.playeranimator", "com.hisbiscusmc.hmccosmetics.playeranimator") + relocate("com.bgsoftware", "com.hisbiscusmc.hmccosmetics.configupdater") archiveFileName.set("HMCCosmeticsRemapped-${project.version}.jar") dependencies { @@ -210,7 +212,7 @@ bukkit { register("hmccosmetics.cmd.emote.other") { default = BukkitPluginDescription.Permission.Default.OP } - register("hmccosmetics.cmd.setlocation") { + register("hmccosmetics.cmd.setwardrobesetting") { default = BukkitPluginDescription.Permission.Default.OP } register("hmccosmetics.cmd.dataclear") { diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 5492a45d..e494ccaa 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -33,6 +33,7 @@ dependencies { implementation("com.jeff_media:SpigotUpdateChecker:3.0.0") implementation("com.owen1212055:particlehelper:1.0.0-SNAPSHOT") implementation("com.ticxo:PlayerAnimator:R1.2.6") + implementation("com.github.BG-Software-LLC:CommentedConfiguration:-SNAPSHOT") //implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.5") } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java index c56d2dfa..2f8b45d6 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java @@ -1,5 +1,6 @@ package com.hibiscusmc.hmccosmetics; +import com.bgsoftware.common.config.CommentedConfiguration; import com.hibiscusmc.hmccosmetics.api.HMCCosmeticSetupEvent; import com.hibiscusmc.hmccosmetics.command.CosmeticCommand; import com.hibiscusmc.hmccosmetics.command.CosmeticCommandTabComplete; @@ -12,6 +13,7 @@ import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic; import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics; import com.hibiscusmc.hmccosmetics.database.Database; import com.hibiscusmc.hmccosmetics.emotes.EmoteManager; +import com.hibiscusmc.hmccosmetics.gui.Menu; import com.hibiscusmc.hmccosmetics.gui.Menus; import com.hibiscusmc.hmccosmetics.hooks.Hooks; import com.hibiscusmc.hmccosmetics.hooks.worldguard.WGHook; @@ -86,13 +88,12 @@ public final class HMCCosmeticsPlugin extends JavaPlugin { .checkNow(); onLatestVersion = checker.isUsingLatestVersion(); // File setup - if (!getDataFolder().exists()) { - saveDefaultConfig(); - //saveResource("translations.yml", false); - saveResource("messages.yml", false); - saveResource("cosmetics/defaultcosmetics.yml", false); - saveResource("menus/defaultmenu.yml", false); - } + saveDefaultConfig(); + //saveResource("translations.yml", false); + if (!Path.of(getDataFolder().getPath(), "messages.yml").toFile().exists()) saveResource("messages.yml", false); + if (!Path.of(getDataFolder().getPath() + "/cosmetics/").toFile().exists()) saveResource("cosmetics/defaultcosmetics.yml", false); + if (!Path.of(getDataFolder().getPath() + "/menus/").toFile().exists()) saveResource("menus/defaultmenu.yml", false); + // Emote folder setup File emoteFile = new File(getDataFolder().getPath() + "/emotes"); if (!emoteFile.exists()) emoteFile.mkdir(); @@ -100,6 +101,16 @@ public final class HMCCosmeticsPlugin extends JavaPlugin { // Player Animator PlayerAnimatorImpl.initialize(this); + // Configuration Sync + final File configFile = Path.of(getInstance().getDataFolder().getPath(), "config.yml").toFile(); + final File messageFile = Path.of(getInstance().getDataFolder().getPath(), "messages.yml").toFile(); + try { + CommentedConfiguration.loadConfiguration(configFile).syncWithConfig(configFile, getInstance().getResource("config.yml"), + "database-settings", "debug-mode", "wardrobe.viewer-location", "wardrobe.npc-location", "wardrobe.wardrobe-location", "wardrobe.leave-location"); + CommentedConfiguration.loadConfiguration(messageFile).syncWithConfig(messageFile, getInstance().getResource("messages.yml")); + } catch (Exception e) {} + + // Setup setup(); // Commands @@ -170,7 +181,7 @@ public final class HMCCosmeticsPlugin extends JavaPlugin { WardrobeSettings.load(loader.load().node("wardrobe")); DatabaseSettings.load(loader.load().node("database-settings")); configLoader = loader; - } catch (ConfigurateException e) { + } catch (Exception e) { throw new RuntimeException(e); } @@ -236,12 +247,19 @@ public final class HMCCosmeticsPlugin extends JavaPlugin { getInstance().getServer().getPluginManager().addPermission(new Permission(cosmetic.getPermission())); } } + for (Menu menu : Menus.values()) { + if (menu.getPermissionNode() != null) { + if (getInstance().getServer().getPluginManager().getPermission(menu.getPermissionNode()) != null) continue; + getInstance().getServer().getPluginManager().addPermission(new Permission(menu.getPermissionNode())); + } + } EmoteManager.loadEmotes(); getInstance().getLogger().info("Successfully Enabled HMCCosmetics"); getInstance().getLogger().info(Cosmetics.values().size() + " Cosmetics Successfully Setup"); getInstance().getLogger().info(Menus.getMenuNames().size() + " Menus Successfully Setup"); + getInstance().getLogger().info(WardrobeSettings.getWardrobes().size() + " Wardrobes Successfully Setup"); getInstance().getLogger().info("Data storage is set to " + DatabaseSettings.getDatabaseType()); Bukkit.getPluginManager().callEvent(new HMCCosmeticSetupEvent()); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerWardrobeEnterEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerWardrobeEnterEvent.java index f1b1c126..f5e39a5b 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerWardrobeEnterEvent.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerWardrobeEnterEvent.java @@ -1,5 +1,6 @@ package com.hibiscusmc.hmccosmetics.api; +import com.hibiscusmc.hmccosmetics.config.Wardrobe; import com.hibiscusmc.hmccosmetics.config.WardrobeLocation; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import org.bukkit.event.Cancellable; @@ -12,11 +13,11 @@ import org.jetbrains.annotations.NotNull; public class PlayerWardrobeEnterEvent extends PlayerCosmeticEvent implements Cancellable { private static final HandlerList handlers = new HandlerList(); private boolean cancel = false; - private WardrobeLocation wardrobeLocation; + private Wardrobe wardrobe; - public PlayerWardrobeEnterEvent(@NotNull CosmeticUser who, @NotNull WardrobeLocation wardrobeLocation) { + public PlayerWardrobeEnterEvent(@NotNull CosmeticUser who, @NotNull Wardrobe wardrobe) { super(who); - this.wardrobeLocation = wardrobeLocation; + this.wardrobe = wardrobe; } @Override @@ -49,11 +50,11 @@ public class PlayerWardrobeEnterEvent extends PlayerCosmeticEvent implements Can return handlers; } - public void setWardrobeLocation(WardrobeLocation wardrobeLocation) { - this.wardrobeLocation = wardrobeLocation; + public void setWardrobe(Wardrobe wardrobe) { + this.wardrobe = wardrobe; } - public WardrobeLocation getWardrobeLocation() { - return wardrobeLocation; + public Wardrobe getWardrobe() { + return wardrobe; } } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java index 6b57af5d..71184d71 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java @@ -2,6 +2,8 @@ package com.hibiscusmc.hmccosmetics.command; import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin; import com.hibiscusmc.hmccosmetics.config.Settings; +import com.hibiscusmc.hmccosmetics.config.Wardrobe; +import com.hibiscusmc.hmccosmetics.config.WardrobeLocation; import com.hibiscusmc.hmccosmetics.config.WardrobeSettings; import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic; import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot; @@ -194,8 +196,14 @@ public class CosmeticCommand implements CommandExecutor { } case ("wardrobe") -> { if (sender instanceof Player) player = ((Player) sender).getPlayer(); + + if (args.length == 1) { + if (!silent) MessagesUtil.sendMessage(player, "not-enough-args"); + return true; + } + if (sender.hasPermission("hmccosmetics.cmd.wardrobe.other")) { - if (args.length >= 2) player = Bukkit.getPlayer(args[1]); + if (args.length >= 3) player = Bukkit.getPlayer(args[2]); } if (!sender.hasPermission("hmccosmetics.cmd.wardrobe")) { @@ -208,9 +216,19 @@ public class CosmeticCommand implements CommandExecutor { return true; } + if (!WardrobeSettings.getWardrobeNames().contains(args[1])) { + if (!silent) MessagesUtil.sendMessage(sender, "no-wardrobes"); + return true; + } + Wardrobe wardrobe = WardrobeSettings.getWardrobe(args[1]); + CosmeticUser user = CosmeticUsers.getUser(player); - user.toggleWardrobe(); + if (user.isInWardrobe()) { + user.leaveWardrobe(); + } else { + user.enterWardrobe(false, wardrobe); + } return true; } // cosmetic menu exampleMenu playerName @@ -289,36 +307,56 @@ public class CosmeticCommand implements CommandExecutor { DyeMenu.openMenu(user, cosmetic); } } - case ("setlocation") -> { - if (!sender.hasPermission("hmccosmetics.cmd.setlocation")) { + case ("setwardrobesetting") -> { + if (!sender.hasPermission("hmccosmetics.cmd.setwardrobesetting")) { if (!silent) MessagesUtil.sendMessage(sender, "no-permission"); return true; } if (player == null) return true; - if (args.length < 2) { + if (args.length < 3) { if (!silent) MessagesUtil.sendMessage(player, "not-enough-args"); return true; } + Wardrobe wardrobe = WardrobeSettings.getWardrobe(args[1]); + if (wardrobe == null) { + wardrobe = new Wardrobe(args[1], new WardrobeLocation(null, null, null), null, -1); + WardrobeSettings.addWardrobe(wardrobe); + //MessagesUtil.sendMessage(player, "no-wardrobes"); + //return true; + } - if (args[1].equalsIgnoreCase("wardrobelocation")) { - WardrobeSettings.setNPCLocation(player.getLocation()); + if (args[2].equalsIgnoreCase("npclocation")) { + WardrobeSettings.setNPCLocation(wardrobe, player.getLocation()); if (!silent) MessagesUtil.sendMessage(player, "set-wardrobe-location"); return true; } - if (args[1].equalsIgnoreCase("viewerlocation")) { - WardrobeSettings.setViewerLocation(player.getLocation()); + if (args[2].equalsIgnoreCase("viewerlocation")) { + WardrobeSettings.setViewerLocation(wardrobe, player.getLocation()); if (!silent) MessagesUtil.sendMessage(player, "set-wardrobe-viewing"); return true; } - if (args[1].equalsIgnoreCase("leavelocation")) { - WardrobeSettings.setLeaveLocation(player.getLocation()); + if (args[2].equalsIgnoreCase("leavelocation")) { + WardrobeSettings.setLeaveLocation(wardrobe, player.getLocation()); if (!silent) MessagesUtil.sendMessage(player, "set-wardrobe-leaving"); return true; } + + if (args.length >= 4) { + if (args[2].equalsIgnoreCase("permission")) { + WardrobeSettings.setWardrobePermission(wardrobe, args[3]); + if (!silent) MessagesUtil.sendMessage(player, "set-wardrobe-permission"); + return true; + } + if (args[2].equalsIgnoreCase("distance")) { + WardrobeSettings.setWardrobeDistance(wardrobe, Integer.valueOf(args[3])); + if (!silent) MessagesUtil.sendMessage(player, "set-wardrobe-distance"); + return true; + } + } } case ("dump") -> { if (player == null) return true; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommandTabComplete.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommandTabComplete.java index 03445bdd..c2c86b4a 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommandTabComplete.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommandTabComplete.java @@ -1,5 +1,7 @@ package com.hibiscusmc.hmccosmetics.command; +import com.hibiscusmc.hmccosmetics.config.Wardrobe; +import com.hibiscusmc.hmccosmetics.config.WardrobeSettings; import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic; import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot; import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics; @@ -36,7 +38,7 @@ public class CosmeticCommandTabComplete implements TabCompleter { if (hasPermission(sender, "hmccosmetics.cmd.wardrobe")) completions.add("wardrobe"); if (hasPermission(sender, "hmccosmetics.cmd.dataclear")) completions.add("dataclear"); if (hasPermission(sender, "hmccosmetics.cmd.dye")) completions.add("dye"); - if (hasPermission(sender, "hmccosmetics.cmd.setlocation")) completions.add("setlocation"); + if (hasPermission(sender, "hmccosmetics.cmd.setwardrobesetting")) completions.add("setwardrobesetting"); if (hasPermission(sender, "hmccosmetics.cmd.hide")) completions.add("hide"); if (hasPermission(sender, "hmccosmetics.cmd.show")) completions.add("show"); if (hasPermission(sender, "hmccosmetics.cmd.debug")) completions.add("debug"); @@ -66,20 +68,29 @@ public class CosmeticCommandTabComplete implements TabCompleter { if (menu.canOpen(user.getPlayer())) completions.add(menu.getId()); } } - case "dataclear", "wardrobe", "hide", "show", "emote" -> { + case "dataclear", "hide", "show", "emote" -> { for (Player player : Bukkit.getOnlinePlayers()) { completions.add(player.getName()); } } + case "wardrobe" -> { + for (Wardrobe wardrobe : WardrobeSettings.getWardrobes()) { + if (wardrobe.hasPermission()) { + if (user.getPlayer().hasPermission(wardrobe.getPermission())) completions.add(wardrobe.getId()); + } else { + completions.add(wardrobe.getId()); + } + } + } case "dye" -> { for (CosmeticSlot slot : user.getDyeableSlots()) { completions.add(slot.name()); } } - case "setlocation" -> { - completions.add("wardrobelocation"); - completions.add("viewerlocation"); - completions.add("leavelocation"); + case "setwardrobesetting" -> { + for (Wardrobe wardrobe : WardrobeSettings.getWardrobes()) { + completions.add(wardrobe.getId()); + } } case "playemote" -> completions.addAll(EmoteManager.getAllNames()); } @@ -91,11 +102,18 @@ public class CosmeticCommandTabComplete implements TabCompleter { case "dye" -> { completions.add("#FFFFFF"); } - case "menu", "apply", "unapply", "playemote" -> { + case "menu", "wardrobe", "apply", "unapply", "playemote" -> { for (Player player : Bukkit.getOnlinePlayers()) { completions.add(player.getName()); } } + case "setwardrobesetting" -> { + completions.add("npclocation"); + completions.add("viewerlocation"); + completions.add("leavelocation"); + completions.add("permission"); + completions.add("distance"); + } } StringUtil.copyPartialMatches(args[2], completions, finalCompletions); } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Settings.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Settings.java index c941049a..63cf694e 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Settings.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Settings.java @@ -42,6 +42,7 @@ public class Settings { private static final String HOOK_WG_MOVE_CHECK_PATH = "player-move-check"; private static final String HOOK_WG_MOVE_CHECK_PATH_LEGACY = "player_move_check"; private static final String COSMETIC_EMOTE_CHECK_PATH = "emote-block-check"; + private static final String COSMETIC_EMOTE_AIR_CHECK_PATH = "emote-air-check"; private static final String COSMETIC_EMOTE_DAMAGE_PATH = "emote-damage-leave"; private static final String COSMETIC_EMOTE_INVINCIBLE_PATH = "emote-invincible"; private static final String COSMETIC_ADD_ENCHANTS_HELMET_PATH = "helmet-add-enchantments"; @@ -70,6 +71,7 @@ public class Settings { private static boolean addChestplateEnchants; private static boolean addLeggingEnchants; private static boolean addBootsEnchants; + private static boolean emoteAirCheck; private static boolean emoteDamageLeave; private static boolean emoteInvincible; private static boolean destroyLooseCosmetics; @@ -105,6 +107,7 @@ public class Settings { forcePermissionJoin = cosmeticSettings.node(FORCE_PERMISSION_JOIN_PATH).getBoolean(false); emoteDistance = cosmeticSettings.node(EMOTE_DISTANCE_PATH).getDouble(-3); cosmeticEmoteBlockCheck = cosmeticSettings.node(COSMETIC_EMOTE_CHECK_PATH).getBoolean(true); + emoteAirCheck = cosmeticSettings.node(COSMETIC_EMOTE_AIR_CHECK_PATH).getBoolean(true); emoteDamageLeave = cosmeticSettings.node(COSMETIC_EMOTE_DAMAGE_PATH).getBoolean(false); emoteInvincible = cosmeticSettings.node(COSMETIC_EMOTE_INVINCIBLE_PATH).getBoolean(false); destroyLooseCosmetics = cosmeticSettings.node(COSMETIC_DESTROY_LOOSE_COSMETIC_PATH).getBoolean(false); @@ -263,6 +266,10 @@ public class Settings { return cosmeticEmoteBlockCheck; } + public static boolean getEmoteAirCheck() { + return emoteAirCheck; + } + public static boolean isEmoteDamageLeave() { return emoteDamageLeave; } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Wardrobe.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Wardrobe.java new file mode 100644 index 00000000..1d080173 --- /dev/null +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/config/Wardrobe.java @@ -0,0 +1,61 @@ +package com.hibiscusmc.hmccosmetics.config; + +import com.hibiscusmc.hmccosmetics.user.CosmeticUser; +import org.bukkit.Location; + +import javax.annotation.Nullable; + +public class Wardrobe { + + private String id; + private int distance = WardrobeSettings.getDefaultDistance(); + private String permission; + private WardrobeLocation location; + + public Wardrobe(String id, WardrobeLocation location, @Nullable String permission, int distance) { + this.id = id; + this.location = location; + if (permission != null) this.permission = permission; + if (distance != -1) this.distance = distance; + } + + public String getId() { + return id; + } + + public WardrobeLocation getLocation() { + return location; + } + + public void setDistance(int distance) { + this.distance = distance; + } + + public void setPermission(String permission) { + this.permission = permission; + } + + public boolean hasPermission() { + return permission != null; + } + public int getDistance() { + return distance; + } + + public String getPermission() { + return permission; + } + + public void setLocation(WardrobeLocation location) { + this.location = location; + } + + public boolean canEnter(CosmeticUser user) { + Location wardrobeLocation = location.getNpcLocation(); + Location location = user.getPlayer().getLocation(); + if (wardrobeLocation == null) return false; + if (distance == -1) return true; + if (!wardrobeLocation.getWorld().equals(location.getWorld())) return false; + return wardrobeLocation.distanceSquared(location) <= distance * distance; + } +} diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/config/WardrobeLocation.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/config/WardrobeLocation.java index fc34072d..dff6b5b5 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/config/WardrobeLocation.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/config/WardrobeLocation.java @@ -26,6 +26,11 @@ public class WardrobeLocation { return leaveLocation.clone(); } + public boolean hasAllLocations() { + if (npcLocation == null || viewerLocation == null || leaveLocation == null) return false; + return true; + } + public void setNPCLocation(Location wardrobeLocation) { this.npcLocation = wardrobeLocation; } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/config/WardrobeSettings.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/config/WardrobeSettings.java index 07cc3c02..1dca8c97 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/config/WardrobeSettings.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/config/WardrobeSettings.java @@ -9,7 +9,9 @@ import org.apache.commons.lang3.EnumUtils; import org.bukkit.GameMode; import org.bukkit.Location; import org.spongepowered.configurate.ConfigurationNode; -import org.spongepowered.configurate.serialize.SerializationException; + +import java.util.*; +import java.util.logging.Level; public class WardrobeSettings { @@ -25,14 +27,18 @@ public class WardrobeSettings { private static final String APPLY_COSMETICS_ON_CLOSE = "apply-cosmetics-on-close"; private static final String OPEN_SOUND = "open-sound"; private static final String CLOSE_SOUND = "close-sound"; - private static final String STATIC_LOCATION_PATH = "wardrobe-location"; + private static final String NPC_LOCATION_PATH = "npc-location"; private static final String VIEWER_LOCATION_PATH = "viewer-location"; private static final String LEAVE_LOCATION_PATH = "leave-location"; private static final String EQUIP_PUMPKIN_WARDROBE = "equip-pumpkin"; + private static final String TRY_COSMETICS_WARDROBE = "unchecked-wardrobe-cosmetics"; private static final String RETURN_LAST_LOCATION = "return-last-location"; private static final String GAMEMODE_OPTIONS_PATH = "gamemode-options"; private static final String FORCE_EXIT_GAMEMODE_PATH = "exit-gamemode-enabled"; private static final String EXIT_GAMEMODE_PATH = "exit-gamemode"; + private static final String WARDROBES_PATH = "wardrobes"; + private static final String PERMISSION_PATH = "permission"; + private static final String DISTANCE_PATH = "distance"; private static final String BOSSBAR_PATH = "bossbar"; private static final String BOSSBAR_ENABLE_PATH = "enabled"; private static final String BOSSBAR_TEXT_PATH = "text"; @@ -58,12 +64,13 @@ public class WardrobeSettings { private static int despawnDelay; private static float bossbarProgress; private static boolean applyCosmeticsOnClose; + private static boolean tryCosmeticsInWardrobe; private static boolean equipPumpkin; private static boolean returnLastLocation; private static boolean enabledBossbar; private static boolean forceExitGamemode; private static GameMode exitGamemode; - private static WardrobeLocation wardrobeLocation; + private static HashMap wardrobes; private static String bossbarMessage; private static BossBar.Overlay bossbarOverlay; private static BossBar.Color bossbarColor; @@ -88,6 +95,7 @@ public class WardrobeSettings { applyCosmeticsOnClose = source.node(APPLY_COSMETICS_ON_CLOSE).getBoolean(); equipPumpkin = source.node(EQUIP_PUMPKIN_WARDROBE).getBoolean(); returnLastLocation = source.node(RETURN_LAST_LOCATION).getBoolean(false); + tryCosmeticsInWardrobe = source.node(TRY_COSMETICS_WARDROBE).getBoolean(false); ConfigurationNode gamemodeNode = source.node(GAMEMODE_OPTIONS_PATH); forceExitGamemode = gamemodeNode.node(FORCE_EXIT_GAMEMODE_PATH).getBoolean(false); @@ -117,17 +125,35 @@ public class WardrobeSettings { transitionStay = transitionNode.node(TRANSITION_STAY_PATH).getInt(2000); transitionFadeOut = transitionNode.node(TRANSITION_FADE_OUT_PATH).getInt(2000); - try { - Location npcLocation = LocationSerializer.INSTANCE.deserialize(Location.class, source.node(STATIC_LOCATION_PATH)); - MessagesUtil.sendDebugMessages("Wardrobe Location: " + npcLocation); - Location viewerLocation = LocationSerializer.INSTANCE.deserialize(Location.class, source.node(VIEWER_LOCATION_PATH)); - MessagesUtil.sendDebugMessages("Viewer Location: " + viewerLocation); - Location leaveLocation = Utils.replaceIfNull(LocationSerializer.INSTANCE.deserialize(Location.class, source.node(LEAVE_LOCATION_PATH)), viewerLocation); - MessagesUtil.sendDebugMessages("Leave Location: " + leaveLocation); - wardrobeLocation = new WardrobeLocation(npcLocation, viewerLocation, leaveLocation); - } catch (SerializationException e) { - throw new RuntimeException(e); + wardrobes = new HashMap<>(); + for (ConfigurationNode wardrobesNode : source.node(WARDROBES_PATH).childrenMap().values()) { + String id = wardrobesNode.key().toString(); + try { + Location npcLocation = LocationSerializer.INSTANCE.deserialize(Location.class, wardrobesNode.node(NPC_LOCATION_PATH)); + MessagesUtil.sendDebugMessages("Wardrobe Location: " + npcLocation); + Location viewerLocation = LocationSerializer.INSTANCE.deserialize(Location.class, wardrobesNode.node(VIEWER_LOCATION_PATH)); + MessagesUtil.sendDebugMessages("Viewer Location: " + viewerLocation); + Location leaveLocation = Utils.replaceIfNull(LocationSerializer.INSTANCE.deserialize(Location.class, wardrobesNode.node(LEAVE_LOCATION_PATH)), viewerLocation); + MessagesUtil.sendDebugMessages("Leave Location: " + leaveLocation); + WardrobeLocation wardrobeLocation = new WardrobeLocation(npcLocation, viewerLocation, leaveLocation); + + String permission = null; + int distance = -1; + if (!wardrobesNode.node(PERMISSION_PATH).virtual()) permission = wardrobesNode.node(PERMISSION_PATH).getString(); + if (!wardrobesNode.node(DISTANCE_PATH).virtual()) distance = wardrobesNode.node(DISTANCE_PATH).getInt(); + + Wardrobe wardrobe = new Wardrobe(id, wardrobeLocation, permission, distance); + addWardrobe(wardrobe); + } catch (Exception e) { + MessagesUtil.sendDebugMessages("Unable to create wardrobe " + id, Level.SEVERE); + } } + + //throw new RuntimeException(e); + } + + public static int getDefaultDistance() { + return staticRadius; } public static boolean getDisableOnDamage() { @@ -172,46 +198,40 @@ public class WardrobeSettings { return returnLastLocation; } - /** - * - * @Deprecated use {@link #getLocation()} - */ - @Deprecated (since = "2.3.2", forRemoval = true) - public static Location getWardrobeLocation() { - return wardrobeLocation.getNpcLocation().clone(); - } - /** - * - * @Deprecated use {@link #getLocation()} - */ - @Deprecated (since = "2.3.2", forRemoval = true) - public static Location getViewerLocation() { - return wardrobeLocation.getViewerLocation().clone(); - } - /** - * - * @Deprecated use {@link #getLocation()} - */ - @Deprecated (since = "2.3.2", forRemoval = true) - public static Location getLeaveLocation() { - return wardrobeLocation.getLeaveLocation().clone(); + public static Wardrobe getWardrobe(String key) { + return wardrobes.get(key); } - public static WardrobeLocation getLocation() { - return wardrobeLocation; + public static Set getWardrobeNames() { + return wardrobes.keySet(); } + public static Collection getWardrobes() { + return wardrobes.values(); + } + + public static void addWardrobe(Wardrobe wardrobe) { + wardrobes.put(wardrobe.getId(), wardrobe); + } + + public static void removeWardrobe(String id) { + wardrobes.remove(id); + } + + @Deprecated public static boolean inDistanceOfWardrobe(final Location wardrobeLocation, final Location playerLocation) { if (displayRadius == -1) return true; if (!wardrobeLocation.getWorld().equals(playerLocation.getWorld())) return false; return playerLocation.distanceSquared(wardrobeLocation) <= displayRadius * displayRadius; } - public static boolean inDistanceOfStatic(final Location location) { + @Deprecated + public static boolean inDistanceOfStatic(Wardrobe wardrobe, final Location location) { + Location wardrobeLocation = wardrobe.getLocation().getNpcLocation(); if (wardrobeLocation == null) return false; if (staticRadius == -1) return true; - if (!getWardrobeLocation().getWorld().equals(location.getWorld())) return false; - return getWardrobeLocation().distanceSquared(location) <= staticRadius * staticRadius; + if (!wardrobeLocation.getWorld().equals(location.getWorld())) return false; + return wardrobeLocation.distanceSquared(location) <= staticRadius * staticRadius; } public static boolean getEnabledBossbar() { @@ -262,71 +282,84 @@ public class WardrobeSettings { return exitGamemode; } - /** - * Sets where the NPC will spawn in the wardrobe - * - * @Deprecated use {@link #setNPCLocation(Location)} - * @param newLocation - */ - @Deprecated (since = "2.3.2", forRemoval = true) - public static void setWardrobeLocation(Location newLocation) { - setNPCLocation(newLocation); + public static boolean isTryCosmeticsInWardrobe() { + return tryCosmeticsInWardrobe; } /** * Sets where the NPC/Mannequin will spawn in the wardrobe * @param newLocation */ - public static void setNPCLocation(Location newLocation) { - wardrobeLocation.setNPCLocation(newLocation); + public static void setNPCLocation(Wardrobe wardrobe, Location newLocation) { + wardrobe.getLocation().setNPCLocation(newLocation); HMCCosmeticsPlugin plugin = HMCCosmeticsPlugin.getInstance(); - plugin.getConfig().set("wardrobe.wardrobe-location." + "world", newLocation.getWorld().getName()); - plugin.getConfig().set("wardrobe.wardrobe-location." + "x", newLocation.getX()); - plugin.getConfig().set("wardrobe.wardrobe-location." + "y", newLocation.getY()); - plugin.getConfig().set("wardrobe.wardrobe-location." + "z", newLocation.getZ()); - plugin.getConfig().set("wardrobe.wardrobe-location." + "yaw", newLocation.getYaw()); - plugin.getConfig().set("wardrobe.wardrobe-location." + "pitch", newLocation.getPitch()); + plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".npc-location." + "world", newLocation.getWorld().getName()); + plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".npc-location." + "x", newLocation.getX()); + plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".npc-location." + "y", newLocation.getY()); + plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".npc-location." + "z", newLocation.getZ()); + plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".npc-location." + "yaw", newLocation.getYaw()); + plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".npc-location." + "pitch", newLocation.getPitch()); - HMCCosmeticsPlugin.getInstance().saveConfig(); + plugin.saveConfig(); } /** * Sets where the player will view the wardrobe * @param newLocation */ - public static void setViewerLocation(Location newLocation) { - wardrobeLocation.setViewerLocation(newLocation); + public static void setViewerLocation(Wardrobe wardrobe, Location newLocation) { + wardrobe.getLocation().setViewerLocation(newLocation); HMCCosmeticsPlugin plugin = HMCCosmeticsPlugin.getInstance(); - plugin.getConfig().set("wardrobe.viewer-location." + "world", newLocation.getWorld().getName()); - plugin.getConfig().set("wardrobe.viewer-location." + "x", newLocation.getX()); - plugin.getConfig().set("wardrobe.viewer-location." + "y", newLocation.getY()); - plugin.getConfig().set("wardrobe.viewer-location." + "z", newLocation.getZ()); - plugin.getConfig().set("wardrobe.viewer-location." + "yaw", newLocation.getYaw()); - plugin.getConfig().set("wardrobe.viewer-location." + "pitch", newLocation.getPitch()); + plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".viewer-location.world", newLocation.getWorld().getName()); + plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".viewer-location.x", newLocation.getX()); + plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".viewer-location.y", newLocation.getY()); + plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".viewer-location.z", newLocation.getZ()); + plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".viewer-location.yaw", newLocation.getYaw()); + plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".viewer-location.pitch", newLocation.getPitch()); - HMCCosmeticsPlugin.getInstance().saveConfig(); + plugin.saveConfig(); } /** * Sets where a player will leave the wardrobe from * @param newLocation */ - public static void setLeaveLocation(Location newLocation) { - wardrobeLocation.setLeaveLocation(newLocation); + public static void setLeaveLocation(Wardrobe wardrobe, Location newLocation) { + wardrobe.getLocation().setLeaveLocation(newLocation); HMCCosmeticsPlugin plugin = HMCCosmeticsPlugin.getInstance(); - plugin.getConfig().set("wardrobe.leave-location." + "world", newLocation.getWorld().getName()); - plugin.getConfig().set("wardrobe.leave-location." + "x", newLocation.getX()); - plugin.getConfig().set("wardrobe.leave-location." + "y", newLocation.getY()); - plugin.getConfig().set("wardrobe.leave-location." + "z", newLocation.getZ()); - plugin.getConfig().set("wardrobe.leave-location." + "yaw", newLocation.getYaw()); - plugin.getConfig().set("wardrobe.leave-location." + "pitch", newLocation.getPitch()); + plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".leave-location.world", newLocation.getWorld().getName()); + plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".leave-location.x", newLocation.getX()); + plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".leave-location.y", newLocation.getY()); + plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".leave-location.z", newLocation.getZ()); + plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".leave-location.yaw", newLocation.getYaw()); + plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".leave-location.pitch", newLocation.getPitch()); - HMCCosmeticsPlugin.getInstance().saveConfig(); + plugin.saveConfig(); + } + + public static void setWardrobePermission(Wardrobe wardrobe, String permission) { + wardrobe.setPermission(permission); + + HMCCosmeticsPlugin plugin = HMCCosmeticsPlugin.getInstance(); + + plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".permission", permission); + + plugin.saveConfig(); + } + + public static void setWardrobeDistance(Wardrobe wardrobe, int distance) { + wardrobe.setDistance(distance); + + HMCCosmeticsPlugin plugin = HMCCosmeticsPlugin.getInstance(); + + plugin.getConfig().set("wardrobe.wardrobes." + wardrobe.getId() + ".distance", distance); + + plugin.saveConfig(); } } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java index 51ed9c0d..8572b1b9 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java @@ -105,7 +105,7 @@ public class Menu { for (ConfigurationNode config : config.node("items").childrenMap().values()) { - List slotString = null; + List slotString; try { slotString = config.node("slots").getList(String.class); } catch (SerializationException e) { @@ -126,7 +126,6 @@ public class Menu { ItemStack item; try { item = ItemSerializer.INSTANCE.deserialize(ItemStack.class, config.node("item")); - //item = config.node("item").get(ItemStack.class); } catch (SerializationException e) { throw new RuntimeException(e); } @@ -144,8 +143,8 @@ public class Menu { } for (int slot : slots) { - ItemStack originalItem = updateItem(user, item, type, config, slot).clone(); - GuiItem guiItem = ItemBuilder.from(originalItem).asGuiItem(); + ItemStack modifiedItem = getMenuItem(user, type, config, item.clone(), slot).clone(); + GuiItem guiItem = ItemBuilder.from(modifiedItem).asGuiItem(); Type finalType = type; guiItem.setAction(event -> { @@ -153,11 +152,9 @@ public class Menu { final ClickType clickType = event.getClick(); if (finalType != null) finalType.run(user, config, clickType); // Need to delay the update by a tick so it will actually update with new values - Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> { - for (int guiSlot : slots) { - gui.updateItem(guiSlot, updateItem(user, originalItem, finalType, config, guiSlot)); - } - }, 1); + for (int guiSlot : slots) { + gui.updateItem(guiSlot, getMenuItem(user, finalType, config, item.clone(), guiSlot)); + } MessagesUtil.sendDebugMessages("Updated slot " + slot); }); @@ -196,11 +193,9 @@ public class Menu { @Contract("_, _, _, _ -> param2") @NotNull - private ItemStack updateItem(CosmeticUser user, @NotNull ItemStack itemStack, Type type, ConfigurationNode config, int slot) { - if (itemStack.hasItemMeta()) { - itemStack = type.setItem(user, config, itemStack, slot); - } - return itemStack; + private ItemStack getMenuItem(CosmeticUser user, Type type, ConfigurationNode config, ItemStack itemStack, int slot) { + if (!itemStack.hasItemMeta()) return itemStack; + return type.setItem(user, config, itemStack, slot); } public String getPermissionNode() { diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java index 0e988cb5..f539dfc2 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java @@ -56,6 +56,10 @@ public class Menus { return names; } + public static Collection values() { + return MENUS.values(); + } + public static void setup() { MENUS.clear(); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java index 5722938f..ad170aa5 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java @@ -75,7 +75,7 @@ public class TypeCosmetic extends Type { if (!actionConfig.node("on-equip").virtual()) actionStrings.addAll(actionConfig.node("on-equip").getList(String.class)); MessagesUtil.sendDebugMessages("on-equip"); // TODO: Redo this - if (cosmetic.isDyable()) { + if (cosmetic.isDyable() && Hooks.isActiveHook("HMCColor")) { DyeMenu.openMenu(user, cosmetic); } else { user.addPlayerCosmetic(cosmetic); @@ -99,12 +99,11 @@ public class TypeCosmetic extends Type { @Override public ItemStack setItem(CosmeticUser user, @NotNull ConfigurationNode config, ItemStack itemStack, int slot) { - ItemMeta itemMeta = itemStack.getItemMeta(); - itemStack.setItemMeta(processLoreLines(user, itemMeta)); + itemStack.setItemMeta(processLoreLines(user, itemStack.getItemMeta())); if (config.node("cosmetic").virtual()) { return itemStack; - }; + } String cosmeticName = config.node("cosmetic").getString(); Cosmetic cosmetic = Cosmetics.getCosmetic(cosmeticName); if (cosmetic == null) { @@ -155,12 +154,10 @@ public class TypeCosmetic extends Type { if (itemMeta.hasLore()) { for (String loreLine : itemMeta.getLore()) { - if (Hooks.isActiveHook("PlaceholderAPI")) - loreLine = PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine); + if (Hooks.isActiveHook("PlaceholderAPI")) loreLine = PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine); processedLore.add(loreLine); } } - itemMeta.setLore(processedLore); return itemMeta; } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HMCPlaceholderExpansion.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HMCPlaceholderExpansion.java index 95f065c2..db37c550 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HMCPlaceholderExpansion.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HMCPlaceholderExpansion.java @@ -110,11 +110,15 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion { if (placeholderArgs.get(1) != null) { Cosmetic cosmetic = Cosmetics.getCosmetic(placeholderArgs.get(1)); if (cosmetic == null) { - Cosmetic secondAttemptCosmetic = Cosmetics.getCosmetic(placeholderArgs.get(1) + "_" + placeholderArgs.get(2)); - if (secondAttemptCosmetic == null) { - return "INVALID_COSMETIC"; + if (placeholderArgs.size() >= 3) { + Cosmetic secondAttemptCosmetic = Cosmetics.getCosmetic(placeholderArgs.get(1) + "_" + placeholderArgs.get(2)); + if (secondAttemptCosmetic == null) { + return "INVALID_COSMETIC"; + } else { + cosmetic = secondAttemptCosmetic; + } } else { - cosmetic = secondAttemptCosmetic; + return "INVALID_COSMETIC"; } } return TranslationUtil.getTranslation("unlockedCosmetic", String.valueOf(user.canEquipCosmetic(cosmetic))); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGHook.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGHook.java index 60f4b3ce..027bd5d5 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGHook.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGHook.java @@ -4,6 +4,7 @@ import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import com.sk89q.worldguard.WorldGuard; import com.sk89q.worldguard.protection.flags.Flag; import com.sk89q.worldguard.protection.flags.StateFlag; +import com.sk89q.worldguard.protection.flags.StringFlag; import com.sk89q.worldguard.protection.flags.registry.FlagConflictException; import com.sk89q.worldguard.protection.flags.registry.FlagRegistry; @@ -21,13 +22,13 @@ public class WGHook { /** * @implNote Please use {@link #getCosmeticWardrobeFlag()} instead */ - public static StateFlag COSMETIC_WARDROBE_FLAG; + public static StringFlag COSMETIC_WARDROBE_FLAG; public WGHook() { FlagRegistry registry = WorldGuard.getInstance().getFlagRegistry(); try { StateFlag cosmeticFlag = new StateFlag("cosmetic-enable", false); - StateFlag wardrobeFlag = new StateFlag("cosmetic-wardrobe", false); + StringFlag wardrobeFlag = new StringFlag("cosmetic-wardrobe"); registry.register(cosmeticFlag); registry.register(wardrobeFlag); COSMETIC_ENABLE_FLAG = cosmeticFlag; @@ -56,7 +57,7 @@ public class WGHook { * Gets the cosmetic wardrobe {@link StateFlag} * @return The cosmetic wardrobe {@link StateFlag} */ - public static StateFlag getCosmeticWardrobeFlag() { + public static StringFlag getCosmeticWardrobeFlag() { return COSMETIC_WARDROBE_FLAG; } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java index 5d4bdd7e..ca0228e7 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java @@ -1,7 +1,10 @@ package com.hibiscusmc.hmccosmetics.hooks.worldguard; +import com.hibiscusmc.hmccosmetics.config.Wardrobe; +import com.hibiscusmc.hmccosmetics.config.WardrobeSettings; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.user.CosmeticUsers; +import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldguard.WorldGuard; import com.sk89q.worldguard.protection.ApplicableRegionSet; @@ -34,13 +37,17 @@ public class WGListener implements Listener { } for (ProtectedRegion protectedRegion : set.getRegions()) { if (protectedRegion.getFlags().containsKey(WGHook.getCosmeticEnableFlag())) { - if (protectedRegion.getFlags().get(WGHook.getCosmeticEnableFlag()).toString().equalsIgnoreCase("ALLOW")) return; + if (protectedRegion.getFlags().get(WGHook.getCosmeticEnableFlag()).toString().equalsIgnoreCase("ALLOW")) { + if (user.getHiddenReason() == CosmeticUser.HiddenReason.WORLDGUARD) user.showCosmetics(); + return; + } user.hideCosmetics(CosmeticUser.HiddenReason.WORLDGUARD); return; } if (protectedRegion.getFlags().containsKey(WGHook.getCosmeticWardrobeFlag())) { - if (!protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString().equalsIgnoreCase("ALLOW")) return; - user.enterWardrobe(); + if (!WardrobeSettings.getWardrobeNames().contains(protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString())) return; + Wardrobe wardrobe = WardrobeSettings.getWardrobe(protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString()); + user.enterWardrobe(true, wardrobe); } } } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java index 9a055a30..96a96f6d 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java @@ -5,7 +5,7 @@ import com.google.common.collect.ImmutableList; import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin; import com.hibiscusmc.hmccosmetics.api.*; import com.hibiscusmc.hmccosmetics.config.Settings; -import com.hibiscusmc.hmccosmetics.config.WardrobeLocation; +import com.hibiscusmc.hmccosmetics.config.Wardrobe; import com.hibiscusmc.hmccosmetics.config.WardrobeSettings; import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic; import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot; @@ -31,7 +31,7 @@ import java.util.logging.Level; public class CosmeticUser { - private UUID uniqueId; + private final UUID uniqueId; private int taskId; private HashMap playerCosmetics = new HashMap<>(); private UserWardrobeManager userWardrobeManager; @@ -159,10 +159,7 @@ public class CosmeticUser { public boolean hasCosmeticInSlot(Cosmetic cosmetic) { if (getCosmetic(cosmetic.getSlot()) == null) return false; - if (cosmetic.getId() == getCosmetic(cosmetic.getSlot()).getId()) { - return true; - } - return false; + return Objects.equals(cosmetic.getId(), getCosmetic(cosmetic.getSlot()).getId()); } public Set getSlotsWithCosmetics() { @@ -243,28 +240,28 @@ public class CosmeticUser { return userEmoteManager; } - public void enterWardrobe() { - enterWardrobe(false); - } - - public void enterWardrobe(boolean ignoreDistance) { - enterWardrobe(ignoreDistance, WardrobeSettings.getLocation()); - } - - public void enterWardrobe(boolean ignoreDistance, WardrobeLocation wardrobeLocation) { - if (!WardrobeSettings.inDistanceOfStatic(getPlayer().getLocation()) && !ignoreDistance) { + public void enterWardrobe(boolean ignoreDistance, Wardrobe wardrobe) { + if (wardrobe.hasPermission() && !getPlayer().hasPermission(wardrobe.getPermission())) { + MessagesUtil.sendMessage(getPlayer(), "no-permission"); + return; + } + if (!wardrobe.canEnter(this) && !ignoreDistance) { MessagesUtil.sendMessage(getPlayer(), "not-near-wardrobe"); return; } - PlayerWardrobeEnterEvent event = new PlayerWardrobeEnterEvent(this, wardrobeLocation); + if (!wardrobe.getLocation().hasAllLocations()) { + MessagesUtil.sendMessage(getPlayer(), "wardrobe-not-setup"); + return; + } + PlayerWardrobeEnterEvent event = new PlayerWardrobeEnterEvent(this, wardrobe); Bukkit.getPluginManager().callEvent(event); if (event.isCancelled()) { return; } - wardrobeLocation = event.getWardrobeLocation(); + wardrobe = event.getWardrobe(); if (userWardrobeManager == null) { - userWardrobeManager = new UserWardrobeManager(this, wardrobeLocation); + userWardrobeManager = new UserWardrobeManager(this, wardrobe); userWardrobeManager.start(); } } @@ -299,16 +296,7 @@ public class CosmeticUser { } public boolean isInWardrobe() { - if (userWardrobeManager == null) return false; - return true; - } - - public void toggleWardrobe() { - if (isInWardrobe()) { - leaveWardrobe(); - } else { - enterWardrobe(); - } + return userWardrobeManager != null; } public void spawnBackpack(CosmeticBackpackType cosmeticBackpackType) { @@ -324,8 +312,7 @@ public class CosmeticUser { } public boolean isBackpackSpawned() { - if (this.userBackpackManager == null) return false; - return true; + return this.userBackpackManager != null; } public void spawnBalloon(CosmeticBalloonType cosmeticBalloonType) { @@ -376,7 +363,7 @@ public class CosmeticUser { } public List getDyeableSlots() { - ArrayList dyableSlots = new ArrayList(); + ArrayList dyableSlots = new ArrayList<>(); for (Cosmetic cosmetic : getCosmetics()) { if (cosmetic.isDyable()) dyableSlots.add(cosmetic.getSlot()); @@ -387,8 +374,8 @@ public class CosmeticUser { public boolean canEquipCosmetic(Cosmetic cosmetic) { if (!cosmetic.requiresPermission()) return true; - if (getPlayer().hasPermission(cosmetic.getPermission())) return true; - return false; + if (isInWardrobe() && WardrobeSettings.isTryCosmeticsInWardrobe()) return true; + return getPlayer().hasPermission(cosmetic.getPermission()); } public void hidePlayer() { @@ -410,7 +397,7 @@ public class CosmeticUser { } public void hideCosmetics(HiddenReason reason) { - if (hideCosmetics == true) return; + if (hideCosmetics) return; PlayerCosmeticHideEvent event = new PlayerCosmeticHideEvent(this, reason); Bukkit.getPluginManager().callEvent(event); if (event.isCancelled()) { diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserEmoteModel.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserEmoteModel.java index 403d5055..e7455cf7 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserEmoteModel.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserEmoteModel.java @@ -67,6 +67,11 @@ public class UserEmoteModel extends PlayerModel { MessagesUtil.sendMessage(player, "emote-blocked"); return; } + // Check if block below player is an air block + if (Settings.getEmoteAirCheck() && newLocation.clone().subtract(0, 1, 0).getBlock().getType().isAir()) { + stopAnimation(); + MessagesUtil.sendMessage(player, "emote-blocked"); + } user.getPlayer().setInvisible(true); user.hideCosmetics(CosmeticUser.HiddenReason.EMOTE); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserWardrobeManager.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserWardrobeManager.java index a7168f5f..177b2b3f 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserWardrobeManager.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserWardrobeManager.java @@ -2,6 +2,7 @@ package com.hibiscusmc.hmccosmetics.user.manager; import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin; import com.hibiscusmc.hmccosmetics.config.Settings; +import com.hibiscusmc.hmccosmetics.config.Wardrobe; import com.hibiscusmc.hmccosmetics.config.WardrobeLocation; import com.hibiscusmc.hmccosmetics.config.WardrobeSettings; import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic; @@ -39,6 +40,8 @@ public class UserWardrobeManager { private String npcName; private GameMode originalGamemode; private final CosmeticUser user; + private final Wardrobe wardrobe; + private final WardrobeLocation wardrobeLocation; private final Location viewingLocation; private final Location npcLocation; private Location exitLocation; @@ -46,15 +49,18 @@ public class UserWardrobeManager { private boolean active; private WardrobeStatus wardrobeStatus; - public UserWardrobeManager(CosmeticUser user, WardrobeLocation location) { + public UserWardrobeManager(CosmeticUser user, Wardrobe wardrobe) { NPC_ID = NMSHandlers.getHandler().getNextEntityId(); ARMORSTAND_ID = NMSHandlers.getHandler().getNextEntityId(); WARDROBE_UUID = UUID.randomUUID(); this.user = user; - this.exitLocation = location.getLeaveLocation(); - this.viewingLocation = location.getViewerLocation(); - this.npcLocation = location.getNpcLocation(); + this.wardrobe = wardrobe; + this.wardrobeLocation = wardrobe.getLocation(); + + this.exitLocation = wardrobeLocation.getLeaveLocation(); + this.viewingLocation = wardrobeLocation.getViewerLocation(); + this.npcLocation = wardrobeLocation.getNpcLocation(); wardrobeStatus = WardrobeStatus.SETUP; } @@ -209,9 +215,7 @@ public class UserWardrobeManager { // For Wardrobe Temp Cosmetics for (Cosmetic cosmetic : user.getCosmetics()) { - if (cosmetic.requiresPermission()) { - if (!player.hasPermission(cosmetic.getPermission())) user.removeCosmeticSlot(cosmetic.getSlot()); - } + if (!user.canEquipCosmetic(cosmetic)) user.removeCosmeticSlot(cosmetic.getSlot()); } user.updateCosmetic(); @@ -231,12 +235,12 @@ public class UserWardrobeManager { this.cancel(); return; } - MessagesUtil.sendDebugMessages("WardrobeUpdate[user= " + user.getUniqueId() + ",status=" + getWardrobeStatus() + "]"); + MessagesUtil.sendDebugMessages("WardrobeUpdate[user=" + user.getUniqueId() + ",status=" + getWardrobeStatus() + "]"); List viewer = Collections.singletonList(player); List outsideViewers = PacketManager.getViewers(viewingLocation); outsideViewers.remove(player); - Location location = WardrobeSettings.getLocation().getNpcLocation(); + Location location = npcLocation; int yaw = data.get(); location.setYaw(yaw); @@ -260,8 +264,8 @@ public class UserWardrobeManager { } if (user.hasCosmeticInSlot(CosmeticSlot.BALLOON)) { - PacketManager.sendTeleportPacket(user.getBalloonManager().getPufferfishBalloonId(), WardrobeSettings.getLocation().getNpcLocation().add(Settings.getBalloonOffset()), false, viewer); - user.getBalloonManager().getModelEntity().teleport(WardrobeSettings.getLocation().getNpcLocation().add(Settings.getBalloonOffset())); + PacketManager.sendTeleportPacket(user.getBalloonManager().getPufferfishBalloonId(), npcLocation.add(Settings.getBalloonOffset()), false, viewer); + user.getBalloonManager().getModelEntity().teleport(npcLocation.add(Settings.getBalloonOffset())); user.getBalloonManager().sendRemoveLeashPacket(outsideViewers); PacketManager.sendEntityDestroyPacket(user.getBalloonManager().getModelId(), outsideViewers); user.getBalloonManager().sendLeashPacket(NPC_ID); diff --git a/common/src/main/resources/config.yml b/common/src/main/resources/config.yml index 6739cedf..2ccdabf9 100644 --- a/common/src/main/resources/config.yml +++ b/common/src/main/resources/config.yml @@ -25,6 +25,7 @@ cosmetic-settings: emote-distance: -3 # This shows how far away the camera should be while a player is doing an emote. Negative is behind player. emote-block-check: true # If the server should check if the block is open where the camera is placed (prevents players viewing through blocks) + emote-air-check: true # Check if there is air under a player, if there is, don't play emote emote-damage-leave: true # If the player should leave the emote when they take damage emote-invincible: false # If the player should not take damage while doing an emote @@ -70,6 +71,8 @@ wardrobe: equip-pumpkin: false # Rather than having a set exit location, this will send the player back to where they entered the wardrobe. Not recommended for WG regions return-last-location: false + # If players in wardrobes should be able to equip any cosmetic, regardless of permission (Cosmetics they do not have access to will be removed when they leave the wardrobe) + unchecked-wardrobe-cosmetics: false gamemode-options: exit-gamemode-enabled: false # Setting this to false will set the gamemode the player came in as. True sets to exit-gamemode gamemode @@ -91,24 +94,26 @@ wardrobe: title-fade-in: 1000 # milliseconds title-stay: 500 # milliseconds title-fade-out: 1000 # milliseconds - wardrobe-location: - world: "World" - x: 0 - y: 0 - z: 0 - yaw: 0 - pitch: 0 - viewer-location: - world: "World" - x: 5 - y: 0 - z: 5 - yaw: 0 - pitch: 0 - leave-location: - world: "World" - x: 5 - y: 5 - z: 5 - yaw: 0 - pitch: 0 + wardrobes: + default: + npc-location: + world: "world" + x: 0 + y: 0 + z: 0 + yaw: 0 + pitch: 0 + viewer-location: + world: "world" + x: 5 + y: 0 + z: 5 + yaw: 0 + pitch: 0 + leave-location: + world: "world" + x: 5 + y: 5 + z: 5 + yaw: 0 + pitch: 0 diff --git a/common/src/main/resources/messages.yml b/common/src/main/resources/messages.yml index 53216d1d..32b6b734 100644 --- a/common/src/main/resources/messages.yml +++ b/common/src/main/resources/messages.yml @@ -11,6 +11,10 @@ not-near-wardrobe: "%prefix% You are not near the wardrobe!" set-wardrobe-location: "%prefix% Set new wardrobe location!" set-wardrobe-viewing: "%prefix% Set new wardrobe viewing location!" set-wardrobe-leaving: "%prefix% Set new wardrobe leaving location!" +set-wardrobe-permission: "%prefix% Set new wardrobe permission!" +set-wardrobe-distance: "%prefix% Set new wardrobe distance!" +no-wardrobes: "%prefix% There are no wardrobes with that name!" +wardrobe-not-setup: "%prefix% This wardrobe does not have all required locations set!" equip-cosmetic: "%prefix% You have equipped !" unequip-cosmetic: "%prefix% You have unequipped !"