diff options
Diffstat (limited to 'src/main/java')
50 files changed, 784 insertions, 770 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java index 57e23487f..eccfc78c9 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java @@ -9,11 +9,12 @@ import at.hannibal2.skyhanni.features.*; import at.hannibal2.skyhanni.features.anvil.AnvilCombineHelper; import at.hannibal2.skyhanni.features.bazaar.BazaarApi; import at.hannibal2.skyhanni.features.bazaar.BazaarBestSellMethod; +import at.hannibal2.skyhanni.features.bazaar.BazaarCancelledBuyOrderClipboard; import at.hannibal2.skyhanni.features.bazaar.BazaarOrderHelper; import at.hannibal2.skyhanni.features.chat.ChatFilter; import at.hannibal2.skyhanni.features.chat.PlayerDeathMessages; import at.hannibal2.skyhanni.features.chat.playerchat.PlayerChatFilter; -import at.hannibal2.skyhanni.features.chat.playerchat.PlayerChatFormatter; +import at.hannibal2.skyhanni.features.chat.playerchat.PlayerChatModifier; import at.hannibal2.skyhanni.features.commands.WikiCommand; import at.hannibal2.skyhanni.features.damageindicator.DamageIndicatorManager; import at.hannibal2.skyhanni.features.dungeon.*; @@ -57,11 +58,11 @@ import org.apache.logging.log4j.Logger; import java.util.ArrayList; import java.util.List; -@Mod(modid = SkyHanniMod.MODID, version = SkyHanniMod.VERSION) +@Mod(modid = SkyHanniMod.MODID, version = SkyHanniMod.VERSION, clientSideOnly = true, useMetadata = true, guiFactory = "at.hannibal2.skyhanni.config.ConfigGuiForgeInterop") public class SkyHanniMod { public static final String MODID = "skyhanni"; - public static final String VERSION = "0.12.1"; + public static final String VERSION = "0.13"; public static Features feature; @@ -101,7 +102,7 @@ public class SkyHanniMod { //features registerEvent(new BazaarOrderHelper()); registerEvent(new ChatFilter()); - registerEvent(new PlayerChatFormatter()); + registerEvent(new PlayerChatModifier()); registerEvent(new DungeonChatFilter()); registerEvent(new HideNotClickableItems()); registerEvent(new ItemDisplayOverlayFeatures()); @@ -158,11 +159,14 @@ public class SkyHanniMod { registerEvent(new SlayerQuestWarning()); registerEvent(new StatsTuning()); registerEvent(new NonGodPotEffectDisplay()); - registerEvent(new HideBlazeParticles()); registerEvent(new SoopyGuessBurrow()); registerEvent(new GriffinBurrowHelper()); registerEvent(new GriffinBurrowParticleFinder()); registerEvent(new BurrowWarpHelper()); + registerEvent(new HighlightBonzoMasks()); + registerEvent(new DungeonLevelColor()); + registerEvent(new BazaarCancelledBuyOrderClipboard()); + registerEvent(new CroesusUnopenedChestTracker()); Commands.INSTANCE.init(); diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt new file mode 100644 index 000000000..db63c0168 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt @@ -0,0 +1,33 @@ +package at.hannibal2.skyhanni.config + +import at.hannibal2.skyhanni.config.core.GuiScreenElementWrapper +import net.minecraft.client.Minecraft +import net.minecraft.client.gui.GuiScreen +import net.minecraftforge.fml.client.IModGuiFactory +import net.minecraftforge.fml.client.IModGuiFactory.RuntimeOptionCategoryElement +import net.minecraftforge.fml.client.IModGuiFactory.RuntimeOptionGuiHandler +import org.lwjgl.input.Keyboard +import java.io.IOException + +class ConfigGuiForgeInterop : IModGuiFactory { + override fun initialize(minecraft: Minecraft) {} + override fun mainConfigGuiClass(): Class<out GuiScreen> { + return WrappedSkyHanniConfig::class.java + } + + override fun runtimeGuiCategories(): Set<RuntimeOptionCategoryElement>? = null + + override fun getHandlerFor(runtimeOptionCategoryElement: RuntimeOptionCategoryElement): RuntimeOptionGuiHandler? = + null + + class WrappedSkyHanniConfig(private val parent: GuiScreen) : GuiScreenElementWrapper(ConfigEditor.editor) { + @Throws(IOException::class) + override fun handleKeyboardInput() { + if (Keyboard.getEventKeyState() && Keyboard.getEventKey() == Keyboard.KEY_ESCAPE) { + Minecraft.getMinecraft().displayGuiScreen(parent) + return + } + super.handleKeyboardInput() + } + } +}
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/config/Features.java b/src/main/java/at/hannibal2/skyhanni/config/Features.java index 605606d8a..0f7f0fd6c 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/Features.java +++ b/src/main/java/at/hannibal2/skyhanni/config/Features.java @@ -10,7 +10,6 @@ import at.hannibal2.skyhanni.config.core.config.gui.GuiPositionEditor; import at.hannibal2.skyhanni.config.features.*; import at.hannibal2.skyhanni.features.HideArmor; import at.hannibal2.skyhanni.features.MarkedPlayerManager; -import at.hannibal2.skyhanni.features.chat.playerchat.PlayerChatFormatter; import com.google.gson.annotations.Expose; import net.minecraft.client.Minecraft; @@ -63,11 +62,6 @@ public class Features extends Config { return; } - if (runnableId.equals("firePillar")) { - editOverlay(activeConfigCategory, 200, 16, slayer.firePillarPos); - return; - } - if (runnableId.equals("ashfangResetCooldown")) { editOverlay(activeConfigCategory, 200, 16, ashfang.nextResetCooldownPos); return; @@ -93,16 +87,6 @@ public class Features extends Config { return; } - if (runnableId.equals("testAllChat")) { - PlayerChatFormatter.Companion.testAllChat(); - return; - } - - if (runnableId.equals("testGuildChat")) { - PlayerChatFormatter.Companion.testGuildChat(); - return; - } - if (runnableId.equals("markOwnPlayer")) { MarkedPlayerManager.Companion.toggleOwn(); return; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java b/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java index 614568903..890d21313 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java @@ -22,4 +22,9 @@ public class Bazaar { @ConfigOption(name = "Best Sell Method Position", desc = "") @ConfigEditorButton(runnableId = "bestSellMethod", buttonText = "Edit") public Position bestSellMethodPos = new Position(10, 10, false, true); + + @Expose + @ConfigOption(name = "Cancelled Buy Order Clipboard", desc = "Saves missing items from cancelled buy orders to clipboard for faster re-entry.") + @ConfigEditorBoolean + public boolean cancelledBuyOrderClipboard = true; } diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java b/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java index d00813c2b..029731f96 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java @@ -2,10 +2,16 @@ package at.hannibal2.skyhanni.config.features; import at.hannibal2.skyhanni.config.core.config.annotations.*; import com.google.gson.annotations.Expose; +import org.lwjgl.input.Keyboard; public class Chat { @Expose + @ConfigOption(name = "Peek Chat", desc = "Hold this key to keep the chat open") + @ConfigEditorKeybind(defaultKey = Keyboard.KEY_Z) + public int peekChat = Keyboard.KEY_Z; + + @Expose @ConfigOption(name = "Chat Filter Types", desc = "") @ConfigEditorAccordion(id = 0) public boolean filterTypes = false; @@ -14,125 +20,70 @@ public class Chat { @ConfigOption(name = "Hypixel Hub", desc = "Block messages outside SkyBlock in the Hypixel lobby: player joins, loot boxes, prototype lobby messages, radiating generosity and Hypixel tournaments.") @ConfigEditorBoolean @ConfigAccordionId(id = 0) - public boolean hypixelHub = false; + public boolean hypixelHub = true; @Expose @ConfigOption(name = "Empty", desc = "Hide all the empty messages from the chat.") @ConfigEditorBoolean @ConfigAccordionId(id = 0) - public boolean empty = false; + public boolean empty = true; @Expose @ConfigOption(name = "Warping", desc = "Block 'sending request to join ..' and 'warping ..' messages.") @ConfigEditorBoolean @ConfigAccordionId(id = 0) - public boolean warping = false; + public boolean warping = true; @Expose @ConfigOption(name = "Welcome", desc = "Hide the 'welcome to skyblock' message.") @ConfigEditorBoolean @ConfigAccordionId(id = 0) - public boolean welcome = false; + public boolean welcome = true; - //TODO remove @Expose - @ConfigOption(name = "Others", desc = "Hide other annoying messages.") + @ConfigOption(name = "Guild Exp", desc = "Hide Guild Exp messages.") @ConfigEditorBoolean @ConfigAccordionId(id = 0) - public boolean others = false; + public boolean guildExp = true; @Expose - @ConfigOption(name = "Player Messages", desc = "") - @ConfigEditorAccordion(id = 1) - public boolean playerMessages = false; + @ConfigOption(name = "Friend Join Left", desc = "Hide friend join/left messages.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean friendJoinLeft = false; @Expose - @ConfigOption(name = "Message Format", desc = "") - @ConfigAccordionId(id = 1) - @ConfigEditorAccordion(id = 2) - public boolean messageFormat = false; + @ConfigOption(name = "Winter Gifts", desc = "Hide useless winter gift messages.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean winterGift = true; @Expose - @ConfigOption(name = "All Channel Prefix", desc = "Show the prefix for the all channel chat.") + @ConfigOption(name = "Powder Mining", desc = "Hide messages while opening chests in crystal hollows.") @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean allChannelPrefix = false; + @ConfigAccordionId(id = 0) + public boolean powderMining = true; + //TODO remove @Expose - @ConfigOption(name = "Player Rank Hider", desc = "Hide player ranks in the chat.") + @ConfigOption(name = "Others", desc = "Hide other annoying messages.") @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean playerRankHider = false; + @ConfigAccordionId(id = 0) + public boolean others = false; @Expose - @ConfigOption(name = "Player Colon Hider", desc = "Hide the colon after the player name in the chat.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean playerColonHider = false; - - @Expose - @ConfigOption( - name = "SkyBlock Level Design", - desc = "Change the design of the Skyblock Level in the chat.\n" + - "§cRequires 'SkyBlock Level in Chat' enabled in the SkyBlock Menu." - ) - @ConfigEditorDropdown( - values = {"§8[§6123§8] §bname§f: msg", - "§6§l123 §bname§f: §fmsg", - "§bname §8[§6123§8]§f: msg", - "§cHide SkyBlock Level"} - ) - @ConfigAccordionId(id = 2) - public int skyblockLevelDesign = 0; - - @Expose - @ConfigOption( - name = "Elite Design", - desc = "Change the design of the Elite position in the chat." - ) - @ConfigEditorDropdown( - values = {"§6[⌬499]", - "§6§l⌬499", - "§cHide Elite Position"} - ) - @ConfigAccordionId(id = 2) - public int eliteFormat = 0; - - @Expose - @ConfigOption( - name = "Channel Design", - desc = "Change the design of the Channel Prefix in the chat." - ) - @ConfigEditorDropdown( - values = {"§2Guild >", - "§2G>", - "§8<§2G§8>", - "§8[§2G§8]", - "§8(§2G§8)"} - ) - @ConfigAccordionId(id = 2) - public int channelDesign = 0; - - @Expose - @ConfigOption(name = "Test All Chat", desc = "Test the All Chat message format locally (no message gets sent to hypixel)") - @ConfigEditorButton(runnableId = "testAllChat") - @ConfigAccordionId(id = 2) - public boolean testAllChat = false; - - @Expose - @ConfigOption(name = "Test Guild Chat", desc = "Test the Guild Chat message format locally (no message gets sent to hypixel)") - @ConfigEditorButton(runnableId = "testGuildChat") - @ConfigAccordionId(id = 2) - public boolean testGuildChat = false; - - @Expose - @ConfigOption(name = "NEU Profile Viewer", desc = "Click on a player name to open the Profile Viewer from NotEnoughUpdates") + @ConfigOption(name = "Player Messages", desc = "") + @ConfigEditorAccordion(id = 1) + public boolean playerMessages = false; + + @Expose + @ConfigOption(name = "Player Rank Hider", desc = "Hide player ranks in all chat messages.") @ConfigEditorBoolean @ConfigAccordionId(id = 1) - public boolean neuProfileViewer = false; + public boolean playerRankHider = true; @Expose - @ConfigOption(name = "Chat Filter", desc = "Scan messages sent by players in all-chat for blacklisted words and greys out the message") + @ConfigOption(name = "Chat Filter", desc = "Scan messages sent by players for blacklisted words and grey out the message if any are found.") @ConfigEditorBoolean @ConfigAccordionId(id = 1) public boolean chatFilter = false; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DevData.java b/src/main/java/at/hannibal2/skyhanni/config/features/DevData.java index 30672ac2e..85b527947 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/DevData.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/DevData.java @@ -123,4 +123,9 @@ public class DevData { @ConfigEditorBoolean @ConfigAccordionId(id = 2) public boolean filterBiomeIdBounds = false; + + @Expose + @ConfigOption(name = "Print Event Timings", desc = "Prints every 10 seconds the timings of all SkyHanni events in the chat.") + @ConfigEditorBoolean + public boolean printEventTimings = false; } diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java b/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java index 40f58df81..074d4e0f7 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java @@ -69,7 +69,7 @@ public class Dungeon { @Expose @ConfigOption(name = "Highlight Deathmites", desc = "Highlight deathmites in dungeon in red color.") @ConfigEditorBoolean - public boolean highlightDeathmites = false; + public boolean highlightDeathmites = true; @ConfigOption(name = "Object Hider", desc = "Hide various things in dungeon.") @ConfigEditorAccordion(id = 3) @@ -109,7 +109,7 @@ public class Dungeon { @ConfigOption(name = "Hide Skeleton Skull", desc = "Hide skeleton skulls laying around in dungeon.") @ConfigEditorBoolean @ConfigAccordionId(id = 3) - public boolean hideSkeletonSkull = false; + public boolean hideSkeletonSkull = true; @Expose @ConfigOption(name = "Hide Healer Orbs", desc = "Hides the damage, ability damage and defensive orbs that spawn when the healer kills mobs.") @@ -149,9 +149,25 @@ public class Dungeon { @ConfigAccordionId(id = 5) public Position copilotPos = new Position(10, 10, false, true); + @ConfigOption(name = "Party Finder", desc = "") + @ConfigEditorAccordion(id = 6) + public boolean partyFinder = false; + + @Expose + @ConfigOption(name = "Colored Class Level", desc = "Show the class levels in party finder in colors.") + @ConfigAccordionId(id = 6) + @ConfigEditorBoolean + public boolean partyFinderColoredClassLevel = true; + @Expose @ConfigOption(name = "Moving Skeleton Skulls", desc = "Highlight Skeleton Skulls when combining into a " + "Skeletor in orange color (not useful combined with feature Hide Skeleton Skull)") @ConfigEditorBoolean - public boolean highlightSkeletonSkull = false; + public boolean highlightSkeletonSkull = true; + + @Expose + @ConfigOption(name = "Croesus Unopened Chest Tracker", desc = "Adds a visual highlight to the Croesus inventory that " + + "shows what chests have not yet been opened.") + @ConfigEditorBoolean + public boolean croesusUnopenedChestTracker = true; }
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java b/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java index 780db21e1..175dcb42d 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java @@ -89,13 +89,14 @@ public class Inventory { ) @ConfigEditorDraggableList( exampleText = { - "\u00a7bMaster Star Tier", - "\u00a7bMaster Skull Tier", - "\u00a7bDungeon Head Floor Number", - "\u00a7bNew Year Cake", - "\u00a7bPet Level", - "\u00a7bMinion Tier", - "\u00a7bCrimson Armor", + "§bMaster Star Tier", + "§bMaster Skull Tier", + "§bDungeon Head Floor Number", + "§bNew Year Cake", + "§bPet Level", + "§bMinion Tier", + "§bCrimson Armor", + "§bWishing Compass" } ) public List<Integer> itemNumberAsStackSize = new ArrayList<>(Collections.singletonList(3)); @@ -115,4 +116,10 @@ public class Inventory { desc = "Show a compact star count in the item name for all items") @ConfigEditorBoolean public boolean itemStars = false; + + @Expose + @ConfigOption(name = "Highlight Depleted Bonzo's Masks", + desc = "Highlight |