aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThatGravyBoat <thatgravyboat@gmail.com>2021-07-06 19:09:11 -0230
committerGitHub <noreply@github.com>2021-07-06 19:09:11 -0230
commit93248d28d6b314b42f6b0d82164975343b214ece (patch)
treee3e06c24454080f059355133d633e5a076d85ad3
parent91464c8f433e8bf323932ac956678971207b607e (diff)
parent804767ebfc26e2a1252bc327def02389b35dfc6e (diff)
downloadSkyblockHud-Death-Defied-93248d28d6b314b42f6b0d82164975343b214ece.tar.gz
SkyblockHud-Death-Defied-93248d28d6b314b42f6b0d82164975343b214ece.tar.bz2
SkyblockHud-Death-Defied-93248d28d6b314b42f6b0d82164975343b214ece.zip
Merge pull request #2 from ThatGravyBoat/prettier
Add prettier settings and format code
-rw-r--r--.gitattributes1
-rw-r--r--.prettierignore5
-rw-r--r--.prettierrc.yml9
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/ComponentBuilder.java99
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java175
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/GuiTextures.java11
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java49
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/SpecialColour.java26
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/Utils.java165
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/api/LeaderboardGetter.java23
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/api/events/SidebarPostEvent.java5
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java16
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/commands/SimpleCommand.java7
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/config/KeyBindings.java3
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java321
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfigEditor.java411
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/BackgroundBlur.java100
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/ChromaColour.java26
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/GlScissorStack.java23
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/GuiElement.java2
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementBoolean.java49
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementColour.java229
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementTextField.java308
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/GuiScreenElementWrapper.java3
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/Config.java4
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/Position.java117
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/Category.java3
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigAccordionId.java2
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorAccordion.java2
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorBoolean.java1
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorButton.java3
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorColour.java2
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorDraggableList.java2
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorDropdown.java4
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorSlider.java4
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorText.java2
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigOption.java5
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditor.java22
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorAccordion.java20
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorBoolean.java11
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorButton.java19
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorColour.java35
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorDraggableList.java149
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorDropdown.java79
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorSlider.java97
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorText.java34
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiPositionEditor.java57
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/struct/ConfigProcessor.java87
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/GuiElementSlider.java61
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/MiscUtils.java53
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/Splitters.java2
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/StringUtils.java14
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpUtils.java11
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpingFloat.java16
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpingInteger.java16
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/render/RenderUtils.java90
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/render/TextRenderUtils.java42
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/dungeons/Classes.java48
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/dungeons/DungeonHandler.java120
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/dungeons/DungeonPlayer.java55
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/BossbarHandler.java8
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/CurrencyHandler.java47
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/HeldItemHandler.java14
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/MapHandler.java118
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/SlayerHandler.java56
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/TimeHandler.java7
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/mapicons/DwarvenIcons.java79
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/mapicons/HubIcons.java295
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/sbentities/EntityTypeRegistry.java8
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/sbentities/SkyBlockEntity.java11
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/location/DwarvenMineHandler.java70
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/location/EndIslandHandler.java21
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/location/FarmingIslandHandler.java7
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/location/IslandHandler.java44
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/location/LocationCategory.java43
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/location/LocationHandler.java31
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/location/Locations.java203
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/location/ParkIslandHandler.java14
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinEndermanRenderer.java7
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinEntityArrow.java6
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinGuiIngameForge.java39
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinNetHandlerPlayClient.java3
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/overlay/DungeonOverlay.java44
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/overlay/GenericOverlays.java8
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/overlay/OverlayHud.java153
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/overlay/RPGHud.java56
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/playerstats/ActionBarParsing.java37
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/seasons/Season.java21
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/seasons/SeasonDateHandler.java52
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/tracker/KillTrackerHandler.java38
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java123
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerHandler.java28
92 files changed, 2195 insertions, 2851 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..94f480d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text=auto eol=lf \ No newline at end of file
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 0000000..3dbc8a9
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,5 @@
+build
+.gradle
+.idea
+run
+gradlew* \ No newline at end of file
diff --git a/.prettierrc.yml b/.prettierrc.yml
new file mode 100644
index 0000000..f1cb8dc
--- /dev/null
+++ b/.prettierrc.yml
@@ -0,0 +1,9 @@
+overrides:
+ - files:
+ - "*.java"
+ options:
+ useTabs: false
+ trailingComma: none
+ tabWidth: 4
+ endOfLine: lf
+ printWidth: 999999999 # >:c fine gravy \ No newline at end of file
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/ComponentBuilder.java b/src/main/java/com/thatgravyboat/skyblockhud/ComponentBuilder.java
index e5299d5..b0c17be 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/ComponentBuilder.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/ComponentBuilder.java
@@ -2,54 +2,53 @@ package com.thatgravyboat.skyblockhud;
public class ComponentBuilder {
- public StringBuilder builder;
-
- public ComponentBuilder(){
- this.builder = new StringBuilder();
- }
-
- public ComponentBuilder apd(String text) {
- return apd(text, '7');
- }
-
- public ComponentBuilder apd(String text, char[] colors) {
- for (char color: colors) {
- builder.append("\u00A7").append(color);
- }
- builder.append(text).append("\u00A7").append('r');
- return this;
- }
-
- public ComponentBuilder apd(String text, char color) {
- builder.append("\u00A7").append(color).append(text).append("\u00A7").append('r');
- return this;
- }
-
- public ComponentBuilder nl(){
- builder.append("\n");
- return this;
- }
-
- public ComponentBuilder nl(String text, char color){
- apd(text, color);
- builder.append("\n");
- return this;
- }
-
- public ComponentBuilder nl(String text, char[] colors){
- apd(text, colors);
- builder.append("\n");
- return this;
- }
-
- public ComponentBuilder nl(String text){
- apd(text);
- builder.append("\n");
- return this;
- }
-
- public String build() {
- return builder.toString();
- }
-
+ public StringBuilder builder;
+
+ public ComponentBuilder() {
+ this.builder = new StringBuilder();
+ }
+
+ public ComponentBuilder apd(String text) {
+ return apd(text, '7');
+ }
+
+ public ComponentBuilder apd(String text, char[] colors) {
+ for (char color : colors) {
+ builder.append("\u00A7").append(color);
+ }
+ builder.append(text).append("\u00A7").append('r');
+ return this;
+ }
+
+ public ComponentBuilder apd(String text, char color) {
+ builder.append("\u00A7").append(color).append(text).append("\u00A7").append('r');
+ return this;
+ }
+
+ public ComponentBuilder nl() {
+ builder.append("\n");
+ return this;
+ }
+
+ public ComponentBuilder nl(String text, char color) {
+ apd(text, color);
+ builder.append("\n");
+ return this;
+ }
+
+ public ComponentBuilder nl(String text, char[] colors) {
+ apd(text, colors);
+ builder.append("\n");
+ return this;
+ }
+
+ public ComponentBuilder nl(String text) {
+ apd(text);
+ builder.append("\n");
+ return this;
+ }
+
+ public String build() {
+ return builder.toString();
+ }
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java
index 3c671f0..d56fd30 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/ComponentHandler.java
@@ -5,6 +5,9 @@ import com.google.common.collect.Ordering;
import com.thatgravyboat.skyblockhud.dungeons.DungeonHandler;
import com.thatgravyboat.skyblockhud.location.*;
import com.thatgravyboat.skyblockhud.seasons.SeasonDateHandler;
+import java.util.Comparator;
+import java.util.List;
+import java.util.regex.Pattern;
import net.minecraft.client.Minecraft;
import net.minecraft.client.network.NetworkPlayerInfo;
import net.minecraft.scoreboard.ScorePlayerTeam;
@@ -17,108 +20,98 @@ import net.minecraftforge.fml.common.gameevent.TickEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
-import java.util.Comparator;
-import java.util.List;
-import java.util.regex.Pattern;
-
public class ComponentHandler {
+
public static final Pattern SCOREBOARD_CHARACTERS = Pattern.compile("[^]\\[a-z A-Z:0-9/'.()+\\d-ยง?]");
- private static final Ordering<NetworkPlayerInfo> sortingList =