From 69564669dba7bd147d94d4dd68e32ab07bc64ce0 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Wed, 5 Jul 2023 15:36:37 +0200 Subject: added toggle for platform index number --- .../skyhanni/config/features/DevConfig.java | 194 +++++++++++++++++++++ .../skyhanni/config/features/DevData.java | 189 -------------------- .../at/hannibal2/skyhanni/utils/ParkourHelper.kt | 6 +- 3 files changed, 198 insertions(+), 191 deletions(-) create mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/DevConfig.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/config/features/DevData.java (limited to 'src/main/java') diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DevConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/DevConfig.java new file mode 100644 index 000000000..3a54bfff7 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/features/DevConfig.java @@ -0,0 +1,194 @@ +package at.hannibal2.skyhanni.config.features; + +import at.hannibal2.skyhanni.config.core.config.Position; +import com.google.gson.annotations.Expose; +import io.github.moulberry.moulconfig.annotations.*; +import org.lwjgl.input.Keyboard; + +public class DevConfig { + + @Expose + @ConfigOption(name = "Repo Auto Update", desc = "Update the repository on every startup.") + @ConfigEditorBoolean + public boolean repoAutoUpdate = true; + + @Expose + @ConfigOption(name = "Debug", desc = "") + @ConfigEditorAccordion(id = 0) + public boolean debugDO_NOT_USE = false; + + @Expose + @ConfigOption(name = "Enable Debug", desc = "Enable Test logic") + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean debugEnabled = false; + + @Expose + @ConfigOption(name = "Command Logging", desc = "Logs stack trace information into the console when a command gets sent to hypixel. (by any mod or the player)") + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean commandLogs = false; + + @Expose + @ConfigOption( + name = "Mod Menu Log", + desc = "Enables debug messages when the currently opened gui changes, with the path to the gui class. " + + "Useful for adding more mods to quick mod menu switch." + ) + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean modMenuLog = false; + + @Expose + @ConfigOption(name = "Show internal name", desc = "Show internal names in item lore.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean showInternalName = false; + + @Expose + @ConfigOption(name = "Show empty internal names", desc = "Shows internal name even if it is blank.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean showEmptyNames = false; + + @Expose + @ConfigOption(name = "Show item UUID", desc = "Show the Unique Identifier of items. in the lore.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean showItemUuid = false; + + @Expose + @ConfigOption(name = "Copy Rng Meter", desc = "Copies internal names and maxed xp needed from rng meter inventories in json format into the clipboard.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean copyRngMeter = false; + + @Expose + @ConfigOption(name = "Highlight Missing Repo Items", desc = "Highlights each item in the current inventory that is not in your current NEU repo.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean highlightMissingRepo = false; + + @ConfigOption(name = "Parcour Waypoints", desc = "") + @Accordion + @Expose + public Waypoints waypoint = new Waypoints(); + + public static class Waypoints { + + @Expose + @ConfigOption(name = "Save Hotkey", desc = "Saves block location to a temporarily parkour and copies everything to your clipboard.") + @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE) + public int saveKey = Keyboard.KEY_NONE; + + @Expose + @ConfigOption(name = "Delete Hotkey", desc = "Deletes the last saved location for when you make a mistake.") + @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE) + public int deleteKey = Keyboard.KEY_NONE; + + @Expose + @ConfigOption(name = "Show Platform Number", desc = "Show the index number over the platform for every parkour.") + @ConfigEditorBoolean + public boolean showPlatformNumber = false; + + } + + @Expose + public Position debugPos = new Position(10, 10, false, true); + + @Expose + @ConfigOption(name = "Minecraft Console", desc = "") + @ConfigEditorAccordion(id = 1) + public boolean minecraftConsole = false; + + @Expose + @ConfigOption(name = "Unfiltered Debug", desc = "Print the debug information for unfiltered console messages.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 1) + public boolean printUnfilteredDebugs = false; + + @Expose + @ConfigOption(name = "Unfiltered Debug File", desc = "Print the debug information into log files instead of into the console for unfiltered console messages.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 1) + public boolean logUnfilteredFile = false; + + @Expose + @ConfigOption( + name = "Outside SkyBlock", + desc = "Print the debug information for unfiltered console messages outside SkyBlock too." + ) + @ConfigEditorBoolean + @ConfigAccordionId(id = 1) + public boolean printUnfilteredDebugsOutsideSkyBlock = false; + + @Expose + @ConfigOption( + name = "Log Filtered", + desc = "Log the filtered messages into the console." + ) + @ConfigEditorBoolean + @ConfigAccordionId(id = 1) + public boolean printFilteredReason = false; + + @Expose + @ConfigOption(name = "Console Filters", desc = "") + @ConfigAccordionId(id = 1) + @ConfigEditorAccordion(id = 2) + public boolean consoleFilters = false; + + @Expose + @ConfigOption(name = "Filter Chat", desc = "Filter chat messages.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 2) + public boolean filterChat = false; + + @Expose + @ConfigOption(name = "Filter Grow Buffer", desc = "Filter 'Needed to grow BufferBuilder buffer:'") + @ConfigEditorBoolean + @ConfigAccordionId(id = 2) + public boolean filterGrowBuffer = true; + + @Expose + @ConfigOption(name = "Filter Sound Error", desc = "Filter 'Unable to play unknown soundEvent'.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 2) + public boolean filterUnknownSound = true; + + @Expose + @ConfigOption(name = "Filter Scoreboard Errors", desc = "Filter error messages with Scoreboard: removeTeam, createTeam, " + + "removeObjective and 'scoreboard team already exists'.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 2) + public boolean filterScoreboardErrors = true; + + @Expose + @ConfigOption(name = "Filter Particle", desc = "Filter message 'Could not spawn particle effect VILLAGER_HAPPY'.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 2) + public boolean filterParticleVillagerHappy = true; + + @Expose + @ConfigOption(name = "Filter OptiFine", desc = "Filter OptiFine messages CustomItems and ConnectedTextures during loading.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 2) + public boolean filterOptiFine = true; + + @Expose + @ConfigOption(name = "Filter AsmHelper Transformer", desc = "Filter messages when AsmHelper is Transforming a class during loading.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 2) + public boolean filterAmsHelperTransformer = true; + + @Expose + @ConfigOption(name = "Filter Applying AsmWriter", desc = "Filter messages when AsmHelper is applying AsmWriter ModifyWriter.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 2) + public boolean filterAsmHelperApplying = true; + + @Expose + @ConfigOption(name = "Filter Biome ID Bounds", desc = "Filter message 'Biome ID is out of bounds'.") + @ConfigEditorBoolean + @ConfigAccordionId(id = 2) + public boolean filterBiomeIdBounds = true; +} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DevData.java b/src/main/java/at/hannibal2/skyhanni/config/features/DevData.java deleted file mode 100644 index 961eefd4b..000000000 --- a/src/main/java/at/hannibal2/skyhanni/config/features/DevData.java +++ /dev/null @@ -1,189 +0,0 @@ -package at.hannibal2.skyhanni.config.features; - -import at.hannibal2.skyhanni.config.core.config.Position; -import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.*; -import org.lwjgl.input.Keyboard; - -public class DevData { - - @Expose - @ConfigOption(name = "Repo Auto Update", desc = "Update the repository on every startup.") - @ConfigEditorBoolean - public boolean repoAutoUpdate = true; - - @Expose - @ConfigOption(name = "Debug", desc = "") - @ConfigEditorAccordion(id = 0) - public boolean debugDO_NOT_USE = false; - - @Expose - @ConfigOption(name = "Enable Debug", desc = "Enable Test logic") - @ConfigEditorBoolean - @ConfigAccordionId(id = 0) - public boolean debugEnabled = false; - - @Expose - @ConfigOption(name = "Command Logging", desc = "Logs stack trace information into the console when a command gets sent to hypixel. (by any mod or the player)") - @ConfigEditorBoolean - @ConfigAccordionId(id = 0) - public boolean commandLogs = false; - - @Expose - @ConfigOption( - name = "Mod Menu Log", - desc = "Enables debug messages when the currently opened gui changes, with the path to the gui class. " + - "Useful for adding more mods to quick mod menu switch." - ) - @ConfigEditorBoolean - @ConfigAccordionId(id = 0) - public boolean modMenuLog = false; - - @Expose - @ConfigOption(name = "Show internal name", desc = "Show internal names in item lore.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 0) - public boolean showInternalName = false; - - @Expose - @ConfigOption(name = "Show empty internal names", desc = "Shows internal name even if it is blank.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 0) - public boolean showEmptyNames = false; - - @Expose - @ConfigOption(name = "Show item UUID", desc = "Show the Unique Identifier of items. in the lore.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 0) - public boolean showItemUuid = false; - - @Expose - @ConfigOption(name = "Copy Rng Meter", desc = "Copies internal names and maxed xp needed from rng meter inventories in json format into the clipboard.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 0) - public boolean copyRngMeter = false; - - @Expose - @ConfigOption(name = "Highlight Missing Repo Items", desc = "Highlights each item in the current inventory that is not in your current NEU repo.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 0) - public boolean highlightMissingRepo = false; - - @ConfigOption(name = "Waypoints", desc = "") - @Accordion - @Expose - public Waypoints waypoint = new Waypoints(); - - public static class Waypoints { - - @Expose - @ConfigOption(name = "Save Hotkey", desc = "Saves block location to the waypoints list and copies everything to your clipboard.") - @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE) - public int saveKey = Keyboard.KEY_NONE; - - @Expose - @ConfigOption(name = "Delete Hotkey", desc = "Deletes the last saved location for when you make a mistake.") - @ConfigEditorKeybind(defaultKey = Keyboard.KEY_NONE) - public int deleteKey = Keyboard.KEY_NONE; - - } - - @Expose - public Position debugPos = new Position(10, 10, false, true); - - @Expose - @ConfigOption(name = "Minecraft Console", desc = "") - @ConfigEditorAccordion(id = 1) - public boolean minecraftConsole = false; - - @Expose - @ConfigOption(name = "Unfiltered Debug", desc = "Print the debug information for unfiltered console messages.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 1) - public boolean printUnfilteredDebugs = false; - - @Expose - @ConfigOption(name = "Unfiltered Debug File", desc = "Print the debug information into log files instead of into the console for unfiltered console messages.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 1) - public boolean logUnfilteredFile = false; - - @Expose - @ConfigOption( - name = "Outside SkyBlock", - desc = "Print the debug information for unfiltered console messages outside SkyBlock too." - ) - @ConfigEditorBoolean - @ConfigAccordionId(id = 1) - public boolean printUnfilteredDebugsOutsideSkyBlock = false; - - @Expose - @ConfigOption( - name = "Log Filtered", - desc = "Log the filtered messages into the console." - ) - @ConfigEditorBoolean - @ConfigAccordionId(id = 1) - public boolean printFilteredReason = false; - - @Expose - @ConfigOption(name = "Console Filters", desc = "") - @ConfigAccordionId(id = 1) - @ConfigEditorAccordion(id = 2) - public boolean consoleFilters = false; - - @Expose - @ConfigOption(name = "Filter Chat", desc = "Filter chat messages.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean filterChat = false; - - @Expose - @ConfigOption(name = "Filter Grow Buffer", desc = "Filter 'Needed to grow BufferBuilder buffer:'") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean filterGrowBuffer = true; - - @Expose - @ConfigOption(name = "Filter Sound Error", desc = "Filter 'Unable to play unknown soundEvent'.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean filterUnknownSound = true; - - @Expose - @ConfigOption(name = "Filter Scoreboard Errors", desc = "Filter error messages with Scoreboard: removeTeam, createTeam, " + - "removeObjective and 'scoreboard team already exists'.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean filterScoreboardErrors = true; - - @Expose - @ConfigOption(name = "Filter Particle", desc = "Filter message 'Could not spawn particle effect VILLAGER_HAPPY'.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean filterParticleVillagerHappy = true; - - @Expose - @ConfigOption(name = "Filter OptiFine", desc = "Filter OptiFine messages CustomItems and ConnectedTextures during loading.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean filterOptiFine = true; - - @Expose - @ConfigOption(name = "Filter AsmHelper Transformer", desc = "Filter messages when AsmHelper is Transforming a class during loading.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean filterAmsHelperTransformer = true; - - @Expose - @ConfigOption(name = "Filter Applying AsmWriter", desc = "Filter messages when AsmHelper is applying AsmWriter ModifyWriter.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean filterAsmHelperApplying = true; - - @Expose - @ConfigOption(name = "Filter Biome ID Bounds", desc = "Filter message 'Biome ID is out of bounds'.") - @ConfigEditorBoolean - @ConfigAccordionId(id = 2) - public boolean filterBiomeIdBounds = true; -} diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt b/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt index 045abbf58..531cc59b1 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt @@ -111,8 +111,10 @@ class ParkourHelper( } else axisAlignedBB(location) event.drawFilledBoundingBox(aabb, colorForIndex(index), 1f) - if (!isMovingPlattform) { - event.drawString(location.offsetCenter().add(0, 1, 0), "§a§l$index", seeThroughBlocks = true) + if (SkyHanniMod.feature.dev.waypoint.showPlatformNumber) { + if (!isMovingPlatform) { + event.drawString(location.offsetCenter().add(0, 1, 0), "§a§l$index", seeThroughBlocks = true) + } } } } catch (e: Throwable) { -- cgit