From 70785f7afa63a1fe682f6e9f3d03b72ecc24b803 Mon Sep 17 00:00:00 2001 From: My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com> Date: Mon, 3 May 2021 21:53:00 -0400 Subject: IntelliJ's Code Clean Up --- .../dungeonsguide/RichPresenceManager.java | 2 +- .../kr/syeyoung/dungeonsguide/SkyblockStatus.java | 2 +- src/main/java/kr/syeyoung/dungeonsguide/a.java | 4 +- src/main/java/kr/syeyoung/dungeonsguide/b.java | 4 +- src/main/java/kr/syeyoung/dungeonsguide/c.java | 4 +- .../commands/CommandDungeonsGuide.java | 2 +- .../dungeonsguide/commands/CommandReparty.java | 15 +----- .../config/guiconfig/FeatureEditPane.java | 6 +-- .../dungeonsguide/config/guiconfig/GuiConfig.java | 6 +-- .../config/guiconfig/GuiGuiLocationConfig.java | 4 +- .../config/guiconfig/GuiParameterValueEdit.java | 2 +- .../dungeonsguide/config/guiconfig/MFeature.java | 6 +-- .../dungeonsguide/config/guiconfig/MParameter.java | 10 ++-- .../guiconfig/PanelDefaultParameterConfig.java | 2 +- .../config/guiconfig/PanelDelegate.java | 2 +- .../config/types/TypeConverterRegistry.java | 2 +- src/main/java/kr/syeyoung/dungeonsguide/d/a.java | 2 +- src/main/java/kr/syeyoung/dungeonsguide/d/b.java | 2 +- src/main/java/kr/syeyoung/dungeonsguide/d/c.java | 2 +- .../dungeonsguide/dungeon/DungeonContext.java | 22 ++++---- .../dungeonsguide/dungeon/MapProcessor.java | 8 +-- .../dungeonsguide/dungeon/actions/ActionMove.java | 2 +- .../dungeon/actions/ActionMoveNearestAir.java | 2 +- .../dungeon/actions/tree/ActionRoute.java | 14 ++--- .../dungeon/doorfinder/CatacombDataProvider.java | 5 +- .../doorfinder/CatacombMasterDataProvider.java | 5 +- .../dungeon/mechanics/DungeonRoomDoor.java | 2 +- .../dungeon/mechanics/DungeonSecret.java | 12 ++--- .../dungeon/roomfinder/DungeonRoom.java | 8 +-- .../roomfinder/DungeonRoomInfoRegistry.java | 8 +-- .../dungeon/roomfinder/RoomMatcher.java | 4 +- src/main/java/kr/syeyoung/dungeonsguide/e.java | 6 +-- .../eventlistener/DungeonListener.java | 24 ++++----- .../eventlistener/PacketListener.java | 3 +- .../dungeonsguide/features/AbstractFeature.java | 2 +- .../dungeonsguide/features/FeatureRegistry.java | 6 +-- .../dungeonsguide/features/GuiFeature.java | 4 +- .../features/impl/boss/FeatureBossHealth.java | 4 +- .../features/impl/boss/FeatureBoxRealLivid.java | 2 +- .../features/impl/boss/FeatureCurrentPhase.java | 4 +- .../features/impl/boss/FeatureHideAnimals.java | 2 +- .../features/impl/boss/FeatureTerracotaTimer.java | 4 +- .../impl/boss/FeatureThornBearPercentage.java | 4 +- .../impl/boss/FeatureThornSpiritBowTimer.java | 4 +- .../impl/boss/terminal/FeatureSimonSaysSolver.java | 6 +-- .../impl/boss/terminal/FeatureTerminalSolvers.java | 2 +- .../features/impl/dungeon/FeatureBoxBats.java | 2 +- .../impl/dungeon/FeatureBoxSkelemaster.java | 2 +- .../features/impl/dungeon/FeatureBoxStarMobs.java | 2 +- .../dungeon/FeatureDungeonCurrentRoomSecrets.java | 4 +- .../impl/dungeon/FeatureDungeonDeaths.java | 7 +-- .../features/impl/dungeon/FeatureDungeonMap.java | 26 +++++----- .../impl/dungeon/FeatureDungeonMilestone.java | 6 +-- .../impl/dungeon/FeatureDungeonRealTime.java | 4 +- .../impl/dungeon/FeatureDungeonSBTime.java | 6 +-- .../features/impl/dungeon/FeatureDungeonScore.java | 8 ++- .../impl/dungeon/FeatureDungeonSecrets.java | 4 +- .../features/impl/dungeon/FeatureHideNameTags.java | 2 +- .../features/impl/dungeon/FeaturePlayerESP.java | 2 +- .../impl/dungeon/FeatureWarnLowHealth.java | 6 +-- .../impl/dungeon/FeatureWatcherWarning.java | 2 +- .../features/impl/etc/FeatureCooldownCounter.java | 2 +- .../features/impl/etc/FeaturePenguins.java | 6 +-- .../impl/etc/ability/FeatureAbilityCooldown.java | 2 +- .../features/impl/party/api/ClassSpecificData.java | 4 +- .../features/impl/party/api/DungeonClass.java | 4 +- .../features/impl/party/api/SkinFetchur.java | 4 +- .../playerpreview/DataRenderDungeonFloorStat.java | 4 +- .../DataRenderDungeonHighestFloorStat.java | 2 +- .../party/playerpreview/DataRendererClassLv.java | 2 +- .../party/playerpreview/DataRendererDungeonLv.java | 2 +- .../party/playerpreview/DataRendererEditor.java | 4 +- .../party/playerpreview/DataRendererSkillLv.java | 2 +- .../playerpreview/FeatureViewPlayerOnJoin.java | 14 ++--- .../features/impl/secret/FeatureActions.java | 7 +-- .../impl/secret/FeatureMechanicBrowse.java | 8 +-- .../features/text/PanelTextParameterConfig.java | 12 ++--- .../features/text/TextHUDFeature.java | 2 +- .../gui/elements/MLabelAndElement.java | 4 +- .../gui/elements/MNavigatingPane.java | 8 +-- .../dungeonsguide/gui/elements/MParameter.java | 6 +-- .../gui/elements/MPortableColorEdit.java | 6 +-- .../dungeonsguide/gui/elements/MTabbedPane.java | 4 +- .../dungeonsguide/gui/elements/MTextField.java | 2 +- .../dungeonsguide/gui/elements/MValue.java | 6 +-- .../dungeonsguide/party/PartyJoinRequest.java | 4 +- .../syeyoung/dungeonsguide/party/PartyManager.java | 12 ++--- .../pathfinding/NodeProcessorDungeonRoom.java | 4 +- .../dungeonsguide/resources/DGTexturePack.java | 2 +- .../dungeonsguide/roomedit/EditingContext.java | 4 +- .../roomedit/gui/GuiDungeonAddSet.java | 12 ++--- .../roomedit/gui/GuiDungeonParameterEdit.java | 12 ++--- .../roomedit/gui/GuiDungeonRoomEdit.java | 8 +-- .../roomedit/gui/GuiDungeonValueEdit.java | 2 +- .../mechanicedit/ValueEditBreakableWall.java | 12 ++--- .../roomedit/mechanicedit/ValueEditDoor.java | 18 +++---- .../roomedit/mechanicedit/ValueEditDummy.java | 10 ++-- .../roomedit/mechanicedit/ValueEditFairySoul.java | 10 ++-- .../roomedit/mechanicedit/ValueEditJournal.java | 10 ++-- .../roomedit/mechanicedit/ValueEditLever.java | 16 +++--- .../roomedit/mechanicedit/ValueEditNPC.java | 10 ++-- .../roomedit/mechanicedit/ValueEditOnewayDoor.java | 12 ++--- .../mechanicedit/ValueEditOnewayLever.java | 16 +++--- .../mechanicedit/ValueEditPressurePlate.java | 16 +++--- .../roomedit/mechanicedit/ValueEditSecret.java | 14 ++--- .../roomedit/mechanicedit/ValueEditTomb.java | 10 ++-- .../roomedit/panes/ActionDisplayPane.java | 6 +-- .../roomedit/panes/ActionTreeDisplayPane.java | 4 +- .../roomedit/panes/GeneralEditPane.java | 20 ++++---- .../roomedit/panes/ProcessorParameterEditPane.java | 4 +- .../roomedit/panes/RoomDataDisplayPane.java | 2 +- .../roomedit/panes/RoomMatchDisplayPane.java | 7 +-- .../roomedit/panes/RoommatchingPane.java | 6 +-- .../roomedit/panes/SecretEditPane.java | 6 +-- .../roomedit/valueedit/ValueEdit.java | 4 +- .../roomedit/valueedit/ValueEditAColor.java | 4 +- .../roomedit/valueedit/ValueEditBoolean.java | 2 +- .../roomedit/valueedit/ValueEditColor.java | 2 +- .../roomedit/valueedit/ValueEditCreator.java | 6 +-- .../valueedit/ValueEditOffsetPointSet.java | 7 +-- .../roomedit/valueedit/ValueEditRegistry.java | 2 +- .../roomprocessor/GeneralRoomProcessor.java | 8 +-- .../roomprocessor/ProcessorFactory.java | 4 +- .../roomprocessor/RoomProcessorButtonSolver.java | 2 +- .../roomprocessor/RoomProcessorCreeperSolver.java | 11 ++-- .../roomprocessor/RoomProcessorIcePath.java | 4 +- .../RoomProcessorTeleportMazeSolver.java | 2 +- .../RoomProcessorTicTacToeSolver.java | 2 +- .../roomprocessor/RoomProcessorTrivia.java | 2 +- .../bombdefuse/RoomProcessorBombDefuseSolver.java | 2 +- .../chambers/BombDefuseChamberGenerator.java | 8 +-- .../bombdefuse/chambers/ChamberProcessor.java | 4 +- .../chambers/GeneralDefuseChamberProcessor.java | 4 +- .../chambers/arrow/ArrowLeftProcessor.java | 4 +- .../chambers/arrow/ArrowRightProcessor.java | 8 +-- .../chambers/color/ColorLeftProcessor.java | 6 ++- .../chambers/color/ColorRightProcessor.java | 6 ++- .../chambers/creeper/CreeperLeftProcessor.java | 2 +- .../chambers/creeper/CreeperRightProcessor.java | 4 +- .../goldenpath/GoldenPathLeftProcessor.java | 6 +-- .../goldenpath/GoldenPathRightProcessor.java | 8 +-- .../chambers/maze/MazeRightProcessor.java | 4 +- .../chambers/number/NumberLeftProcessor.java | 5 +- .../chambers/number/NumberRightProcessor.java | 6 ++- .../bossfight/BossfightProcessorLivid.java | 2 +- .../bossfight/BossfightProcessorThorn.java | 2 +- .../bossfight/GeneralBossfightProcessor.java | 2 +- .../icefill/RoomProcessorIcePath2.java | 4 +- .../waterpuzzle/RoomProcessorWaterPuzzle.java | 10 ++-- .../roomprocessor/waterpuzzle/WaterBoard.java | 20 ++++---- .../syeyoung/dungeonsguide/stomp/StompClient.java | 6 +-- .../dungeonsguide/stomp/StompClientStatus.java | 2 +- .../syeyoung/dungeonsguide/stomp/StompPayload.java | 2 +- .../dungeonsguide/stomp/StompSubscription.java | 4 +- .../syeyoung/dungeonsguide/utils/RenderUtils.java | 60 +++++++++++----------- .../kr/syeyoung/dungeonsguide/utils/XPUtils.java | 6 +-- 156 files changed, 470 insertions(+), 506 deletions(-) (limited to 'src/main/java/kr') diff --git a/src/main/java/kr/syeyoung/dungeonsguide/RichPresenceManager.java b/src/main/java/kr/syeyoung/dungeonsguide/RichPresenceManager.java index ec7a9ce5..a1003ec5 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/RichPresenceManager.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/RichPresenceManager.java @@ -56,7 +56,7 @@ public class RichPresenceManager implements Runnable { }).build(), true); } - private SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); + private final SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); public void updatePresence() { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/SkyblockStatus.java b/src/main/java/kr/syeyoung/dungeonsguide/SkyblockStatus.java index d2635c89..c43ed955 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/SkyblockStatus.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/SkyblockStatus.java @@ -46,7 +46,7 @@ public class SkyblockStatus { Minecraft mc = Minecraft.getMinecraft(); if (mc == null || mc.thePlayer == null) return false; if (!mc.isSingleplayer() && mc.thePlayer.getClientBrand() != null) { - if (mc.thePlayer.getClientBrand().startsWith("Hypixel BungeeCord")) return true; + return mc.thePlayer.getClientBrand().startsWith("Hypixel BungeeCord"); } return false; } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/a.java b/src/main/java/kr/syeyoung/dungeonsguide/a.java index 2fc4bb4d..dd4f7562 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/a.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/a.java @@ -38,7 +38,7 @@ public class a public void a(FMLInitializationEvent a) { - this.a = this; + kr.syeyoung.dungeonsguide.a.a = this; d.init(a); } @@ -50,7 +50,7 @@ public class a try { c = b.b(this.getClass().getResourceAsStream("/kr/syeyoung/dungeonsguide/e.class") == null ? System.getProperty("dg.version") == null ? "latest" : System.getProperty("dg.version") : null); if (c != null) { - this.a = this; + kr.syeyoung.dungeonsguide.a.a = this; URL.setURLStreamHandlerFactory(new c(b)); LaunchClassLoader d = (LaunchClassLoader) a.class.getClassLoader(); d.addURL(new URL("z:///")); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/b.java b/src/main/java/kr/syeyoung/dungeonsguide/b.java index 9e350d69..d914878c 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/b.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/b.java @@ -29,7 +29,7 @@ import java.util.zip.ZipInputStream; public class b { private KeyPair a; private String b; - private ProgressManager.ProgressBar p; + private final ProgressManager.ProgressBar p; public String c() { return b; @@ -132,7 +132,7 @@ public class b { return e.get("data").getAsString(); } - private HashMap c = new HashMap(); + private final HashMap c = new HashMap(); public HashMap d() { return c; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/c.java b/src/main/java/kr/syeyoung/dungeonsguide/c.java index 6e2d8023..dbef9503 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/c.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/c.java @@ -4,7 +4,7 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; public interface c { - public void init(FMLInitializationEvent event); + void init(FMLInitializationEvent event); - public void pre(FMLPreInitializationEvent event); + void pre(FMLPreInitializationEvent event); } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java b/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java index c4e006bb..c175572a 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandDungeonsGuide.java @@ -305,7 +305,7 @@ public class CommandDungeonsGuide extends CommandBase { File runDir = new File(f, "dungeonruns"); runDir.mkdirs(); - File runFile = new File(runDir, UUID.randomUUID().toString()+".dgrun"); + File runFile = new File(runDir, UUID.randomUUID() +".dgrun"); DungeonContext dungeonContext = e.getDungeonsGuide().getSkyblockStatus().getContext(); if (dungeonContext == null) { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandReparty.java b/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandReparty.java index 78a3bb9d..02ef7fd3 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandReparty.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/commands/CommandReparty.java @@ -1,25 +1,14 @@ package kr.syeyoung.dungeonsguide.commands; -import kr.syeyoung.dungeonsguide.config.guiconfig.GuiConfig; -import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoomInfoRegistry; -import kr.syeyoung.dungeonsguide.e; import kr.syeyoung.dungeonsguide.features.FeatureRegistry; import kr.syeyoung.dungeonsguide.utils.TextUtils; import net.minecraft.client.Minecraft; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; -import net.minecraft.util.ChatComponentText; import net.minecraftforge.client.event.ClientChatReceivedEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; -import javax.crypto.BadPaddingException; -import javax.crypto.IllegalBlockSizeException; -import javax.crypto.NoSuchPaddingException; -import java.io.IOException; -import java.security.InvalidAlgorithmParameterException; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.List; @@ -45,7 +34,7 @@ public class CommandReparty extends CommandBase { requestReparty(); } - public static enum Phase { + public enum Phase { NOT, REQUESTED, RECEIVE_PARTYMEMBERS, @@ -53,7 +42,7 @@ public class CommandReparty extends CommandBase { REPARTY } - private List players = new ArrayList(); + private final List players = new ArrayList(); private long nextTrigger = Long.MAX_VALUE; private Phase phase = Phase.NOT; @SubscribeEvent diff --git a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/FeatureEditPane.java b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/FeatureEditPane.java index 0ab6761f..4f641f53 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/FeatureEditPane.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/FeatureEditPane.java @@ -20,11 +20,11 @@ import java.util.*; import java.util.List; public class FeatureEditPane extends MPanel { - private List features; + private final List features; - private List le = new ArrayList(); + private final List le = new ArrayList(); - private GuiConfig config; + private final GuiConfig config; private MTextField textField; private String search = ""; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiConfig.java b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiConfig.java index 406046d9..8c18c77e 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiConfig.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiConfig.java @@ -24,12 +24,12 @@ import java.util.Stack; public class GuiConfig extends GuiScreen { - private MPanel mainPanel = new MPanel(); + private final MPanel mainPanel = new MPanel(); @Getter - private MNavigatingPane tabbedPane; + private final MNavigatingPane tabbedPane; - private Stack history = new Stack(); + private final Stack history = new Stack(); public GuiConfig() { MNavigatingPane tabbedPane = new MNavigatingPane(); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiGuiLocationConfig.java b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiGuiLocationConfig.java index 93ae3a22..6e0ac495 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiGuiLocationConfig.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiGuiLocationConfig.java @@ -17,8 +17,8 @@ import java.io.IOException; public class GuiGuiLocationConfig extends GuiScreen { - private MPanel mainPanel = new MPanel(); - private GuiScreen before; + private final MPanel mainPanel = new MPanel(); + private final GuiScreen before; public GuiGuiLocationConfig(final GuiScreen before, AbstractFeature featureWhitelist) { this.before = before; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterValueEdit.java b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterValueEdit.java index 8b229656..177f2545 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterValueEdit.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/GuiParameterValueEdit.java @@ -21,7 +21,7 @@ import java.io.IOException; public class GuiParameterValueEdit extends GuiScreen { - private MPanel mainPanel = new MPanel() { + private final MPanel mainPanel = new MPanel() { @Override public void onBoundsUpdate() { save.setBounds(new Rectangle(0 ,getBounds().height - 20, getBounds().width, 20)); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/MFeature.java b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/MFeature.java index fa6f2312..be03b5b8 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/MFeature.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/MFeature.java @@ -24,14 +24,14 @@ import java.util.ArrayList; public class MFeature extends MPanel { @Getter - private AbstractFeature feature; + private final AbstractFeature feature; - private List addons = new ArrayList(); + private final List addons = new ArrayList(); @Getter @Setter private Color hover; - private GuiConfig config; + private final GuiConfig config; public MFeature(final AbstractFeature abstractFeature, final GuiConfig config) { this.config = config; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/MParameter.java b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/MParameter.java index f9913f00..d2abc0ad 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/MParameter.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/MParameter.java @@ -20,21 +20,21 @@ import java.util.ArrayList; import java.util.List; public class MParameter extends MPanel { - private MLabel label; + private final MLabel label; @Getter - private AbstractFeature feature; + private final AbstractFeature feature; @Getter - private FeatureParameter parameter; + private final FeatureParameter parameter; - private List addons = new ArrayList(); + private final List addons = new ArrayList(); @Getter @Setter private Color hover; private PanelDefaultParameterConfig config; - private MLabel label2; + private final MLabel label2; public MParameter(AbstractFeature abstractFeature, final FeatureParameter parameter, final GuiConfig config2) { this.config = config; this.parameter = parameter; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/PanelDefaultParameterConfig.java b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/PanelDefaultParameterConfig.java index 75b6e881..34927fd6 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/PanelDefaultParameterConfig.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/PanelDefaultParameterConfig.java @@ -35,7 +35,7 @@ public class PanelDefaultParameterConfig extends MPanel { this.setBounds(new Rectangle(0,0,parentWidth, parentHeight)); } - private GuiConfig config; + private final GuiConfig config; public PanelDefaultParameterConfig(final GuiConfig config, AbstractFeature feature, List pre, Set ignore) { this.config = config; for (MPanel mPanel : pre) { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/PanelDelegate.java b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/PanelDelegate.java index 23da3206..32312d78 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/PanelDelegate.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/config/guiconfig/PanelDelegate.java @@ -12,7 +12,7 @@ import net.minecraft.client.renderer.GlStateManager; import java.awt.*; public class PanelDelegate extends MPanel { - private GuiFeature guiFeature; + private final GuiFeature guiFeature; private boolean draggable = false; public PanelDelegate(GuiFeature guiFeature, boolean draggable) { this.guiFeature = guiFeature; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/config/types/TypeConverterRegistry.java b/src/main/java/kr/syeyoung/dungeonsguide/config/types/TypeConverterRegistry.java index cce82ea3..967c1a11 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/config/types/TypeConverterRegistry.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/config/types/TypeConverterRegistry.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Map; public class TypeConverterRegistry { - private static Map typeConverterMap = new HashMap(); + private static final Map typeConverterMap = new HashMap(); public static void register(TypeConverter typeConverter) { typeConverterMap.put(typeConverter.getTypeString(), typeConverter); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/d/a.java b/src/main/java/kr/syeyoung/dungeonsguide/d/a.java index 58c89ba8..7cab89ae 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/d/a.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/d/a.java @@ -7,7 +7,7 @@ import java.net.URL; import java.net.URLConnection; public class a extends URLConnection { - private b a; + private final b a; protected a(URL b, b a) { super(b); connected = false; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/d/b.java b/src/main/java/kr/syeyoung/dungeonsguide/d/b.java index 80f69af9..fa674b59 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/d/b.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/d/b.java @@ -9,7 +9,7 @@ import java.net.URLStreamHandler; @AllArgsConstructor public class b extends URLStreamHandler { - private kr.syeyoung.dungeonsguide.b a; + private final kr.syeyoung.dungeonsguide.b a; @Override protected URLConnection openConnection(URL a) throws IOException { return new a(a, this.a); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/d/c.java b/src/main/java/kr/syeyoung/dungeonsguide/d/c.java index 5b3a47e3..16977501 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/d/c.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/d/c.java @@ -7,7 +7,7 @@ import java.net.URLStreamHandlerFactory; @AllArgsConstructor public class c implements URLStreamHandlerFactory { - private kr.syeyoung.dungeonsguide.b a; + private final kr.syeyoung.dungeonsguide.b a; @Override public URLStreamHandler createURLStreamHandler(String a) { if ("z".equals(a)) { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/DungeonContext.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/DungeonContext.java index 99517134..cc3b1617 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/DungeonContext.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/DungeonContext.java @@ -30,26 +30,26 @@ import java.util.List; public class DungeonContext { @Getter - private World world; + private final World world; @Getter - private MapProcessor mapProcessor; + private final MapProcessor mapProcessor; @Getter @Setter private BlockPos dungeonMin; @Getter - private Map roomMapper = new HashMap(); + private final Map roomMapper = new HashMap(); @Getter - private List dungeonRoomList = new ArrayList(); + private final List dungeonRoomList = new ArrayList(); @Getter - private List globalRoomProcessors = new ArrayList(); + private final List globalRoomProcessors = new ArrayList(); @Getter - private Map deaths = new HashMap(); + private final Map deaths = new HashMap(); @Getter - private List milestoneReached = new ArrayList(); + private final List milestoneReached = new ArrayList(); @Getter @Setter private long BossRoomEnterSeconds = -1; @@ -81,16 +81,16 @@ public class DungeonContext { private BossfightProcessor bossfightProcessor; @Getter - private Set players = new HashSet(); + private final Set players = new HashSet(); @Getter - private List events = new ArrayList(); + private final List events = new ArrayList(); public DungeonContext(World world) { this.world = world; createEvent(new DungeonNodataEvent("DUNGEON_CONTEXT_CREATION")); mapProcessor = new MapProcessor(this); - DungeonSpecificDataProvider doorFinder = DungeonSpecificDataProviderRegistry.getDoorFinder(((SkyblockStatus) e.getDungeonsGuide().getSkyblockStatus()).getDungeonName()); + DungeonSpecificDataProvider doorFinder = DungeonSpecificDataProviderRegistry.getDoorFinder(e.getDungeonsGuide().getSkyblockStatus().getDungeonName()); if (doorFinder != null) trapRoomGen = doorFinder.isTrapSpawn(e.getDungeonsGuide().getSkyblockStatus().getDungeonName()); else mapProcessor.setBugged(true); @@ -112,7 +112,7 @@ public class DungeonContext { bossroomSpawnPos = Minecraft.getMinecraft().thePlayer.getPosition(); MinecraftForge.EVENT_BUS.post(new BossroomEnterEvent()); createEvent(new DungeonNodataEvent("BOSSROOM_ENTER")); - DungeonSpecificDataProvider doorFinder = DungeonSpecificDataProviderRegistry.getDoorFinder(((SkyblockStatus) e.getDungeonsGuide().getSkyblockStatus()).getDungeonName()); + DungeonSpecificDataProvider doorFinder = DungeonSpecificDataProviderRegistry.getDoorFinder(e.getDungeonsGuide().getSkyblockStatus().getDungeonName()); if (doorFinder != null) { bossfightProcessor = doorFinder.createBossfightProcessor(world, e.getDungeonsGuide().getSkyblockStatus().getDungeonName()); } else { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java index e3ec00c6..51442cf1 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java @@ -42,7 +42,7 @@ public class MapProcessor { private MapData lastMapData2; @Getter - private BiMap mapIconToPlayerMap = HashBiMap.create(); + private final BiMap mapIconToPlayerMap = HashBiMap.create(); @Getter private Dimension unitRoomDimension; @@ -54,7 +54,7 @@ public class MapProcessor { @Setter private boolean bugged = false; - private List roomsFound = new ArrayList(); + private final List roomsFound = new ArrayList(); private boolean axisMatch = false; @@ -127,7 +127,7 @@ public class MapProcessor { } // determine door location based on npc, and determine map min from there { - DungeonSpecificDataProvider doorFinder = DungeonSpecificDataProviderRegistry.getDoorFinder(((SkyblockStatus) e.getDungeonsGuide().getSkyblockStatus()).getDungeonName()); + DungeonSpecificDataProvider doorFinder = DungeonSpecificDataProviderRegistry.getDoorFinder(e.getDungeonsGuide().getSkyblockStatus().getDungeonName()); if (doorFinder == null) { Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("§eDungeons Guide §7:: §cCouldn't find door processor for "+e.getDungeonsGuide().getSkyblockStatus().getDungeonName())); bugged = true; @@ -245,7 +245,7 @@ public class MapProcessor { builder.append(isSet ? "O" : "X"); } } - e.sendDebugChat(new ChatComponentText("Shape visual: "+builder.toString())); + e.sendDebugChat(new ChatComponentText("Shape visual: "+ builder)); context.getDungeonRoomList().add(rooms); for (Point p:rooms.getUnitPoints()) { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMove.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMove.java index 2a7ebd38..f8071fd5 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMove.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMove.java @@ -47,7 +47,7 @@ public class ActionMove extends AbstractAction { float multiplier = distance / 120f; //mobs only render ~120 blocks away float scale = 0.45f * multiplier; scale *= 25.0 / 6.0; - RenderUtils.drawTextAtWorld("Destination", pos.getX() + 0.5f, (float) (pos.getY() + 0.5f + scale), pos.getZ() + 0.5f, 0xFF00FF00, 1f, true, false, partialTicks); + RenderUtils.drawTextAtWorld("Destination", pos.getX() + 0.5f, pos.getY() + 0.5f + scale, pos.getZ() + 0.5f, 0xFF00FF00, 1f, true, false, partialTicks); RenderUtils.drawTextAtWorld(String.format("%.2f",MathHelper.sqrt_double(pos.distanceSq(Minecraft.getMinecraft().thePlayer.getPosition())))+"m", pos.getX() + 0.5f, pos.getY() + 0.5f - scale, pos.getZ() + 0.5f, 0xFFFFFF00, 1f, true, false, partialTicks); if (FeatureRegistry.SECRET_TOGGLE_KEY.isEnabled() && Keybinds.togglePathfindStatus) return; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMoveNearestAir.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMoveNearestAir.java index 3a49005d..a149e129 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMoveNearestAir.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMoveNearestAir.java @@ -46,7 +46,7 @@ public class ActionMoveNearestAir extends AbstractAction { float multiplier = distance / 120f; //mobs only render ~120 blocks away float scale = 0.45f * multiplier; scale *= 25.0 / 6.0; - RenderUtils.drawTextAtWorld("Destination", pos.getX() + 0.5f, (float) (pos.getY() + 0.5f + scale), pos.getZ() + 0.5f, 0xFF00FF00, 1f, true, false, partialTicks); + RenderUtils.drawTextAtWorld("Destination", pos.getX() + 0.5f, pos.getY() + 0.5f + scale, pos.getZ() + 0.5f, 0xFF00FF00, 1f, true, false, partialTicks); RenderUtils.drawTextAtWorld(String.format("%.2f",MathHelper.sqrt_double(pos.distanceSq(Minecraft.getMinecraft().thePlayer.getPosition())))+"m", pos.getX() + 0.5f, pos.getY() + 0.5f - scale, pos.getZ() + 0.5f, 0xFFFFFF00, 1f, true, false, partialTicks); if (FeatureRegistry.SECRET_TOGGLE_KEY.isEnabled() && Keybinds.togglePathfindStatus) return; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/tree/ActionRoute.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/tree/ActionRoute.java index d5c99c8a..ce4ba4df 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/tree/ActionRoute.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/tree/ActionRoute.java @@ -13,16 +13,16 @@ import java.util.List; public class ActionRoute { @Getter - private String mechanic; + private final String mechanic; @Getter - private String state; + private final String state; @Getter private int current; @Getter - private List actions; + private final List actions; - private DungeonRoom dungeonRoom; + private final DungeonRoom dungeonRoom; public ActionRoute(DungeonRoom dungeonRoom, String mechanic, String state) { this.mechanic = mechanic; @@ -62,10 +62,12 @@ public class ActionRoute { } public void onRenderWorld(float partialTicks) { getCurrentAction().onRenderWorld(dungeonRoom, partialTicks); - }; + } + public void onRenderScreen(float partialTicks) { getCurrentAction().onRenderScreen(dungeonRoom, partialTicks); - }; + } + public void onTick() { Action current = getCurrentAction(); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombDataProvider.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombDataProvider.java index 0c874458..50955ba9 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombDataProvider.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombDataProvider.java @@ -104,9 +104,6 @@ public class CatacombDataProvider implements DungeonSpecificDataProvider { return true; } else if (floor.equals("F6")) { return true; - } else if (floor.equals("F7")) { - return true; - } - return false; + } else return floor.equals("F7"); } } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombMasterDataProvider.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombMasterDataProvider.java index f41bcf03..0e8e67b2 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombMasterDataProvider.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombMasterDataProvider.java @@ -89,9 +89,6 @@ public class CatacombMasterDataProvider implements DungeonSpecificDataProvider { return true; } else if (floor.equals("M6")) { return true; - } else if (floor.equals("M7")) { - return true; - } - return false; + } else return floor.equals("M7"); } } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonRoomDoor.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonRoomDoor.java index d9e8cd2d..b7760327 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonRoomDoor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonRoomDoor.java @@ -14,7 +14,7 @@ import java.util.HashSet; import java.util.Set; public class DungeonRoomDoor implements DungeonMechanic { - private DungeonDoor doorfinder; + private final DungeonDoor doorfinder; public DungeonRoomDoor(DungeonDoor doorfinder) { this.doorfinder = doorfinder; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java index b7a3eee9..6966fd65 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonSecret.java @@ -58,7 +58,7 @@ public class DungeonSecret implements DungeonMechanic { if (!NodeProcessorDungeonRoom.isValidBlock(blockState)) return; } - dungeonRoom.getRoomContext().put("i-" + pos.toString(), true); + dungeonRoom.getRoomContext().put("i-" + pos, true); } } } @@ -104,7 +104,7 @@ public class DungeonSecret implements DungeonMechanic { return SecretStatus.NOT_SURE; } else { Vec3 pos = new Vec3(secretPoint.getBlockPos(dungeonRoom)); - if (dungeonRoom.getRoomContext().containsKey("i-"+pos.toString())) + if (dungeonRoom.getRoomContext().containsKey("i-"+ pos)) return SecretStatus.FOUND; Vec3 player = Minecraft.getMinecraft().thePlayer.getPositionVector(); if (player.squareDistanceTo(pos) < 16) { @@ -116,7 +116,7 @@ public class DungeonSecret implements DungeonMechanic { if (!NodeProcessorDungeonRoom.isValidBlock(blockState)) return SecretStatus.NOT_SURE; } - dungeonRoom.getRoomContext().put("i-" + pos.toString(), true); + dungeonRoom.getRoomContext().put("i-" + pos, true); } return SecretStatus.NOT_SURE; } @@ -175,16 +175,16 @@ public class DungeonSecret implements DungeonMechanic { RenderUtils.drawTextAtWorld(getCurrentState(dungeonRoom), pos.getX() +0.5f, pos.getY()+0f, pos.getZ()+0.5f, 0xFFFFFFFF, 0.03f, false, true, partialTicks); } - public static enum SecretType { + public enum SecretType { BAT, CHEST, ITEM_DROP, ESSENCE } @AllArgsConstructor @Getter - public static enum SecretStatus { + public enum SecretStatus { DEFINITELY_NOT("definitely_not"), NOT_SURE("not_sure"), CREATED("created"), FOUND("found"), ERROR("error"); - private String stateName; + private final String stateName; } public DungeonSecret clone() throws CloneNotSupportedException { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoom.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoom.java index ffc9ca6d..c77e8056 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoom.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoom.java @@ -74,7 +74,7 @@ public class DungeonRoom { } @Getter - private PathFinder pathFinder; + private final PathFinder pathFinder; public ScheduledFuture> createEntityPathTo(IBlockAccess blockaccess, Entity entityIn, BlockPos targetPos, float dist) { return asyncPathFinder.schedule(() -> { @@ -93,16 +93,16 @@ public class DungeonRoom { private static final ScheduledExecutorService asyncPathFinder = Executors.newScheduledThreadPool(2); @Getter - private NodeProcessorDungeonRoom nodeProcessorDungeonRoom; + private final NodeProcessorDungeonRoom nodeProcessorDungeonRoom; @Getter private final Map roomContext = new HashMap(); @AllArgsConstructor @Getter - public static enum RoomState { + public enum RoomState { DISCOVERED(0), COMPLETE_WITHOUT_SECRETS(0), FINISHED(0), FAILED(-14); - private int scoreModifier; + private final int scoreModifier; } private RoomProcessor roomProcessor; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoomInfoRegistry.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoomInfoRegistry.java index 19f2fd3c..e0bfe0f3 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoomInfoRegistry.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoomInfoRegistry.java @@ -18,9 +18,9 @@ import java.security.NoSuchAlgorithmException; import java.util.*; public class DungeonRoomInfoRegistry { - private static List registered = new ArrayList(); - private static Map> shapeMap = new HashMap>(); - private static Map uuidMap = new HashMap(); + private static final List registered = new ArrayList(); + private static final Map> shapeMap = new HashMap>(); + private static final Map uuidMap = new HashMap(); public static void register(DungeonRoomInfo dungeonRoomInfo) { if (dungeonRoomInfo == null) throw new NullPointerException("what the fak parameter is noll?"); @@ -42,7 +42,7 @@ public class DungeonRoomInfoRegistry { public static List getByShape(Short shape) { List dungeonRoomInfos = shapeMap.get(shape); - return dungeonRoomInfos == null ? Collections.emptyList() : dungeonRoomInfos; + return dungeonRoomInfos == null ? Collections.emptyList() : dungeonRoomInfos; } public static DungeonRoomInfo getByUUID(UUID uid) { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/RoomMatcher.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/RoomMatcher.java index cf846b20..c3e3706b 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/RoomMatcher.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/RoomMatcher.java @@ -12,7 +12,7 @@ import net.minecraft.world.World; import java.util.List; public class RoomMatcher { - private DungeonRoom dungeonRoom; + private final DungeonRoom dungeonRoom; @Getter private DungeonRoomInfo match; @@ -20,7 +20,7 @@ public class RoomMatcher { private int rotation; // how much the "found room" has to rotate clockwise to match the given dungeon room info. ! private boolean triedMatch = false; - private World w; + private final World w; public RoomMatcher(DungeonRoom dungeonRoom) { this.dungeonRoom = dungeonRoom; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/e.java b/src/main/java/kr/syeyoung/dungeonsguide/e.java index 5a011e9e..b6cea8ce 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/e.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/e.java @@ -62,7 +62,7 @@ public class e implements c, CloseListener { @Getter - private b authenticator; + private final b authenticator; @Getter private StompInterface stompConnection; @@ -79,7 +79,7 @@ public class e implements c, CloseListener { CommandReparty commandReparty; - private String stompURL = "wss://dungeons.guide/ws"; + private final String stompURL = "wss://dungeons.guide/ws"; // private String stompURL = "ws://localhost/ws"; public void init(FMLInitializationEvent event) { ProgressManager.ProgressBar progressbar = ProgressManager.push("DungeonsGuide", 4); @@ -180,7 +180,7 @@ public class e implements c, CloseListener { public SkyblockStatus getSkyblockStatus() { - return (SkyblockStatus) skyblockStatus; + return skyblockStatus; } public static e getDungeonsGuide() { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/DungeonListener.java b/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/DungeonListener.java index 2bb6f72b..ca724f9e 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/DungeonListener.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/DungeonListener.java @@ -67,7 +67,7 @@ public class DungeonListener { @SubscribeEvent public void onPostDraw(GuiScreenEvent.DrawScreenEvent.Post e) { try { - SkyblockStatus skyblockStatus = (SkyblockStatus) kr.syeyoung.dungeonsguide.e.getDungeonsGuide().getSkyblockStatus(); + SkyblockStatus skyblockStatus = kr.syeyoung.dungeonsguide.e.getDungeonsGuide().getSkyblockStatus(); if (!skyblockStatus.isOnDungeon()) return; @@ -89,7 +89,7 @@ public class DungeonListener { @SubscribeEvent public void onEntityUpdate(LivingEvent.LivingUpdateEvent e) { try { - SkyblockStatus skyblockStatus = (SkyblockStatus) kr.syeyoung.dungeonsguide.e.getDungeonsGuide().getSkyblockStatus(); + SkyblockStatus skyblockStatus = kr.syeyoung.dungeonsguide.e.getDungeonsGuide().getSkyblockStatus(); if (!skyblockStatus.isOnDungeon()) return; @@ -150,7 +150,7 @@ public class DungeonListener { - SkyblockStatus skyblockStatus = (SkyblockStatus) kr.syeyoung.dungeonsguide.e.getDungeonsGuide().getSkyblockStatus(); + SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); { boolean isOnDungeon = skyblockStatus.isOnDungeon(); boolean isOnSkyblock = skyblockStatus.isOnSkyblock(); @@ -217,7 +217,7 @@ public class DungeonListener { } - SkyblockStatus skyblockStatus = (SkyblockStatus) e.getDungeonsGuide().getSkyblockStatus(); + SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); if (!skyblockStatus.isOnDungeon()) return; if (skyblockStatus.getContext() != null) { @@ -243,7 +243,7 @@ public class DungeonListener { @SubscribeEvent(receiveCanceled = true, priority = EventPriority.HIGHEST) public void onChatReceived(ClientChatReceivedEvent clientChatReceivedEvent) { try { - SkyblockStatus skyblockStatus = (SkyblockStatus) e.getDungeonsGuide().getSkyblockStatus(); + SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); if (!skyblockStatus.isOnDungeon()) return; if (clientChatReceivedEvent.type != 2 && clientChatReceivedEvent.message.getFormattedText().contains("§6> §e§lEXTRA STATS §6<")) { @@ -287,7 +287,7 @@ public class DungeonListener { } if (clientChatReceivedEvent.type == 2) return; for (RoomProcessor globalRoomProcessor : context.getGlobalRoomProcessors()) { - if (globalRoomProcessor == roomProcessor) continue;; + if (globalRoomProcessor == roomProcessor) continue; try { globalRoomProcessor.chatReceived(clientChatReceivedEvent.message); } catch (Throwable t) { @@ -304,7 +304,7 @@ public class DungeonListener { @SubscribeEvent public void onWorldRender(RenderWorldLastEvent renderWorldLastEvent) { try { - SkyblockStatus skyblockStatus = (SkyblockStatus) e.getDungeonsGuide().getSkyblockStatus(); + SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); if (!skyblockStatus.isOnDungeon()) return; DungeonContext context = skyblockStatus.getContext(); @@ -360,7 +360,7 @@ public class DungeonListener { @SubscribeEvent() public void onKey2(InputEvent.KeyInputEvent keyInputEvent) { try { - SkyblockStatus skyblockStatus = (SkyblockStatus) e.getDungeonsGuide().getSkyblockStatus(); + SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); if (!skyblockStatus.isOnDungeon()) return; DungeonContext context = skyblockStatus.getContext(); @@ -391,7 +391,7 @@ public class DungeonListener { @SubscribeEvent() public void onInteract(PlayerInteractEntityEvent interact) { try { - SkyblockStatus skyblockStatus = (SkyblockStatus) e.getDungeonsGuide().getSkyblockStatus(); + SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); if (!skyblockStatus.isOnDungeon()) return; DungeonContext context = skyblockStatus.getContext(); @@ -452,7 +452,7 @@ public class DungeonListener { @SubscribeEvent public void onInteract(PlayerInteractEvent keyInputEvent) { try { - SkyblockStatus skyblockStatus = (SkyblockStatus) e.getDungeonsGuide().getSkyblockStatus(); + SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); if (!skyblockStatus.isOnDungeon()) return; DungeonContext context = skyblockStatus.getContext(); @@ -482,7 +482,7 @@ public class DungeonListener { } @Getter - private Map entityIdToPosMap = new HashMap(); + private final Map entityIdToPosMap = new HashMap(); @SubscribeEvent public void onEntitySpawn(EntityJoinWorldEvent spawn) { DungeonActionManager.getSpawnLocation().put(spawn.entity.getEntityId(), new Vec3(spawn.entity.posX, spawn.entity.posY, spawn.entity.posZ)); @@ -495,7 +495,7 @@ public class DungeonListener { DungeonActionManager.getKilleds().add(deathEvent.entity.getEntityId()); try { - SkyblockStatus skyblockStatus = (SkyblockStatus) e.getDungeonsGuide().getSkyblockStatus(); + SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); if (!skyblockStatus.isOnDungeon()) return; DungeonContext context = skyblockStatus.getContext(); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/PacketListener.java b/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/PacketListener.java index 9cb62929..4dab60ed 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/PacketListener.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/PacketListener.java @@ -23,7 +23,8 @@ import java.lang.reflect.Field; @ChannelHandler.Sharable public class PacketListener extends ChannelDuplexHandler { - private SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();; + private final SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); + @Override public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception { Packet packet = (Packet) msg; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/AbstractFeature.java b/src/main/java/kr/syeyoung/dungeonsguide/features/AbstractFeature.java index cb7468ee..c0724573 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/AbstractFeature.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/AbstractFeature.java @@ -71,7 +71,7 @@ public abstract class AbstractFeature { ConfigPanelCreator.map.put("base." + key , new Supplier() { @Override public MPanel get() { - return new PanelDefaultParameterConfig(config, AbstractFeature.this, Collections.emptyList(), Collections.emptySet()); + return new PanelDefaultParameterConfig(config, AbstractFeature.this, Collections.emptyList(), Collections.emptySet()); } }); return "base." + key ; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java b/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java index b38bf1b7..92b2c52e 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java @@ -26,10 +26,10 @@ import java.util.Map; public class FeatureRegistry { @Getter - private static List featureList = new ArrayList(); - private static Map featureByKey = new HashMap(); + private static final List featureList = new ArrayList(); + private static final Map featureByKey = new HashMap(); @Getter - private static Map> featuresByCategory = new HashMap>(); + private static final Map> featuresByCategory = new HashMap>(); public static AbstractFeature getFeatureByKey(String key) { return featureByKey.get(key); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/GuiFeature.java b/src/main/java/kr/syeyoung/dungeonsguide/features/GuiFeature.java index a1a8fb7a..3b735225 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/GuiFeature.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/GuiFeature.java @@ -28,14 +28,14 @@ public abstract class GuiFeature extends AbstractFeature implements ScreenRender private double defaultWidth; @Setter(value = AccessLevel.PROTECTED) private double defaultHeight; - private double defaultRatio; + private final double defaultRatio; protected GuiFeature(String category, String name, String description, String key, boolean keepRatio, int width, int height) { super(category, name, description, key); this.keepRatio = keepRatio; this.defaultWidth = width; this.defaultHeight = height; - this.defaultRatio = defaultWidth / (double)defaultHeight; + this.defaultRatio = defaultWidth / defaultHeight; this.featureRect = new GUIRectangle(0, 0, width, height); } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureBossHealth.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureBossHealth.java index 0aa03a03..17ffbe8b 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureBossHealth.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureBossHealth.java @@ -56,9 +56,7 @@ public class FeatureBossHealth extends TextHUDFeature { @Override public java.util.List getUsedTextStyle() { - return Arrays.asList(new String[] { - "title", "separator", "health", "separator2", "maxHealth" - }); + return Arrays.asList("title", "separator", "health", "separator2", "maxHealth"); } @Override diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureBoxRealLivid.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureBoxRealLivid.java index 1464d397..5013c957 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureBoxRealLivid.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureBoxRealLivid.java @@ -27,7 +27,7 @@ public class FeatureBoxRealLivid extends SimpleFeature implements WorldRenderLis } - private SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); + private final SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); @Override public void drawWorld(float partialTicks) { if (!isEnabled()) return; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureCurrentPhase.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureCurrentPhase.java index 91572f80..112a9f82 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureCurrentPhase.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureCurrentPhase.java @@ -37,9 +37,7 @@ public class FeatureCurrentPhase extends TextHUDFeature { @Override public List getUsedTextStyle() { - return Arrays.asList(new String[] { - "title", "separator", "phase" - }); + return Arrays.asList("title", "separator", "phase"); } @Override diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureHideAnimals.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureHideAnimals.java index dfce6493..cec2ea0b 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureHideAnimals.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureHideAnimals.java @@ -28,7 +28,7 @@ public class FeatureHideAnimals extends SimpleFeature implements EntityLivingRen } - private SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); + private final SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); @Override public void onEntityRenderPre(RenderLivingEvent.Pre renderPlayerEvent) { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureTerracotaTimer.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureTerracotaTimer.java index bb59419d..a79f1743 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureTerracotaTimer.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureTerracotaTimer.java @@ -40,9 +40,7 @@ public class FeatureTerracotaTimer extends TextHUDFeature { @Override public List getUsedTextStyle() { - return Arrays.asList(new String[] { - "title", "separator", "number", "unit" - }); + return Arrays.asList("title", "separator", "number", "unit"); } @Override diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureThornBearPercentage.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureThornBearPercentage.java index afce2cd5..63e768c7 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureThornBearPercentage.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureThornBearPercentage.java @@ -45,9 +45,7 @@ public class FeatureThornBearPercentage extends TextHUDFeature { @Override public java.util.List getUsedTextStyle() { - return Arrays.asList(new String[] { - "title", "separator", "number", "unit" - }); + return Arrays.asList("title", "separator", "number", "unit"); } @Override diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureThornSpiritBowTimer.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureThornSpiritBowTimer.java index 26ccaa1b..8f61d3b2 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureThornSpiritBowTimer.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/FeatureThornSpiritBowTimer.java @@ -40,9 +40,7 @@ public class FeatureThornSpiritBowTimer extends TextHUDFeature implements ChatLi @Override public List getUsedTextStyle() { - return Arrays.asList(new String[] { - "title", "separator", "time" - }); + return Arrays.asList("title", "separator", "time"); } @Override diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/terminal/FeatureSimonSaysSolver.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/terminal/FeatureSimonSaysSolver.java index 2f92873e..687e0cf0 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/terminal/FeatureSimonSaysSolver.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/terminal/FeatureSimonSaysSolver.java @@ -24,9 +24,9 @@ public class FeatureSimonSaysSolver extends SimpleFeature implements WorldRender super("Bossfight","Simon Says Solver","Solver for Simon says puzzle", "bossfight.simonsays2"); } - private SkyblockStatus ss = e.getDungeonsGuide().getSkyblockStatus(); - private List orderbuild = new ArrayList(); - private LinkedList orderclick = new LinkedList(); + private final SkyblockStatus ss = e.getDungeonsGuide().getSkyblockStatus(); + private final List orderbuild = new ArrayList(); + private final LinkedList orderclick = new LinkedList(); @Override public void drawWorld(float partialTicks) { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/terminal/FeatureTerminalSolvers.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/terminal/FeatureTerminalSolvers.java index d069c84d..7f415f78 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/terminal/FeatureTerminalSolvers.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/boss/terminal/FeatureTerminalSolvers.java @@ -35,7 +35,7 @@ public class FeatureTerminalSolvers extends SimpleFeature implements GuiOpenList private TerminalSolutionProvider solutionProvider; private TerminalSolution solution; - private List clicked = new ArrayList(); + private final List clicked = new ArrayList(); @Override public void onGuiOpen(GuiOpenEvent event) { diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxBats.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxBats.java index 92df3989..509bdfa3 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxBats.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxBats.java @@ -26,7 +26,7 @@ public class FeatureBoxBats extends SimpleFeature implements WorldRenderListener } - private SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); + private final SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); @Override public void drawWorld(float partialTicks) { if (!isEnabled()) return; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxSkelemaster.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxSkelemaster.java index 545a5449..7fb95532 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxSkelemaster.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxSkelemaster.java @@ -26,7 +26,7 @@ public class FeatureBoxSkelemaster extends SimpleFeature implements WorldRenderL } - private SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); + private final SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); @Override public void drawWorld(float partialTicks) { if (!isEnabled()) return; diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxStarMobs.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxStarMobs.java index e647e0de..881773af 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxStarMobs.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureBoxStarMobs.java @@ -25,7 +25,7 @@ public class FeatureBoxStarMobs extends SimpleFeature implements WorldRenderList } - private SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus(); + private final Skybl