From ff17b30c4b585622ca3b8e06eb77794aa21f4285 Mon Sep 17 00:00:00 2001 From: syeyoung Date: Wed, 16 Nov 2022 18:12:33 +0900 Subject: - Discontinue Auction Api for now - Make it build Signed-off-by: syeyoung --- .../dungeon/mechanics/DungeonBreakableWall.java | 9 ++- .../dungeon/mechanics/DungeonDoor.java | 6 +- .../dungeon/mechanics/DungeonDummy.java | 5 +- .../dungeon/mechanics/DungeonFairySoul.java | 6 +- .../dungeon/mechanics/DungeonJournal.java | 4 +- .../dungeon/mechanics/DungeonLever.java | 2 +- .../dungeon/mechanics/DungeonNPC.java | 6 +- .../dungeon/mechanics/DungeonOnewayDoor.java | 6 +- .../dungeon/mechanics/DungeonOnewayLever.java | 4 +- .../dungeon/mechanics/DungeonPressurePlate.java | 4 +- .../dungeon/mechanics/DungeonRoomDoor.java | 4 +- .../dungeon/mechanics/DungeonSecret.java | 4 +- .../dungeon/mechanics/DungeonTomb.java | 9 ++- .../mechanics/dunegonmechanic/DungeonMechanic.java | 2 +- .../kr/syeyoung/dungeonsguide/mod/ArrayUtils.java | 40 ------------- .../syeyoung/dungeonsguide/mod/DungeonsGuide.java | 1 - .../syeyoung/dungeonsguide/mod/SkyblockStatus.java | 1 - .../dungeonsguide/mod/commands/CommandDgDebug.java | 4 +- .../dungeonsguide/mod/commands/CommandReparty.java | 2 +- .../mod/config/guiconfig/RootConfigPanel.java | 1 - .../guiconfig/location/GuiGuiLocationConfig.java | 2 +- .../config/guiconfig/location/PanelDelegate.java | 2 +- .../mod/config/types/TCTextStyle.java | 2 +- .../mod/config/types/TCTextStyleList.java | 3 +- .../mod/cosmetics/ActiveCosmetic.java | 1 + .../mod/cosmetics/CosmeticsManager.java | 1 - .../mod/cosmetics/CustomPacketPlayerListItem.java | 1 - .../dungeonsguide/mod/discord/gamesdk/GameSDK.java | 2 - .../mod/discord/gamesdk/jna/GameSDKTypeMapper.java | 1 - .../jna/datastruct/DiscordCreateParams.java | 2 - .../gamesdk/jna/datastruct/DiscordFileStat.java | 1 - .../gamesdk/jna/datastruct/DiscordLobby.java | 1 - .../gamesdk/jna/datastruct/DiscordSkuPrice.java | 1 - .../gamesdk/jna/datastruct/DiscordStruct.java | 2 - .../gamesdk/jna/datastruct/DiscordUser.java | 2 - .../jna/datastruct/DiscordUserAchievement.java | 1 - .../interfacestruct/IDiscordAchievementEvents.java | 2 +- .../IDiscordAchievementManager.java | 6 +- .../interfacestruct/IDiscordActivityEvents.java | 6 +- .../interfacestruct/IDiscordActivityManager.java | 8 +-- .../IDiscordApplicationManager.java | 4 +- .../gamesdk/jna/interfacestruct/IDiscordCore.java | 2 +- .../jna/interfacestruct/IDiscordImageManager.java | 8 +-- .../jna/interfacestruct/IDiscordLobbyEvents.java | 6 +- .../jna/interfacestruct/IDiscordLobbyManager.java | 10 ++-- .../interfacestruct/IDiscordLobbySearchQuery.java | 4 +- .../interfacestruct/IDiscordLobbyTransaction.java | 2 +- .../jna/interfacestruct/IDiscordNetworkEvents.java | 2 +- .../jna/interfacestruct/IDiscordOverlayEvents.java | 2 +- .../interfacestruct/IDiscordOverlayManager.java | 2 +- .../IDiscordRelationshipEvents.java | 4 +- .../IDiscordRelationshipManager.java | 6 +- .../interfacestruct/IDiscordStorageManager.java | 4 +- .../jna/interfacestruct/IDiscordStoreEvents.java | 4 +- .../jna/interfacestruct/IDiscordStoreManager.java | 8 +-- .../jna/interfacestruct/IDiscordUserEvents.java | 2 +- .../jna/interfacestruct/IDiscordUserManager.java | 6 +- .../jna/interfacestruct/IDiscordVoiceEvents.java | 2 +- .../jna/interfacestruct/IDiscordVoiceManager.java | 6 +- .../mod/discord/rpc/RichPresenceManager.java | 19 ++++--- .../dungeonsguide/mod/dungeon/DungeonContext.java | 1 - .../dungeonsguide/mod/dungeon/DungeonFacade.java | 2 +- .../dungeon/actions/ActionBreakWithSuperBoom.java | 2 +- .../mod/dungeon/actions/ActionChangeState.java | 2 - .../mod/dungeon/actions/ActionClick.java | 2 +- .../mod/dungeon/actions/ActionClickSet.java | 2 +- .../mod/dungeon/actions/ActionDropItem.java | 2 +- .../mod/dungeon/actions/ActionInteract.java | 3 +- .../mod/dungeon/actions/ActionKill.java | 3 +- .../mod/dungeon/actions/ActionMove.java | 1 - .../mod/dungeon/actions/ActionMoveNearestAir.java | 3 +- .../DungeonSpecificDataProviderRegistry.java | 2 +- .../mod/dungeon/pathfinding/AStarCornerCut.java | 5 +- .../mod/dungeon/pathfinding/CachedWorld.java | 5 +- .../mod/dungeon/pathfinding/ThetaStar.java | 5 +- .../mod/dungeon/roomedit/EditingContext.java | 3 +- .../mod/dungeon/roomedit/gui/GuiDungeonAddSet.java | 8 +-- .../roomedit/gui/GuiDungeonParameterEdit.java | 9 ++- .../dungeon/roomedit/gui/GuiDungeonRoomEdit.java | 3 +- .../dungeon/roomedit/gui/GuiDungeonValueEdit.java | 11 ++-- .../mechanicedit/ValueEditBreakableWall.java | 8 ++- .../roomedit/mechanicedit/ValueEditDoor.java | 6 +- .../roomedit/mechanicedit/ValueEditDummy.java | 8 ++- .../roomedit/mechanicedit/ValueEditFairySoul.java | 13 +++-- .../roomedit/mechanicedit/ValueEditJournal.java | 8 +-- .../roomedit/mechanicedit/ValueEditLever.java | 11 +++- .../roomedit/mechanicedit/ValueEditNPC.java | 8 ++- .../roomedit/mechanicedit/ValueEditOnewayDoor.java | 6 +- .../mechanicedit/ValueEditOnewayLever.java | 6 +- .../mechanicedit/ValueEditPressurePlate.java | 7 ++- .../roomedit/mechanicedit/ValueEditSecret.java | 6 +- .../roomedit/mechanicedit/ValueEditTomb.java | 11 +++- .../dungeon/roomedit/panes/ActionDisplayPane.java | 4 +- .../roomedit/panes/ActionTreeDisplayPane.java | 4 +- .../dungeon/roomedit/panes/GeneralEditPane.java | 3 +- .../roomedit/panes/ProcessorParameterEditPane.java | 6 +- .../roomedit/panes/RoomDataDisplayPane.java | 1 - .../mod/dungeon/roomedit/panes/SecretEditPane.java | 6 +- .../roomedit/valueedit/ValueEditAColor.java | 2 +- .../roomedit/valueedit/ValueEditBoolean.java | 2 +- .../dungeon/roomedit/valueedit/ValueEditColor.java | 6 +- .../dungeon/roomedit/valueedit/ValueEditFloat.java | 2 +- .../roomedit/valueedit/ValueEditInteger.java | 2 +- .../roomedit/valueedit/ValueEditOffsetPoint.java | 10 +++- .../valueedit/ValueEditOffsetPointSet.java | 4 +- .../roomedit/valueedit/ValueEditRegistry.java | 4 +- .../roomedit/valueedit/ValueEditString.java | 2 +- .../mod/dungeon/roomfinder/DungeonRoom.java | 2 - .../roomfinder/DungeonRoomInfoRegistry.java | 3 - .../mod/dungeon/roomfinder/RoomMatcher.java | 4 +- .../roomprocessor/GeneralRoomProcessor.java | 18 ++++-- .../roomprocessor/RoomProcessorBlazeSolver.java | 7 ++- .../roomprocessor/RoomProcessorCreeperSolver.java | 2 +- .../roomprocessor/RoomProcessorIcePath.java | 2 +- .../roomprocessor/RoomProcessorRedRoom.java | 3 +- .../dungeon/roomprocessor/RoomProcessorRiddle.java | 4 +- .../RoomProcessorTeleportMazeSolver.java | 2 +- .../dungeon/roomprocessor/RoomProcessorTrivia.java | 3 +- .../bombdefuse/RoomProcessorBombDefuseSolver.java | 13 ++++- .../bombdefuse/chambers/BDChamber.java | 2 +- .../chambers/GeneralDefuseChamberProcessor.java | 4 +- .../chambers/arrow/ArrowRightProcessor.java | 3 +- .../chambers/color/ColorLeftProcessor.java | 5 +- .../chambers/color/ColorRightProcessor.java | 5 +- .../chambers/creeper/CreeperLeftProcessor.java | 2 +- .../chambers/creeper/CreeperRightProcessor.java | 2 +- .../goldenpath/GoldenPathLeftProcessor.java | 2 +- .../goldenpath/GoldenPathProcessorMatcher.java | 3 +- .../goldenpath/GoldenPathRightProcessor.java | 2 +- .../chambers/maze/MazeLeftProcessor.java | 3 +- .../chambers/maze/MazeProcessorMatcher.java | 3 +- .../chambers/maze/MazeRightProcessor.java | 2 +- .../chambers/number/NumberLeftProcessor.java | 3 +- .../chambers/number/NumberRightProcessor.java | 3 +- .../bossfight/BossfightProcessorBonzo.java | 1 + .../boxpuzzle/BoxPuzzleSolvingThread.java | 3 +- .../boxpuzzle/RoomProcessorBoxSolver.java | 8 +-- .../icefill/RoomProcessorIcePath2.java | 3 +- .../waterpuzzle/RoomProcessorWaterPuzzle.java | 2 +- .../roomprocessor/waterpuzzle/WaterBoard.java | 5 +- .../mod/events/impl/DiscordUserUpdateEvent.java | 1 - .../mod/events/listener/FeatureListener.java | 1 - .../mod/events/listener/PacketListener.java | 5 +- .../mod/features/AbstractFeature.java | 5 +- .../dungeonsguide/mod/features/GuiFeature.java | 8 ++- .../impl/advanced/FeatureDebuggableMap.java | 1 - .../impl/advanced/FeatureRoomCoordDisplay.java | 5 +- .../impl/advanced/FeatureRoomDebugInfo.java | 2 +- .../mod/features/impl/boss/FeatureBossHealth.java | 5 +- .../features/impl/boss/FeatureBoxRealLivid.java | 6 +- .../mod/features/impl/boss/FeatureChestPrice.java | 3 +- .../features/impl/boss/FeatureCurrentPhase.java | 5 +- .../mod/features/impl/boss/FeatureHideAnimals.java | 3 +- .../features/impl/boss/FeatureTerracotaTimer.java | 8 ++- .../impl/boss/FeatureThornBearPercentage.java | 7 ++- .../impl/boss/FeatureThornSpiritBowTimer.java | 8 ++- .../features/impl/boss/FeatureWarningOnPortal.java | 12 ++-- .../impl/boss/terminal/FeatureSimonSaysSolver.java | 1 - .../features/impl/cosmetics/PrefixSelectorGUI.java | 2 +- .../discord/inviteViewer/PartyInviteViewer.java | 10 ++-- .../impl/discord/invteTooltip/MTooltipInvite.java | 7 +-- .../invteTooltip/MTooltipInviteElement.java | 4 +- .../impl/discord/onlinealarm/PlayingDGAlarm.java | 8 +-- .../mod/features/impl/dungeon/FeatureBoxBats.java | 2 - .../impl/dungeon/FeatureBoxSkelemaster.java | 4 +- .../features/impl/dungeon/FeatureBoxStarMobs.java | 2 - .../dungeon/FeatureDungeonCurrentRoomSecrets.java | 6 +- .../impl/dungeon/FeatureDungeonDeaths.java | 10 +++- .../features/impl/dungeon/FeatureDungeonMap.java | 5 +- .../impl/dungeon/FeatureDungeonMilestone.java | 7 ++- .../impl/dungeon/FeatureDungeonRealTime.java | 6 +- .../impl/dungeon/FeatureDungeonRoomName.java | 3 +- .../features/impl/dungeon/FeatureDungeonScore.java | 5 +- .../impl/dungeon/FeatureDungeonSecrets.java | 6 +- .../features/impl/dungeon/FeatureDungeonTombs.java | 6 +- .../features/impl/dungeon/FeatureHideNameTags.java | 1 - .../features/impl/dungeon/FeaturePlayerESP.java | 1 - .../dungeon/FeaturePressAnyKeyToCloseChest.java | 1 - .../impl/dungeon/FeatureWarnLowHealth.java | 6 +- .../impl/dungeon/FeatureWatcherWarning.java | 7 ++- .../impl/etc/FeatureAutoAcceptReparty.java | 5 +- .../mod/features/impl/etc/FeatureCopyMessages.java | 1 + .../impl/etc/FeatureDecreaseExplosionSound.java | 1 - .../features/impl/etc/FeatureDisableMessage.java | 1 - .../mod/features/impl/etc/FeaturePenguins.java | 7 ++- .../mod/features/impl/etc/FeatureTooltipPrice.java | 1 - .../mod/features/impl/etc/FeatureUpdateAlarm.java | 4 +- .../impl/etc/ability/FeatureAbilityCooldown.java | 6 +- .../mod/features/impl/party/APIKey.java | 1 - .../features/impl/party/FeatureGoodParties.java | 3 + .../mod/features/impl/party/FeaturePartyList.java | 7 ++- .../mod/features/impl/party/FeaturePartyReady.java | 6 +- .../features/impl/party/api/ClassSpecificData.java | 1 + .../party/customgui/FeatureCustomPartyFinder.java | 1 + .../impl/party/customgui/PanelPartyFinder.java | 7 ++- .../party/customgui/PanelPartyFinderSettings.java | 2 +- .../impl/party/playerpreview/FakePlayer.java | 2 +- .../FeatureViewPlayerStatsOnJoin.java | 1 - .../impl/DataRenderDungeonFloorStat.java | 4 +- .../impl/DataRenderDungeonHighestFloorStat.java | 4 +- .../datarenders/impl/DataRendererClassLv.java | 8 ++- .../datarenders/impl/DataRendererDungeonLv.java | 2 +- .../datarenders/impl/DataRendererLilyWeight.java | 1 - .../impl/DataRendererSelectedClassLv.java | 2 +- .../mod/features/impl/secret/FeatureActions.java | 7 ++- .../mod/features/impl/secret/FeatureBloodRush.java | 1 - .../impl/secret/FeatureCreateRefreshLine.java | 2 - .../impl/secret/FeaturePathfindStrategy.java | 2 - .../impl/secret/FeatureSoulRoomWarning.java | 13 +++-- .../impl/secret/FeatureTogglePathfind.java | 1 - .../impl/secret/PathfindLineProperties.java | 2 - .../mechanicbrowser/FeatureMechanicBrowse.java | 11 ++-- .../mechanicbrowser/MechanicBrowserElement.java | 2 +- .../mechanicbrowser/PanelMechanicBrowser.java | 8 +-- .../features/text/PanelTextParameterConfig.java | 4 +- .../mod/features/text/TextHUDFeature.java | 3 - .../dungeonsguide/mod/gui/elements/MColor.java | 1 - .../mod/gui/elements/MLabelAndElement.java | 1 - .../mod/gui/elements/MNavigatingPane.java | 4 +- .../dungeonsguide/mod/gui/elements/MParameter.java | 5 +- .../mod/gui/elements/MPortableColorEdit.java | 2 +- .../dungeonsguide/mod/gui/elements/MScrollBar.java | 3 +- .../mod/gui/elements/MTabbedPane.java | 1 - .../dungeonsguide/mod/gui/elements/MTextField.java | 2 +- .../mod/gui/elements/MToggleButton.java | 2 +- .../dungeonsguide/mod/gui/elements/MValue.java | 3 +- .../dungeonsguide/mod/party/PartyManager.java | 4 +- .../dungeonsguide/mod/resources/DGTexturePack.java | 12 +--- .../syeyoung/dungeonsguide/mod/utils/AhUtils.java | 65 +++++++++++----------- .../dungeonsguide/mod/utils/TimeScoreUtil.java | 4 +- .../dungeonsguide/mod/utils/cursor/GLCursors.java | 1 - .../mod/wsresource/StaticResourceCache.java | 3 +- 232 files changed, 552 insertions(+), 519 deletions(-) delete mode 100755 mod/src/main/java/kr/syeyoung/dungeonsguide/mod/ArrayUtils.java (limited to 'mod/src/main/java') diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonBreakableWall.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonBreakableWall.java index 64d4dc0b..b342f6fd 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonBreakableWall.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonBreakableWall.java @@ -19,11 +19,14 @@ package kr.syeyoung.dungeonsguide.dungeon.mechanics; import com.google.common.collect.Sets; -import kr.syeyoung.dungeonsguide.mod.dungeon.actions.*; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPointSet; -import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.RouteBlocker; import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.DungeonMechanic; +import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.RouteBlocker; +import kr.syeyoung.dungeonsguide.mod.dungeon.actions.AbstractAction; +import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionBreakWithSuperBoom; +import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionChangeState; +import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionMoveNearestAir; import kr.syeyoung.dungeonsguide.mod.dungeon.roomfinder.DungeonRoom; import kr.syeyoung.dungeonsguide.mod.utils.RenderUtils; import lombok.Data; @@ -32,8 +35,8 @@ import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; import java.awt.*; -import java.util.*; import java.util.List; +import java.util.*; @Data public class DungeonBreakableWall implements DungeonMechanic, RouteBlocker { diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDoor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDoor.java index 4cf779c4..ffe57433 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDoor.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDoor.java @@ -19,12 +19,12 @@ package kr.syeyoung.dungeonsguide.dungeon.mechanics; import com.google.common.collect.Sets; -import kr.syeyoung.dungeonsguide.mod.dungeon.actions.AbstractAction; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPointSet; -import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionChangeState; -import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.RouteBlocker; import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.DungeonMechanic; +import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.RouteBlocker; +import kr.syeyoung.dungeonsguide.mod.dungeon.actions.AbstractAction; +import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionChangeState; import kr.syeyoung.dungeonsguide.mod.dungeon.roomfinder.DungeonRoom; import kr.syeyoung.dungeonsguide.mod.utils.RenderUtils; import lombok.Data; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDummy.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDummy.java index 60ca1b3a..ef83e1ee 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDummy.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonDummy.java @@ -19,9 +19,12 @@ package kr.syeyoung.dungeonsguide.dungeon.mechanics; import com.google.common.collect.Sets; -import kr.syeyoung.dungeonsguide.mod.dungeon.actions.*; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.DungeonMechanic; +import kr.syeyoung.dungeonsguide.mod.dungeon.actions.AbstractAction; +import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionChangeState; +import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionClick; +import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionMove; import kr.syeyoung.dungeonsguide.mod.dungeon.roomfinder.DungeonRoom; import kr.syeyoung.dungeonsguide.mod.utils.RenderUtils; import lombok.Data; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonFairySoul.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonFairySoul.java index 0bbecfbd..864b1330 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonFairySoul.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonFairySoul.java @@ -19,13 +19,13 @@ package kr.syeyoung.dungeonsguide.dungeon.mechanics; import com.google.common.collect.Sets; +import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; +import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.DungeonMechanic; +import kr.syeyoung.dungeonsguide.dungeon.mechanics.predicates.PredicateArmorStand; import kr.syeyoung.dungeonsguide.mod.dungeon.actions.AbstractAction; import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionChangeState; import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionInteract; import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionMove; -import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; -import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.DungeonMechanic; -import kr.syeyoung.dungeonsguide.dungeon.mechanics.predicates.PredicateArmorStand; import kr.syeyoung.dungeonsguide.mod.dungeon.roomfinder.DungeonRoom; import kr.syeyoung.dungeonsguide.mod.utils.RenderUtils; import lombok.Data; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonJournal.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonJournal.java index 897fad3d..2153c748 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonJournal.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonJournal.java @@ -19,11 +19,11 @@ package kr.syeyoung.dungeonsguide.dungeon.mechanics; import com.google.common.collect.Sets; +import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; +import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.DungeonMechanic; import kr.syeyoung.dungeonsguide.mod.dungeon.actions.AbstractAction; import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionChangeState; import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionMove; -import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; -import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.DungeonMechanic; import kr.syeyoung.dungeonsguide.mod.dungeon.roomfinder.DungeonRoom; import kr.syeyoung.dungeonsguide.mod.utils.RenderUtils; import lombok.Data; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonLever.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonLever.java index a27bd833..af336105 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonLever.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonLever.java @@ -19,9 +19,9 @@ package kr.syeyoung.dungeonsguide.dungeon.mechanics; import com.google.common.collect.Sets; -import kr.syeyoung.dungeonsguide.mod.dungeon.actions.*; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.DungeonMechanic; +import kr.syeyoung.dungeonsguide.mod.dungeon.actions.*; import kr.syeyoung.dungeonsguide.mod.dungeon.roomfinder.DungeonRoom; import kr.syeyoung.dungeonsguide.mod.utils.RenderUtils; import lombok.Data; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonNPC.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonNPC.java index 4eed8f27..702c7fc1 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonNPC.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonNPC.java @@ -19,13 +19,13 @@ package kr.syeyoung.dungeonsguide.dungeon.mechanics; import com.google.common.collect.Sets; +import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; +import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.DungeonMechanic; +import kr.syeyoung.dungeonsguide.dungeon.mechanics.predicates.PredicateArmorStand; import kr.syeyoung.dungeonsguide.mod.dungeon.actions.AbstractAction; import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionChangeState; import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionInteract; import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionMove; -import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; -import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.DungeonMechanic; -import kr.syeyoung.dungeonsguide.dungeon.mechanics.predicates.PredicateArmorStand; import kr.syeyoung.dungeonsguide.mod.dungeon.roomfinder.DungeonRoom; import kr.syeyoung.dungeonsguide.mod.utils.RenderUtils; import lombok.Data; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayDoor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayDoor.java index af4b8f65..7299c11f 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayDoor.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayDoor.java @@ -19,13 +19,13 @@ package kr.syeyoung.dungeonsguide.dungeon.mechanics; import com.google.common.collect.Sets; -import kr.syeyoung.dungeonsguide.mod.dungeon.actions.AbstractAction; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPointSet; +import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.DungeonMechanic; +import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.RouteBlocker; +import kr.syeyoung.dungeonsguide.mod.dungeon.actions.AbstractAction; import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionChangeState; import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionMoveNearestAir; -import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.RouteBlocker; -import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.DungeonMechanic; import kr.syeyoung.dungeonsguide.mod.dungeon.roomfinder.DungeonRoom; import kr.syeyoung.dungeonsguide.mod.utils.RenderUtils; import lombok.Data; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayLever.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayLever.java index f3b641e2..f4894de4 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayLever.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayLever.java @@ -19,17 +19,17 @@ package kr.syeyoung.dungeonsguide.dungeon.mechanics; import com.google.common.collect.Sets; -import kr.syeyoung.dungeonsguide.mod.dungeon.actions.*; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.DungeonMechanic; +import kr.syeyoung.dungeonsguide.mod.dungeon.actions.*; import kr.syeyoung.dungeonsguide.mod.dungeon.roomfinder.DungeonRoom; import kr.syeyoung.dungeonsguide.mod.utils.RenderUtils; import lombok.Data; import net.minecraft.util.BlockPos; import java.awt.*; -import java.util.*; import java.util.List; +import java.util.*; @Data public class DungeonOnewayLever implements DungeonMechanic { diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonPressurePlate.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonPressurePlate.java index 936dc00c..c48a5e7f 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonPressurePlate.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonPressurePlate.java @@ -19,17 +19,17 @@ package kr.syeyoung.dungeonsguide.dungeon.mechanics; import com.google.common.collect.Sets; -import kr.syeyoung.dungeonsguide.mod.dungeon.actions.*; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.DungeonMechanic; +import kr.syeyoung.dungeonsguide.mod.dungeon.actions.*; import kr.syeyoung.dungeonsguide.mod.dungeon.roomfinder.DungeonRoom; import kr.syeyoung.dungeonsguide.mod.utils.RenderUtils; import lombok.Data; import net.minecraft.util.BlockPos; import java.awt.*; -import java.util.*; import java.util.List; +import java.util.*; @Data public class DungeonPressurePlate implements DungeonMechanic { diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonRoomDoor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonRoomDoor.java index 9a3bedcc..fbd88bda 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonRoomDoor.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonRoomDoor.java @@ -19,11 +19,11 @@ package kr.syeyoung.dungeonsguide.dungeon.mechanics; import com.google.common.collect.Sets; +import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; +import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.DungeonMechanic; import kr.syeyoung.dungeonsguide.mod.dungeon.actions.AbstractAction; import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionMove; -import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; import kr.syeyoung.dungeonsguide.mod.dungeon.doorfinder.DungeonDoor; -import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.DungeonMechanic; import kr.syeyoung.dungeonsguide.mod.dungeon.roomfinder.DungeonRoom; import kr.syeyoung.dungeonsguide.mod.utils.RenderUtils; import lombok.Getter; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java index 48ec30f6..f53a0f5a 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java @@ -19,11 +19,11 @@ package kr.syeyoung.dungeonsguide.dungeon.mechanics; import com.google.common.collect.Sets; +import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; +import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.DungeonMechanic; import kr.syeyoung.dungeonsguide.mod.DungeonsGuide; import kr.syeyoung.dungeonsguide.mod.dungeon.DungeonActionContext; import kr.syeyoung.dungeonsguide.mod.dungeon.actions.*; -import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; -import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.DungeonMechanic; import kr.syeyoung.dungeonsguide.mod.dungeon.pathfinding.NodeProcessorDungeonRoom; import kr.syeyoung.dungeonsguide.mod.dungeon.roomfinder.DungeonRoom; import kr.syeyoung.dungeonsguide.mod.utils.RenderUtils; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonTomb.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonTomb.java index b14ffaf3..99ece6f1 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonTomb.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonTomb.java @@ -19,11 +19,14 @@ package kr.syeyoung.dungeonsguide.dungeon.mechanics; import com.google.common.collect.Sets; -import kr.syeyoung.dungeonsguide.mod.dungeon.actions.*; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPointSet; -import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.RouteBlocker; import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.DungeonMechanic; +import kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic.RouteBlocker; +import kr.syeyoung.dungeonsguide.mod.dungeon.actions.AbstractAction; +import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionBreakWithSuperBoom; +import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionChangeState; +import kr.syeyoung.dungeonsguide.mod.dungeon.actions.ActionMoveNearestAir; import kr.syeyoung.dungeonsguide.mod.dungeon.roomfinder.DungeonRoom; import kr.syeyoung.dungeonsguide.mod.utils.RenderUtils; import lombok.Data; @@ -32,8 +35,8 @@ import net.minecraft.init.Blocks; import net.minecraft.util.BlockPos; import java.awt.*; -import java.util.*; import java.util.List; +import java.util.*; @Data public class DungeonTomb implements DungeonMechanic, RouteBlocker { diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/dunegonmechanic/DungeonMechanic.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/dunegonmechanic/DungeonMechanic.java index 9aa18701..5b7efcf3 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/dunegonmechanic/DungeonMechanic.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/dunegonmechanic/DungeonMechanic.java @@ -18,8 +18,8 @@ package kr.syeyoung.dungeonsguide.dungeon.mechanics.dunegonmechanic; -import kr.syeyoung.dungeonsguide.mod.dungeon.actions.AbstractAction; import kr.syeyoung.dungeonsguide.dungeon.data.OffsetPoint; +import kr.syeyoung.dungeonsguide.mod.dungeon.actions.AbstractAction; import kr.syeyoung.dungeonsguide.mod.dungeon.roomfinder.DungeonRoom; import java.awt.*; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/ArrayUtils.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/ArrayUtils.java deleted file mode 100755 index 035542b1..00000000 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/ArrayUtils.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod - * Copyright (C) 2021 cyoung06 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -package kr.syeyoung.dungeonsguide.mod.utils; - -public class ArrayUtils { - public static int[][] rotateCounterClockwise(int[][] arr) { - int[][] res = new int[arr[0].length][arr.length]; - for(int y=0; y { diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/types/TCTextStyleList.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/types/TCTextStyleList.java index 12a570bd..accbc01d 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/types/TCTextStyleList.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/types/TCTextStyleList.java @@ -20,8 +20,7 @@ package kr.syeyoung.dungeonsguide.mod.config.types; import com.google.gson.JsonArray; import com.google.gson.JsonElement; - - +import kr.syeyoung.dungeonsguide.mod.features.text.TextStyle; import java.util.ArrayList; import java.util.List; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/ActiveCosmetic.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/ActiveCosmetic.java index b71a003c..8a066a7d 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/ActiveCosmetic.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/ActiveCosmetic.java @@ -1,6 +1,7 @@ package kr.syeyoung.dungeonsguide.mod.cosmetics; import lombok.Data; + import java.util.UUID; @Data diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CosmeticsManager.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CosmeticsManager.java index 4908a170..6482e5d5 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CosmeticsManager.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CosmeticsManager.java @@ -21,7 +21,6 @@ package kr.syeyoung.dungeonsguide.mod.cosmetics; import kr.syeyoung.dungeonsguide.mod.cosmetics.chatreplacers.*; import kr.syeyoung.dungeonsguide.mod.events.impl.PlayerListItemPacketEvent; - import kr.syeyoung.dungeonsguide.mod.events.impl.StompConnectedEvent; import kr.syeyoung.dungeonsguide.mod.stomp.StompHeader; import kr.syeyoung.dungeonsguide.mod.stomp.StompManager; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CustomPacketPlayerListItem.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CustomPacketPlayerListItem.java index 541ec392..7cf0b6cf 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CustomPacketPlayerListItem.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/cosmetics/CustomPacketPlayerListItem.java @@ -20,7 +20,6 @@ package kr.syeyoung.dungeonsguide.mod.cosmetics; import kr.syeyoung.dungeonsguide.mod.events.impl.PlayerListItemPacketEvent; - import net.minecraft.network.play.INetHandlerPlayClient; import net.minecraft.network.play.server.S38PacketPlayerListItem; import net.minecraftforge.common.MinecraftForge; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/GameSDK.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/GameSDK.java index 70d8b8b7..f66043b5 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/GameSDK.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/GameSDK.java @@ -21,10 +21,8 @@ package kr.syeyoung.dungeonsguide.mod.discord.gamesdk; import com.sun.jna.Library; import com.sun.jna.Native; import com.sun.jna.Platform; - import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.GameSDKTypeMapper; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.NativeGameSDK; - import lombok.Getter; import java.io.File; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/GameSDKTypeMapper.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/GameSDKTypeMapper.java index b7e2c6b6..78e0b7bb 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/GameSDKTypeMapper.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/GameSDKTypeMapper.java @@ -19,7 +19,6 @@ package kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna; import com.sun.jna.DefaultTypeMapper; - import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.*; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordCreateParams.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordCreateParams.java index f1c4590d..9c7e15a9 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordCreateParams.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordCreateParams.java @@ -20,14 +20,12 @@ package kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct; import com.sun.jna.Pointer; import com.sun.jna.Structure; - import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.NativeGameSDK; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.interfacestruct.*; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.DiscordClientID; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.DiscordVersion; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.UInt64; - import java.util.Arrays; import java.util.List; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordFileStat.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordFileStat.java index 40f72b6c..58c1832c 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordFileStat.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordFileStat.java @@ -20,7 +20,6 @@ package kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct; import com.sun.jna.Pointer; import com.sun.jna.Structure; - import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.UInt64; import java.util.Arrays; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordLobby.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordLobby.java index c89dc1cf..aa2f144f 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordLobby.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordLobby.java @@ -22,7 +22,6 @@ import com.sun.jna.Pointer; import com.sun.jna.Structure; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordLobbyType; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.DiscordSnowflake; - import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.UInt32; import java.util.Arrays; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordSkuPrice.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordSkuPrice.java index c69ca97a..234c0039 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordSkuPrice.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordSkuPrice.java @@ -20,7 +20,6 @@ package kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct; import com.sun.jna.Pointer; import com.sun.jna.Structure; - import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.UInt32; import java.util.Arrays; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordStruct.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordStruct.java index c95680a5..12292692 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordStruct.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordStruct.java @@ -21,10 +21,8 @@ package kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct; import com.sun.jna.Library; import com.sun.jna.Pointer; import com.sun.jna.Structure; - import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.GameSDKTypeMapper; - import java.util.Collections; import java.util.Map; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordUser.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordUser.java index 62144977..3db714dc 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordUser.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordUser.java @@ -20,10 +20,8 @@ package kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct; import com.sun.jna.Pointer; import com.sun.jna.Structure; - import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.DiscordSnowflake; - import java.util.Arrays; import java.util.List; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordUserAchievement.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordUserAchievement.java index db13ab77..52b87ace 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordUserAchievement.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/datastruct/DiscordUserAchievement.java @@ -21,7 +21,6 @@ package kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct; import com.sun.jna.Pointer; import com.sun.jna.Structure; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.DiscordSnowflake; - import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.UInt32; import java.util.Arrays; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordAchievementEvents.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordAchievementEvents.java index a75e0186..a33adb16 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordAchievementEvents.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordAchievementEvents.java @@ -18,9 +18,9 @@ package kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.interfacestruct; +import com.sun.jna.Pointer; import com.sun.jna.Structure; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordStruct; -import com.sun.jna.Pointer; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordUserAchievement; import java.util.Arrays; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordAchievementManager.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordAchievementManager.java index 40d37327..31cd93f8 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordAchievementManager.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordAchievementManager.java @@ -18,16 +18,16 @@ package kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.interfacestruct; +import com.sun.jna.Pointer; import com.sun.jna.Structure; import com.sun.jna.ptr.IntByReference; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.NativeGameSDK; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordStruct; -import com.sun.jna.Pointer; +import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordUserAchievement; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordResult; +import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.DiscordSnowflake; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.Int32; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.UInt8; -import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.DiscordSnowflake; -import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordUserAchievement; import java.util.Arrays; import java.util.List; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordActivityEvents.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordActivityEvents.java index d340e544..b64ab1bb 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordActivityEvents.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordActivityEvents.java @@ -18,12 +18,12 @@ package kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.interfacestruct; -import com.sun.jna.Structure; -import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordStruct; import com.sun.jna.Pointer; -import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordActivityActionType; +import com.sun.jna.Structure; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordActivity; +import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordStruct; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordUser; +import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordActivityActionType; import java.util.Arrays; import java.util.List; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordActivityManager.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordActivityManager.java index 2cab2538..db559e9c 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordActivityManager.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordActivityManager.java @@ -18,16 +18,16 @@ package kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.interfacestruct; +import com.sun.jna.Pointer; import com.sun.jna.Structure; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.NativeGameSDK; +import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordActivity; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordStruct; -import com.sun.jna.Pointer; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordActivityActionType; +import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordActivityJoinRequestReply; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordResult; -import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.UInt32; -import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordActivity; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.DiscordSnowflake; -import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordActivityJoinRequestReply; +import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.UInt32; import java.util.Arrays; import java.util.List; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordApplicationManager.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordApplicationManager.java index ff07aec8..e9c04560 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordApplicationManager.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordApplicationManager.java @@ -18,12 +18,12 @@ package kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.interfacestruct; +import com.sun.jna.Pointer; import com.sun.jna.Structure; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.NativeGameSDK; +import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordOAuth2Token; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordStruct; -import com.sun.jna.Pointer; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordResult; -import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordOAuth2Token; import java.util.Arrays; import java.util.List; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordCore.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordCore.java index 95e4ad16..8aab4147 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordCore.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordCore.java @@ -18,11 +18,11 @@ package kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.interfacestruct; +import com.sun.jna.Pointer; import com.sun.jna.Structure; import com.sun.jna.TypeMapper; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.GameSDKTypeMapper; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordStruct; -import com.sun.jna.Pointer; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordLogLevel; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordResult; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordImageManager.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordImageManager.java index 322d4a79..b2bcf8ab 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordImageManager.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordImageManager.java @@ -18,15 +18,13 @@ package kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.interfacestruct; +import com.sun.jna.Pointer; import com.sun.jna.Structure; - +import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordImageDimensions; +import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordImageHandle; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordStruct; - -import com.sun.jna.Pointer; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordResult; -import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordImageDimensions; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.UInt32; -import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordImageHandle; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordLobbyEvents.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordLobbyEvents.java index 72ee2293..5cb278c4 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordLobbyEvents.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordLobbyEvents.java @@ -18,13 +18,13 @@ package kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.interfacestruct; +import com.sun.jna.Pointer; import com.sun.jna.Structure; import com.sun.jna.ptr.ByteByReference; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordStruct; -import com.sun.jna.Pointer; -import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.UInt8; -import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.UInt32; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.Int64; +import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.UInt32; +import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.UInt8; import java.util.Arrays; import java.util.List; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordLobbyManager.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordLobbyManager.java index 08bfba44..9e68032f 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordLobbyManager.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordLobbyManager.java @@ -18,19 +18,19 @@ package kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.interfacestruct; +import com.sun.jna.Pointer; import com.sun.jna.Structure; import com.sun.jna.ptr.ByteByReference; import com.sun.jna.ptr.IntByReference; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.NativeGameSDK; +import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordLobby; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordStruct; -import com.sun.jna.Pointer; +import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordUser; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordResult; -import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordLobby; +import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.DiscordSnowflake; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.Int32; -import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.UInt8; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.UInt32; -import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.DiscordSnowflake; -import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordUser; +import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.UInt8; import java.util.Arrays; import java.util.List; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordLobbySearchQuery.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordLobbySearchQuery.java index 83019eb6..402f1e1b 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordLobbySearchQuery.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordLobbySearchQuery.java @@ -21,11 +21,11 @@ package kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.interfacestruct; import com.sun.jna.Pointer; import com.sun.jna.Structure; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordStruct; +import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordLobbySearchCast; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordLobbySearchComparison; -import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordResult; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordLobbySearchDistance; +import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordResult; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.UInt32; -import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordLobbySearchCast; import java.util.Arrays; import java.util.List; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordLobbyTransaction.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordLobbyTransaction.java index 0005c2bf..ef0178e8 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordLobbyTransaction.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordLobbyTransaction.java @@ -23,8 +23,8 @@ import com.sun.jna.Structure; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.datastruct.DiscordStruct; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordLobbyType; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.enumuration.EDiscordResult; -import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.UInt32; import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.DiscordSnowflake; +import kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.typedef.UInt32; import java.util.Arrays; import java.util.List; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordNetworkEvents.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordNetworkEvents.java index 2f08f975..75d2266c 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordNetworkEvents.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/discord/gamesdk/jna/interfacestruct/IDiscordNetworkEvents.java @@ -18,10 +18,10 @@ package kr.syeyoung.dungeonsguide.mod.discord.gamesdk.jna.interfacestruct; +import com.sun.jna.Pointer; import com.sun.jna.Structure; import com.sun.jna.ptr.ByteByReference; import kr.sye