aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/xmrvizzy/skyblocker/skyblock
diff options
context:
space:
mode:
authormsg-programs <msgdoesstuff@gmail.com>2023-09-09 11:08:48 +0200
committermsg-programs <msgdoesstuff@gmail.com>2023-09-09 11:08:48 +0200
commit236454a49d54054c0719c4f14055ec718869dc4f (patch)
tree73435898788d1f654f900e27260961787518a38c /src/main/java/me/xmrvizzy/skyblocker/skyblock
parent6ca63aa2a9da8ef23f093f35d2569ad8605f59ab (diff)
downloadSkyblocker-236454a49d54054c0719c4f14055ec718869dc4f.tar.gz
Skyblocker-236454a49d54054c0719c4f14055ec718869dc4f.tar.bz2
Skyblocker-236454a49d54054c0719c4f14055ec718869dc4f.zip
Remove whitespace on empty lines
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/item/AttributeShards.java12
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomItemNames.java4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java8
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java6
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/SearchResultsWidget.java8
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandOwnersWidget.java2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java2
8 files changed, 22 insertions, 22 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/AttributeShards.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/AttributeShards.java
index 0f106cdf..8f71e7b9 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/AttributeShards.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/AttributeShards.java
@@ -4,7 +4,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
public class AttributeShards {
private static final Object2ObjectOpenHashMap<String, String> ID_2_SHORT_NAME = new Object2ObjectOpenHashMap<>();
-
+
static {
//Weapons
ID_2_SHORT_NAME.put("arachno", "A");
@@ -18,11 +18,11 @@ public class AttributeShards {
ID_2_SHORT_NAME.put("mana_steal", "MS");
ID_2_SHORT_NAME.put("midas_touch", "MT");
ID_2_SHORT_NAME.put("undead", "U");
-
+
//Swords & Bows
ID_2_SHORT_NAME.put("warrior", "W");
ID_2_SHORT_NAME.put("deadeye", "DE");
-
+
//Armor or Equipment
ID_2_SHORT_NAME.put("arachno_resistance", "AR");
ID_2_SHORT_NAME.put("blazing_resistance", "BR");
@@ -40,7 +40,7 @@ public class AttributeShards {
ID_2_SHORT_NAME.put("speed", "S");
ID_2_SHORT_NAME.put("undead_resistance", "UR");
ID_2_SHORT_NAME.put("veteran", "V");
-
+
//Fishing Gear
ID_2_SHORT_NAME.put("blazing_fortune", "BF");
ID_2_SHORT_NAME.put("fishing_experience", "FE");
@@ -50,9 +50,9 @@ public class AttributeShards {
ID_2_SHORT_NAME.put("fishing_speed", "FS");
ID_2_SHORT_NAME.put("hunter", "H");
ID_2_SHORT_NAME.put("trophy_hunter", "TH");
-
+
}
-
+
public static String getShortName(String id) {
return ID_2_SHORT_NAME.getOrDefault(id, "");
}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomItemNames.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomItemNames.java
index c744144a..8c160456 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomItemNames.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomItemNames.java
@@ -53,11 +53,11 @@ public class CustomItemNames {
}
} else {
//If the text is provided then set the item's custom name to it
-
+
//Set italic to false if it hasn't been changed (or was already false)
Style currentStyle = text.getStyle();
((MutableText) text).setStyle(currentStyle.withItalic((currentStyle.isItalic() ? true : false)));
-
+
customItemNames.put(itemUuid, text);
SkyblockerConfig.save();
source.sendFeedback(Text.translatable("skyblocker.customItemNames.added"));
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
index dc2a89f8..53d603eb 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
@@ -64,7 +64,7 @@ public class PriceInfoTooltip {
.append(getCoinsMessage(npcPricesJson.get(name).getAsDouble(), count)));
}
}
-
+
if (SkyblockerConfig.get().general.itemTooltip.enableMotesPrice && Utils.isInTheRift()) {
if(motesPricesJson == null) {
nullWarning();
@@ -191,7 +191,7 @@ public class PriceInfoTooltip {
}
}
}
-
+
private static void nullWarning() {
if (!nullMsgSend && client.player != null) {
client.player.sendMessage(Text.translatable("skyblocker.itemTooltip.nullMessage"), false);
@@ -301,7 +301,7 @@ public class PriceInfoTooltip {
return priceTextTotal.append(priceTextEach);
}
}
-
+
private static Text getMotesMessage(int price, int count) {
float motesMultiplier = SkyblockerConfig.get().locations.rift.mcGrubberStacks * 0.05f + 1;
if (count == 1) {
@@ -355,7 +355,7 @@ public class PriceInfoTooltip {
if (SkyblockerConfig.get().general.itemTooltip.enableMuseumDate && isMuseumJson == null)
futureList.add(CompletableFuture.runAsync(() -> isMuseumJson = downloadPrices("museum")));
-
+
if (SkyblockerConfig.get().general.itemTooltip.enableMotesPrice && motesPricesJson == null)
futureList.add(CompletableFuture.runAsync(() -> motesPricesJson = downloadPrices("motes")));
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java
index 12636ce1..915f91bc 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java
@@ -55,17 +55,17 @@ public class ResultButtonWidget extends ClickableWidget {
MinecraftClient client = MinecraftClient.getInstance();
List<Text> tooltip = Screen.getTooltipFromItem(client, this.itemStack);
List<OrderedText> orderedTooltip = new ArrayList<>();
-
+
for(int i = 0; i < tooltip.size(); i++) {
orderedTooltip.add(tooltip.get(i).asOrderedText());
}
-
+
client.currentScreen.setTooltip(orderedTooltip);
}
@Override
protected void appendClickableNarrations(NarrationMessageBuilder builder) {
// TODO Auto-generated method stub
-
+
}
}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/SearchResultsWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/SearchResultsWidget.java
index 7f628a19..feb7f30b 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/SearchResultsWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/SearchResultsWidget.java
@@ -126,7 +126,7 @@ public class SearchResultsWidget implements Drawable {
craftText = textRenderer.trimToWidth(craftText, MAX_TEXT_WIDTH) + ELLIPSIS;
}
context.drawTextWithShadow(textRenderer, craftText, this.parentX + 11, this.parentY + 31, 0xffffffff);
-
+
//Item name
Text resultText = this.recipeResults.get(this.currentPage).result.getName();
if (textRenderer.getWidth(Formatting.strip(resultText.getString())) > MAX_TEXT_WIDTH) {
@@ -134,7 +134,7 @@ public class SearchResultsWidget implements Drawable {
resultText = Text.literal(getLegacyFormatting(resultText.getString()) + textRenderer.trimToWidth(Formatting.strip(resultText.getString()), MAX_TEXT_WIDTH) + ELLIPSIS).setStyle(resultText.getStyle());
}
context.drawTextWithShadow(textRenderer, resultText, this.parentX + 11, this.parentY + 43, 0xffffffff);
-
+
//Arrow pointing to result item from the recipe
context.drawTextWithShadow(textRenderer, "▶", this.parentX + 96, this.parentY + 90, 0xaaffffff);
}
@@ -149,7 +149,7 @@ public class SearchResultsWidget implements Drawable {
if (this.nextPageButton.active) this.nextPageButton.render(context, mouseX, mouseY, delta);
RenderSystem.enableDepthTest();
}
-
+
/**
* Used for drawing tooltips over truncated text
*/
@@ -160,7 +160,7 @@ public class SearchResultsWidget implements Drawable {
}
RenderSystem.enableDepthTest();
}
-
+
/**
* @see #drawTooltip(TextRenderer, DrawContext, Text, int, int, int, int)
*/
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java
index d9e97976..fe229a44 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java
@@ -102,6 +102,6 @@ public class QuickNavButton extends ClickableWidget {
@Override
protected void appendClickableNarrations(NarrationMessageBuilder builder) {
// TODO Auto-generated method stub
-
+
}
}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandOwnersWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandOwnersWidget.java
index 2e8e2c40..afa883be 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandOwnersWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandOwnersWidget.java
@@ -60,7 +60,7 @@ public class IslandOwnersWidget extends Widget {
PlainTextComponent ptc = new PlainTextComponent(entry);
this.addComponent(ptc);
}
-
+
}
}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java
index 1be6adda..9f60ed34 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java
@@ -19,7 +19,7 @@ public class PlayerComponent extends Component {
private final Identifier tex;
public PlayerComponent(PlayerListEntry ple) {
-
+
boolean plainNames = SkyblockerConfig.get().general.tabHud.plainPlayerNames;
Team team = ple.getScoreboardTeam();
String username = ple.getProfile().getName();