From 59fbe6b43fb455c546064c554da576f10e364bbe Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 17:31:24 +0200 Subject: Spotless apply for branch mergeDetrav for #2998 (#2999) spotlessApply Co-authored-by: GitHub GTNH Actions <> --- src/main/java/com/detrav/gui/DetravScannerGUI.java | 31 ++++++++-------- src/main/java/com/detrav/gui/OresList.java | 12 +++---- .../com/detrav/gui/textures/DetravMapTexture.java | 42 ++++++++++------------ 3 files changed, 41 insertions(+), 44 deletions(-) (limited to 'src/main/java/com/detrav/gui') diff --git a/src/main/java/com/detrav/gui/DetravScannerGUI.java b/src/main/java/com/detrav/gui/DetravScannerGUI.java index c0a7e7f16f..14f3742c90 100644 --- a/src/main/java/com/detrav/gui/DetravScannerGUI.java +++ b/src/main/java/com/detrav/gui/DetravScannerGUI.java @@ -54,15 +54,15 @@ public class DetravScannerGUI extends GuiScreen { if (oresList == null || (prevW != width || prevH != height)) { oresList = new OresList( - this, - 100, - currentHeight, - aY, - aY + currentHeight, - aX + currentWidth, - 10, - map.packet.ores, - ((name, invert) -> { if (map != null) map.loadTexture(null, name, invert); })); + this, + 100, + currentHeight, + aY, + aY + currentHeight, + aX + currentWidth, + 10, + map.packet.ores, + ((name, invert) -> { if (map != null) map.loadTexture(null, name, invert); })); prevW = width; prevH = height; } @@ -72,7 +72,8 @@ public class DetravScannerGUI extends GuiScreen { map.glBindTexture(); map.draw(aX, aY); oresList.drawScreen(x, y, f); - mc.getTextureManager().bindTexture(back); + mc.getTextureManager() + .bindTexture(back); GL11.glColor4f(0xFF, 0xFF, 0xFF, 0xFF); // draw corners @@ -102,12 +103,12 @@ public class DetravScannerGUI extends GuiScreen { short fluidAmount = fluidInfo[tX][tY].get((byte) 2); if (fluidId != 0 && fluidAmount > 0) { info.add( - StatCollector.translateToLocal("gui.detrav.scanner.tooltip.fluid_name") - + map.packet.metaMap.get(fluidId)); + StatCollector.translateToLocal("gui.detrav.scanner.tooltip.fluid_name") + + map.packet.metaMap.get(fluidId)); info.add( - StatCollector.translateToLocal("gui.detrav.scanner.tooltip.fluid_amount") - + GT_Utility.formatNumbers(fluidAmount) - + " L"); + StatCollector.translateToLocal("gui.detrav.scanner.tooltip.fluid_amount") + + GT_Utility.formatNumbers(fluidAmount) + + " L"); } else info.add(StatCollector.translateToLocal("gui.detrav.scanner.tooltip.no_fluid")); } else { info.add(StatCollector.translateToLocal("gui.detrav.scanner.tooltip.no_fluid")); diff --git a/src/main/java/com/detrav/gui/OresList.java b/src/main/java/com/detrav/gui/OresList.java index 54c2152f5a..cc8f9b1baa 100644 --- a/src/main/java/com/detrav/gui/OresList.java +++ b/src/main/java/com/detrav/gui/OresList.java @@ -22,7 +22,7 @@ class OresList extends GuiScrollingList { private int selected = -1; public OresList(GuiScreen parent, int width, int height, int top, int bottom, int left, int entryHeight, - HashMap aOres, BiConsumer onSelected) { + HashMap aOres, BiConsumer onSelected) { super(parent.mc, width, height, top, bottom, left, entryHeight); this.parent = parent; this.onSelected = onSelected; @@ -57,10 +57,10 @@ class OresList extends GuiScrollingList { @Override protected void drawSlot(int slotIdx, int entryRight, int slotTop, int slotBuffer, Tessellator tess) { parent.drawString( - parent.mc.fontRenderer, - parent.mc.fontRenderer.trimStringToWidth(keys.get(slotIdx), listWidth - 10), - this.left + 3, - slotTop - 1, - ores.getOrDefault(keys.get(slotIdx), 0x7d7b76)); + parent.mc.fontRenderer, + parent.mc.fontRenderer.trimStringToWidth(keys.get(slotIdx), listWidth - 10), + this.left + 3, + slotTop - 1, + ores.getOrDefault(keys.get(slotIdx), 0x7d7b76)); } } diff --git a/src/main/java/com/detrav/gui/textures/DetravMapTexture.java b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java index 01c570d5a1..1659b9bffc 100644 --- a/src/main/java/com/detrav/gui/textures/DetravMapTexture.java +++ b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java @@ -51,14 +51,14 @@ public class DetravMapTexture extends AbstractTexture { } } else if (packet.ptype == 2) { final short fluidId = packet.map[i][j].get((byte) 1), - fluidSize = packet.map[i][j].get((byte) 2); + fluidSize = packet.map[i][j].get((byte) 2); final String name = packet.metaMap.get(fluidId); // Variables used to locate within a chunk. final int k = (i % 16), l = (j % 16); if (((k + l * 16) * 3) < (fluidSize + 48) - && (selected.equals("All") || selected.equals(name))) { + && (selected.equals("All") || selected.equals(name))) { image.setRGB(i, j, packet.ores.getOrDefault(name, Color.BLACK.getRGB()) | 0XFF000000); } } else if (packet.ptype == 3) { @@ -120,29 +120,25 @@ public class DetravMapTexture extends AbstractTexture { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.addVertexWithUV( - (double) (x), - (double) (y + height), - 0, - (double) ((float) (u) * f), - (double) ((float) (v + height) * f1)); + (double) (x), + (double) (y + height), + 0, + (double) ((float) (u) * f), + (double) ((float) (v + height) * f1)); tessellator.addVertexWithUV( - (double) (x + width), - (double) (y + height), - 0, - (double) ((float) (u + width) * f), - (double) ((float) (v + height) * f1)); + (double) (x + width), + (double) (y + height), + 0, + (double) ((float) (u + width) * f), + (double) ((float) (v + height) * f1)); tessellator.addVertexWithUV( - (double) (x + width), - (double) (y), - 0, - (double) ((float) (u + width) * f), - (double) ((float) (v) * f1)); - tessellator.addVertexWithUV( - (double) (x), - (double) (y), - 0, - (double) ((float) (u) * f), - (double) ((float) (v) * f1)); + (double) (x + width), + (double) (y), + 0, + (double) ((float) (u + width) * f), + (double) ((float) (v) * f1)); + tessellator + .addVertexWithUV((double) (x), (double) (y), 0, (double) ((float) (u) * f), (double) ((float) (v) * f1)); tessellator.draw(); } -- cgit