From 1efc40508a99accee0ec3f5cb3e8492a7b61d20c Mon Sep 17 00:00:00 2001 From: vicisacat Date: Tue, 19 Mar 2024 08:45:49 +0100 Subject: reformat whole file to the rescue! --- .../skyblock/item/SkyblockCraftingTableScreen.java | 6 +++--- .../skyblock/item/SkyblockCraftingTableScreenHandler.java | 13 +++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src/main') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreen.java index 13c04e8b..95cbbf4a 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreen.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreen.java @@ -51,7 +51,7 @@ public class SkyblockCraftingTableScreen extends HandledScreen this.onMouseClick(handler.slots.get(26), handler.slots.get(26).id, 0, SlotActionType.PICKUP)); @@ -100,7 +100,7 @@ public class SkyblockCraftingTableScreen extends HandledScreen= (double)(left + this.backgroundWidth) || mouseY >= (double)(top + this.backgroundHeight); + boolean bl = mouseX < (double) left || mouseY < (double) top || mouseX >= (double) (left + this.backgroundWidth) || mouseY >= (double) (top + this.backgroundHeight); return this.recipeBook.isClickOutsideBounds(mouseX, mouseY, this.x, this.y, this.backgroundWidth, this.backgroundHeight, button) && bl; } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreenHandler.java b/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreenHandler.java index 1d66c661..04974ade 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreenHandler.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/item/SkyblockCraftingTableScreenHandler.java @@ -15,9 +15,10 @@ public class SkyblockCraftingTableScreenHandler extends GenericContainerScreenHa 19, 20, 21, 23, 25, 28, 29, 30, 34 }; + public SkyblockCraftingTableScreenHandler(ScreenHandlerType type, int syncId, PlayerInventory playerInventory, Inventory inventory, int rows) { super(type, syncId, playerInventory, inventory, rows); - for (int i = 0; i < rows*9; i++) { + for (int i = 0; i < rows * 9; i++) { Slot originalSlot = slots.get(i); if (Arrays.binarySearch(normalSlots, i) >= 0) { int[] coords = getCoords(i); @@ -31,7 +32,7 @@ public class SkyblockCraftingTableScreenHandler extends GenericContainerScreenHa } } int yOffset = (rows - 4) * 18 + 19; - for (int i = rows*9; i < slots.size(); i++) { + for (int i = rows * 9; i < slots.size(); i++) { Slot originalSlot = slots.get(i); Slot slot = new Slot(originalSlot.inventory, originalSlot.getIndex(), originalSlot.x, originalSlot.y - yOffset); slot.id = i; @@ -46,12 +47,12 @@ public class SkyblockCraftingTableScreenHandler extends GenericContainerScreenHa private int[] getCoords(int slot) { if (slot == 23) return new int[]{124, 35}; if (slot == 16 || slot == 25 || slot == 34) { - int y = (slot/9 - 1) * 18 + 8; + int y = (slot / 9 - 1) * 18 + 8; return new int[]{174, y}; } - int gridX = slot%9 - 1; - int gridY = slot/9 - 1; - return new int[]{30 + gridX*18, 17+gridY*18}; + int gridX = slot % 9 - 1; + int gridY = slot / 9 - 1; + return new int[]{30 + gridX * 18, 17 + gridY * 18}; } public static class DisabledSlot extends Slot { -- cgit