From ea3ec354ba3bb5b4ac64b8032816b8e4c407f099 Mon Sep 17 00:00:00 2001 From: IRONM00N <64110067+IRONM00N@users.noreply.github.com> Date: Tue, 28 Dec 2021 00:49:28 -0500 Subject: more code clean up (#38) --- src/main/java/NotSkyblockAddonsInstallerFrame.java | 1 - .../moulberry/notenoughupdates/CustomItems.java | 5 +- .../notenoughupdates/ItemPriceInformation.java | 4 +- .../notenoughupdates/NEUEventListener.java | 11 +- .../moulberry/notenoughupdates/NEUManager.java | 46 ++- .../moulberry/notenoughupdates/NEUOverlay.java | 32 +- .../notenoughupdates/NotEnoughUpdates.java | 24 +- .../notenoughupdates/auction/APIManager.java | 2 - .../notenoughupdates/auction/CustomAH.java | 25 +- .../notenoughupdates/auction/CustomAHGui.java | 2 - .../collectionlog/CollectionConstant.java | 2 - .../collectionlog/GuiCollectionLog.java | 1 - .../commands/ClientCommandBase.java | 1 - .../notenoughupdates/commands/Commands.java | 4 +- .../notenoughupdates/commands/SimpleCommand.java | 1 - .../notenoughupdates/commands/StatsCommand.java | 2 - .../notenoughupdates/core/BackgroundBlur.java | 2 - .../notenoughupdates/core/ChromaColour.java | 2 - .../notenoughupdates/core/GlScissorStack.java | 2 - .../notenoughupdates/core/GuiElement.java | 1 - .../notenoughupdates/core/GuiElementBoolean.java | 1 - .../notenoughupdates/core/GuiElementColour.java | 2 - .../notenoughupdates/core/GuiElementTextField.java | 1 - .../core/GuiScreenElementWrapper.java | 1 - .../notenoughupdates/core/config/Config.java | 2 - .../core/config/GuiPositionEditor.java | 1 - .../core/config/KeybindHelper.java | 2 - .../notenoughupdates/core/config/Position.java | 2 - .../notenoughupdates/core/config/PositionNew.java | 4 +- .../core/config/annotations/Category.java | 2 - .../core/config/annotations/ConfigAccordionId.java | 2 - .../config/annotations/ConfigEditorAccordion.java | 2 - .../config/annotations/ConfigEditorBoolean.java | 4 +- .../config/annotations/ConfigEditorButton.java | 2 - .../config/annotations/ConfigEditorColour.java | 4 +- .../annotations/ConfigEditorDraggableList.java | 2 - .../config/annotations/ConfigEditorDropdown.java | 2 - .../core/config/annotations/ConfigEditorFSR.java | 2 - .../config/annotations/ConfigEditorKeybind.java | 2 - .../config/annotations/ConfigEditorSlider.java | 2 - .../core/config/annotations/ConfigEditorText.java | 4 +- .../core/config/annotations/ConfigOption.java | 2 - .../core/config/gui/GuiOptionEditor.java | 2 - .../core/config/gui/GuiOptionEditorAccordion.java | 1 - .../core/config/gui/GuiOptionEditorBoolean.java | 1 - .../core/config/gui/GuiOptionEditorButton.java | 1 - .../core/config/gui/GuiOptionEditorColour.java | 2 - .../config/gui/GuiOptionEditorDraggableList.java | 1 - .../core/config/gui/GuiOptionEditorDropdown.java | 1 - .../core/config/gui/GuiOptionEditorFSR.java | 1 - .../core/config/gui/GuiOptionEditorKeybind.java | 1 - .../core/config/gui/GuiOptionEditorSlider.java | 2 - .../core/config/gui/GuiOptionEditorText.java | 2 - .../core/config/gui/GuiPositionEditor.java | 1 - .../core/config/struct/ConfigProcessor.java | 2 - .../core/util/GuiElementSlider.java | 2 - .../notenoughupdates/core/util/MiscUtils.java | 1 - .../notenoughupdates/core/util/Splitters.java | 2 - .../notenoughupdates/core/util/StringUtils.java | 2 - .../notenoughupdates/core/util/lerp/LerpUtils.java | 2 - .../core/util/lerp/LerpingFloat.java | 1 - .../core/util/lerp/LerpingInteger.java | 1 - .../core/util/render/RenderUtils.java | 2 - .../core/util/render/TextRenderUtils.java | 2 - .../notenoughupdates/cosmetics/CapeManager.java | 80 ++--- .../notenoughupdates/cosmetics/CapeNode.java | 1 - .../notenoughupdates/cosmetics/GuiCosmetics.java | 1 - .../notenoughupdates/cosmetics/NEUCape.java | 5 +- .../notenoughupdates/cosmetics/ShaderManager.java | 1 - .../notenoughupdates/dungeons/DungeonBlocks.java | 41 +-- .../notenoughupdates/dungeons/DungeonMap.java | 2 - .../notenoughupdates/dungeons/DungeonWin.java | 2 - .../dungeons/GuiDungeonMapEditor.java | 5 +- .../notenoughupdates/gamemodes/GuiGamemodes.java | 1 - .../notenoughupdates/gamemodes/SBGamemodes.java | 2 - .../infopanes/CollectionLogInfoPane.java | 1 - .../notenoughupdates/infopanes/DevInfoPane.java | 8 +- .../infopanes/FlipperInfoPane.java | 12 +- .../notenoughupdates/infopanes/HTMLInfoPane.java | 1 - .../notenoughupdates/infopanes/InfoPane.java | 2 - .../infopanes/ScrollableInfoPane.java | 1 - .../notenoughupdates/infopanes/TextInfoPane.java | 1 - .../notenoughupdates/itemeditor/GuiElement.java | 2 - .../itemeditor/GuiElementButton.java | 1 - .../itemeditor/GuiElementText.java | 2 - .../itemeditor/GuiElementTextField.java | 1 - .../notenoughupdates/itemeditor/NEUItemEditor.java | 1 - .../notenoughupdates/mbgui/MBAnchorPoint.java | 1 - .../notenoughupdates/mbgui/MBDeserializer.java | 2 - .../notenoughupdates/mbgui/MBGuiElement.java | 2 - .../notenoughupdates/mbgui/MBGuiGroup.java | 2 - .../notenoughupdates/mbgui/MBGuiGroupAligned.java | 3 - .../notenoughupdates/mbgui/MBGuiGroupFloating.java | 5 +- .../miscfeatures/AuctionBINWarning.java | 2 - .../miscfeatures/AuctionSortModeWarning.java | 2 - .../miscfeatures/BetterContainers.java | 2 - .../miscfeatures/CollectionLogManager.java | 2 - .../miscfeatures/CrystalOverlay.java | 16 +- .../miscfeatures/CustomItemEffects.java | 59 ++-- .../miscfeatures/CustomSkulls.java | 2 - .../miscfeatures/DamageCommas.java | 5 +- .../miscfeatures/DwarvenMinesTextures.java | 3 - .../miscfeatures/DwarvenMinesWaypoints.java | 72 ++--- .../miscfeatures/EnchantingSolvers.java | 15 +- .../notenoughupdates/miscfeatures/FairySouls.java | 14 +- .../miscfeatures/FancyPortals.java | 2 - .../miscfeatures/FishingHelper.java | 3 - .../miscfeatures/ItemCooldowns.java | 2 - .../miscfeatures/ItemCustomizeManager.java | 2 - .../miscfeatures/ItemRarityHalo.java | 2 - .../notenoughupdates/miscfeatures/MiningStuff.java | 4 +- .../miscfeatures/NPCRetexturing.java | 2 - .../miscfeatures/NullzeeSphere.java | 2 - .../miscfeatures/PetInfoOverlay.java | 82 ++--- .../notenoughupdates/miscfeatures/SlotLocking.java | 2 - .../miscfeatures/StorageManager.java | 7 +- .../miscfeatures/StreamerMode.java | 2 - .../notenoughupdates/miscfeatures/SunTzu.java | 2 - .../miscgui/AccessoryBagOverlay.java | 129 +++----- .../notenoughupdates/miscgui/CalendarOverlay.java | 2 - .../notenoughupdates/miscgui/GuiCustomEnchant.java | 1 - .../notenoughupdates/miscgui/GuiEnchantColour.java | 1 - .../miscgui/GuiInvButtonEditor.java | 95 +++--- .../notenoughupdates/miscgui/GuiItemCustomize.java | 1 - .../notenoughupdates/miscgui/GuiItemRecipe.java | 2 - .../miscgui/InventoryStorageSelector.java | 8 +- .../miscgui/NEUOverlayPlacements.java | 1 - .../notenoughupdates/miscgui/StorageOverlay.java | 1 - .../notenoughupdates/miscgui/TradeWindow.java | 23 +- .../miscgui/tutorials/NeuConfigTutorial.java | 2 - .../miscgui/tutorials/NeuTutorial.java | 201 ++++++------ .../miscgui/tutorials/TutorialBase.java | 201 ++++++------ .../mixins/MixinAbstractClientPlayer.java | 2 - .../notenoughupdates/mixins/MixinContainer.java | 2 - .../mixins/MixinEffectRenderer.java | 2 - .../notenoughupdates/mixins/MixinEntityPlayer.java | 1 - .../mixins/MixinEntityPlayerSP.java | 2 - .../mixins/MixinEntityRenderer.java | 2 - .../notenoughupdates/mixins/MixinGuiChest.java | 2 - .../notenoughupdates/mixins/MixinGuiContainer.java | 1 - .../notenoughupdates/mixins/MixinGuiIngame.java | 1 - .../notenoughupdates/mixins/MixinGuiInventory.java | 2 - .../notenoughupdates/mixins/MixinGuiScreen.java | 2 - .../mixins/MixinInventoryEffectRenderer.java | 2 - .../mixins/MixinInventoryPlayer.java | 3 - .../mixins/MixinItemCameraTransforms.java | 2 - .../notenoughupdates/mixins/MixinItemRenderer.java | 2 - .../notenoughupdates/mixins/MixinItemStack.java | 2 - .../mixins/MixinLayerArmorBase.java | 2 - .../mixins/MixinLayerCustomHead.java | 1 - .../mixins/MixinLoadingScreenRenderer.java | 2 - .../notenoughupdates/mixins/MixinMinecraft.java | 2 - .../notenoughupdates/mixins/MixinMouseHelper.java | 2 - .../mixins/MixinNetHandlerPlayClient.java | 1 - .../mixins/MixinPlayerControllerMP.java | 2 - .../notenoughupdates/mixins/MixinRender.java | 2 - .../notenoughupdates/mixins/MixinRenderFish.java | 2 - .../notenoughupdates/mixins/MixinRenderGlobal.java | 2 - .../notenoughupdates/mixins/MixinRenderItem.java | 2 - .../notenoughupdates/mixins/MixinRenderList.java | 1 - .../mixins/MixinRendererLivingEntity.java | 2 - .../mixins/MixinTextureManager.java | 2 - .../mixins/MixinTileEntitySkullRenderer.java | 2 - .../mixins/MixinTileEntitySpecialRenderer.java | 1 - .../mixins/MixinVboRenderList.java | 1 - .../notenoughupdates/mixins/MixinWorld.java | 1 - .../notenoughupdates/mixins/MixinWorldClient.java | 2 - .../notenoughupdates/options/NEUConfig.java | 133 ++++---- .../notenoughupdates/options/NEUConfigEditor.java | 1 - .../options/seperateSections/AHTweaks.java | 2 - .../options/seperateSections/Dungeons.java | 1 + .../options/seperateSections/LocationEdit.java | 1 - .../options/seperateSections/Mining.java | 40 +-- .../options/seperateSections/Notifications.java | 14 +- .../options/seperateSections/SlayerOverlay.java | 1 - .../overlays/AuctionSearchOverlay.java | 3 - .../overlays/CombatSkillOverlay.java | 3 - .../overlays/CrystalHollowOverlay.java | 33 +- .../notenoughupdates/overlays/FarmingOverlay.java | 2 - .../overlays/FishingSkillOverlay.java | 2 - .../notenoughupdates/overlays/FuelBar.java | 2 - .../notenoughupdates/overlays/MiningOverlay.java | 51 ++- .../overlays/MiningSkillOverlay.java | 3 - .../notenoughupdates/overlays/OverlayManager.java | 1 - .../overlays/RancherBootOverlay.java | 2 - .../notenoughupdates/overlays/SlayerOverlay.java | 1 - .../notenoughupdates/overlays/TextOverlay.java | 2 - .../overlays/TextOverlayStyle.java | 2 - .../notenoughupdates/overlays/TimersOverlay.java | 3 - .../profileviewer/GuiProfileViewer.java | 163 +++------- .../notenoughupdates/profileviewer/Panorama.java | 2 - .../profileviewer/PlayerStats.java | 40 +-- .../profileviewer/ProfileViewer.java | 342 ++++++++------------- .../moulberry/notenoughupdates/util/Constants.java | 2 - .../util/DiscordMarkdownBuilder.java | 1 - .../notenoughupdates/util/GuiTextures.java | 3 +- .../notenoughupdates/util/HastebinUploader.java | 1 - .../notenoughupdates/util/HypixelApi.java | 1 - .../notenoughupdates/util/LerpingFloat.java | 1 - .../notenoughupdates/util/NEUResourceManager.java | 1 - .../notenoughupdates/util/ProfileApiSyncer.java | 2 - .../util/ReverseWorldRenderer.java | 1 - .../moulberry/notenoughupdates/util/SBInfo.java | 4 +- .../notenoughupdates/util/SpecialColour.java | 2 - .../moulberry/notenoughupdates/util/TexLoc.java | 2 - .../moulberry/notenoughupdates/util/Utils.java | 29 +- .../notenoughupdates/util/XPInformation.java | 2 - 207 files changed, 880 insertions(+), 1500 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/NotSkyblockAddonsInstallerFrame.java b/src/main/java/NotSkyblockAddonsInstallerFrame.java index 12431ae0..322555c8 100644 --- a/src/main/java/NotSkyblockAddonsInstallerFrame.java +++ b/src/main/java/NotSkyblockAddonsInstallerFrame.java @@ -16,7 +16,6 @@ import java.util.regex.Pattern; import java.util.zip.ZipEntry; public class NotSkyblockAddonsInstallerFrame extends JFrame implements ActionListener, MouseListener { - private static final Pattern IN_MODS_SUBFOLDER = Pattern.compile("1\\.8\\.9[/\\\\]?$"); private JLabel logo = null; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/CustomItems.java b/src/main/java/io/github/moulberry/notenoughupdates/CustomItems.java index 5cadd856..f94a0633 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/CustomItems.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/CustomItems.java @@ -7,8 +7,7 @@ import io.github.moulberry.notenoughupdates.util.Constants; import net.minecraft.util.EnumChatFormatting; public class CustomItems { - - /** + /* * So it has come to this, huh? Snooping through the source to find all my carefully crafted easter eggs. You * cheated not only the game, but yourself. You didn't grow. You didn't improve. You took a * shortcut and gained nothing. You experienced a hollow victory. Nothing was risked and nothing was gained. @@ -77,7 +76,7 @@ public class CustomItems { "We do a lil Chatting" ); - /** + /* * SHAAAAAAAAAAAAAAAAAAME */ diff --git a/src/main/java/io/github/moulberry/notenoughupdates/ItemPriceInformation.java b/src/main/java/io/github/moulberry/notenoughupdates/ItemPriceInformation.java index 43689d3a..e7c55d77 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/ItemPriceInformation.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/ItemPriceInformation.java @@ -46,8 +46,7 @@ public class ItemPriceInformation { //noinspection ResultOfMethodCallIgnored file.createNewFile(); writer.write(gson.toJson(items)); - } catch (IOException ignored) { - } + } catch (IOException ignored) {} } } @@ -304,5 +303,4 @@ public class ItemPriceInformation { return false; } - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java index db610720..341fe9ea 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUEventListener.java @@ -915,8 +915,6 @@ public class NEUEventListener { *

* All of this only matters if players are using gui scale auto which may result in the inventory being drawn * over the various panes. - * - * @param event */ @SubscribeEvent public void onGuiBackgroundDraw(GuiScreenEvent.BackgroundDrawnEvent event) { @@ -1121,8 +1119,6 @@ public class NEUEventListener { /** * Will draw the NEUOverlay over the inventory if focusInv == false. (z-translation of 300 is so that NEUOverlay * will draw over Items in the inventory (which render at a z value of about 250)) - * - * @param event */ @SubscribeEvent public void onGuiScreenDrawPost(GuiScreenEvent.DrawScreenEvent.Post event) { @@ -1258,8 +1254,7 @@ public class NEUEventListener { if (cost.length() > 0) { chestCost = Integer.parseInt(cost.toString()); } - } catch (Exception ignored) { - } + } catch (Exception ignored) {} String missingItem = null; int totalValue = 0; @@ -1428,8 +1423,6 @@ public class NEUEventListener { /** * Sends a mouse event to NEUOverlay if the inventory isn't hovered AND focused. * Will also cancel the event if if NEUOverlay#mouseInput returns true. - * - * @param event */ @SubscribeEvent(priority = EventPriority.LOW) public void onGuiScreenMouse(GuiScreenEvent.MouseInputEvent.Pre event) { @@ -2532,8 +2525,6 @@ public class NEUEventListener { /** * This makes it so that holding LCONTROL while hovering over an item with NBT will show the NBT of the item. - * - * @param event */ @SubscribeEvent public void onItemTooltip(ItemTooltipEvent event) { diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java index cb01206e..0f4e58bf 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUManager.java @@ -36,7 +36,6 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; public class NEUManager { - private final NotEnoughUpdates neu; public final Gson gson; public final APIManager auctionManager; @@ -305,8 +304,6 @@ public class NEUManager { /** * Loads the item in to the itemMap and also stores various words associated with this item * in to titleWordMap and loreWordMap. These maps are used in the searching algorithm. - * - * @param internalName */ public void loadItem(String internalName) { itemstackCache.remove(internalName); @@ -408,11 +405,10 @@ public class NEUManager { out: for (String s : query.split(" ")) { for (int i = 0; i < splitToSeach.length; i++) { - if (lastMatch == -1 || lastMatch == i - 1) { - if (splitToSeach[i].startsWith(s)) { - lastMatch = i; - continue out; - } + if (!(lastMatch == -1 || lastMatch == i - 1)) continue; + if (splitToSeach[i].startsWith(s)) { + lastMatch = i; + continue out; } } return false; @@ -599,27 +595,24 @@ public class NEUManager { for (String queryWord : query.split(" ")) { HashMap> matchesToKeep = new HashMap<>(); for (HashMap> wordMatches : subMapWithKeysThatAreSuffixes(queryWord, wordMap).values()) { - if (wordMatches != null && !wordMatches.isEmpty()) { - if (matches == null) { - //Copy all wordMatches to titleMatches - for (String internalname : wordMatches.keySet()) { + if (!(wordMatches != null && !wordMatches.isEmpty())) continue; + if (matches == null) { + //Copy all wordMatches to titleMatches + for (String internalname : wordMatches.keySet()) { + if (!matchesToKeep.containsKey(internalname)) { + matchesToKeep.put(internalname, new ArrayList<>()); + } + matchesToKeep.get(internalname).addAll(wordMatches.get(internalname)); + } + } else { + for (String internalname : matches.keySet()) { + if (!wordMatches.containsKey(internalname)) continue; + for (Integer newIndex : wordMatches.get(internalname)) { + if (!matches.get(internalname).contains(newIndex - 1)) continue; if (!matchesToKeep.containsKey(internalname)) { matchesToKeep.put(internalname, new ArrayList<>()); } - matchesToKeep.get(internalname).addAll(wordMatches.get(internalname)); - } - } else { - for (String internalname : matches.keySet()) { - if (wordMatches.containsKey(internalname)) { - for (Integer newIndex : wordMatches.get(internalname)) { - if (matches.get(internalname).contains(newIndex - 1)) { - if (!matchesToKeep.containsKey(internalname)) { - matchesToKeep.put(internalname, new ArrayList<>()); - } - matchesToKeep.get(internalname).add(newIndex); - } - } - } + matchesToKeep.get(internalname).add(newIndex); } } } @@ -1475,5 +1468,4 @@ public class NEUManager { return stack; } } - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java index 2b518fec..18e0fc3b 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/NEUOverlay.java @@ -68,7 +68,6 @@ import java.util.concurrent.atomic.AtomicReference; import static io.github.moulberry.notenoughupdates.util.GuiTextures.*; public class NEUOverlay extends Gui { - private static final ResourceLocation SUPERGEHEIMNISVERMOGEN = new ResourceLocation("notenoughupdates:supersecretassets/bald.png"); private static final ResourceLocation SEARCH_BAR = new ResourceLocation("notenoughupdates:search_bar.png"); private static final ResourceLocation SEARCH_BAR_GOLD = new ResourceLocation("notenoughupdates:search_bar_gold.png"); @@ -236,11 +235,8 @@ public class NEUOverlay extends Gui { int paddingUnscaled = getPaddingUnscaled(); GlStateManager.color(1, 1, 1, 1); - if (searchMode) { - Minecraft.getMinecraft().getTextureManager().bindTexture(SEARCH_BAR_GOLD); - } else { - Minecraft.getMinecraft().getTextureManager().bindTexture(SEARCH_BAR); - } + + Minecraft.getMinecraft().getTextureManager().bindTexture(searchMode ? SEARCH_BAR_GOLD : SEARCH_BAR); int w = getWidth(); int h = getHeight(); @@ -316,8 +312,7 @@ public class NEUOverlay extends Gui { } @Override - public void recalculate() { - } + public void recalculate() {} }; } @@ -334,8 +329,7 @@ public class NEUOverlay extends Gui { } @Override - public void recalculate() { - } + public void recalculate() {} @Override public void mouseClick(float x, float y, int mouseX, int mouseY) { @@ -348,8 +342,7 @@ public class NEUOverlay extends Gui { } @Override - public void mouseClickOutside() { - } + public void mouseClickOutside() {} @Override public void render(float x, float y) { @@ -387,8 +380,7 @@ public class NEUOverlay extends Gui { } @Override - public void recalculate() { - } + public void recalculate() {} @Override public void mouseClick(float x, float y, int mouseX, int mouseY) { @@ -405,8 +397,7 @@ public class NEUOverlay extends Gui { } @Override - public void mouseClickOutside() { - } + public void mouseClickOutside() {} @Override public void render(float x, float y) { @@ -445,8 +436,7 @@ public class NEUOverlay extends Gui { } @Override - public void recalculate() { - } + public void recalculate() {} @Override public void mouseClick(float x, float y, int mouseX, int mouseY) { @@ -467,8 +457,7 @@ public class NEUOverlay extends Gui { } @Override - public void mouseClickOutside() { - } + public void mouseClickOutside() {} @Override public void render(float x, float y) { @@ -2060,8 +2049,6 @@ public class NEUOverlay extends Gui { /** * Sets the current page and marks that the itemsPane should be redrawn - * - * @param page */ public void setPage(int page) { this.page = page; @@ -2356,5 +2343,4 @@ public class NEUOverlay extends Gui { public float getInfoPaneOffsetFactor() { return infoPaneOffsetFactor.getValue() * getWidthMult(); } - } \ No newline at end of file diff --git a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java index 881e3d3c..23b89b44 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/NotEnoughUpdates.java @@ -78,18 +78,15 @@ public class NotEnoughUpdates { public Commands commands; - public static HashMap petRarityToColourMap = new HashMap<>(); - - static { - petRarityToColourMap.put("UNKNOWN", EnumChatFormatting.RED.toString()); - - petRarityToColourMap.put("COMMON", EnumChatFormatting.WHITE.toString()); - petRarityToColourMap.put("UNCOMMON", EnumChatFormatting.GREEN.toString()); - petRarityToColourMap.put("RARE", EnumChatFormatting.BLUE.toString()); - petRarityToColourMap.put("EPIC", EnumChatFormatting.DARK_PURPLE.toString()); - petRarityToColourMap.put("LEGENDARY", EnumChatFormatting.GOLD.toString()); - petRarityToColourMap.put("MYTHIC", EnumChatFormatting.LIGHT_PURPLE.toString()); - } + public static HashMap petRarityToColourMap = new HashMap() {{ + put("UNKNOWN", EnumChatFormatting.RED.toString()); + put("COMMON", EnumChatFormatting.WHITE.toString()); + put("UNCOMMON", EnumChatFormatting.GREEN.toString()); + put("RARE", EnumChatFormatting.BLUE.toString()); + put("EPIC", EnumChatFormatting.DARK_PURPLE.toString()); + put("LEGENDARY", EnumChatFormatting.GOLD.toString()); + put("MYTHIC", EnumChatFormatting.LIGHT_PURPLE.toString()); + }}; public static ProfileViewer profileViewer; @@ -104,8 +101,6 @@ public class NotEnoughUpdates { /** * Instantiates NEUIo, NEUManager and NEUOverlay instances. Registers keybinds and adds a shutdown hook to clear tmp folder. - * - * @param event */ @EventHandler public void preinit(FMLPreInitializationEvent event) { @@ -339,6 +334,5 @@ public class NotEnoughUpdates { hasSkyblockScoreboard = false; } - } } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java b/src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java index 6726093d..b3e145a8 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java @@ -30,7 +30,6 @@ import java.util.concurrent.Executors; import java.util.function.Consumer; public class APIManager { - private final NEUManager manager; public final CustomAH customAH; @@ -1001,5 +1000,4 @@ public class APIManager { } }, 3000L, TimeUnit.MILLISECONDS); }*/ - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/auction/CustomAH.java b/src/main/java/io/github/moulberry/notenoughupdates/auction/CustomAH.java index a408100d..449fff1e 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/auction/CustomAH.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/auction/CustomAH.java @@ -45,7 +45,6 @@ import java.util.regex.Pattern; import static io.github.moulberry.notenoughupdates.util.GuiTextures.*; public class CustomAH extends Gui { - private enum PriceFilter { Greater, Less, @@ -439,21 +438,19 @@ public class CustomAH extends Gui { GlStateManager.disableBlend(); } - private final HashMap timeParseMap = new HashMap<>(); + private final HashMap timeParseMap = new HashMap() {{ + Pattern dayPattern = Pattern.compile("([0-9]+)d"); + Pattern hourPattern = Pattern.compile("([0-9]+)h"); + Pattern minutePattern = Pattern.compile("([0-9]+)m"); + Pattern secondPattern = Pattern.compile("([0-9]+)s"); - public long prettyTimeToMillis(String endsInStr) { - if (timeParseMap.isEmpty()) { - Pattern dayPattern = Pattern.compile("([0-9]+)d"); - Pattern hourPattern = Pattern.compile("([0-9]+)h"); - Pattern minutePattern = Pattern.compile("([0-9]+)m"); - Pattern secondPattern = Pattern.compile("([0-9]+)s"); - - timeParseMap.put(dayPattern, 24 * 60 * 60 * 1000L); - timeParseMap.put(hourPattern, 60 * 60 * 1000L); - timeParseMap.put(minutePattern, 60 * 1000L); - timeParseMap.put(secondPattern, 1000L); - } + put(dayPattern, 24 * 60 * 60 * 1000L); + put(hourPattern, 60 * 60 * 1000L); + put(minutePattern, 60 * 1000L); + put(secondPattern, 1000L); + }}; + public long prettyTimeToMillis(String endsInStr) { if (endsInStr != null) { long timeUntilEnd = 0; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/auction/CustomAHGui.java b/src/main/java/io/github/moulberry/notenoughupdates/auction/CustomAHGui.java index a42fdb64..4602120a 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/auction/CustomAHGui.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/auction/CustomAHGui.java @@ -3,7 +3,6 @@ package io.github.moulberry.notenoughupdates.auction; import net.minecraft.client.gui.GuiScreen; public class CustomAHGui extends GuiScreen { - public CustomAHGui() { this.allowUserInput = true; } @@ -11,5 +10,4 @@ public class CustomAHGui extends GuiScreen { public boolean doesGuiPauseGame() { return false; } - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/collectionlog/CollectionConstant.java b/src/main/java/io/github/moulberry/notenoughupdates/collectionlog/CollectionConstant.java index 25f6cfca..6931ceea 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/collectionlog/CollectionConstant.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/collectionlog/CollectionConstant.java @@ -5,7 +5,6 @@ import java.util.List; import java.util.regex.Pattern; public class CollectionConstant { - public static class DropEntry { public String type; public Pattern regex; @@ -13,5 +12,4 @@ public class CollectionConstant { } public List dropdata; - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/collectionlog/GuiCollectionLog.java b/src/main/java/io/github/moulberry/notenoughupdates/collectionlog/GuiCollectionLog.java index ed479e79..39e27d57 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/collectionlog/GuiCollectionLog.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/collectionlog/GuiCollectionLog.java @@ -12,7 +12,6 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; public class GuiCollectionLog extends GuiScreen { - private static final ResourceLocation COLLECTION_LOG_TEX = new ResourceLocation("notenoughupdates:collectionlog.png"); @Override diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/ClientCommandBase.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/ClientCommandBase.java index 39d8bb24..c00d7c72 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/commands/ClientCommandBase.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/ClientCommandBase.java @@ -4,7 +4,6 @@ import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; public abstract class ClientCommandBase extends CommandBase { - private final String name; protected ClientCommandBase(String name) { diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java index 3be881ac..97004752 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/Commands.java @@ -56,7 +56,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; public class Commands { - public Commands() { //ClientCommandHandler.instance.registerCommand(collectionLogCommand); //ClientCommandHandler.instance.registerCommand(collectionLogCommand2); @@ -909,8 +908,7 @@ public class Commands { Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("")); NotEnoughUpdates.INSTANCE.displayLinks(update); Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("")); - } catch (Exception ignored) { - } + } catch (Exception ignored) {} } } }); diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/SimpleCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/SimpleCommand.java index f13dca10..2e2e2831 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/commands/SimpleCommand.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/SimpleCommand.java @@ -8,7 +8,6 @@ import net.minecraft.util.BlockPos; import java.util.List; public class SimpleCommand extends CommandBase { - private final String commandName; private final ProcessCommandRunnable runnable; private TabCompleteRunnable tabRunnable; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/StatsCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/StatsCommand.java index 3888e3ea..99bfe368 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/commands/StatsCommand.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/StatsCommand.java @@ -27,7 +27,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; public class StatsCommand extends ClientCommandBase { - private final ExecutorService threadPool = Executors.newFixedThreadPool(1); public StatsCommand() { @@ -147,5 +146,4 @@ public class StatsCommand extends ClientCommandBase { } return -1; } - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/BackgroundBlur.java b/src/main/java/io/github/moulberry/notenoughupdates/core/BackgroundBlur.java index 98b4ccfe..b21421a3 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/BackgroundBlur.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/BackgroundBlur.java @@ -23,7 +23,6 @@ import java.util.Map; import java.util.Set; public class BackgroundBlur { - private static class OutputStuff { public Framebuffer framebuffer; public Shader blurShaderHorz = null; @@ -260,5 +259,4 @@ public class BackgroundBlur { out.framebuffer.unbindFramebufferTexture(); GlStateManager.depthMask(true); } - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/ChromaColour.java b/src/main/java/io/github/moulberry/notenoughupdates/core/ChromaColour.java index 1581c77c..238ede58 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/ChromaColour.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/ChromaColour.java @@ -3,7 +3,6 @@ package io.github.moulberry.notenoughupdates.core; import java.awt.*; public class ChromaColour { - public static String special(int chromaSpeed, int alpha, int rgb) { return special(chromaSpeed, alpha, (rgb & 0xFF0000) >> 16, (rgb & 0x00FF00) >> 8, (rgb & 0x0000FF)); } @@ -90,5 +89,4 @@ public class ChromaColour { return (a & 0xFF) << 24 | (Color.HSBtoRGB(hsv[0], hsv[1], hsv[2]) & 0x00FFFFFF); } - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/GlScissorStack.java b/src/main/java/io/github/moulberry/notenoughupdates/core/GlScissorStack.java index 45f7e269..7de02783 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/GlScissorStack.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/GlScissorStack.java @@ -7,7 +7,6 @@ import org.lwjgl.opengl.GL11; import java.util.LinkedList; public class GlScissorStack { - private static class Bounds { int left; int top; @@ -83,5 +82,4 @@ public class GlScissorStack { boundsStack.clear(); GL11.glDisable(GL11.GL_SCISSOR_TEST); } - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElement.java b/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElement.java index aa3d4989..88dd7f01 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElement.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElement.java @@ -3,7 +3,6 @@ package io.github.moulberry.notenoughupdates.core; import net.minecraft.client.gui.Gui; public abstract class GuiElement extends Gui { - public abstract void render(); public abstract boolean mouseInput(int mouseX, int mouseY); diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElementBoolean.java b/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElementBoolean.java index 66310dfd..be13e410 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElementBoolean.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElementBoolean.java @@ -11,7 +11,6 @@ import org.lwjgl.input.Mouse; import java.util.function.Consumer; public class GuiElementBoolean extends GuiElement { - public int x; public int y; private boolean value; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElementColour.java b/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElementColour.java index 6d267040..cf25cefe 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElementColour.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElementColour.java @@ -18,7 +18,6 @@ import java.awt.image.BufferedImage; import java.util.function.Consumer; public class GuiElementColour extends GuiElement { - public static final ResourceLocation colour_selector_dot = new ResourceLocation("notenoughupdates:core/colour_selector_dot.png"); public static final ResourceLocation colour_selector_bar = new ResourceLocation("notenoughupdates:core/colour_selector_bar.png"); public static final ResourceLocation colour_selector_bar_alpha = new ResourceLocation("notenoughupdates:core/colour_selector_bar_alpha.png"); @@ -395,5 +394,4 @@ public class GuiElementColour extends GuiElement { } return false; } - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElementTextField.java b/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElementTextField.java index 5b52515d..32303e58 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElementTextField.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/GuiElementTextField.java @@ -15,7 +15,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; public class GuiElementTextField { - public static final int SCISSOR_TEXT = 0b10000000; public static final int DISABLE_BG = 0b1000000; public static final int SCALE_TEXT = 0b100000; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/GuiScreenElementWrapper.java b/src/main/java/io/github/moulberry/notenoughupdates/core/GuiScreenElementWrapper.java index 8d32d6c3..8fdd0652 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/GuiScreenElementWrapper.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/GuiScreenElementWrapper.java @@ -6,7 +6,6 @@ import org.lwjgl.input.Mouse; import java.io.IOException; public class GuiScreenElementWrapper extends GuiScreen { - public final GuiElement element; public GuiScreenElementWrapper(GuiElement element) { diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/Config.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/Config.java index f5d8488c..2186a002 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/Config.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/Config.java @@ -1,7 +1,5 @@ package io.github.moulberry.notenoughupdates.core.config; public class Config { - public void executeRunnable(int runnableId) {} - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/GuiPositionEditor.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/GuiPositionEditor.java index 1a69789b..030cbe21 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/GuiPositionEditor.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/GuiPositionEditor.java @@ -8,7 +8,6 @@ import net.minecraft.client.gui.ScaledResolution; import java.io.IOException; public class GuiPositionEditor extends GuiScreen { - public PositionNew position = new PositionNew(); public int clickedX; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/KeybindHelper.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/KeybindHelper.java index b1013047..bc9d5e5b 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/KeybindHelper.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/KeybindHelper.java @@ -4,7 +4,6 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; public class KeybindHelper { - public static String getKeyName(int keyCode) { if (keyCode == 0) { return "NONE"; @@ -46,5 +45,4 @@ public class KeybindHelper { return Keyboard.getEventKeyState() && Keyboard.getEventKey() == keyCode; } } - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/Position.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/Position.java index 270570f8..e0787a16 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/Position.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/Position.java @@ -4,7 +4,6 @@ import com.google.gson.annotations.Expose; import net.minecraft.client.gui.ScaledResolution; public class Position { - @Expose private int x; @Expose @@ -187,5 +186,4 @@ public class Position { } return deltaY; } - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/PositionNew.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/PositionNew.java index a0029dd8..62719091 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/PositionNew.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/PositionNew.java @@ -7,7 +7,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; public class PositionNew { - public enum Anchor { MIN(0, 0, 0), MID(0.5f, -0.5f, 0), @@ -59,8 +58,7 @@ public class PositionNew { this.allowResize = allowResize; } - protected PositionNew() { - } + protected PositionNew() {} public int moveX(ScaledResolution scaledResolution, int deltaX, int sizeX) { int originalX = resolveX(scaledResolution, sizeX); diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/Category.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/Category.java index 2611b466..5f079a55 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/Category.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/Category.java @@ -8,9 +8,7 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Category { - String name(); String desc(); - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigAccordionId.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigAccordionId.java index 54d3e345..d889402f 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigAccordionId.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigAccordionId.java @@ -8,7 +8,5 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface ConfigAccordionId { - int id(); - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorAccordion.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorAccordion.java index 47948985..1333136e 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorAccordion.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorAccordion.java @@ -8,7 +8,5 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface ConfigEditorAccordion { - int id(); - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorBoolean.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorBoolean.java index 3c6465e6..a0ca1f38 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorBoolean.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorBoolean.java @@ -7,6 +7,4 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) -public @interface ConfigEditorBoolean { - -} +public @interface ConfigEditorBoolean {} diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorButton.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorButton.java index be8363d5..b6419fbc 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorButton.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorButton.java @@ -8,9 +8,7 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface ConfigEditorButton { - int runnableId(); String buttonText() default ""; - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorColour.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorColour.java index e7033f69..6640ade9 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorColour.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorColour.java @@ -7,6 +7,4 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) -public @interface ConfigEditorColour { - -} +public @interface ConfigEditorColour {} diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorDraggableList.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorDraggableList.java index 8689bda8..07a504bf 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorDraggableList.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorDraggableList.java @@ -8,7 +8,5 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface ConfigEditorDraggableList { - String[] exampleText(); - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorDropdown.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorDropdown.java index e878d657..a921de5a 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorDropdown.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorDropdown.java @@ -8,9 +8,7 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface ConfigEditorDropdown { - String[] values(); int initialIndex() default 0; - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorFSR.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorFSR.java index e6ec3548..7dfd05d7 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorFSR.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorFSR.java @@ -8,9 +8,7 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface ConfigEditorFSR { - int runnableId(); String buttonText() default ""; - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorKeybind.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorKeybind.java index 527171f2..361d6c9a 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorKeybind.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorKeybind.java @@ -8,7 +8,5 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface ConfigEditorKeybind { - int defaultKey(); - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorSlider.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorSlider.java index 4a6fb5be..f562d14e 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorSlider.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorSlider.java @@ -8,11 +8,9 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface ConfigEditorSlider { - float minValue(); float maxValue(); float minStep(); - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorText.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorText.java index 556bbb1e..1ff7e39e 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorText.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigEditorText.java @@ -7,6 +7,4 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) -public @interface ConfigEditorText { - -} +public @interface ConfigEditorText {} diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigOption.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigOption.java index 77738abf..3b0c27cf 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigOption.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/annotations/ConfigOption.java @@ -8,11 +8,9 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface ConfigOption { - String name(); String desc(); int subcategoryId() default -1; - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditor.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditor.java index 3ccb3841..3f476906 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditor.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditor.java @@ -8,7 +8,6 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; public abstract class GuiOptionEditor { - protected final ConfigProcessor.ProcessedOption option; private static final int HEIGHT = 45; @@ -60,5 +59,4 @@ public abstract class GuiOptionEditor { } public void renderOverlay(int x, int y, int width) {} - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorAccordion.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorAccordion.java index 7406f2c3..7f316af9 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorAccordion.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorAccordion.java @@ -12,7 +12,6 @@ import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; public class GuiOptionEditorAccordion extends GuiOptionEditor { - private final int accordionId; private boolean accordionToggled; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorBoolean.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorBoolean.java index 8c8c32b6..7bdca50d 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorBoolean.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorBoolean.java @@ -4,7 +4,6 @@ import io.github.moulberry.notenoughupdates.core.GuiElementBoolean; import io.github.moulberry.notenoughupdates.core.config.struct.ConfigProcessor; public class GuiOptionEditorBoolean extends GuiOptionEditor { - private final GuiElementBoolean bool; public GuiOptionEditorBoolean(ConfigProcessor.ProcessedOption option) { diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorButton.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorButton.java index 82d965e3..e9eb457b 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorButton.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorButton.java @@ -11,7 +11,6 @@ import org.lwjgl.input.Mouse; import static io.github.moulberry.notenoughupdates.util.GuiTextures.button_tex; public class GuiOptionEditorButton extends GuiOptionEditor { - private final int runnableId; private String buttonText; private final Config config; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorColour.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorColour.java index 4cd74e79..40dfb8f0 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorColour.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorColour.java @@ -11,7 +11,6 @@ import org.lwjgl.input.Mouse; import static io.github.moulberry.notenoughupdates.util.GuiTextures.button_white; public class GuiOptionEditorColour extends GuiOptionEditor { - private String chromaColour; private GuiElementColour colourElement = null; @@ -67,5 +66,4 @@ public class GuiOptionEditorColour extends GuiOptionEditor { public boolean keyboardInput() { return colourElement != null && colourElement.keyboardInput(); } - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorDraggableList.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorDraggableList.java index c91f2b6a..2552c8ae 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorDraggableList.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorDraggableList.java @@ -21,7 +21,6 @@ import java.util.List; import static io.github.moulberry.notenoughupdates.util.GuiTextures.button_tex; public class GuiOptionEditorDraggableList extends GuiOptionEditor { - private static final ResourceLocation DELETE = new ResourceLocation("notenoughupdates:core/delete.png"); private final String[] exampleText; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorDropdown.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorDropdown.java index c003f135..e75d9a54 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorDropdown.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorDropdown.java @@ -9,7 +9,6 @@ import net.minecraft.client.gui.Gui; import org.lwjgl.input.Mouse; public class GuiOptionEditorDropdown extends GuiOptionEditor { - private final String[] values; private final boolean useOrdinal; private int selected; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorFSR.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorFSR.java index 545241c0..185251c3 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorFSR.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorFSR.java @@ -11,7 +11,6 @@ import org.lwjgl.input.Mouse; import static io.github.moulberry.notenoughupdates.util.GuiTextures.button_fsr; public class GuiOptionEditorFSR extends GuiOptionEditor { - private final int runnableId; private String buttonText; private final Config config; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorKeybind.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorKeybind.java index c1297668..a20ba3bf 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorKeybind.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorKeybind.java @@ -14,7 +14,6 @@ import org.lwjgl.opengl.GL11; import static io.github.moulberry.notenoughupdates.util.GuiTextures.button_tex; public class GuiOptionEditorKeybind extends GuiOptionEditor { - private static final ResourceLocation RESET = new ResourceLocation("notenoughupdates:itemcustomize/reset.png"); private int keyCode; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorSlider.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorSlider.java index 50e98a1d..53ef95ca 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorSlider.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorSlider.java @@ -8,7 +8,6 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; public class GuiOptionEditorSlider extends GuiOptionEditor { - private final GuiElementSlider slider; private final GuiElementTextField textField; @@ -126,5 +125,4 @@ public class GuiOptionEditorSlider extends GuiOptionEditor { } return false; } - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorText.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorText.java index b05c3ee3..19dcefd0 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorText.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiOptionEditorText.java @@ -7,7 +7,6 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; public class GuiOptionEditorText extends GuiOptionEditor { - private final GuiElementTextField textField; public GuiOptionEditorText(ConfigProcessor.ProcessedOption option) { @@ -77,5 +76,4 @@ public class GuiOptionEditorText extends GuiOptionEditor { } return false; } - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiPositionEditor.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiPositionEditor.java index 467d2b93..22c143c9 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiPositionEditor.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiPositionEditor.java @@ -12,7 +12,6 @@ import org.lwjgl.input.Mouse; import java.io.IOException; public class GuiPositionEditor extends GuiScreen { - private final Position position; private final Position originalPosition; private final int elementWidth; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/struct/ConfigProcessor.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/struct/ConfigProcessor.java index 3c4e6833..0df39015 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/struct/ConfigProcessor.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/struct/ConfigProcessor.java @@ -10,7 +10,6 @@ import java.util.LinkedHashMap; import java.util.List; public class ConfigProcessor { - public static class ProcessedCategory { public final String name; public final String desc; @@ -180,5 +179,4 @@ public class ConfigProcessor { } return processedConfig; } - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/util/GuiElementSlider.java b/src/main/java/io/github/moulberry/notenoughupdates/core/util/GuiElementSlider.java index cc8e9708..9f65c23d 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/util/GuiElementSlider.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/util/GuiElementSlider.java @@ -13,7 +13,6 @@ import java.util.function.Consumer; import static io.github.moulberry.notenoughupdates.util.GuiTextures.*; public class GuiElementSlider extends GuiElement { - public int x; public int y; public int width; @@ -119,5 +118,4 @@ public class GuiElementSlider extends GuiElement { public boolean keyboardInput() { return false; } - } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/util/MiscUtils.java b/src/main/java/io/github/moulberry/notenoughupdates/core/util/MiscUtils.java index 6e3ad7d1..342916d9 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/util/MiscUtils.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/util/MiscUtils.java @@ -20,7 +20,6 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; public class MiscUtils { - public static void copyToClipboard(String str) { Toolkit.getDefaultToolkit().getSystemClipboard()