From a257588b836687a7ff73ddecf06fc5b85910a616 Mon Sep 17 00:00:00 2001 From: Kevin <92656833+kevinthegreat1@users.noreply.github.com> Date: Thu, 3 Jul 2025 21:10:59 +0800 Subject: Add Spotless and Checkstyle (#1189) * Add spotless * Configure spotless * Add checkstyle * Allow some stuff * Turn off tab enforcement * Get rid of some more rules * Remove indent rules * Don't sort lang files * Remove wrapping rules * Apply spotless * Apply spotless again * Fix checkstyle violations * Update checkstyle DTD * Add Javadoc and Mixin checks --- src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java | 1 - .../java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandlerTest.java | 2 +- .../de/hysky/skyblocker/skyblock/chat/filters/AbilityFilterTest.java | 4 ++-- .../java/de/hysky/skyblocker/skyblock/chat/filters/AdFilterTest.java | 4 ++-- .../de/hysky/skyblocker/skyblock/chat/filters/AoteFilterTest.java | 4 ++-- .../de/hysky/skyblocker/skyblock/chat/filters/AutopetFilterTest.java | 4 ++-- .../de/hysky/skyblocker/skyblock/chat/filters/HealFilterTest.java | 4 ++-- .../hysky/skyblocker/skyblock/chat/filters/ImplosionFilterTest.java | 4 ++-- .../hysky/skyblocker/skyblock/chat/filters/TeleportPadFilterTest.java | 2 +- .../java/de/hysky/skyblocker/skyblock/dungeon/AcceptRepartyTest.java | 2 +- .../de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdosTest.java | 2 +- .../java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TriviaTest.java | 4 ++-- src/test/java/de/hysky/skyblocker/skyblock/dwarven/FetchurTest.java | 2 +- src/test/java/de/hysky/skyblocker/skyblock/dwarven/PuzzlerTest.java | 4 ++-- .../de/hysky/skyblocker/skyblock/dwarven/fossil/FossilSolverTest.java | 1 - .../de/hysky/skyblocker/skyblock/special/DyeSpecialEffectsTest.java | 2 +- src/test/java/de/hysky/skyblocker/utils/InstancedUtilsTest.java | 2 +- .../java/de/hysky/skyblocker/utils/chat/ChatPatternListenerTest.java | 2 +- src/test/java/de/hysky/skyblocker/utils/waypoint/WaypointTest.java | 1 - 19 files changed, 24 insertions(+), 27 deletions(-) (limited to 'src/test/java/de') diff --git a/src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java b/src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java index 8e1ddd39..0fad4840 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java @@ -1,6 +1,5 @@ package de.hysky.skyblocker.skyblock; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/test/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandlerTest.java b/src/test/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandlerTest.java index 5f1bf9de..644c5b9d 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandlerTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandlerTest.java @@ -28,4 +28,4 @@ class ChatRulesHandlerTest { Assertions.assertEquals(text, testText); } -} \ No newline at end of file +} diff --git a/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/AbilityFilterTest.java b/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/AbilityFilterTest.java index b48ba406..05a89a9f 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/AbilityFilterTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/AbilityFilterTest.java @@ -3,7 +3,7 @@ package de.hysky.skyblocker.skyblock.chat.filters; import org.junit.jupiter.api.Test; class AbilityFilterTest extends ChatFilterTest { - public AbilityFilterTest() { + AbilityFilterTest() { super(new AbilityFilter()); } @@ -16,4 +16,4 @@ class AbilityFilterTest extends ChatFilterTest { void cooldown() { assertMatches("This ability is on cooldown for 42s."); } -} \ No newline at end of file +} diff --git a/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/AdFilterTest.java b/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/AdFilterTest.java index 47e4cda5..a215f54e 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/AdFilterTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/AdFilterTest.java @@ -9,7 +9,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; class AdFilterTest extends ChatPatternListenerTest { - public AdFilterTest() { + AdFilterTest() { super(new AdFilter()); } @@ -65,4 +65,4 @@ class AdFilterTest extends ChatPatternListenerTest { assertTrue(matcher.matches()); assertTrue(listener.onMatch(null, matcher)); } -} \ No newline at end of file +} diff --git a/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/AoteFilterTest.java b/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/AoteFilterTest.java index b80ef371..44d793ec 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/AoteFilterTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/AoteFilterTest.java @@ -3,7 +3,7 @@ package de.hysky.skyblocker.skyblock.chat.filters; import org.junit.jupiter.api.Test; class AoteFilterTest extends ChatFilterTest { - public AoteFilterTest() { + AoteFilterTest() { super(new AoteFilter()); } @@ -11,4 +11,4 @@ class AoteFilterTest extends ChatFilterTest { void testRegex() { assertMatches("There are blocks in the way!"); } -} \ No newline at end of file +} diff --git a/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/AutopetFilterTest.java b/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/AutopetFilterTest.java index 98e6f0a3..8930cb07 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/AutopetFilterTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/AutopetFilterTest.java @@ -4,7 +4,7 @@ import de.hysky.skyblocker.utils.chat.ChatPatternListenerTest; import org.junit.jupiter.api.Test; class AutopetFilterTest extends ChatPatternListenerTest { - public AutopetFilterTest() { + AutopetFilterTest() { super(new AutopetFilter()); } @@ -12,4 +12,4 @@ class AutopetFilterTest extends ChatPatternListenerTest { void testAutopet() { assertMatches("Autopet equipped your [Lvl 85] Tiger! VIEW RULE"); } -} \ No newline at end of file +} diff --git a/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/HealFilterTest.java b/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/HealFilterTest.java index a4c052da..96bdbfc3 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/HealFilterTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/HealFilterTest.java @@ -3,7 +3,7 @@ package de.hysky.skyblocker.skyblock.chat.filters; import org.junit.jupiter.api.Test; class HealFilterTest extends ChatFilterTest { - public HealFilterTest() { + HealFilterTest() { super(new HealFilter()); } @@ -16,4 +16,4 @@ class HealFilterTest extends ChatFilterTest { void healedYou() { assertMatches("H3aler_ healed you for 56 health!"); } -} \ No newline at end of file +} diff --git a/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/ImplosionFilterTest.java b/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/ImplosionFilterTest.java index 29a84554..07f71212 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/ImplosionFilterTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/ImplosionFilterTest.java @@ -3,7 +3,7 @@ package de.hysky.skyblocker.skyblock.chat.filters; import org.junit.jupiter.api.Test; class ImplosionFilterTest extends ChatFilterTest { - public ImplosionFilterTest() { + ImplosionFilterTest() { super(new ImplosionFilter()); } @@ -16,4 +16,4 @@ class ImplosionFilterTest extends ChatFilterTest { void multipleEnemies() { assertMatches("Your Implosion hit 7 enemies for 4,452,817.4 damage."); } -} \ No newline at end of file +} diff --git a/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/TeleportPadFilterTest.java b/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/TeleportPadFilterTest.java index 4f45c2fe..2554fae6 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/TeleportPadFilterTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/chat/filters/TeleportPadFilterTest.java @@ -16,4 +16,4 @@ public class TeleportPadFilterTest extends ChatFilterTest { void testNoDestination() { assertMatches("This Teleport Pad does not have a destination set!"); } -} \ No newline at end of file +} diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dungeon/AcceptRepartyTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/AcceptRepartyTest.java index 5dba3f96..1b88adf9 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/dungeon/AcceptRepartyTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/AcceptRepartyTest.java @@ -34,4 +34,4 @@ public class AcceptRepartyTest extends ChatPatternListenerTest { /* group: */ "invite", /* expect: */ "1wolvesgaming"); } -} \ No newline at end of file +} diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdosTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdosTest.java index 5d1b2e66..43954441 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdosTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdosTest.java @@ -13,4 +13,4 @@ class ThreeWeirdosTest { void testHope() { ChatPatternListenerTest.assertGroup(ThreeWeirdos.PATTERN.matcher("[NPC] Hope: The reward isn't in any of our chests."), 1, "Hope"); } -} \ No newline at end of file +} diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TriviaTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TriviaTest.java index 52a7ad8c..6bdecd0b 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TriviaTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TriviaTest.java @@ -4,7 +4,7 @@ import de.hysky.skyblocker.utils.chat.ChatPatternListenerTest; import org.junit.jupiter.api.Test; class TriviaTest extends ChatPatternListenerTest { - public TriviaTest() { + TriviaTest() { super(new Trivia()); } @@ -30,4 +30,4 @@ class TriviaTest extends ChatPatternListenerTest { void answer3() { assertGroup(" ⓒ Answer 3", 3, "Answer 3"); } -} \ No newline at end of file +} diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/FetchurTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/FetchurTest.java index 12a194ee..93340fbb 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/FetchurTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/FetchurTest.java @@ -4,7 +4,7 @@ import de.hysky.skyblocker.utils.chat.ChatPatternListenerTest; import org.junit.jupiter.api.Test; class FetchurTest extends ChatPatternListenerTest { - public FetchurTest() { + FetchurTest() { super(new Fetchur()); } diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/PuzzlerTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/PuzzlerTest.java index c32010cf..e58a8d70 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/PuzzlerTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/PuzzlerTest.java @@ -4,7 +4,7 @@ import de.hysky.skyblocker.utils.chat.ChatPatternListenerTest; import org.junit.jupiter.api.Test; class PuzzlerTest extends ChatPatternListenerTest { - public PuzzlerTest() { + PuzzlerTest() { super(new Puzzler()); } @@ -12,4 +12,4 @@ class PuzzlerTest extends ChatPatternListenerTest { void puzzler() { assertGroup("[NPC] Puzzler: ◀▲◀▲▲▶▶◀▲▼", 1, "◀▲◀▲▲▶▶◀▲▼"); } -} \ No newline at end of file +} diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/fossil/FossilSolverTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/fossil/FossilSolverTest.java index 5eba8722..0d791129 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/dwarven/fossil/FossilSolverTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/fossil/FossilSolverTest.java @@ -5,7 +5,6 @@ import de.hysky.skyblocker.skyblock.dwarven.fossil.Structures.TileState; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.util.Arrays; import static de.hysky.skyblocker.skyblock.dwarven.fossil.FossilCalculations.*; diff --git a/src/test/java/de/hysky/skyblocker/skyblock/special/DyeSpecialEffectsTest.java b/src/test/java/de/hysky/skyblocker/skyblock/special/DyeSpecialEffectsTest.java index 9421ca1d..28e35909 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/special/DyeSpecialEffectsTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/special/DyeSpecialEffectsTest.java @@ -9,7 +9,7 @@ public class DyeSpecialEffectsTest { void testDye1() { Assertions.assertTrue(DyeSpecialEffects.DROP_PATTERN.matcher("WOW! [MVP+] Crystalfall found Necron Dye #7!").matches(), "Dye Test #1 didn't match!"); } - + @Test void testDye2() { Assertions.assertTrue(DyeSpecialEffects.DROP_PATTERN.matcher("WOW! [MVP+] AzureAaron found Wild Strawberry Dye #1,888!").matches(), "Dye Test #2 didn't match!"); diff --git a/src/test/java/de/hysky/skyblocker/utils/InstancedUtilsTest.java b/src/test/java/de/hysky/skyblocker/utils/InstancedUtilsTest.java index 762f4baf..f50ea7bd 100644 --- a/src/test/java/de/hysky/skyblocker/utils/InstancedUtilsTest.java +++ b/src/test/java/de/hysky/skyblocker/utils/InstancedUtilsTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; public class InstancedUtilsTest { @SuppressWarnings("EqualsWithItself") - @Test + @Test void testSameInstanceEqual() { Vector3i vec1 = new Vector3i(8, 8, 8); diff --git a/src/test/java/de/hysky/skyblocker/utils/chat/ChatPatternListenerTest.java b/src/test/java/de/hysky/skyblocker/utils/chat/ChatPatternListenerTest.java index 1caff40c..1f0327a5 100644 --- a/src/test/java/de/hysky/skyblocker/utils/chat/ChatPatternListenerTest.java +++ b/src/test/java/de/hysky/skyblocker/utils/chat/ChatPatternListenerTest.java @@ -28,4 +28,4 @@ public abstract class ChatPatternListenerTest { assertTrue(matcher.matches()); assertEquals(expect, matcher.group(group)); } -} \ No newline at end of file +} diff --git a/src/test/java/de/hysky/skyblocker/utils/waypoint/WaypointTest.java b/src/test/java/de/hysky/skyblocker/utils/waypoint/WaypointTest.java index 897a2e1d..93da8ef4 100644 --- a/src/test/java/de/hysky/skyblocker/utils/waypoint/WaypointTest.java +++ b/src/test/java/de/hysky/skyblocker/utils/waypoint/WaypointTest.java @@ -1,7 +1,6 @@ package de.hysky.skyblocker.utils.waypoint; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Box; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -- cgit