From e67506f885fa73ccd33616f90bb6a1b8649fc41d Mon Sep 17 00:00:00 2001 From: Jakubk15 <77227023+Jakubk15@users.noreply.github.com> Date: Sun, 7 Jul 2024 15:34:48 +0200 Subject: [PATCH] Adjust codestyle --- .../database/AbstractDatabaseService.java | 6 ++++-- .../implementation/locker/ParcelSendingGUI.java | 9 ++++++--- .../gui/implementation/remote/ParcelListGUI.java | 6 ++++-- .../gui/implementation/remote/SentParcelsGUI.java | 3 ++- .../locker/controller/LockerPlaceController.java | 4 ++-- .../parcellockers/shared/Position.java | 6 +++--- .../eternalcode/parcellockers/util/ItemUtil.java | 15 ++++++++++----- 7 files changed, 31 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/eternalcode/parcellockers/database/AbstractDatabaseService.java b/src/main/java/com/eternalcode/parcellockers/database/AbstractDatabaseService.java index 578d80a4..d36c5b0a 100644 --- a/src/main/java/com/eternalcode/parcellockers/database/AbstractDatabaseService.java +++ b/src/main/java/com/eternalcode/parcellockers/database/AbstractDatabaseService.java @@ -47,7 +47,8 @@ protected CompletableFuture supplyExecute(String sql, ThrowingFunction T executeSync(String sql, ThrowingFunction storageGUI.show(player, this.size)); - } else if (slotsSize <= 18 && this.size == ParcelSize.SMALL) { + } + else if (slotsSize <= 18 && this.size == ParcelSize.SMALL) { this.scheduler.runTask(this.plugin, () -> storageGUI.show(player, ParcelSize.MEDIUM)); - } else { + } + else { this.scheduler.runTask(this.plugin, () -> storageGUI.show(player, ParcelSize.LARGE)); } - } else { + } + else { this.scheduler.runTask(this.plugin, () -> storageGUI.show(player, this.size)); } }) diff --git a/src/main/java/com/eternalcode/parcellockers/gui/implementation/remote/ParcelListGUI.java b/src/main/java/com/eternalcode/parcellockers/gui/implementation/remote/ParcelListGUI.java index 7e94e4c8..79ba3da9 100644 --- a/src/main/java/com/eternalcode/parcellockers/gui/implementation/remote/ParcelListGUI.java +++ b/src/main/java/com/eternalcode/parcellockers/gui/implementation/remote/ParcelListGUI.java @@ -125,7 +125,8 @@ private void show(Player player, Page page) { Sentry.captureException(throwable); throwable.printStackTrace(); } - }); + } + ); } @@ -160,7 +161,8 @@ private List replaceParcelPlaceholders(Parcel parcel, List lore) formatter.register("{POSITION_X}", locker.position().x()) .register("{POSITION_Y}", locker.position().y()) .register("{POSITION_Z}", locker.position().z()); - } else { + } + else { formatter.register("{POSITION_X}", "-") .register("{POSITION_Y}", "-") .register("{POSITION_Z}", "-"); diff --git a/src/main/java/com/eternalcode/parcellockers/gui/implementation/remote/SentParcelsGUI.java b/src/main/java/com/eternalcode/parcellockers/gui/implementation/remote/SentParcelsGUI.java index 1c192a9b..e37ee9ff 100644 --- a/src/main/java/com/eternalcode/parcellockers/gui/implementation/remote/SentParcelsGUI.java +++ b/src/main/java/com/eternalcode/parcellockers/gui/implementation/remote/SentParcelsGUI.java @@ -125,7 +125,8 @@ private List replaceParcelPlaceholders(Parcel parcel, List lore) formatter.register("{POSITION_X}", locker.position().x()) .register("{POSITION_Y}", locker.position().y()) .register("{POSITION_Z}", locker.position().z()); - } else { + } + else { formatter.register("{POSITION_X}", "-") .register("{POSITION_Y}", "-") .register("{POSITION_Z}", "-"); diff --git a/src/main/java/com/eternalcode/parcellockers/locker/controller/LockerPlaceController.java b/src/main/java/com/eternalcode/parcellockers/locker/controller/LockerPlaceController.java index 6af220d0..c4b1ecf8 100644 --- a/src/main/java/com/eternalcode/parcellockers/locker/controller/LockerPlaceController.java +++ b/src/main/java/com/eternalcode/parcellockers/locker/controller/LockerPlaceController.java @@ -93,7 +93,8 @@ public void onBlockPlace(BlockPlaceEvent event) { } this.announcer.sendMessage(player, this.config.messages.parcelLockerSuccessfullyCreated); }); - } else { + } + else { event.setCancelled(true); } this.lockerCreators.remove(player.getUniqueId()); @@ -106,5 +107,4 @@ public void onBlockPlace(BlockPlaceEvent event) { player.beginConversation(conversationFactory.buildConversation(player)); } - } diff --git a/src/main/java/com/eternalcode/parcellockers/shared/Position.java b/src/main/java/com/eternalcode/parcellockers/shared/Position.java index ecb34eac..3a3792b3 100644 --- a/src/main/java/com/eternalcode/parcellockers/shared/Position.java +++ b/src/main/java/com/eternalcode/parcellockers/shared/Position.java @@ -32,9 +32,9 @@ public static Position parse(String parse) { /** * Returns the distance between two positions. * - * @param a - * @param b - * @return the distance between two positions + * @param a the first position + * @param b the second position + * @return the distance between two positions */ public static int distance(Position a, Position b) { diff --git a/src/main/java/com/eternalcode/parcellockers/util/ItemUtil.java b/src/main/java/com/eternalcode/parcellockers/util/ItemUtil.java index e0156d25..7a704b79 100644 --- a/src/main/java/com/eternalcode/parcellockers/util/ItemUtil.java +++ b/src/main/java/com/eternalcode/parcellockers/util/ItemUtil.java @@ -39,7 +39,8 @@ private ItemUtil() { public static String serialize(ItemStack stack) { try { return JSON.writeValueAsString(stack); - } catch (JsonProcessingException e) { + } + catch (JsonProcessingException e) { Sentry.captureException(e); throw new ParcelLockersException("Failed to serialize itemstack", e); } @@ -48,7 +49,8 @@ public static String serialize(ItemStack stack) { public static String serializeItems(List stack) { try { return JSON.writeValueAsString(stack); - } catch (JsonProcessingException e) { + } + catch (JsonProcessingException e) { Sentry.captureException(e); throw new ParcelLockersException("Failed to serialize itemstack", e); } @@ -57,7 +59,8 @@ public static String serializeItems(List stack) { public static ItemStack deserialize(String string) { try { return JSON.readValue(string, ItemStack.class); - } catch (JsonProcessingException e) { + } + catch (JsonProcessingException e) { Sentry.captureException(e); throw new ParcelLockersException("Failed to deserialize itemstack", e); } @@ -66,7 +69,8 @@ public static ItemStack deserialize(String string) { public static List deserializeItems(String string) { try { return JSON.readValue(string, JSON.getTypeFactory().constructCollectionType(List.class, ItemStack.class)); - } catch (JsonProcessingException e) { + } + catch (JsonProcessingException e) { Sentry.captureException(e); throw new ParcelLockersException("Failed to deserialize itemstack", e); } @@ -103,7 +107,8 @@ public static List replaceParcelPlaceholders(Parcel parcel, List formatter.register("{POSITION_X}", locker.position().x()) .register("{POSITION_Y}", locker.position().y()) .register("{POSITION_Z}", locker.position().z()); - } else { + } + else { formatter.register("{POSITION_X}", "-") .register("{POSITION_Y}", "-") .register("{POSITION_Z}", "-");