summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWalker Selby <git@walkerselby.com>2023-11-22 11:50:00 +0000
committerGitHub <noreply@github.com>2023-11-22 12:50:00 +0100
commit4ff0a7de8109b748cdaa707e9714478140095171 (patch)
treed0321aeb182c1ace326c8c851dbf9a7e8861ff62 /src
parent5d1e9a07eabe3872c714b17b64b7a6e0a0073d73 (diff)
downloadskyhanni-4ff0a7de8109b748cdaa707e9714478140095171.tar.gz
skyhanni-4ff0a7de8109b748cdaa707e9714478140095171.tar.bz2
skyhanni-4ff0a7de8109b748cdaa707e9714478140095171.zip
Internal Change: Reformat Code to match .editorconfig (#628)
Code cleanup done everywhere #628
Diffstat (limited to 'src')
-rw-r--r--src/main/java/SkyHanniInstallerFrame.java34
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/events/RenderEntityOutlineEvent.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt27
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt11
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chat/WatchdogHider.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaFontRenderer.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShader.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostData.kt26
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonTeammateOutlines.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/anniversary/Year300RaffleEvent.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowType.kt10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaAPI.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt11
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterAPI.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobFarmingContestsInventory.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/CropPage.kt31
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/OverviewPage.kt134
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/UpgradePage.kt76
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/visitor/VisitorTooltipParser.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/mining/HighlightMiningCommissionMobs.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/MiscFeatures.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/PlayerChatSymbols.kt17
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/SuperpairsClicksAlert.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/TimeFeatures.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListReader.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorTracker.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt85
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazingSouls.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideDamageIndicator.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/RiftAPI.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveLivingMetalHelper.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftHorsezookaHider.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerType.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerFirePitsWarning.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/mixins/hooks/FontRendererHook.kt13
-rw-r--r--src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinFontRenderer.java4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiContainer.java12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/test/command/CopyNearbyParticlesCommand.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/test/command/CopyScoreboardCommand.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt23
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt20
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt16
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/MinecraftConsoleFilter.kt26
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/Timer.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ContributorListJson.java3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/MayorJson.java16
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SeaCreatureJson.java3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt62
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/shader/Uniform.kt3
-rw-r--r--src/test/java/at/hannibal2/skyhanni/test/ItemUtilsTest.kt24
85 files changed, 611 insertions, 335 deletions
diff --git a/src/main/java/SkyHanniInstallerFrame.java b/src/main/java/SkyHanniInstallerFrame.java
index fa8868254..a9584dedf 100644
--- a/src/main/java/SkyHanniInstallerFrame.java
+++ b/src/main/java/SkyHanniInstallerFrame.java
@@ -166,8 +166,8 @@ public class SkyHanniInstallerFrame extends JFrame implements ActionListener, Mo
margin = 5;
BufferedImage myPicture = ImageIO.read(Objects.requireNonNull(getClass()
- .getClassLoader()
- .getResourceAsStream("assets/skyhanni/logo.png"), "Logo not found."));
+ .getClassLoader()
+ .getResourceAsStream("assets/skyhanni/logo.png"), "Logo not found."));
Image scaled = myPicture.getScaledInstance(w - margin * 2, h - margin, Image.SCALE_SMOOTH);
logo = new JLabel(new ImageIcon(scaled));
logo.setName("Logo");
@@ -222,8 +222,8 @@ public class SkyHanniInstallerFrame extends JFrame implements ActionListener, Mo
descriptionText.setOpaque(false);
descriptionText.setPreferredSize(new Dimension(w - margin * 2, h - margin));
descriptionText.setText(
- "This installer will copy SkyHanni into your forge mods folder for you, and replace any old versions that already exist. " +
- "Close this if you prefer to do this yourself!");
+ "This installer will copy SkyHanni into your forge mods folder for you, and replace any old versions that already exist. " +
+ "Close this if you prefer to do this yourself!");
descriptionText.setWrapStyleWord(true);
y += h;
@@ -251,7 +251,7 @@ public class SkyHanniInstallerFrame extends JFrame implements ActionListener, Mo
forgeDescriptionText.setOpaque(false);
forgeDescriptionText.setPreferredSize(new Dimension(w - margin * 2, h - margin));
forgeDescriptionText.setText(
- "However, you still need to install Forge client in order to be able to run this mod. Click here to visit the download page for Forge 1.8.9!");
+ "However, you still need to install Forge client in order to be able to run this mod. Click here to visit the download page for Forge 1.8.9!");
forgeDescriptionText.setForeground(Color.BLUE.darker());
forgeDescriptionText.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
forgeDescriptionText.setWrapStyleWord(true);
@@ -315,8 +315,8 @@ public class SkyHanniInstallerFrame extends JFrame implements ActionListener, Mo
try {
BufferedImage myPicture = ImageIO.read(Objects.requireNonNull(getClass()
- .getClassLoader()
- .getResourceAsStream("assets/skyhanni/folder.png"), "Folder icon not found."));
+ .getClassLoader()
+ .getResourceAsStream("assets/skyhanni/folder.png"), "Folder icon not found."));
Image scaled = myPicture.getScaledInstance(w - 8, h - 6, Image.SCALE_SMOOTH);
buttonChooseFolder = new JButton(new ImageIcon(scaled));
buttonChooseFolder.setName("ButtonFolder");
@@ -430,7 +430,7 @@ public class SkyHanniInstallerFrame extends JFrame implements ActionListener, Mo
if (e.getSource() == getForgeTextArea()) {
try {
Desktop.getDesktop().browse(new URI(
- "http://files.minecraftforge.net/maven/net/minecraftforge/forge/index_1.8.9.html"));
+ "http://files.minecraftforge.net/maven/net/minecraftforge/forge/index_1.8.9.html"));
} catch (IOException | URISyntaxException ex) {
showErrorPopup(ex);
}
@@ -519,10 +519,10 @@ public class SkyHanniInstallerFrame extends JFrame implements ActionListener, Mo
} catch (Exception ex) {
ex.printStackTrace();
showErrorMessage("Was not able to delete the other SkyHanni files found in your mods folder!" +
- System.lineSeparator() +
- "Please make sure that your minecraft is currently closed and try again, or feel" +
- System.lineSeparator() +
- "free to open your mods folder and delete those files manually.");
+ System.lineSeparator() +
+ "Please make sure that your minecraft is currently closed and try again, or feel" +
+ System.lineSeparator() +
+ "free to open your mods folder and delete those files manually.");
return true;
}
continue;
@@ -667,10 +667,10 @@ public class SkyHanniInstallerFrame extends JFrame implements ActionListener, Mo
private File getThisFile() {
try {
return new File(SkyHanniInstallerFrame.class
- .getProtectionDomain()
- .getCodeSource()
- .getLocation()
- .toURI());
+ .getProtectionDomain()
+ .getCodeSource()
+ .getLocation()
+ .toURI());
} catch (URISyntaxException ex) {
showErrorPopup(ex);
}
@@ -700,4 +700,4 @@ public class SkyHanniInstallerFrame extends JFrame implements ActionListener, Mo
MACOS,
UNKNOWN
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index 22beb125e..aa78bec09 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -190,6 +190,6 @@ class HypixelData {
val displayName = objective.displayName
val scoreboardTitle = displayName.removeColor()
return scoreboardTitle.contains("SKYBLOCK") ||
- scoreboardTitle.contains("SKIBLOCK") // April 1st jokes are so funny
+ scoreboardTitle.contains("SKIBLOCK") // April 1st jokes are so funny
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/events/RenderEntityOutlineEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/RenderEntityOutlineEvent.kt
index 21e18bd6c..6a197de6c 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/RenderEntityOutlineEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/RenderEntityOutlineEvent.kt
@@ -7,7 +7,7 @@ import net.minecraft.entity.item.EntityItemFrame
import java.util.function.Consumer
class RenderEntityOutlineEvent(theType: Type?, potentialEntities: HashSet<Entity>?) :
- LorenzEvent() {
+ LorenzEvent() {
/**
* The phase of the event (see [Type]
@@ -115,4 +115,4 @@ class RenderEntityOutlineEvent(theType: Type?, potentialEntities: HashSet<Entity
NO_XRAY
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt
index b59eae0b2..ee1fc5874 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt
@@ -24,6 +24,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
class BingoCardDisplay {
private var display = emptyList<String>()
+
// TODO USE SH-REPO
private val goalCompletePattern = "§6§lBINGO GOAL COMPLETE! §r§e(?<name>.*)".toPattern()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt b/src/main/java/at/hannibal2/s