diff --git a/build.gradle.kts b/build.gradle.kts index cdecaa9..6d7976e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -56,7 +56,7 @@ repositories { dependencies { compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT") - compileOnly("com.github.World1-6.World1-6Utils:World1-6Utils-Plugin:634da50bcc") + compileOnly("com.github.World1-6.World1-6Utils:World1-6Utils-Plugin:965d4bcdcb") compileOnly("org.geysermc.floodgate:api:2.2.3-SNAPSHOT") } diff --git a/src/main/java/com/andrew121410/mc/world16elevators/commands/ElevatorCMD.java b/src/main/java/com/andrew121410/mc/world16elevators/commands/ElevatorCMD.java index 35c2ef7..a13198e 100644 --- a/src/main/java/com/andrew121410/mc/world16elevators/commands/ElevatorCMD.java +++ b/src/main/java/com/andrew121410/mc/world16elevators/commands/ElevatorCMD.java @@ -518,30 +518,56 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String return true; } + String value = eleArgs.getOtherArgumentsAt(1); if (setting.equalsIgnoreCase("ticksPerSecond")) { - long valueLong = Utils.asLongOrElse(eleArgs.getOtherArgumentsAt(1), ElevatorSettings.DEFAULT_TICKS_PER_SECOND); + player.sendMessage(Translate.miniMessage("The default ticks per second is: " + ElevatorSettings.DEFAULT_TICKS_PER_SECOND)); + Long valueLong = Utils.asLongOrElse(value, null); + if (valueLong == null) { + player.sendMessage(Translate.miniMessage("The current ticks per second is: " + elevator.getElevatorSettings().getTicksPerSecond())); + return true; + } elevator.getElevatorSettings().setTicksPerSecond(valueLong); - player.sendMessage(Translate.chat("The ticks per second has been updated to: " + valueLong)); + player.sendMessage(Translate.miniMessage("The ticks per second has been updated to: " + valueLong)); return true; } else if (setting.equalsIgnoreCase("doorHolderTicksPerSecond")) { - long valueLong = Utils.asLongOrElse(eleArgs.getOtherArgumentsAt(1), ElevatorSettings.DEFAULT_DOOR_HOLDER_TICKS_PER_SECOND); + player.sendMessage(Translate.miniMessage("The default door holder ticks per second is: " + ElevatorSettings.DEFAULT_DOOR_HOLDER_TICKS_PER_SECOND)); + Long valueLong = Utils.asLongOrElse(value, null); + if (valueLong == null) { + player.sendMessage(Translate.miniMessage("The current door holder ticks per second is: " + elevator.getElevatorSettings().getDoorHolderTicksPerSecond())); + return true; + } elevator.getElevatorSettings().setDoorHolderTicksPerSecond(valueLong); - player.sendMessage(Translate.chat("The door holder ticks per second has been updated to: " + valueLong)); + player.sendMessage(Translate.miniMessage("The door holder ticks per second has been updated to: " + valueLong)); return true; } else if (setting.equalsIgnoreCase("elevatorWaiterTicksPerSecond")) { - long valueLong = Utils.asLongOrElse(eleArgs.getOtherArgumentsAt(1), ElevatorSettings.DEFAULT_ELEVATOR_WAITER_TICKS_PER_SECOND); + player.sendMessage(Translate.miniMessage("The default elevator waiter ticks per second is: " + ElevatorSettings.DEFAULT_ELEVATOR_WAITER_TICKS_PER_SECOND)); + Long valueLong = Utils.asLongOrElse(value, null); + if (valueLong == null) { + player.sendMessage(Translate.miniMessage("The current elevator waiter ticks per second is: " + elevator.getElevatorSettings().getElevatorWaiterTicksPerSecond())); + return true; + } elevator.getElevatorSettings().setElevatorWaiterTicksPerSecond(valueLong); - player.sendMessage(Translate.chat("The elevator waiter ticks per second has been updated to: " + valueLong)); + player.sendMessage(Translate.miniMessage("The elevator waiter ticks per second has been updated to: " + valueLong)); return true; } else if (setting.equalsIgnoreCase("doElevatorLeveling")) { - boolean bool = Utils.asBooleanOrElse(eleArgs.getOtherArgumentsAt(1), true); + player.sendMessage(Translate.miniMessage("The default do elevator leveling is: true")); + Boolean bool = Utils.asBooleanOrElse(value, null); + if (bool == null) { + player.sendMessage(Translate.miniMessage("The current do elevator leveling is: " + elevator.getElevatorSettings().isDoElevatorLeveling())); + return true; + } elevator.getElevatorSettings().setDoElevatorLeveling(bool); - player.sendMessage(Translate.chat("The doLevelingSystem has been set to: " + bool)); + player.sendMessage(Translate.miniMessage("The do elevator leveling has been updated to: " + bool)); return true; } else if (setting.equalsIgnoreCase("onlyTwoFloors")) { - boolean bool = Utils.asBooleanOrElse(eleArgs.getOtherArgumentsAt(1), false); + player.sendMessage(Translate.miniMessage("The default only two floors is: false")); + Boolean bool = Utils.asBooleanOrElse(value, null); + if (bool == null) { + player.sendMessage(Translate.miniMessage("The current only two floors is: " + elevator.getElevatorSettings().isOnlyTwoFloors())); + return true; + } elevator.getElevatorSettings().setOnlyTwoFloors(bool); - player.sendMessage(Translate.chat("onlyTwoFloors has been set to: " + bool)); + player.sendMessage(Translate.miniMessage("The only two floors has been updated to: " + bool)); return true; } else if (setting.equalsIgnoreCase("arrivalSound") || setting.equalsIgnoreCase("passingByFloorSound")) { if (args.length == 7) { @@ -549,69 +575,77 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String String fakeVolume = eleArgs.getOtherArgumentsAt(2); String fakePitch = eleArgs.getOtherArgumentsAt(3); if (fakeSound == null || fakeVolume == null || fakePitch == null) { - player.sendMessage(Translate.chat("sound is null, or volume is null, or pitch is null.")); + player.sendMessage(Translate.miniMessage("Invalid sound, volume, or pitch.")); return true; } Sound sound = Sound.valueOf(fakeSound); float volume = Utils.asFloatOrElse(fakeVolume, 99.1F); float pitch = Utils.asFloatOrElse(fakePitch, 99.1F); - - if (volume == 91.1F || pitch == 91.1F) { - player.sendMessage(Translate.chat("Volume or pitch is messed up.")); + if (volume == 99.1F || pitch == 99.1F) { + player.sendMessage(Translate.miniMessage("Invalid volume or pitch.")); return true; } ElevatorSound elevatorSound = new ElevatorSound(sound, volume, pitch); if (setting.equalsIgnoreCase("arrivalSound")) { elevator.getElevatorSettings().setArrivalSound(elevatorSound); - player.sendMessage("Sound was set to: " + elevatorSound); - } else if (setting.equalsIgnoreCase("passingByFloorSound")) { + player.sendMessage(Translate.miniMessage("The arrival sound has been updated.")); + } else { elevator.getElevatorSettings().setPassingByFloorSound(elevatorSound); - player.sendMessage("Sound was set to: " + elevatorSound); + player.sendMessage(Translate.miniMessage("The passing by floor sound has been updated.")); } - return true; } else if (args.length == 4) { if (setting.equalsIgnoreCase("arrivalSound")) { - elevator.getElevatorSettings().setArrivalSound(null); - player.sendMessage(Translate.chat("Removed arrival sound.")); + player.sendMessage(Translate.miniMessage("The current arrival sound is: " + elevator.getElevatorSettings().getArrivalSound())); } else { - elevator.getElevatorSettings().setPassingByFloorSound(null); - player.sendMessage(Translate.chat("Removed passing by floor sound.")); + player.sendMessage(Translate.miniMessage("The current passing by floor sound is: " + elevator.getElevatorSettings().getPassingByFloorSound())); } return true; } return true; } else if (setting.equalsIgnoreCase("floorSelectorType")) { + player.sendMessage(Translate.miniMessage("The default floor selector type is: " + ElevatorFloorSelectorType.CLICK_CHAT)); ElevatorFloorSelectorType elevatorFloorSelectorType; try { - elevatorFloorSelectorType = ElevatorFloorSelectorType.valueOf(eleArgs.getOtherArgumentsAt(1)); + elevatorFloorSelectorType = ElevatorFloorSelectorType.valueOf(value); } catch (Exception ignored) { - player.sendMessage(Translate.color("&cThat's not a valid ElevatorFloorSelectorType")); + player.sendMessage(Translate.miniMessage("That's not a valid ElevatorFloorSelectorType.")); return true; } elevator.getElevatorSettings().setFloorSelectorType(elevatorFloorSelectorType); - player.sendMessage(Translate.color("floorSelectorType has been set to " + elevatorFloorSelectorType.name())); + player.sendMessage(Translate.miniMessage("The floor selector type has been updated to: " + elevatorFloorSelectorType.name())); return true; } else if (setting.equalsIgnoreCase("callButtonType")) { + player.sendMessage(Translate.miniMessage("The default call button type is: " + ElevatorCallButtonType.CALL_THE_ELEVATOR)); ElevatorCallButtonType elevatorCallButtonType; try { - elevatorCallButtonType = ElevatorCallButtonType.valueOf(eleArgs.getOtherArgumentsAt(1)); + elevatorCallButtonType = ElevatorCallButtonType.valueOf(value); } catch (Exception ignored) { - player.sendMessage(Translate.color("&cThat's not a valid ElevatorCallButtonType")); + player.sendMessage(Translate.miniMessage("That's not a valid ElevatorCallButtonType.")); return true; } elevator.getElevatorSettings().setCallButtonType(elevatorCallButtonType); - player.sendMessage(Translate.color("callButtonType has been set to " + elevatorCallButtonType.name())); + player.sendMessage(Translate.miniMessage("The call button type has been updated to: " + elevatorCallButtonType.name())); return true; } else if (setting.equalsIgnoreCase("signFinderSystem")) { - boolean bool = Utils.asBooleanOrElse(eleArgs.getOtherArgumentsAt(1), true); + player.sendMessage(Translate.miniMessage("The default sign finder system is: true")); + Boolean bool = Utils.asBooleanOrElse(value, null); + if (bool == null) { + player.sendMessage(Translate.miniMessage("The current sign finder system is: " + elevator.getElevatorSettings().isSignFinderSystem())); + return true; + } elevator.getElevatorSettings().setSignFinderSystem(bool); - player.sendMessage(Translate.chat("The signFinderSystem has been set to: " + bool)); + player.sendMessage(Translate.miniMessage("The sign finder system has been updated to: " + bool)); return true; } else if (setting.equalsIgnoreCase("teleportElevatorOnEmpty")) { - boolean bool = Utils.asBooleanOrElse(eleArgs.getOtherArgumentsAt(1), false); + player.sendMessage(Translate.miniMessage("The default teleport elevator on empty is: false")); + Boolean bool = Utils.asBooleanOrElse(value, null); + if (bool == null) { + player.sendMessage(Translate.miniMessage("The current teleport elevator on empty is: " + elevator.getElevatorSettings().isTeleportElevatorOnEmpty())); + return true; + } elevator.getElevatorSettings().setTeleportElevatorOnEmpty(bool); - player.sendMessage(Translate.chat("The teleportElevatorOnEmpty has been set to: " + bool)); + player.sendMessage(Translate.miniMessage("The teleport elevator on empty has been updated to: " + bool)); return true; } return true;