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 --- build.gradle | 31 ++++- checkstyle.xml | 141 +++++++++++++++++++++ settings.gradle | 16 +-- .../java/de/hysky/skyblocker/SkyblockerMod.java | 1 - .../jei/SkyblockCraftingRecipeCategory.java | 2 +- .../compatibility/jei/SkyblockerJEIPlugin.java | 3 - .../compatibility/modmenu/ModMenuEntry.java | 2 +- .../rei/SkyblockRecipeDisplayGenerator.java | 3 - .../rei/SkyblockerREIClientPlugin.java | 1 - .../hysky/skyblocker/config/ImageRepoLoader.java | 6 +- .../skyblocker/config/configs/GeneralConfig.java | 12 +- .../skyblocker/config/configs/HelperConfig.java | 12 +- .../skyblocker/config/configs/MiningConfig.java | 8 +- .../skyblocker/mixins/ClientPlayerEntityMixin.java | 1 - .../ClientPlayerInteractionManagerMixin.java | 2 + .../skyblocker/mixins/MinecraftClientMixin.java | 2 +- .../mixins/YggdrasilServicesKeyInfoMixin.java | 2 +- .../mixins/accessors/InGameHudInvoker.java | 2 +- .../mixins/accessors/WorldRendererAccessor.java | 2 +- .../de/hysky/skyblocker/skyblock/ChestValue.java | 4 +- .../hysky/skyblocker/skyblock/InventorySearch.java | 2 +- .../de/hysky/skyblocker/skyblock/SmoothAOTE.java | 1 - .../hysky/skyblocker/skyblock/chat/ChatRule.java | 3 - .../skyblock/chat/ChatRulesConfigListWidget.java | 4 +- .../skyblocker/skyblock/chat/ChatRulesHandler.java | 2 +- .../skyblock/chat/filters/AutopetFilter.java | 2 +- .../skyblock/chat/filters/TeleportPadFilter.java | 2 +- .../skyblock/crimson/dojo/StaminaTestHelper.java | 1 - .../skyblocker/skyblock/crimson/kuudra/Kuudra.java | 2 +- .../skyblocker/skyblock/dungeon/CroesusProfit.java | 3 +- .../skyblocker/skyblock/dungeon/DungeonScore.java | 1 - .../skyblock/dungeon/GuardianHealth.java | 1 - .../skyblocker/skyblock/dungeon/LeapOverlay.java | 2 +- .../partyfinder/FinderSettingsContainer.java | 4 +- .../dungeon/partyfinder/OptionDropdownWidget.java | 2 +- .../dungeon/partyfinder/RangedValueWidget.java | 4 +- .../skyblock/dungeon/puzzle/CreeperBeams.java | 18 +-- .../puzzle/waterboard/WaterboardOneFlow.java | 2 +- .../skyblock/dungeon/secrets/SecretWaypoint.java | 8 +- .../skyblock/dungeon/terminal/ColorTerminal.java | 2 +- .../dungeon/terminal/LightsOnTerminal.java | 2 +- .../skyblock/dungeon/terminal/OrderTerminal.java | 10 +- .../dungeon/terminal/StartsWithTerminal.java | 2 +- .../skyblock/dwarven/CrystalsHudWidget.java | 1 - .../hysky/skyblocker/skyblock/dwarven/Puzzler.java | 2 +- .../dwarven/fossil/FossilCalculations.java | 4 +- .../skyblock/dwarven/fossil/FossilSolver.java | 3 - .../skyblock/dwarven/fossil/Structures.java | 7 +- .../profittrackers/PowderMiningTracker.java | 1 - .../dwarven/profittrackers/corpse/CorpseLoot.java | 2 +- .../skyblock/experiment/UltrasequencerSolver.java | 2 +- .../skyblock/fancybars/EditBarColorPopup.java | 4 +- .../skyblocker/skyblock/fishing/FishingHelper.java | 5 - .../skyblock/fishing/FishingHookDisplayHelper.java | 4 +- .../skyblock/fishing/FishingHudWidget.java | 4 +- .../skyblock/fishing/SeaCreatureTracker.java | 3 +- .../skyblock/foraging/ModernForagingIsland.java | 2 +- .../skyblocker/skyblock/item/HotbarSlotLock.java | 2 +- .../skyblocker/skyblock/item/ItemCooldowns.java | 5 - .../skyblock/item/SkyblockInventoryScreen.java | 2 +- .../background/adders/ItemRarityBackground.java | 1 - .../item/custom/CustomArmorAnimatedDyes.java | 2 +- .../custom/screen/AnimatedDyeTimelineWidget.java | 8 +- .../item/custom/screen/ColorSelectionWidget.java | 4 +- .../item/custom/screen/CustomizeArmorScreen.java | 4 +- .../skyblock/item/custom/screen/PlayerWidget.java | 4 +- .../item/custom/screen/TrimElementButton.java | 2 +- .../item/custom/screen/TrimSelectionWidget.java | 2 +- .../item/slottext/adders/ChoosePetLevelAdder.java | 2 +- .../item/slottext/adders/HeartOfTheXAdder.java | 2 +- .../item/tooltip/info/DataTooltipInfo.java | 2 +- .../item/tooltip/info/DataTooltipInfoType.java | 2 +- .../skyblock/itemlist/ItemRepository.java | 3 - .../skyblock/itemlist/ItemStackBuilder.java | 2 +- .../skyblock/itemlist/StackOverlays.java | 2 +- .../recipebook/SkyblockRecipeBookWidget.java | 2 +- .../skyblock/itemlist/recipebook/package-info.java | 2 +- .../profileviewer/ProfileViewerNavButton.java | 4 +- .../profileviewer/ProfileViewerTextWidget.java | 2 +- .../dungeons/DungeonFloorRunsWidget.java | 2 +- .../skyblock/profileviewer/inventory/Pet.java | 2 +- .../inventory/itemLoaders/BackpackItemLoader.java | 2 +- .../inventory/itemLoaders/InventoryItemLoader.java | 2 +- .../skyblock/profileviewer/utils/LevelFinder.java | 8 +- .../profileviewer/utils/ProfileViewerUtils.java | 2 +- .../profileviewer/utils/SubPageSelectButton.java | 2 +- .../skyblocker/skyblock/rift/EffigyWaypoints.java | 2 +- .../skyblocker/skyblock/rift/EnigmaSouls.java | 2 +- .../skyblock/rift/HealingMelonIndicator.java | 2 +- .../shortcut/ShortcutsConfigListWidget.java | 2 +- .../skyblock/special/DungeonsSpecialEffects.java | 2 +- .../skyblock/tabhud/config/preview/PreviewTab.java | 8 +- .../skyblock/tabhud/util/PlayerListManager.java | 2 +- .../tabhud/widget/ComponentBasedWidget.java | 2 +- .../skyblock/tabhud/widget/HudWidget.java | 5 + .../skyblocker/skyblock/waypoint/FairySouls.java | 2 +- .../skyblock/waypoint/IndividualWaypoint.java | 2 +- .../hysky/skyblocker/skyblock/waypoint/Relics.java | 2 +- .../hysky/skyblocker/utils/ApiAuthentication.java | 4 +- .../java/de/hysky/skyblocker/utils/Formatters.java | 1 - src/main/java/de/hysky/skyblocker/utils/Http.java | 8 +- .../java/de/hysky/skyblocker/utils/OkLabColor.java | 8 +- .../de/hysky/skyblocker/utils/TextTransformer.java | 8 +- src/main/java/de/hysky/skyblocker/utils/Utils.java | 2 +- .../skyblocker/utils/chat/ChatMessageListener.java | 2 +- .../blockpos/DefaultClientPosArgument.java | 2 +- .../argumenttypes/color/ColorArgumentType.java | 1 - .../skyblocker/utils/datafixer/JsonHelper.java | 52 ++++---- .../utils/datafixer/LegacyItemStackFixer.java | 2 +- .../utils/datafixer/LegacyStringNbtReader.java | 12 +- .../skyblocker/utils/render/FrustumUtils.java | 2 +- .../skyblocker/utils/render/RenderHelper.java | 4 +- .../skyblocker/utils/render/gui/ARGBTextInput.java | 6 +- .../utils/render/gui/AbstractPopupScreen.java | 4 +- .../utils/render/gui/ColorHighlight.java | 2 +- .../utils/render/gui/CyclingTextureWidget.java | 2 +- .../utils/render/gui/DropdownWidget.java | 5 +- .../utils/render/state/SkyblockerRenderState.java | 4 +- .../utils/scheduler/MessageScheduler.java | 2 +- .../skyblocker/utils/tictactoe/TicTacToeUtils.java | 4 +- .../skyblocker/skyblock/StatusBarTrackerTest.java | 1 - .../skyblock/chat/ChatRulesHandlerTest.java | 2 +- .../skyblock/chat/filters/AbilityFilterTest.java | 4 +- .../skyblock/chat/filters/AdFilterTest.java | 4 +- .../skyblock/chat/filters/AoteFilterTest.java | 4 +- .../skyblock/chat/filters/AutopetFilterTest.java | 4 +- .../skyblock/chat/filters/HealFilterTest.java | 4 +- .../skyblock/chat/filters/ImplosionFilterTest.java | 4 +- .../chat/filters/TeleportPadFilterTest.java | 2 +- .../skyblock/dungeon/AcceptRepartyTest.java | 2 +- .../skyblock/dungeon/puzzle/ThreeWeirdosTest.java | 2 +- .../skyblock/dungeon/puzzle/TriviaTest.java | 4 +- .../skyblocker/skyblock/dwarven/FetchurTest.java | 2 +- .../skyblocker/skyblock/dwarven/PuzzlerTest.java | 4 +- .../skyblock/dwarven/fossil/FossilSolverTest.java | 1 - .../skyblock/special/DyeSpecialEffectsTest.java | 2 +- .../hysky/skyblocker/utils/InstancedUtilsTest.java | 2 +- .../utils/chat/ChatPatternListenerTest.java | 2 +- .../skyblocker/utils/waypoint/WaypointTest.java | 1 - 139 files changed, 411 insertions(+), 268 deletions(-) create mode 100644 checkstyle.xml diff --git a/build.gradle b/build.gradle index 65e0a801..f8b092a7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,12 @@ plugins { + // Building id 'fabric-loom' version '1.10-SNAPSHOT' + id "de.hysky.skyblocker.annotation-processor" + id "com.diffplug.spotless" version "6.20.0" + id "checkstyle" + // Publishing id 'maven-publish' id "me.modmuss50.mod-publish-plugin" version "0.8.1" - id "de.hysky.skyblocker.annotation-processor" } version = "${project.mod_version}+${project.minecraft_version}" @@ -237,6 +241,31 @@ test { systemProperty("IS_TEST_ENV", "true") } +spotless { + java { + removeUnusedImports() + //indentWithTabs() // TODO: turn on when more files are converted to tabs + trimTrailingWhitespace() + endWithNewline() + } + + json { + target 'src/**/lang/en_us.json' + targetExclude 'src/**/generated/**' + //gson().sortByKeys().indentWithSpaces(2) // TODO: turn on in the future + } + + groovyGradle { + target 'src/**/*.gradle', '*.gradle', 'gradle/*.gradle' + greclipse() + } +} + +checkstyle { + toolVersion = "10.20.2" + configFile = rootProject.file("checkstyle.xml") +} + publishMods { file = remapJar.archiveFile changelog = System.getenv('CHANGELOG') diff --git a/checkstyle.xml b/checkstyle.xml new file mode 100644 index 00000000..ef00ae6e --- /dev/null +++ b/checkstyle.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/settings.gradle b/settings.gradle index 56266b41..75c4d726 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,10 +1,10 @@ pluginManagement { - repositories { - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - mavenCentral() - gradlePluginPortal() - } + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } } \ No newline at end of file diff --git a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java index 84f72693..fcda86b0 100644 --- a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java +++ b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java @@ -6,7 +6,6 @@ import de.hysky.skyblocker.annotations.Init; import de.hysky.skyblocker.config.ConfigNullFieldsFix; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.config.datafixer.ConfigDataFixer; -import de.hysky.skyblocker.skyblock.StatusBarTracker; import de.hysky.skyblocker.skyblock.item.tooltip.BackpackPreview; import de.hysky.skyblocker.skyblock.tabhud.util.PlayerListManager; import de.hysky.skyblocker.utils.Utils; diff --git a/src/main/java/de/hysky/skyblocker/compatibility/jei/SkyblockCraftingRecipeCategory.java b/src/main/java/de/hysky/skyblocker/compatibility/jei/SkyblockCraftingRecipeCategory.java index edafd7a6..59d812cf 100644 --- a/src/main/java/de/hysky/skyblocker/compatibility/jei/SkyblockCraftingRecipeCategory.java +++ b/src/main/java/de/hysky/skyblocker/compatibility/jei/SkyblockCraftingRecipeCategory.java @@ -39,4 +39,4 @@ public class SkyblockCraftingRecipeCategory extends CraftingRecipeCategory { public IDrawable getIcon() { return icon; } -} \ No newline at end of file +} diff --git a/src/main/java/de/hysky/skyblocker/compatibility/jei/SkyblockerJEIPlugin.java b/src/main/java/de/hysky/skyblocker/compatibility/jei/SkyblockerJEIPlugin.java index 9b75bd77..2b984faa 100644 --- a/src/main/java/de/hysky/skyblocker/compatibility/jei/SkyblockerJEIPlugin.java +++ b/src/main/java/de/hysky/skyblocker/compatibility/jei/SkyblockerJEIPlugin.java @@ -4,7 +4,6 @@ import de.hysky.skyblocker.SkyblockerMod; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.mixins.accessors.HandledScreenAccessor; import de.hysky.skyblocker.skyblock.itemlist.ItemRepository; -import de.hysky.skyblocker.skyblock.itemlist.recipes.SkyblockCraftingRecipe; import de.hysky.skyblocker.utils.Location; import de.hysky.skyblocker.utils.Utils; import de.hysky.skyblocker.utils.datafixer.ItemStackComponentizationFixer; @@ -23,13 +22,11 @@ import net.minecraft.client.gui.screen.ingame.InventoryScreen; import net.minecraft.client.util.math.Rect2i; import net.minecraft.item.ItemStack; import net.minecraft.recipe.*; -import net.minecraft.recipe.book.CraftingRecipeCategory; import net.minecraft.util.Identifier; import org.jetbrains.annotations.NotNull; import java.util.Collections; import java.util.List; -import java.util.Map; @JeiPlugin public class SkyblockerJEIPlugin implements IModPlugin { diff --git a/src/main/java/de/hysky/skyblocker/compatibility/modmenu/ModMenuEntry.java b/src/main/java/de/hysky/skyblocker/compatibility/modmenu/ModMenuEntry.java index e0b0bc2f..ea35809b 100644 --- a/src/main/java/de/hysky/skyblocker/compatibility/modmenu/ModMenuEntry.java +++ b/src/main/java/de/hysky/skyblocker/compatibility/modmenu/ModMenuEntry.java @@ -12,4 +12,4 @@ public class ModMenuEntry implements ModMenuApi { public ConfigScreenFactory getModConfigScreenFactory() { return SkyblockerConfigManager::createGUI; } -} \ No newline at end of file +} diff --git a/src/main/java/de/hysky/skyblocker/compatibility/rei/SkyblockRecipeDisplayGenerator.java b/src/main/java/de/hysky/skyblocker/compatibility/rei/SkyblockRecipeDisplayGenerator.java index fa4787df..2b9775c6 100644 --- a/src/main/java/de/hysky/skyblocker/compatibility/rei/SkyblockRecipeDisplayGenerator.java +++ b/src/main/java/de/hysky/skyblocker/compatibility/rei/SkyblockRecipeDisplayGenerator.java @@ -1,11 +1,8 @@ package de.hysky.skyblocker.compatibility.rei; import de.hysky.skyblocker.skyblock.itemlist.ItemRepository; -import de.hysky.skyblocker.utils.ItemUtils; -import de.hysky.skyblocker.utils.NEURepoManager; import me.shedaniel.rei.api.client.registry.display.DynamicDisplayGenerator; import me.shedaniel.rei.api.common.entry.EntryStack; -import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes; import net.minecraft.item.ItemStack; import java.util.List; diff --git a/src/main/java/de/hysky/skyblocker/compatibility/rei/SkyblockerREIClientPlugin.java b/src/main/java/de/hysky/skyblocker/compatibility/rei/SkyblockerREIClientPlugin.java index d4c9fe8f..307d9d09 100644 --- a/src/main/java/de/hysky/skyblocker/compatibility/rei/SkyblockerREIClientPlugin.java +++ b/src/main/java/de/hysky/skyblocker/compatibility/rei/SkyblockerREIClientPlugin.java @@ -17,7 +17,6 @@ import me.shedaniel.rei.api.client.registry.entry.EntryRegistry; import me.shedaniel.rei.api.client.registry.screen.ExclusionZones; import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.util.EntryStacks; -import net.minecraft.item.ItemStack; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.InventoryScreen; import net.minecraft.item.Items; diff --git a/src/main/java/de/hysky/skyblocker/config/ImageRepoLoader.java b/src/main/java/de/hysky/skyblocker/config/ImageRepoLoader.java index 77dd2f61..0a22ce69 100644 --- a/src/main/java/de/hysky/skyblocker/config/ImageRepoLoader.java +++ b/src/main/java/de/hysky/skyblocker/config/ImageRepoLoader.java @@ -108,7 +108,7 @@ public class ImageRepoLoader { /** * Writes the {@code newHash} into a file to be used to check for repo updates. - * + * * @implNote Checking whether the directory exists or not isn't needed as this is called after all files are written successfully. */ private static void writeCommitData(String newHash) throws IOException { @@ -122,7 +122,7 @@ public class ImageRepoLoader { /** * Deletes all directories (not files) inside of the {@link #REPO_DIRECTORY} - * @throws IOException + * @throws IOException */ private static void deleteDirectories() throws IOException { Files.list(REPO_DIRECTORY) @@ -140,6 +140,6 @@ public class ImageRepoLoader { static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( Codec.STRING.fieldOf("commit").forGetter(CommitData::commit), Codec.LONG.fieldOf("lastUpdated").forGetter(CommitData::lastUpdated)) - .apply(instance, CommitData::new)); + .apply(instance, CommitData::new)); } } diff --git a/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java index 73bc4469..1058d86a 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java @@ -184,16 +184,16 @@ public class GeneralConfig { public boolean slotText = true; @Deprecated - @SerialEntry - public SlotTextMode slotTextMode = SlotTextMode.ENABLED; + @SerialEntry + public SlotTextMode slotTextMode = SlotTextMode.ENABLED; @Deprecated - @SerialEntry - public boolean slotTextToggled = true; + @SerialEntry + public boolean slotTextToggled = true; @Deprecated - @SerialEntry - public boolean attributeShardInfo = true; + @SerialEntry + public boolean attributeShardInfo = true; @SerialEntry public ItemBackgroundStyle itemBackgroundStyle = ItemBackgroundStyle.SQUARE; diff --git a/src/main/java/de/hysky/skyblocker/config/configs/HelperConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/HelperConfig.java index 91c596c5..3007078e 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/HelperConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/HelperConfig.java @@ -79,19 +79,19 @@ public class HelperConfig { public boolean enableFishingHelper = true; @Deprecated - @SerialEntry - public transient boolean enableFishingHookDisplay = true; + @SerialEntry + public transient boolean enableFishingHookDisplay = true; @SerialEntry public boolean enableFishingTimer = false; @Deprecated - @SerialEntry - public transient boolean changeTimerColor = true; + @SerialEntry + public transient boolean changeTimerColor = true; @Deprecated - @SerialEntry - public transient float fishingTimerScale = 1f; + @SerialEntry + public transient float fishingTimerScale = 1f; @SerialEntry public boolean hideOtherPlayersRods = false; diff --git a/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java index 46b5f962..698ab947 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java @@ -121,8 +121,8 @@ public class MiningConfig { public boolean enabled = true; @Deprecated - @SerialEntry - public transient float textScale = 1; + @SerialEntry + public transient float textScale = 1; @SerialEntry public boolean findInChat = true; @@ -139,8 +139,8 @@ public class MiningConfig { public CommissionWaypointMode mode = CommissionWaypointMode.BOTH; @Deprecated - @SerialEntry - public transient float textScale = 1; + @SerialEntry + public transient float textScale = 1; @SerialEntry public boolean useColor = true; diff --git a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayerEntityMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayerEntityMixin.java index f7fd94cd..16dcb40c 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayerEntityMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayerEntityMixin.java @@ -16,7 +16,6 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.AbstractClientPlayerEntity; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.world.ClientWorld; -import net.minecraft.text.Text; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayerInteractionManagerMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayerInteractionManagerMixin.java index aa50c783..6a37301c 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayerInteractionManagerMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayerInteractionManagerMixin.java @@ -10,6 +10,7 @@ import net.minecraft.network.packet.Packet; import net.minecraft.util.Hand; import org.apache.commons.lang3.mutable.MutableObject; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Slice; @@ -30,6 +31,7 @@ public class ClientPlayerInteractionManagerMixin { } } + @Unique private void swingHandWithoutPackets(PlayerEntity playerEntity, Hand hand) { playerEntity.swingHand(hand, false); // The playerEntity override for swingHand is the other method with just the hand parameter, this one isn't overridden and doesn't lead to sending packets. } diff --git a/src/main/java/de/hysky/skyblocker/mixins/MinecraftClientMixin.java b/src/main/java/de/hysky/skyblocker/mixins/MinecraftClientMixin.java index 69b9aa09..f5c8bf94 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/MinecraftClientMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/MinecraftClientMixin.java @@ -36,4 +36,4 @@ public abstract class MinecraftClientMixin { private InventoryScreen skyblocker$skyblockInventoryScreen(PlayerEntity player, Operation original) { return Utils.isOnSkyblock() && SkyblockerConfigManager.get().uiAndVisuals.showEquipmentInInventory ? new SkyblockInventoryScreen(player) : original.call(player); } -} \ No newline at end of file +} diff --git a/src/main/java/de/hysky/skyblocker/mixins/YggdrasilServicesKeyInfoMixin.java b/src/main/java/de/hysky/skyblocker/mixins/YggdrasilServicesKeyInfoMixin.java index 12621894..7ffad67c 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/YggdrasilServicesKeyInfoMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/YggdrasilServicesKeyInfoMixin.java @@ -57,4 +57,4 @@ public class YggdrasilServicesKeyInfoMixin { private boolean skyblocker$dontLogFailedSignatureValidations(Logger logger, String message, Object property, Object exception) { return !Utils.isOnHypixel(); } -} \ No newline at end of file +} diff --git a/src/main/java/de/hysky/skyblocker/mixins/accessors/InGameHudInvoker.java b/src/main/java/de/hysky/skyblocker/mixins/accessors/InGameHudInvoker.java index 80e46293..f815644b 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/accessors/InGameHudInvoker.java +++ b/src/main/java/de/hysky/skyblocker/mixins/accessors/InGameHudInvoker.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.gen.Invoker; @Mixin(InGameHud.class) public interface InGameHudInvoker { - + @Accessor @Nullable Text getOverlayMessage(); diff --git a/src/main/java/de/hysky/skyblocker/mixins/accessors/WorldRendererAccessor.java b/src/main/java/de/hysky/skyblocker/mixins/accessors/WorldRendererAccessor.java index e52b1c85..117637e1 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/accessors/WorldRendererAccessor.java +++ b/src/main/java/de/hysky/skyblocker/mixins/accessors/WorldRendererAccessor.java @@ -10,4 +10,4 @@ import net.minecraft.client.render.WorldRenderer; public interface WorldRendererAccessor { @Accessor Frustum getFrustum(); -} \ No newline at end of file +} diff --git a/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java b/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java index 544933a4..83c5e5c5 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/ChestValue.java @@ -329,9 +329,9 @@ public class ChestValue { } private static class ChestValueTextWidget extends TextWidget { - public boolean shadow = false; + private static final boolean shadow = false; - public ChestValueTextWidget(int width, int height, Text message, TextRenderer textRenderer) { + private ChestValueTextWidget(int width, int height, Text message, TextRenderer textRenderer) { super(width, height, message, textRenderer); alignLeft(); } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/InventorySearch.java b/src/main/java/de/hysky/skyblocker/skyblock/InventorySearch.java index fc6daaa4..8835a6e2 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/InventorySearch.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/InventorySearch.java @@ -98,7 +98,7 @@ public class InventorySearch { private final HandledScreen screen; private boolean hoveredState = false; - public SearchTextWidget(HandledScreen handledScreen) { + private SearchTextWidget(HandledScreen handledScreen) { super(Text.translatable("skyblocker.inventorySearch.clickHereToSearch"), Screens.getTextRenderer(handledScreen)); setPosition((handledScreen.width - this.getWidth()) / 2, 15); underlinedText = getMessage().copy().formatted(Formatting.UNDERLINE); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/SmoothAOTE.java b/src/main/java/de/hysky/skyblocker/skyblock/SmoothAOTE.java index 8c8f50d8..4aea9a0c 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/SmoothAOTE.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/SmoothAOTE.java @@ -1,6 +1,5 @@ package de.hysky.skyblocker.skyblock; -import de.hysky.skyblocker.SkyblockerMod; import de.hysky.skyblocker.annotations.Init; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.skyblock.dungeon.DungeonBoss; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java index d60b18e5..b111cfb5 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRule.java @@ -273,6 +273,3 @@ public class ChatRule { .collect(CollectionUtils.enumSetCollector(Location.class)); } } - - - diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java index dd231074..73d50860 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java @@ -107,7 +107,7 @@ public class ChatRulesConfigListWidget extends ElementListWidget existing = references.stream() diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/FinderSettingsContainer.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/FinderSettingsContainer.java index 955d1a7a..18ffc945 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/FinderSettingsContainer.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/FinderSettingsContainer.java @@ -173,8 +173,8 @@ public class FinderSettingsContainer extends ContainerWidget { //System.out.println("Min and max: " + minAndMax[0] + " " + minAndMax[1]); int leMin = -1; int leMax = -1; - try {leMin = Integer.parseInt(minAndMax[0].trim());} catch (NumberFormatException ignored) {} - try {leMax = Integer.parseInt(minAndMax[1].trim());} catch (NumberFormatException ignored) {} + try {leMin = Integer.parseInt(minAndMax[0].trim()); } catch (NumberFormatException ignored) {} + try {leMax = Integer.parseInt(minAndMax[1].trim()); } catch (NumberFormatException ignored) {} widget.setMinAndMax(leMin, leMax); return true; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/OptionDropdownWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/OptionDropdownWidget.java index 0a96ade0..283a43a7 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/OptionDropdownWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/OptionDropdownWidget.java @@ -123,7 +123,7 @@ public class OptionDropdownWidget extends ElementListWidget getColors(Int2ObjectMap slots) { - if(orderedSlots == null && !orderSlots(slots)) + if (orderedSlots == null && !orderSlots(slots)) return Collections.emptyList(); - while(currentNum < PANES_NUM && slots.containsKey(orderedSlots[currentNum]) && Items.LIME_STAINED_GLASS_PANE.equals(slots.get(orderedSlots[currentNum]).getItem())) + while (currentNum < PANES_NUM && slots.containsKey(orderedSlots[currentNum]) && Items.LIME_STAINED_GLASS_PANE.equals(slots.get(orderedSlots[currentNum]).getItem())) currentNum++; List highlights = new ArrayList<>(3); int last = Integer.min(3, PANES_NUM - currentNum); - for(int i = 0; i < last; i++) { + for (int i = 0; i < last; i++) { highlights.add(new ColorHighlight(orderedSlots[currentNum + i], (224 - 64 * i) << 24 | 64 << 16 | 96 << 8 | 255)); } return highlights; @@ -45,8 +45,8 @@ public final class OrderTerminal extends SimpleContainerSolver implements Termin public boolean orderSlots(Int2ObjectMap slots) { ContainerSolver.trimEdges(slots, 4); orderedSlots = new int[PANES_NUM]; - for(Int2ObjectMap.Entry slot : slots.int2ObjectEntrySet()) { - if(Items.AIR.equals(slot.getValue().getItem())) { + for (Int2ObjectMap.Entry slot : slots.int2ObjectEntrySet()) { + if (Items.AIR.equals(slot.getValue().getItem())) { orderedSlots = null; return false; } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/terminal/StartsWithTerminal.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/terminal/StartsWithTerminal.java index 893e9f61..c03f6ba6 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/terminal/StartsWithTerminal.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/terminal/StartsWithTerminal.java @@ -125,4 +125,4 @@ public final class StartsWithTerminal extends SimpleContainerSolver implements T return new ItemState(item, false); } } -} \ No newline at end of file +} diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudWidget.java index f2ffc42b..b4df0116 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHudWidget.java @@ -16,7 +16,6 @@ import org.joml.Vector2i; import org.joml.Vector2ic; import java.util.List; -import java.util.Map; import java.util.Set; @RegisterWidget diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Puzzler.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Puzzler.java index 400f40ff..fdcda8a2 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Puzzler.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/Puzzler.java @@ -36,4 +36,4 @@ public class Puzzler extends ChatPatternListener { world.setBlockState(new BlockPos(x, 195, z), Blocks.CRIMSON_PLANKS.getDefaultState()); return false; } -} \ No newline at end of file +} diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/fossil/FossilCalculations.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/fossil/FossilCalculations.java index 13dbf469..e579a507 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/fossil/FossilCalculations.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/fossil/FossilCalculations.java @@ -38,7 +38,7 @@ public class FossilCalculations { int[] total = new int[EXCAVATOR_WIDTH * EXCAVATOR_HEIGHT]; minimumTiles = EXCAVATOR_WIDTH * EXCAVATOR_HEIGHT; AtomicInteger fossilCount = new AtomicInteger(); - Arrays.stream(tiles.state()).forEach(row -> Arrays.stream(row).forEach(tile -> {if (tile.equals(Structures.TileState.FOSSIL)) fossilCount.getAndIncrement();})); + Arrays.stream(tiles.state()).forEach(row -> Arrays.stream(row).forEach(tile -> {if (tile.equals(Structures.TileState.FOSSIL)) fossilCount.getAndIncrement(); })); //loop though tile options and if they are valid List validStates = new ArrayList<>(); @@ -229,7 +229,7 @@ public class FossilCalculations { Structures.TileGrid output = new Structures.TileGrid(new Structures.TileState[grid.width()][grid.height()]); for (int originalX = 0; originalX < grid.width(); originalX++) { for (int originalY = 0; originalY < grid.height(); originalY++) { - output.updateSlot(originalY,startingWidth - originalX, grid.getSlot(originalX, originalY)); + output.updateSlot(originalY, startingWidth - originalX, grid.getSlot(originalX, originalY)); } } return output; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/fossil/FossilSolver.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/fossil/FossilSolver.java index b47da408..94848d63 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/fossil/FossilSolver.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/fossil/FossilSolver.java @@ -172,6 +172,3 @@ public class FossilSolver extends SimpleContainerSolver implements TooltipAdder } - - - diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/fossil/Structures.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/fossil/Structures.java index 45bb9ca9..fb44dbf3 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/fossil/Structures.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/fossil/Structures.java @@ -48,11 +48,16 @@ public class Structures { @Override public boolean equals(Object o) { if (this == o) return true; - if(o instanceof TileGrid(TileState[][] state2)) { + if (o instanceof TileGrid(TileState[][] state2)) { return Arrays.deepEquals(state, state2); } return false; } + + @Override + public int hashCode() { + return Arrays.deepHashCode(state); + } } /** diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/profittrackers/PowderMiningTracker.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/profittrackers/PowderMiningTracker.java index 4a41d9e7..108440a4 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/profittrackers/PowderMiningTracker.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/profittrackers/PowderMiningTracker.java @@ -31,7 +31,6 @@ import org.jetbrains.annotations.Unmodifiable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.nio.file.Path; import java.text.NumberFormat; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/profittrackers/corpse/CorpseLoot.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/profittrackers/corpse/CorpseLoot.java index 6ce8cf6b..1ac57caf 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/profittrackers/corpse/CorpseLoot.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/profittrackers/corpse/CorpseLoot.java @@ -79,4 +79,4 @@ public final class CorpseLoot { private static @NotNull String getItemId(String itemName) { return CorpseProfitTracker.getName2IdMap().getOrDefault(itemName, ""); } -} \ No newline at end of file +} diff --git a/src/main/java/de/hysky/skyblocker/skyblock/experiment/UltrasequencerSolver.java b/src/main/java/de/hysky/skyblocker/skyblock/experiment/UltrasequencerSolver.java index 918fc84f..c1d1dcdc 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/experiment/UltrasequencerSolver.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/experiment/UltrasequencerSolver.java @@ -22,7 +22,7 @@ public final class UltrasequencerSolver extends ExperimentSolver { public static final UltrasequencerSolver INSTANCE = new UltrasequencerSolver(); /** * The playable slots of Ultrasequencer in the Metaphysical level. - * + * * Even though the Supreme/Transcendent levels have less playable slots we filter out black glass panes later on * since black isn't in the color sequence. */ diff --git a/src/main/java/de/hysky/skyblocker/skyblock/fancybars/EditBarColorPopup.java b/src/main/java/de/hysky/skyblocker/skyblock/fancybars/EditBarColorPopup.java index 7dd2b973..02327438 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/fancybars/EditBarColorPopup.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/fancybars/EditBarColorPopup.java @@ -62,7 +62,7 @@ public class EditBarColorPopup extends AbstractPopupScreen { private final EnterConfirmTextFieldWidget textFieldWidget; - public BasicColorSelector(int x, int y, int width, Runnable onEnter) { + private BasicColorSelector(int x, int y, int width, Runnable onEnter) { super(x, y, width, 15, Text.literal("edit color")); textFieldWidget = new EnterConfirmTextFieldWidget(MinecraftClient.getInstance().textRenderer, getX() + 16, getY(), width - 16, 15, Text.empty(), onEnter); textFieldWidget.setChangedListener(this::onTextChange); @@ -74,7 +74,7 @@ public class EditBarColorPopup extends AbstractPopupScreen { return List.of(textFieldWidget); } - public int getColor() { + private int getColor() { return color; } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/fishing/FishingHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/fishing/FishingHelper.java index 176e6ce6..cd9fbffb 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/fishing/FishingHelper.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/fishing/FishingHelper.java @@ -6,9 +6,6 @@ import de.hysky.skyblocker.config.configs.HelperConfig; import de.hysky.skyblocker.utils.Utils; import de.hysky.skyblocker.utils.render.RenderHelper; import de.hysky.skyblocker.utils.render.title.Title; -import de.hysky.skyblocker.utils.scheduler.Scheduler; -import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext; -import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents; import net.fabricmc.fabric.api.event.player.UseItemCallback; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; @@ -16,10 +13,8 @@ import net.minecraft.entity.decoration.ArmorStandEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.FishingRodItem; import net.minecraft.item.ItemStack; -import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Formatting; -import net.minecraft.util.math.Vec3d; public class FishingHelper { private static final Title title = new Title("skyblocker.fishing.reelNow", Formatting.GREEN); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/fishing/FishingHookDisplayHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/fishing/FishingHookDisplayHelper.java index c3f285d9..d3547ba7 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/fishing/FishingHookDisplayHelper.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/fishing/FishingHookDisplayHelper.java @@ -28,7 +28,7 @@ public class FishingHookDisplayHelper { public static void init() { ClientPlayConnectionEvents.JOIN.register((_handler, _sender, _client) -> fishingHookArmorStand = null); - HudLayerRegistrationCallback.EVENT.register(d -> d.attachLayerAfter(IdentifiedLayer.TITLE_AND_SUBTITLE,FISHING_HOOK_DISPLAY,FishingHookDisplayHelper::render)); + HudLayerRegistrationCallback.EVENT.register(d -> d.attachLayerAfter(IdentifiedLayer.TITLE_AND_SUBTITLE, FISHING_HOOK_DISPLAY, FishingHookDisplayHelper::render)); } public static void render(DrawContext context, RenderTickCounter tickDelta) { @@ -58,7 +58,7 @@ public class FishingHookDisplayHelper { // Scale the text by 3x context.getMatrices().push(); context.getMatrices().scale(3.0F, 3.0F, 1.0F); - context.drawCenteredTextWithShadow(client.textRenderer, armorStandName, (int) (x / 3.0F), (int) (y / 3.0F),0); + context.drawCenteredTextWithShadow(client.textRenderer, armorStandName, (int) (x / 3.0F), (int) (y / 3.0F), 0); context.getMatrices().pop(); } //else update the tab diff --git a/src/main/java/de/hysky/skyblocker/skyblock/fishing/FishingHudWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/fishing/FishingHudWidget.java index 02c83032..b4b0fce4 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/fishing/FishingHudWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/fishing/FishingHudWidget.java @@ -108,9 +108,9 @@ public class FishingHudWidget extends ComponentBasedWidget { float maxTime; PetInfo pet = PetCache.getCurrentPet(); if (pet != null && pet.type().contains("SLUG")){ - int level = LevelFinder.getLevelInfo("PET_"+pet.tier(),(long)pet.exp()).level; + int level = LevelFinder.getLevelInfo("PET_"+pet.tier(), (long) pet.exp()).level; maxTime =20 * (1 - (level/200f)); - }else{ + } else { maxTime = 20; } time = Math.clamp(time, 0, maxTime); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/fishing/SeaCreatureTracker.java b/src/main/java/de/hysky/skyblocker/skyblock/fishing/SeaCreatureTracker.java index 92278e62..c85df735 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/fishing/SeaCreatureTracker.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/fishing/SeaCreatureTracker.java @@ -56,7 +56,7 @@ public class SeaCreatureTracker { checkCapNotification(); checkRarityNotification(); //schedule notification for end of timer - Scheduler.INSTANCE.schedule(SeaCreatureTracker::checkTimerNotification,SkyblockerConfigManager.get().helpers.fishing.timerLength * 20); + Scheduler.INSTANCE.schedule(SeaCreatureTracker::checkTimerNotification, SkyblockerConfigManager.get().helpers.fishing.timerLength * 20); } } @@ -171,4 +171,3 @@ public class SeaCreatureTracker { record LiveSeaCreature(SeaCreature seaCreature, Entity entity, Long spawnTime) {} } - diff --git a/src/main/java/de/hysky/skyblocker/skyblock/foraging/ModernForagingIsland.java b/src/main/java/de/hysky/skyblocker/skyblock/foraging/ModernForagingIsland.java index fd256681..82319193 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/foraging/ModernForagingIsland.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/foraging/ModernForagingIsland.java @@ -3,6 +3,6 @@ package de.hysky.skyblocker.skyblock.foraging; public class ModernForagingIsland { public static void init() { - + } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/HotbarSlotLock.java b/src/main/java/de/hysky/skyblocker/skyblock/item/HotbarSlotLock.java index acab9d99..9e5ec59e 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/item/HotbarSlotLock.java +++ b/src/main/java/de/hysky/skyb