Skip to content
This repository was archived by the owner on Mar 19, 2025. It is now read-only.

Commit 235f5f5

Browse files
committed
style: sonarcloud changes
1 parent 0ca1451 commit 235f5f5

2 files changed

Lines changed: 14 additions & 24 deletions

File tree

src/main/java/net/guizhanss/villagertrade/implementation/menu/TradeMenu.java

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,7 @@ private void setupMenu() {
178178
TradeMenuTask.addPlayer(player.getUniqueId(), this);
179179
SoundUtils.playOpenMenuSound(player);
180180
});
181-
menu.addMenuCloseHandler(player -> {
182-
TradeMenuTask.removePlayer(player.getUniqueId());
183-
});
181+
menu.addMenuCloseHandler(player -> TradeMenuTask.removePlayer(player.getUniqueId()));
184182

185183
// back button
186184
menu.addItem(BACK_SLOT, getBackButton(player), (player, slot, item, action) -> {
@@ -201,13 +199,11 @@ private void setupMenu() {
201199

202200
// trader types
203201
menu.addItem(TRADER_TYPES_SLOT, getTraderTypesButton(), (player, slot, item, action) -> {
204-
TraderTypesMenu.open(player, traderTypes, (newTraderTypes) -> {
202+
TraderTypesMenu.open(player, traderTypes, newTraderTypes -> {
205203
traderTypes = newTraderTypes;
206204
menu.replaceExistingItem(TRADER_TYPES_SLOT, getTraderTypesButton());
207205
openMenu();
208-
}, () -> {
209-
openMenu();
210-
});
206+
}, this::openMenu);
211207
return false;
212208
});
213209

@@ -220,7 +216,7 @@ private void setupMenu() {
220216
Keys.TRADES_MAX_USES,
221217
String.valueOf(maxUses),
222218
Validators::isPositiveInteger,
223-
(input) -> {
219+
input -> {
224220
openMenu();
225221
if (input.isPresent()) {
226222
maxUses = Integer.parseInt(input.get());
@@ -252,7 +248,7 @@ private void setupMenu() {
252248
Keys.TRADES_EXP_VILLAGER,
253249
String.valueOf(expVillager),
254250
Validators::isInteger,
255-
(input) -> {
251+
input -> {
256252
openMenu();
257253
if (input.isPresent()) {
258254
expVillager = Integer.parseInt(input.get());
@@ -273,7 +269,7 @@ private void setupMenu() {
273269
Keys.TRADES_PRICE_MULTIPLIER,
274270
String.valueOf(priceMultiplier),
275271
Validators::isDouble,
276-
(input) -> {
272+
input -> {
277273
openMenu();
278274
if (input.isPresent()) {
279275
priceMultiplier = Float.parseFloat(input.get());
@@ -314,7 +310,7 @@ private void setupMenu() {
314310
}
315311
return false;
316312
});
317-
tickingHandlers.put(SAVE_SLOT, (slot) -> {
313+
tickingHandlers.put(SAVE_SLOT, slot -> {
318314
// TODO improve performance
319315
menu.replaceExistingItem(SAVE_SLOT, getSaveButton(getInvalidReason()));
320316
});
@@ -347,7 +343,7 @@ private void addTradeItemSlots(int infoSlot, int itemSlot, int amountSlot,
347343
// add 3 items: info, item, amount
348344
menu.addItem(infoSlot, getItemInfoButton(infoMaterial, key, tradeItem), ChestMenuUtils.getEmptyClickHandler());
349345
menu.addItem(itemSlot, tradeItem.getItem());
350-
tickingHandlers.put(itemSlot, (slot) -> {
346+
tickingHandlers.put(itemSlot, slot -> {
351347
ItemStack item = menu.getItemInSlot(slot);
352348
// we don't want to update the menu if the item is the same
353349
if (tradeItem.isItem(item)) {
@@ -408,7 +404,7 @@ private void inputAmount(MutableTradeItem tradeItem, Consumer<Optional<Integer>>
408404
msg -> msg.replace("%itemInfo%", tradeItem.toShortString(false))
409405
.replace("%itemAmount%", String.valueOf(tradeItem.getAmount()))
410406
);
411-
MenuUtils.awaitInput(player, (playerInput) -> {
407+
MenuUtils.awaitInput(player, playerInput -> {
412408
if (playerInput.equalsIgnoreCase(Strings.CANCEL)) {
413409
callback.accept(Optional.empty());
414410
return;
@@ -429,9 +425,9 @@ private void inputNumber(String key, String value, Predicate<String> validator,
429425
Consumer<Optional<String>> callback) {
430426
player.closeInventory();
431427
VillagerTrade.getLocalization().sendKeyedMessage(player, LANG_MENU + key + ".input",
432-
msg -> msg.replace("%value%", value)
428+
msg -> msg.replace(VALUE, value)
433429
);
434-
MenuUtils.awaitInput(player, (playerInput) -> {
430+
MenuUtils.awaitInput(player, playerInput -> {
435431
if (playerInput.equalsIgnoreCase(Strings.CANCEL)) {
436432
callback.accept(Optional.empty());
437433
return;
@@ -577,9 +573,7 @@ private ItemStack getRemoveButton() {
577573
@ParametersAreNonnullByDefault
578574
private boolean removeHandler(Player player, int slot, ItemStack item, ClickAction action) {
579575
player.closeInventory();
580-
RemoveCommand.awaitRemoval(player, originalConfig, () -> {
581-
new TradeListMenu(player);
582-
});
576+
RemoveCommand.awaitRemoval(player, originalConfig, () -> new TradeListMenu(player));
583577
return false;
584578
}
585579

src/main/java/net/guizhanss/villagertrade/implementation/menu/TraderTypesMenu.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,8 @@ private void setupMenu() {
104104
menu.setEmptySlotsClickable(false);
105105
menu.setPlayerInventoryClickable(false);
106106

107-
menu.addMenuOpeningHandler(player -> {
108-
SoundUtils.playOpenMenuSound(player);
109-
});
110-
menu.addMenuCloseHandler(player -> {
111-
cancelCallback.run();
112-
});
107+
menu.addMenuOpeningHandler(SoundUtils::playOpenMenuSound);
108+
menu.addMenuCloseHandler(player -> cancelCallback.run());
113109

114110
// wandering trader
115111
menu.addItem(0, getTraderItem(Heads.WANDERING_TRADER, "wandering_trader", wanderingTrader),

0 commit comments

Comments
 (0)