diff options
71 files changed, 573 insertions, 512 deletions
diff --git a/.idea/dictionaries/default_user.xml b/.idea/dictionaries/default_user.xml index 3de37f405..64c012a13 100644 --- a/.idea/dictionaries/default_user.xml +++ b/.idea/dictionaries/default_user.xml @@ -1,225 +1,276 @@ <component name="ProjectDictionaryState"> - <dictionary name="default.user"> - <words> - <w>abiphone</w> - <w>agaricus</w> - <w>allinvite</w> - <w>apec</w> - <w>arachne</w> - <w>arachne's</w> - <w>ashfang</w> - <w>autopet</w> - <w>bacte</w> - <w>bandana</w> - <w>berberis</w> - <w>biome</w> - <w>bladesoul</w> - <w>blobbercysts</w> - <w>bloodfiend</w> - <w>bobber</w> - <w>bobber's</w> - <w>bonzo</w> - <w>bonzo's</w> - <w>bonzos</w> - <w>boop</w> - <w>bossbar</w> - <w>broodfather</w> - <w>broodmother</w> - <w>cadycous</w> - <w>carrolyn</w> - <w>cata</w> - <w>cavespider</w> - <w>chestplate</w> - <w>chocolatefactory</w> - <w>chronomatron</w> - <w>chumcap</w> - <w>citrine</w> - <w>coflnet</w> - <w>coords</w> - <w>craftable</w> - <w>cropie</w> - <w>crosshair</w> - <w>deathmite</w> - <w>deathmites</w> - <w>deathripper</w> - <w>demonlord</w> - <w>derpy</w> - <w>despawn</w> - <w>dicer</w> - <w>disintegrator</w> - <w>disintegrators</w> - <w>dragontail</w> - <w>dreadfarm</w> - <w>dreadlord</w> - <w>dungeoneering</w> - <w>dwarven</w> - <w>egglocator</w> - <w>einary</w> - <w>einary's</w> - <w>elitebot</w> - <w>enderman</w> - <w>endermen</w> - <w>endermite</w> - <w>enderstone</w> - <w>endstone</w> - <w>etherwarp</w> - <w>explosivity</w> - <w>fermento</w> - <w>firedust</w> - <w>firesale</w> - <w>firesales</w> - <w>getfromsacks</w> - <w>glacite</w> - <w>glowstone</w> - <w>goldor</w> - <w>gratitudes</w> - <w>hardstone</w> - <w>hatcessory</w> - <w>hecatomb</w> - <w>hideparticles</w> - <w>hoppity</w> - <w>hoppity's</w> - <w>horsezooka</w> - <w>hotbar</w> - <w>hotm</w> - <w>hoverable</w> - <w>hpb's</w> - <w>hypixel</w> - <w>hypixel's</w> - <w>ichor</w> - <w>igrupan</w> - <w>igrupan's</w> - <w>ingame</w> - <w>inquis</w> - <w>inquistiors</w> - <w>internalname</w> - <w>interp</w> - <w>itemstack</w> - <w>jawbus</w> - <w>jerries</w> - <w>jerrypocalypse</w> - <w>jyrre</w> - <w>kaeso</w> - <w>keybind</w> - <w>keybinds</w> - <w>kindlebane</w> - <w>kismets</w> - <w>kloon</w> - <w>kuudra</w> - <w>kuudra's</w> - <w>laggy</w> - <w>lapis</w> - <w>larvas</w> - <w>lclick</w> - <w>lerp</w> - <w>livids</w> - <w>matriach</w> - <w>mawdredge</w> - <w>maxor</w> - <w>mcmod</w> - <w>millenia</w> - <w>miniboss</w> - <w>mirrorverse</w> - <w>mmclick</w> - <w>mobtracker</w> - <w>modid</w> - <w>moldfin</w> - <w>mooshroom</w> - <w>moul</w> - <w>moulberry</w> - <w>moulconfig</w> - <w>mouselocked</w> - <w>mouselowered</w> - <w>mycelium</w> - <w>nametag</w> - <w>nametags</w> - <w>necron</w> - <w>netherrack</w> - <w>neu's</w> - <w>npcs</w> - <w>nukekebi</w> - <w>nukekubi</w> - <w>odger</w> - <w>odger's</w> - <w>odonata</w> - <w>odonatas</w> - <w>opengenerowmenu</w> - <w>opti</w> - <w>oruo</w> - <w>packmaster</w> - <w>peridot</w> - <w>perkpocalypse</w> - <w>pickblock</w> - <w>pickobulus</w> - <w>pickonimbus</w> - <w>plhlegblast</w> - <w>polarvoid</w> - <w>preinitialization</w> - <w>procs</w> - <w>punchcard</w> - <w>pyrochaos</w> - <w>quazii</w> - <w>rclick</w> - <w>recombobulated</w> - <w>recombobulator</w> - <w>redstone</w> - <w>reindrake</w> - <w>renderable</w> - <w>renderables</w> - <w>revenant</w> - <w>riftstalker</w> - <w>robotron</w> - <w>runecrafting</w> - <w>sadan</w> - <w>scatha</w> - <w>sethome</w> - <w>shcopytranslation</w> - <w>shcropstartlocation</w> - <w>shlanedetection</w> - <w>shmarkplayer</w> - <w>shmouselock</w> - <w>shoutout</w> - <w>shulker</w> - <w>shwords</w> - <w>shworldedit</w> - <w>skeletor</w> - <w>skyblock</w> - <w>skyhanni</w> - <w>skyhanni's</w> - <w>skymall</w> - <w>skytils</w> - <w>skytils's</w> - <w>soopy</w> - <w>soopy's</w> - <w>soulsand</w> - <w>soulweaver</w> - <w>sprayonator</w> - <w>stillgore</w> - <w>stonk</w> - <w>superboom</w> - <w>supercraft</w> - <w>supercrafting</w> - <w>superlite</w> - <w>superpairs</w> - <w>tablist</w> - <w>terracottas</w> - <w>thaumaturgy</w> - <w>treasurite</w> - <w>tubulator</w> - <w>turbomax</w> - <w>twinclaws</w> - <w>typhoeus</w> - <w>ultrasequencer</w> - <w>unobtained</w> - <w>untrackable</w> - <w>vermins</w> - <w>viewrecipe</w> - <w>voidgloom</w> - <w>voidling</w> - <w>voltas</w> - <w>wikithis</w> - <w>wyld</w> - <w>yoggie</w> - </words> - </dictionary> -</component> + <dictionary name="default.user"> + <words> + <w>aatrox</w> + <w>abiphone</w> + <w>agaricus</w> + <w>allinvite</w> + <w>apec</w> + <w>arachne</w> + <w>arachne's</w> + <w>armorstand</w> + <w>armorstands</w> + <w>ashfang</w> + <w>astraea</w> + <w>attunement</w> + <w>autopet</w> + <w>azrael</w> + <w>bacte</w> + <w>bandana</w> + <w>berberis</w> + <w>bezal</w> + <w>biblio</w> + <w>biome</w> + <w>bladesoul</w> + <w>blobbercyst</w> + <w>blobbercysts</w> + <w>bloodfiend</w> + <w>bobber</w> + <w>bobber's</w> + <w>bonzo</w> + <w>bonzo's</w> + <w>bonzos</w> + <w>boop</w> + <w>bossbar</w> + <w>branchstrutter</w> + <w>broodfather</w> + <w>broodmother</w> + <w>burningsoul</w> + <w>caducous</w> + <w>cadycous</w> + <w>carrolyn</w> + <w>cata</w> + <w>cavespider</w> + <w>chestplate</w> + <w>chocolatefactory</w> + <w>chronomatron</w> + <w>chumcap</w> + <w>cinderbat</w> + <w>citrine</w> + <w>coflnet</w> + <w>coords</w> + <w>craftable</w> + <w>crit</w> + <w>cropie</w> + <w>crosshair</w> + <w>deathmite</w> + <w>deathmites</w> + <w>deathripper</w> + <w>deepterror</w> + <w>demonlord</w> + <w>derpy</w> + <w>despawn</w> + <w>dicer</w> + <w>disintegrator</w> + <w>disintegrators</w> + <w>dragontail</w> + <w>dreadfarm</w> + <w>dreadlord</w> + <w>dungeoneering</w> + <w>dwarven</w> + <w>egglocator</w> + <w>einary</w> + <w>einary's</w> + <w>elitebot</w> + <w>enderman</w> + <w>endermen</w> + <w>endermite</w> + <w>enderstone</w> + <w>endstone</w> + <w>etherwarp</w> + <w>explosivity</w> + <w>ezpz</w> + <w>fairylosopher</w> + <w>fermento</w> + <w>firedust</w> + <w>firesale</w> + <w>firesales</w> + <w>framebuffer</w> + <w>getfromsacks</w> + <w>ghast</w> + <w>glacite</w> + <w>glowstone</w> + <w>goldor</w> + <w>golem</w> + <w>gratitudes</w> + <w>hardstone</w> + <w>hatcessory</w> + <w>hecatomb</w> + <w>hexatorum</w> + <w>hideparticles</w> + <w>hoppity</w> + <w>hoppity's</w> + <w>horsezooka</w> + <w>hotbar</w> + <w>hotm</w> + <w>hoverable</w> + <w>hpb's</w> + <w>hypixel</w> + <w>hypixel's</w> + <w>ichor</w> + <w>igrupan</w> + <w>igrupan's</w> + <w>ingame</w> + <w>inquis</w> + <w>inquistiors</w> + <w>insanium</w> + <w>internalname</w> + <w>interp</w> + <w>itemstack</w> + <w>jawbus</w> + <w>jerries</w> + <w>jerrypocalypse</w> + <w>jyrre</w> + <w>kada</w> + <w>kaeso</w> + <w>keybind</w> + <w>keybinds</w> + <w>kindlebane</w> + <w>kismets</w> + <w>kloon</w> + <w>kuudra</w> + <w>kuudra's</w> + <w>laggy</w> + <w>lapis</w> + <w>larvas</w> + <w>lclick</w> + <w>lerp</w> + <w>livids</w> + <w>locraw</w> + <w>magmafish</w> + <w>matriach</w> + <w>mawdredge</w> + <w>maxor</w> + <w>mcmod</w> + <w>millenia</w> + <w>minecart</w> + <w>mineman</w> + <w>miniboss</w> + <w>mirrorverse</w> + <w>misclick</w> + <w>missclick</w> + <w>mmclick</w> + <w>mobtracker</w> + <w>modid</w> + <w>modrinth</w> + <w>moldfin</w> + <w>mooshroom</w> + <w>moul</w> + <w>moulberry</w> + <w>moulconfig</w> + <w>mouselocked</w> + <w>mouselowered</w> + <w>mycelium</w> + <w>nametag</w> + <w>nametags</w> + <w>necron</w> + <w>netherrack</w> + <w>neu's</w> + <w>npcs</w> + <w>nukekebi</w> + <w>nukekubi</w> + <w>odger</w> + <w>odger's</w> + <w>odonata</w> + <w>odonatas</w> + <w>opengenerowmenu</w> + <w>opti</w> + <w>oruo</w> + <w>otherside</w> + <w>overworld</w> + <w>packmaster</w> + <w>peridot</w> + <w>perkpocalypse</w> + <w>pesterminator</w> + <w>pickblock</w> + <w>pickobulus</w> + <w>pickonimbus</w> + <w>pitchin</w> + <w>plhlegblast</w> + <w>pling</w> + <w>pocalypse</w> + <w>polarvoid</w> + <w>preinitialization</w> + <w>procs</w> + <w>prospection</w> + <w>pumpgrotto</w> + <w>punchcard</w> + <w>pyrochaos</w> + <w>quazii</w> + <w>ragnarock</w> + <w>rclick</w> + <w>recombobulated</w> + <w>recombobulator</w> + <w>redstone</w> + <w>reindrake</w> + <w>renderable</w> + <w>renderables</w> + <w>revenant</w> + <w>riftstalker</w> + <w>rngesus</w> + <w>robotron</w> + <w>runecrafting</w> + <w>sadan</w> + <w>scarleton</w> + <w>scatha</w> + <w>sepulture</w> + <w>seraphine</w> + <w>sethome</w> + <w>shcopytranslation</w> + <w>shcropstartlocation</w> + <w>shlanedetection</w> + <w>shmarkplayer</w> + <w>shmouselock</w> + <w>shoutout</w> + <w>shulker</w> + <w>shwords</w> + <w>shworldedit</w> + <w>skeletor</w> + <w>skyblock</w> + <w>skyhanni</w> + <w>skyhanni's</w> + <w>skymall</w> + <w>skytils</w> + <w>skytils's</w> + <w>slimehill</w> + <w>soopy</w> + <w>soopy's</w> + <w>soulbound</w> + <w>soulflow</w> + <w>soulsand</w> + <w>soulweaver</w> + <w>sprayonator</w> + <w>statspocalypse</w> + <w>stillgore</w> + <w>stonk</w> + <w>superboom</w> + <w>supercraft</w> + <w>supercrafting</w> + <w>superlite</w> + <w>superpairs</w> + <w>tablist</w> + <w>terracottas</w> + <w>thaumaturgist</w> + <w>thaumaturgy</w> + <w>townsquare</w> + <w>treasurite</w> + <w>tubulator</w> + <w>turbomax</w> + <w>twinclaws</w> + <w>typhoeus</w> + <w>ultrasequencer</w> + <w>unobtained</w> + <w>untrackable</w> + <w>vermins</w> + <w>viewrecipe</w> + <w>voidgloom</w> + <w>voidling</w> + <w>voltas</w> + <w>weaponsmith</w> + <w>wikithis</w> + <w>wyld</w> + <w>yoggie</w> + <w>yolkar</w> + </words> + </dictionary> +</component>
\ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b622b4a6d..3194902b8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -145,7 +145,7 @@ The repo is located at https://github.com/hannibal002/SkyHanni-REPO. A copy of all json files is stored on the computer under `.minecraft\config\skyhanni\repo`. On every game start, the copy gets updated (if outdated and if not manually disabled). If you add stuff to the repo make sure it gets serialised. See -the [jsonobjects](src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo) +the [JsonObjects](src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo) folder for how to properly do this. You also may have to disable repo auto update in game. ### Discord IPC diff --git a/annotation-processors/src/main/kotlin/at/hannibal2/skyhanni/skyhannimodule/ModuleProcessor.kt b/annotation-processors/src/main/kotlin/at/hannibal2/skyhanni/skyhannimodule/ModuleProcessor.kt index 99d7904d0..5ce902613 100644 --- a/annotation-processors/src/main/kotlin/at/hannibal2/skyhanni/skyhannimodule/ModuleProcessor.kt +++ b/annotation-processors/src/main/kotlin/at/hannibal2/skyhanni/skyhannimodule/ModuleProcessor.kt @@ -90,10 +90,10 @@ class ModuleProcessor(private val codeGenerator: CodeGenerator, private val logg error("${warnings.size} errors related to event annotations found, please fix them before continuing. Click on the kspKotlin build log for more information.") } - val dependencies = symbols.mapNotNull { it.containingFile }.toTypedArray() - val deps = Dependencies(true, *dependencies) + val sources = symbols.mapNotNull { it.containingFile }.toTypedArray() + val dependencies = Dependencies(true, *sources) - val file = codeGenerator.createNewFile(deps, "at.hannibal2.skyhanni.skyhannimodule", "LoadedModules") + val file = codeGenerator.createNewFile(dependencies, "at.hannibal2.skyhanni.skyhannimodule", "LoadedModules") OutputStreamWriter(file).use { it.write("package at.hannibal2.skyhanni.skyhannimodule\n\n") diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index b9b4c19b0..22be128be 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -12,7 +12,7 @@ + Show effective area (as a wireframe, filled or circle). + Show mana regeneration buff next to the GUI element. + Option to hide flare particles. -+ Added a "Line to Arachne" setting, just like with slayer minibosses. - ++ Added a "Line to Arachne" setting, just like with slayer mini bosses. - azurejelly (https://github.com/hannibal002/SkyHanni/pull/1888) + Added In-Water Display. - Stella (https://github.com/hannibal002/SkyHanni/pull/1892) + Useful when using a Prismarine Blade in Stranded Mode. @@ -256,7 +256,7 @@ Empa (https://github.com/hannibal002/SkyHanni/pull/1875) + Updated /shclearminiondata to remove only bugged minions nearby, not all minions. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1951) -+ Added information about the current Perkopocalypse Mayor's perks to the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2003) ++ Added information about the current Perkpocalypse Mayor's perks to the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2003) + Added support for Fancy Contributors in nametags. - Empa (https://github.com/hannibal002/SkyHanni/pull/1687) + Improved overall performance slightly by about ~1%. - nea (https://github.com/hannibal002/SkyHanni/pull/2033) + Improved Hypixel server detection. - Luna (https://github.com/hannibal002/SkyHanni/pull/2064) @@ -337,7 +337,7 @@ + Fixed showing "No Magical Power detected" message multiple times. - Empa (https://github.com/hannibal002/SkyHanni/pull/2065) + Fixed unknown lines not appearing instantly in the Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2063) + Fixed Anniversary Line not being detected in Custom Scoreboard. - Empa, j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2058) -+ Fixed Perkapocalypse Mayor's time being longer than Jerry's time in office. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2045) ++ Fixed Perkpocalypse Mayor's time being longer than Jerry's time in office. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2045) + Fixed Unknown lines in the Custom Scoreboard. - Empa (https://github.com/hannibal002/SkyHanni/pull/2119) + Fixed broken event start time for upcoming events in the Custom Scoreboard. - Luna (https://github.com/hannibal002/SkyHanni/pull/2113) + Fixed the New Year Event missing in the Custom Scoreboard.. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2122) @@ -449,7 +449,7 @@ + Reserves a key namespace, that is only accessible from this group. + Increased usage of seconds passed. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1899) + Refactored /ff. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/873) -+ Added Perkopocalypse Mayor to MayorAPI. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2003) ++ Added Perkpocalypse Mayor to MayorAPI. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2003) + Created FmlEventApi to hold Forge events before dispatching them as SkyHanniEvents. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1986) + Ensured correct config version when downgrading the mod. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1990) + Changed CachedItemData to use SimpleTimeMark. - nea (https://github.com/hannibal002/SkyHanni/pull/2006) @@ -500,7 +500,7 @@ + This is separate from chroma. + This is achieved by using §#§0§0§0§f§f§f§/. + Simply use the ExtendedChatColor class. -+ Refactored Area Miniboss Features to use mob detection. - Empa (https://github.com/hannibal002/SkyHanni/pull/2095) ++ Refactored Area Mini boss Features to use mob detection. - Empa (https://github.com/hannibal002/SkyHanni/pull/2095) + Added OreBlock and OreType. - Empa (https://github.com/hannibal002/SkyHanni/pull/1655) + Added OreMinedEvent. - Empa (https://github.com/hannibal002/SkyHanni/pull/1655) + Provides information on the original block mined, and any other blocks mined by sources like Efficient Miner, Mole, etc. @@ -508,7 +508,7 @@ + Fixed HotmAPI saving incorrect level values when using Blue Egg. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2097) + Fixed the interest widget and added a scrap widget. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/2094) + Made SkyHanni into a Mod. - hannibal2 + nea (https://github.com/hannibal002/SkyHanni/pull/2099) -+ Fixed illegal mob detection with ridable pets. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2010) ++ Fixed illegal mob detection with rideable pets. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2010) + Removed yet another deprecated function. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/2021) + Created and implemented PlayerDeathEvent. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1544) + Added a list of named nodes for the graph editor. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2059) @@ -661,7 +661,7 @@ + Added Factory Chat Filters. - RobotHanzo (https://github.com/hannibal002/SkyHanni/pull/1574) + Hide chocolate factory upgrade and employee promotion messages. + Copy Chocolate Factory Stats to clipboard. - seraid (https://github.com/hannibal002/SkyHanni/pull/1517) -+ Highlight unbought items in Hoppity shop. - seraid (https://github.com/hannibal002/SkyHanni/pull/1517) ++ Highlight non-purchased items in Hoppity shop. - seraid (https://github.com/hannibal002/SkyHanni/pull/1517) + Added time tower status to the chocolate factory stats. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1506) + Also can notify you when you get a new charge or your charges are full. @@ -702,7 +702,7 @@ + Highlights the Heavy Pearls. + Draws a line to the Heavy Pearls. -#### Slayer Featues +#### Slayer Features + Added Blaze Slayer fire pillar display. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1766) + Shows a large display with a timer when the Fire Pillar is about to explode. @@ -838,7 +838,7 @@ #### Commands Improvements -+ Add /trade to tab completeable commands. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1354) ++ Add /trade to tab completable commands. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1354) + Improved gfs to have support for calculations in amount. - Conutik (https://github.com/hannibal002/SkyHanni/pull/1493) + Cleanup the format for the /shcommand hover description. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1531) @@ -926,7 +926,7 @@ + Improved various Hoppity features. - seraid (https://github.com/hannibal002/SkyHanni/pull/1517) + Show an estimation of when you will prestige based on your chocolate/second. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1514) -+ Removed the Hoppity Menu Shortcut in The Rift, Kuudra, Catacombs and Mineshafts. - ++ Removed the Hoppity Menu Shortcut in Rift, Kuudra, Catacombs and Mineshaft. - raven (https://github.com/hannibal002/SkyHanni/pull/1585) + You cannot use the chocolate factory in these areas, resulting in the button being removed. + Live update chocolate amounts in other inventories related to the chocolate factory. - @@ -1241,7 +1241,7 @@ #### Rift Fixes -+ Fixed Rift NPC shops being treated as overworld ones for selling items to them. - ++ Fixed Rift NPC shops being treated as Overworld ones for selling items to them. - Alexia Luna (https://github.com/hannibal002/SkyHanni/pull/1494) + Fixed Blood Effigies timers in the Rift. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1649) + Fixed timers showing even when above the set respawn time. @@ -1289,7 +1289,7 @@ #### Crimson Isle Fixes -+ Fixed incorrect miniboss amount displayed by Crimson Isle Reputation Helper. - ++ Fixed incorrect mini boss amount displayed by Crimson Isle Reputation Helper. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1633) + Fixed Volcano Explosivity Display. - Alexia Luna (https://github.com/hannibal002/SkyHanni/pull/1821) + Broken when Hypixel introduced the new tab list. @@ -1344,7 +1344,7 @@ + Fixed updater downloading the wrong version. - Empa (https://github.com/hannibal002/SkyHanni/pull/1590) + Fixed some mob features not working with Skytils' ping display. - Thunderblade73 & martimavocado (https://github.com/hannibal002/SkyHanni/pull/1605) -+ Fixed overly frequent bazaar price error messages. - hannnibal2 (https://github.com/hannibal002/SkyHanni/pull/1597) ++ Fixed overly frequent bazaar price error messages. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1597) + Fixed overly long description for Patcher send coordinates waypoints. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1631) + Fixed the low quiver warning. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1629) @@ -1354,7 +1354,7 @@ Luna (https://github.com/hannibal002/SkyHanni/pull/1706) + Fixed bugged minion name tags on your private island when opening a minion. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1630) -+ Fixed supercrafted items being incorrectly added to profit trackers. - ++ Fixed super-crafted items being incorrectly added to profit trackers. - Empa (https://github.com/hannibal002/SkyHanni/pull/1784) + Fixed typo in the Mythological Creature Tracker reset command. - Jordyrat (https://github.com/hannibal002/SkyHanni/pull/1800) @@ -1383,7 +1383,7 @@ + Added offset to tick event. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1342) + Made dungeon milestone use repo instead of local patterns. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1342) -+ Unprivate LorenzVec.toCleanString. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/1344) ++ Removed private modifier from LorenzVec.toCleanString. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/1344) + Removed Old TimeMark Class. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1322) + Remove a lot of usage of fixed rate timers and replace with a new event. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1264) @@ -1414,7 +1414,7 @@ + Added Renderable.verticalContainer. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1318) + Remove a lot of deprecated methods. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1371) + Added Renderable.table. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/822) -+ Add API for rendering fake ghostly/holograhpic entities in the world. - ++ Add API for rendering fake ghostly/holographic entities in the world. - nea (https://github.com/hannibal002/SkyHanni/pull/731) + Added a `removeSpray` method to `Plot`. - Alexia Luna (https://github.com/hannibal002/SkyHanni/pull/1178) + Changed stuff around with chat messages. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1227) @@ -1454,7 +1454,7 @@ + Removed use of notenoughupdates.util.Constants. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1191) + Made a generic gson builder containing common type adapters. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1308) - + Moved specific gson types (Elite api data and Hypixel api data) to their own gsons. + + Moved specific gson types (Elite api data and Hypixel api data) to their own Gson objects. + Elitebot api now uses CropType and PestType instead of strings. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1308) + Added Renderable.multiClickable. - Thunderblade73 (https://github.com/hannibal002/SkyHanni/pull/1407) @@ -1609,7 +1609,7 @@ + Highlights your selected class in green if it's available. + Kismet tracking for dungeon chests. - Thunderblade73 + Highlight chests which have been rerolled inside Croesus - + Shows kismet amount at the reroll button + + Shows kismet amount at the re-roll button #### Garden Features @@ -1724,7 +1724,7 @@ j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1221) + Using a draggable list, you can fully customise, what events will be shown which what priority. + Updated default Scoreboard Elements config option. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1221) -+ Added feature to showcase foxy's extra in Custom Scoreboard. - ++ Added feature to showcase Foxy' extra event in Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/1270) ##### Garden Improvements @@ -1767,7 +1767,7 @@ Empa (https://github.com/hannibal002/SkyHanni/pull/1284) + Immediately hide waypoints when there are no pests left. - Empa (https://github.com/hannibal002/SkyHanni/pull/1284) -#### Crimson Improvelemts +#### Crimson Improvements + Show Town Board waypoint when there is an accepted Rescue Mission quest. - Alexia Luna (https://github.com/hannibal002/SkyHanni/pull/1157) @@ -1848,7 +1848,7 @@ martimavocado (https://github.com/hannibal002/SkyHanni/pull/1211) + Fix a typo in Not Clickable Items in the /equipment menu. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/1242) -+ Fixed `/playtimedetailed`'s Limbo displaying incorrectly for x.0 playtimes. - ++ Fixed `/playtimedetailed`'s Limbo displaying incorrectly for x.0 play times. - martimavocado (https://github.com/hannibal002/SkyHanni/pull/1252) #### Chat Fixes @@ -1920,7 +1920,7 @@ #### Slayer Fixes -+ Added Burningsoul Demon (75M HP miniboss) to line to miniboss and highlight slayer minibosses. - ++ Added Burningsoul Demon (75M HP mini boss) to line to mini boss and highlight slayer mini bosses. - Empa (https://github.com/hannibal002/SkyHanni/pull/1144) + Fixed Damage Indicator not hiding vanilla names. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1179) + Fixed Slayer Profit Tracker not detecting the slayer spawn cost when taking money from the bank. - @@ -2014,7 +2014,7 @@ hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1195) + Remove the removed stack size option from config. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1274) -#### Fishign Fixes +#### Fishing Fixes + Renamed "fishing contest" to "fishing festival". - Empa (https://github.com/hannibal002/SkyHanni/pull/1222) + Fixed duplicate chat prefix when updating trophy fishing data from NEU PV. - @@ -2152,7 +2152,7 @@ CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1226) + Refactored visitor handling code slightly. - Alexia Luna (https://github.com/hannibal002/SkyHanni/pull/1224) + Removed unneeded inSacks property. -+ Added "unknownAmmount" to PestSpawnEvent. - Empa (https://github.com/hannibal002/SkyHanni/pull/1237) ++ Added "unknownAmount" to PestSpawnEvent. - Empa (https://github.com/hannibal002/SkyHanni/pull/1237) + Added StringUtils.generateRandomId(). - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1128) + Added ChatUtils.clickableChat support for runnable action. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1128) @@ -2516,7 +2516,7 @@ + Fixed no bait warning appearing at the wrong moment or not appearing at all. - hannibal2 + Fixed Crimson Isle Fishing Geyser Box showing even when very far away. - Obsidian -#### Invenory Fixes +#### Inventory Fixes + Fixed hide non-clickable items not working in some bazaar pages. - hannibal2 + Fixed rogue sword ability taking into account mage cooldown reduction. - Empa @@ -2555,7 +2555,7 @@ + Fixed GUI positions moving into the bottom-right corner when leaving the GUI position editor while pressing the mouse button on next reopen. - hannibal2 + Fixed parts of Compact Tab List being uncoloured. - CalMWolfs -+ Fixed Compact Tab List' Toggle Tab not working when using patcher. - hannibal2 ++ Fixed Compact Tab List' Toggle Tab not working when using Patcher. - hannibal2 + Fixed Skill progress display size too small when not using the progress bar. - Thunderblade73 + Fixed the skill progress bar trying to get out of the screen. - HiZe + Fixed the negative time remaining in the skill ETA display. - HiZe @@ -2651,7 +2651,7 @@ + Added the SkyHanni icon to the IntelliJ profile view. - Erymanthus + Fixed key name in utils patterns. - CalMWolfs + Using NEUInternalName in the Reputation Helper Quest. - CalMWolfs -+ Limit RAM to 4 GB in the developement enviroment. - CalMWolfs ++ Limit RAM to 4 GB in the development environment. - CalMWolfs + This is just the default and can be changed if needed. + Made /shupdaterepo better. - CalMWolfs + Added alignment support to Renderable. - Thunderblade73 @@ -2777,7 +2777,7 @@ #### Diana Features + Added Diana Profit Tracker. - hannibal2 - + Same options as slayer and fising trackers. + + Same options as slayer and fishing trackers. + Added highlight for the Minos Inquisitors to make them easier to see. - Cad + Added Mythological Mob Tracker. - hannibal2 + Counts the different mythological mobs you have dug up. @@ -2809,7 +2809,7 @@ #### Stranded Features -+ Highlights NPCs in the stranded menu that are placeable but havent been placed. - walker ++ Highlights NPCs in the stranded menu that are placeable but haven't been placed. - walker #### Rift Features @@ -3056,7 +3056,7 @@ + Created Matcher.groupOrNull. - walker + cleanPlayerName respects playerRankHider option now. - hannibal2 + Replaced ItemWarnEntry with VisitorReward. This should fix some errors. - hannibal2 -+ GardenNextJacobContest now uses SimpleTimeMark. SimpleTimeMark is storable in the config and comparable - hannibal2 ++ GardenNextJacobContest now uses SimpleTimeMark. SimpleTimeMark can now be saved in the config directly and compared - hannibal2 + No longer sending contest data to elite close to new year. - hannibal2 + Added RepoPatterns. - nea + Use LorenzToolTipEvent over ItemTooltipEvent if possible. - hannibal2 @@ -3174,7 +3174,7 @@ + Fixed opening the Pet menu no longer updating the current pet display. - hannibal2 + Fixed Archfiend Dice and High Class Archfiend Dice counting as slayer drops when rolled. - hannibal2 + Fixed dice roll profit counting as Mob Kill Coins in Slayer Tracker. - hannibal2 -+ Fixed Sack Display sometimes not formatting a million correctly. - Hize ++ Fixed Sack Display sometimes not formatting a million correctly. - HiZe + Fixed Estimated Item Value getting shown in stats breakdown menu. - hannibal2 + Fixed a bug with the ender chest and SkyHanni GUI editor. - hannibal2 + Fixed crimson isle faction icon in tab list showing twice and not going away fully when enabling the "hide faction" @@ -3190,7 +3190,7 @@ + Add log clearing. - CalMWolfs + Add auto-prefix to chat message methods. - walker + Added support for extra data in error manager. - hannibal2 -+ Added /readcropmilestonefromclipboard. - hannibal2 ++ Added /shreadcropmilestonefromclipboard. - hannibal2 + This command reads the clipboard content, in the format of users sending crop milestone step data. + The new data gets compared to the currently saved data, differences are getting replaced and the result gets put into the clipboard. The clipboard context can be used to update the repo content. @@ -3220,7 +3220,7 @@ + Added **Compact Tab List**. + Compacts the tablist to make it look much nicer (old SBA feature, but fewer bugs). - CalMWolfs - + Option to hide Hypixel advertisment banners. - CalMWolfs + + Option to hide Hypixel advertisement banners. - CalMWolfs + Added **Advanced Player List**. - hannibal2 + Customize the player list (inside the tab list) in various ways. + Change the sort order of players: Default, SkyBlock Level, alphabetical name, Iron Man first/bingo level, @@ -3242,7 +3242,7 @@ + Added Highlight Party Members. - Cad + Marking party members with a bright outline to better find them in the world. -+ Porting SBA's **chroma** into SkyHanni with many more options and chroma everything. - VixidDev ++ Porting SkyBlockAddon's **chroma** into SkyHanni with many more options and chroma everything. - VixidDev + Options to change speed, size, saturation and direction. + Added Modify Visual Words (command /shwords). - CalMWolfs + Allows you to replace text on your screen with different text (like the SBE one, just less costly). @@ -3300,11 +3300,11 @@ + Thanks Tobbbb for the coordinates! + Support for hiding basket waypoints once you have clicked on them. - hannibal2 + Option to show only the closest basket. - hannibal2 -+ Help with the 2023 Halloween visitor challenge (ephemeral dingsibumsi or something) - nea ++ Help with the 2023 Halloween visitor challenge (Ephemeral Gratitude) - nea + New Visitor Ping: Pings you when you are less than 10 seconds away from getting a new visitor. + Accept Hotkey: Accept a visitor when you press this keybind while in the visitor GUI. + Added support for showing the Primal Fear data from tab list as GUI elements. - Erymanthus -+ Play warning sound when the next Primal Fear can spawn. - thunderblade73 ++ Play warning sound when the next Primal Fear can spawn. - Thunderblade73 #### Commands @@ -3365,7 +3365,7 @@ + Only items with recipes are tab completed. + Added option to set the size of highlighted motes orbs in rift and make them smaller by default. - cimbraien + Disabled clicks on SkyHanni GUIs while inside NEU's or Skytils profile viewer. - hannibal2 -+ Removed armor stand checks for Trevor Solver. This fixes or nerfs the feature to not highlight mobs behind blocks ++ Removed armor stand checks for Trevor Solver. This fixes or de-buffs the feature to not highlight mobs behind blocks sometimes. - hannibal2 + Added diamond and gold essence support to PowderTracker. - walker + Change the fandom wiki search engine (under the /wiki command) from Google to the fandom wiki's built-in search @@ -3611,7 +3611,7 @@ + Change the color, width, and duration of the line. + Show alert when reaching max super-pairs clicks. - pretz + Plays a beep sound and sends a message in chat when the player reaches the maximum number of clicks gained for - super-pairs minigames. + super-pair mini games. + Added gemstone slot unlock costs to the Estimated Item Value. - Fix3dll + **Powder Grinding Tracker** - HiZe + Shows the Mithril/Gemstone Powder gained, the number of chests opened, if Double Powder is active, and the items @@ -3668,7 +3668,7 @@ + Adds **Double Hook** to the **sea creature chat message** instead of in a previous line. - appable0 + Rune display now shows always in sack display. + Shark fish counter now counts twice for Double hook. - appable0 -+ Ghost counter check for Mist now ignores y coordiantes - HiZe ++ Ghost counter check for Mist now ignores y coordinates - HiZe + Telling the user about the bypass hotkey when the visitor drop warning blocks a visitor refusal. - CalMWolfs + Added warning sound when the worm fishing cap of 60 is hit. - CarsCupcake + Shared inquisitor waypoints will now get removed after 75 seconds. - hannibal2 @@ -3805,7 +3805,7 @@ + Fixed maxed pet exp progress bar is wrong for bingo pet. - hannibal2 + Hopefully fixed bug that opening a visitor too quickly causes detection problems. - hannibal2 + Added nametags for minions as soon as they are placed. - Cad -+ Fixed wrong display offset in Powder Tracker. - Hize ++ Fixed wrong display offset in Powder Tracker. - HiZe + Fixed some features not working correctly because of broken location detection for wrong Hypixel area names. - Cad + This includes: + Wilted Berberis Helper (in the Rift, Dreadfarm) @@ -3829,7 +3829,7 @@ + This should also fix problems with false positive detections in the crimson isle. + Fixed item rarity problems. - hannibal2 + Fixed a rare error when opening minion inventory. - hannibal2 -+ Fixed stuff in the **Trozen Treasure Tracker**. - CalMWolfs ++ Fixed stuff in the **Frozen Treasure Tracker**. - CalMWolfs + The ice/hour calculation + Rate Timer + Typos @@ -3840,12 +3840,12 @@ + Added workaround for new fire sale cosmetics (pet skin, helmet skin, rune) in estimated item value. - hannibal2 + Fixed garden visitors not highlighting on status "new". - hannibal2 + Fixed wrongly highlighting enchanted sacks for reputation helper fetch quests. - hannibal2 -+ Fixed Fragged Spirit Mask not showing a cooldown after being triggered. - Cad ++ Fixed Fragmented Spirit Mask not showing a cooldown after being triggered. - Cad + Fixed item rarity problems with very special. - hannibal2 + Fixed party member detection issues for the tab complete feature. - CalMWolfs + Hide item rarity error message in /ff. - hannibal2 + Fixed an issue with the Wheat Profit Display not showing the correct value when combined with seeds. - Thunderblade73 -+ Tab complte party members now also detects if the party leader leaves. - CalMWolfs ++ Tab complete party members now also detects if the party leader leaves. - CalMWolfs + Fixed typos in many config settings. - Absterge + Fixed NEU Heavy Pearl detection. - hannibal2 + Fixed showing Wrong Slayer Warning sometimes at the wrong time. - Cad @@ -3906,7 +3906,7 @@ + Added existing slayer feature support for **Vampire Slayer** - HiZe + This contains RNG Meter, Slayer quest warning and Items on ground + Added item ability cooldown support for **Weirder Tuba** and **Holy Ice** - HiZe -+ Added **Lazer Parkour** Solver - CalMWolfs ++ Added **Laser Parkour** Solver - CalMWolfs + Highlights the location of the invisible blocks in the Mirrorverse + Added Mirrorverse **Dance Room Helper** - HiZe + Helps to solve the dance room in the Mirrorverse by showing multiple tasks at once. @@ -3929,7 +3929,7 @@ + **Living Metal Suit** Progress - HiZe + Display progress Living Metal Suit (Default disabled) + Option to show a compacted version of the overlay when the set is maxed -+ Added Highlight for Blobbercysts in Bacte fight in colloseum in rift - HiZe ++ Added Highlight for Blobbercysts in Bacte fight in colosseum in rift - HiZe + Show a line between **Defense blocks** and the mob and highlight the blocks - hannibal2 + Hide particles around Defense Blocks + Show a moving animation between **Living Metal** and the next block - hannibal2 @@ -3979,7 +3979,7 @@ + Added Highlight enderman slayer Nukekubi (Skulls) - dragon99z + Added option to hide the vanilla particles around enderman + Hide particles around enderman slayer bosses and mini bosses -+ Added support for Shadow Fury abilty cooldown - HiZe ++ Added support for Shadow Fury ability cooldown - HiZe + Added /sendcoords sending, detecting and rendering - dragon99z + Added **Boss Spawn Warning** - HiZe + hannibal2 + Send a title when your slayer boss is about to spawn @@ -4048,11 +4048,11 @@ + Server restart timer no longer shows all the time if over 2 minutes + Fixed crazy rare drops not counting properly - ReyMaratov + Fixed individual attribute prices in estimated item value - nea -+ Fixed sack display detection - hize -+ Fixed rare Ghost Counter bugs - hize ++ Fixed sack display detection - HiZe ++ Fixed rare Ghost Counter bugs - HiZe + Fixed a bug that farming weight display does not show up if you only have one profile + Fixed broken thorn damage indicator detection in dungeon F4/M4 -+ Fixed togglesneak mod breaking escape menu open detection for quick mod menu switch ++ Fixed "toggle sneak mod" breaking escape menu open detection for quick mod menu switch + Fixed error with detecting hit phase during eman slayer in damage indicator + No longer double counting mob kill coins in slayer item profit tracker + Fixed jacob contest time chat message chat shows one second too long @@ -4157,7 +4157,7 @@ + Hide the RNG Meter message from chat if the current item is selected + Added **Ghost Counter** (Contributed by HiZe) + Shows number of ghosts killed in the Mist in Dwarven Mines - + Shows kill combo, coins per scavenger, all item drops, bestiarity, magic find and more + + Shows kill combo, coins per scavenger, all item drops, bestiary, magic find and more + Each display line is highly customizable ### Changes @@ -4389,7 +4389,7 @@ + Added Bingo Card display. + **Minion Craft Helper** - Show how many more items you need to upgrade the minion in your inventory. Especially useful for bingo. -+ Hide dead entities - Similar to Skytil's feature for inside dungeon, but for everywhere. ++ Hide dead entities - Similar to Skytils' feature for inside dungeon, but for everywhere. + Hide Fireball particles and hide Fire Block particles. + Made **blaze slayer clear view** work with more particles. + Added colors for the missing slayer area bosses (Golden Ghoul, Old Wolf and Spider Keeper) @@ -4658,7 +4658,7 @@ - Added highlight the voidling extremist in pink color - Added highlight corrupted mobs in purple color - Added command /shmarkplayer <player> (marking a player with yellow color) -- Added highlight slayer miniboss in blue color +- Added highlight slayer mini boss in blue color - Added option to hide the death messages of other players, except for players who are close to the player, inside dungeon or during a Kuudra fight. - Added highlight the enderman slayer Yang Glyph (Beacon) in red color (supports beacon in hand and beacon flying) @@ -4674,7 +4674,7 @@ - Added /wiki command (using hypixel-skyblock.fandom.com instead of Hypixel wiki) - Added hiding damage splashes while inside the boss room (replacing a broken feature from Skytils) - Added Summoning Mob Display (Show the health of your spawned summoning mobs listed in an extra GUI element and hiding - the corresponding spawning/despawning chat messages) + the corresponding spawning/de-spawning chat messages) - Added option to hide the nametag of your spawned summoning mobs - Added option to mark the own summoning mobs in green - Added Ashfang Blazing Souls display @@ -4768,8 +4768,8 @@ ## Version 0.1 - Added damage indicator for some bosses who are outside dungeon (4 nether bosses: Ashfang, barbarian duke, mage outlaw - and Bladesoul, slayers: Enderman 1-4, revenant 5, and untested support for vanquisher in nether, Enderdragon and - Endstone protector in end) + and Bladesoul, slayers: Enderman 1-4, revenant 5, and untested support for Vanquisher in Crimson Isle, Ender Dragon and + Endstone Protector in end) - Added item ability cooldown background display (over the slot, work in progress) - Added Ashfang freeze cooldown (when you get hit by “anti ability” and slowness effect) - Changed “hot clickable items” to show items again, but only with dark gray overlay. Looks nicer diff --git a/docs/DISCORD_FAQ.md b/docs/DISCORD_FAQ.md index 8a4f9714a..9edc75867 100644 --- a/docs/DISCORD_FAQ.md +++ b/docs/DISCORD_FAQ.md @@ -24,8 +24,8 @@ _Frequently Asked Questions_ > **7: My Jacob Contest Display crops are wrong, how do I fix this?** > Run the command `/shclearcontestdata` to clear the Jacob contest data. -> **8: How can I get bigger crop hitboxes?** -> Use Patcher or PolyPatcher to have 1.12 hitboxes in 1.8.9. +> **8: How can I get bigger crop hit boxes?** +> Use Patcher or PolyPatcher to have 1.12 hit boxes in 1.8.9. > - [Sk1erLLC's Patcher](<https://sk1er.club/mods/patcher>) > - [Polyfrost's PolyPatcher](<https://modrinth.com/mod/patcher>) (a fork of Patcher with OneConfig, slightly different features, and bug fixes) diff --git a/docs/FEATURES.md b/docs/FEATURES.md index 4aded1014..d26e272a4 100644 --- a/docs/FEATURES.md +++ b/docs/FEATURES.md @@ -100,7 +100,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. + Highlights your selected class in green if it's available. + Kismet tracking for dungeon chests. - Thunderblade73 + Highlight chests which have been rerolled inside Croesus - + Shows kismet amount at the reroll button + + Shows kismet amount at the re-roll button + SA Jump Notification. - CarsCupcake (https://github.com/hannibal002/SkyHanni/pull/852) + Warn shorty before a Shadow Assassin jumps to you in dungeons. + Notifications for architect on puzzle fail. - Conutik (https://github.com/hannibal002/SkyHanni/pull/1197) @@ -244,7 +244,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. - Option to hide the nametag of your spawned summoning mobs. - Option to mark the own summoning mobs in green. - Summoning Mob Display (Show the health of your spawned summoning mobs listed in an extra GUI element and hiding the - corresponding spawning/despawning chat messages) + corresponding spawning/de-spawning chat messages) </details> <details open><summary> @@ -322,7 +322,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. + Works in crystal hollows too (worm fishing) + Keybind to manually reset the barn/worm fishing timer. - CarsCupcake + Warning sound when the worm fishing cap of 60 is hit. - CarsCupcake - + Has support for the gamemode Stranded. - hannibal2 + + Has support for the game mode Stranded. - hannibal2 + **Shark Fish Counter** - Counts how many sharks have been caught. + **Odger waypoint** - Show the Odger waypoint when trophy fishes are in the inventory and no lava rod in hand. + Showing fished item names @@ -457,10 +457,10 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. + **Griffin Pet Warning** + Warn when holding an Ancestral Spade while no Griffin pet is selected. + **Inquisitor Sharing** - + Share aypoints for inquisitors you find with your party. + + Share waypoints for inquisitors you find with your party. + Show a timer until the inquisitor will despawn. + Diana Profit Tracker. - hannibal2 - + Same options as slayer and fising trackers. + + Same options as slayer and fishing trackers. + Highlight for the Minos Inquisitors to make them easier to see. - Cad + Mythological Mob Tracker. - hannibal2 + Counts the different mythological mobs you have dug up. @@ -520,7 +520,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. + Highlight corrupted mobs. + **Arachne Minis Hider** - Hides the nametag above arachne minis. + **Arachne Boss Highlighter** - Highlight the arachne boss in red and mini bosses and orange. -+ "Line to Arachne" setting, just like with slayer minibosses. - azurejelly (https://github.com/hannibal002/SkyHanni/pull/1888) ++ "Line to Arachne" setting, just like with slayer mini bosses. - azurejelly (https://github.com/hannibal002/SkyHanni/pull/1888) + Countdown for Arachne spawn. - Cad + Supports quick spawns. + Option to hide the vanilla particles around enderman @@ -557,7 +557,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. + **Garden Level Display** - Show the current garden level and progress to the next level. + **Fake garden level up** message: - hannibal2 + In 10k garden exp steps after level 15. - + Uses the overflow exp that hypixel still caluclates (maybe official upgrade with more garden levels in the + + Uses the overflow exp that hypixel still calculates (maybe official upgrade with more garden levels in the future?). + Click on the message to open the garden level display. - J10a1n15 + **Farming Weight and Leaderboard** @@ -570,7 +570,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. switching to a different pet for leveling. + **Money per Hour** + Displays the money per hour YOU get with YOUR crop/minute value when selling the items to bazaar. - + Suppports the dicer drops from melon and pumpkins as well. - CalMWolfs + + Supports the dicer drops from melon and pumpkins as well. - CalMWolfs + Supports armor drops. - CalMWolfs + Farming contest timer. + Wrong fungi cutter mode warning. @@ -764,7 +764,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. + Hide already completed kloon terminal waypoints + **Crux Talisman Progress** Display - HiZe + Show bonuses you get from the talisman -+ **Lazer Parkour** Solver - CalMWolfs ++ **Laser Parkour** Solver - CalMWolfs + Highlights the location of the invisible blocks in the Mirrorverse + Mirrorverse **Dance Room Helper** - HiZe + Helps to solve the dance room in the Mirrorverse by showing multiple tasks at once. @@ -784,7 +784,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. + Living Metal Suit Progress - HiZe + Display progress Living Metal Suit (Default disabled) + Option to show a compacted version of the overlay when the set is maxed -+ Highlight for Blobbercysts in Bacte fight in colloseum in rift - HiZe ++ Highlight for Blobbercysts in Bacte fight in colosseum in rift - HiZe + Show a line between **Defense blocks** and the mob and highlight the blocks - hannibal2 + Hide particles around Defense Blocks + Show a moving animation between **Living Metal** and the next block - hannibal2 @@ -880,11 +880,11 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. + Thanks Tobbbb for the coordinates! + Support for hiding basket waypoints once you have clicked on them. - hannibal2 + Option to show only the closest basket. - hannibal2 -+ Help with the 2023 Halloween visitor challenge (ephemeral dingsibumsi or something) - nea ++ Help with the 2023 Halloween visitor challenge (Ephemeral Gratitude) - nea + New Visitor Ping: Pings you when you are less than 10 seconds away from getting a new visitor. + Accept Hotkey: Accept a visitor when you press this keybind while in the visitor GUI. + Support for showing the primal fear data from tab list as GUI elements. - Erymanthus -+ Play warning sound when the next Primal Fear can spawn. - thunderblade73 ++ Play warning sound when the next Primal Fear can spawn. - Thunderblade73 + Unique Gifting Opportunities. - nea + Highlight players who you haven't given gifts to yet. + Only highlight ungifted players while holding a gift. @@ -916,7 +916,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. + Factory Chat Filters. - RobotHanzo (https://github.com/hannibal002/SkyHanni/pull/1574) + Hide chocolate factory upgrade and employee promotion messages. + Copy Chocolate Factory Stats to clipboard. - seraid (https://github.com/hannibal002/SkyHanni/pull/1517) -+ Highlight unbought items in Hoppity shop. - seraid (https://github.com/hannibal002/SkyHanni/pull/1517) ++ Highlight non-purchased items in Hoppity shop. - seraid (https://github.com/hannibal002/SkyHanni/pull/1517) + Added time tower status to the chocolate factory stats. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1506) + Also can notify you when you get a new charge or your charges are full. + Extra tooltip stats about upgrades for the chocolate factory. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/1594) @@ -991,7 +991,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. </summary> -+ Highlights NPCs in the stranded menu that are placeable but havent been placed. - walker ++ Highlights NPCs in the stranded menu that are placeable but haven't been placed. - walker </details> <details open><summary> @@ -1036,7 +1036,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. + **Tia Relay Waypoint** - Show the next Relay waypoint for Tia The Fairy, where maintenance for the abiphone network needs to be done. + **Tia Relay Helper** - Helps with solving the sound puzzle. -+ **Hide dead entities** - Similar to Skytil's feature for inside dungeon, but for everywhere. ++ **Hide dead entities** - Similar to Skytils' feature for inside dungeon, but for everywhere. + **Tps Display** - Show the Tps of the current server. + **Particle Hider** - Hide blaze particles, fire block particles, fireball particles, near redstone particles, far particles or smoke particles. @@ -1084,7 +1084,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. + Option to highlight items that are full in the sack inventory. + **Ghost Counter** (Contributed by HiZe) + Shows number of ghosts killed in the Mist in Dwarven Mines - + Shows kill combo, coins per scavenger, all item drops, bestiarity, magic find and more + + Shows kill combo, coins per scavenger, all item drops, bestiary, magic find and more + Each display line is highly customizable + **Frozen Treasure Tracker** (Contributed by CalMWolfs) + Show different items collected while breaking treasures in the Glacial Cave in Jerry's Workshop @@ -1103,7 +1103,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. + **Ender Node Tracker** - pretz + Tracks items and profit obtained from collecting ender nodes and killing normal endermen. + **Harp Keybinds** - NetheriteMiner - + In Melodys Harp, press buttons with your number row on the keyboard instead of clicking. + + In Melody's Harp, press buttons with your number row on the keyboard instead of clicking. + **Teleport Pad Compact Name** + Hide the 'Warp to' and 'No Destination' texts over teleport pads. + Only on Private island. @@ -1127,10 +1127,10 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. + Allows to change those settings anytime again with /shdefaultoptions. + Show alert when reaching max super-pairs clicks. - pretz + Plays a beep sound and sends a message in chat when the player reaches the maximum number of clicks gained for - super-pairs minigames. + super-pairs mini games. + Anniversary Event Active Player Ticket Timer. - nea + Option to play a sound as well. -+ **Travor Trapper** Features in Farming Islands ++ **Trevor Trapper** Features in Farming Islands + Trapper Cooldown GUI. - NetheriteMiner + Show the cooldown on screen in an overlay (intended for abiphone users). + **Trevor the Trapper Tracker**. - CalMWolfs @@ -1145,7 +1145,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. + Change the scale with plus and minus keys. - CalMWolfs + **Compact Tab List**. + Compacts the tablist to make it look much nicer (old SBA feature, but fewer bugs). - CalMWolfs - + Option to hide Hypixel advertisment banners. - CalMWolfs + + Option to hide Hypixel advertisement banners. - CalMWolfs + **Advanced Player List**. - hannibal2 + Customize the player list (inside the tab list) in various ways. + Change the sort order of players: Default, SkyBlock Level, alphabetical name, Iron Man first/bingo level, @@ -1161,7 +1161,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. + Show a chat message for how long you were in limbo once you leave it. + Highlight Party Members. - Cad + Marking party members with a bright outline to better find them in the world. -+ Porting SBA's **chroma** into SkyHanni with many more options and chroma everything. - VixidDev ++ Porting SkyBlockAddon's **chroma** into SkyHanni with many more options and chroma everything. - VixidDev + Options to change speed, size, saturation and direction. + Modify Visual Words (command /shwords). - CalMWolfs + Allows you to replace text on your screen with different text (like the SBE one, just less costly). @@ -1256,7 +1256,7 @@ Use `/sh` or `/skyhanni` to open the SkyHanni config in game. + Highly customizable: Colors, display sizes. + Estimated Price Integration. + Favorite slots; option to only display favorite slots. -+ Added a Chat Message if the Perkapocalypse Mayor is unknown. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2009) ++ Added a Chat Message if the Perkpocalypse Mayor is unknown. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/2009) + Added a source download verification checker. - ThatGravyBoat (https://github.com/hannibal002/SkyHanni/pull/1914) + Warns you when the mod has been downloaded from an untrusted source (not the official GitHub or Modrinth). + Shows a list of items that can be crafted with the items in your inventory when inside the crafting menu. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/1334) diff --git a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt index 5c9c3017a..b40255449 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt @@ -8,7 +8,7 @@ import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent import at.hannibal2.skyhanni.events.NeuRepositoryReloadEvent import at.hannibal2.skyhanni.events.SecondPassedEvent import at.hannibal2.skyhanni.events.SkillExpGainEvent -import at.hannibal2.skyhanni.events.SkillOverflowLevelupEvent +import at.hannibal2.skyhanni.events.SkillOverflowLevelUpEvent import at.hannibal2.skyhanni.features.skillprogress.SkillProgress import at.hannibal2.skyhanni.features.skillprogress.SkillType import at.hannibal2.skyhanni.features.skillprogress.SkillUtil.SPACE_SPLITTER @@ -266,7 +266,7 @@ object SkillAPI { currentXp ) if (skillInfo.overflowLevel > 60 && levelOverflow == skillInfo.overflowLevel + 1) - SkillOverflowLevelupEvent(skillType, skillInfo.overflowLevel, levelOverflow).postAndCatch() + SkillOverflowLevelUpEvent(skillType, skillInfo.overflowLevel, levelOverflow).postAndCatch() skillInfo.apply { this.level = level diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt index 4afced89b..959f81973 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt @@ -382,7 +382,7 @@ object Commands { ) { SkyHanniDebugsAndTests.toggleRender() } registerCommand( "shcarrolyn", - "Toggels if the specified crops effect is active from carrolyn", + "Toggles if the specified crops effect is active from carrolyn", ) { CaptureFarmingGear.handelCarrolyn(it) } @@ -392,11 +392,11 @@ object Commands { ) { SkyHanniMod.repo.displayRepoStatus(false) } registerCommand( "shclearkismet", - "Cleares the saved values of the applied kismet feathers in Croesus", + "Clears the saved values of the applied kismet feathers in Croesus", ) { CroesusChestTracker.resetChest() } registerCommand( "shkingfix", - "Reseting the local King Talisman Helper offset.", + "Resets the local King Talisman Helper offset.", ) { KingTalismanHelper.kingFix() } registerCommand( "shupdate", @@ -544,7 +544,7 @@ object Commands { "(names, description, orderings and stuff).", ) { SkyHanniDebugsAndTests.resetConfigCommand() } registerCommand( - "readcropmilestonefromclipboard", + "shreadcropmilestonefromclipboard", "Read crop milestone from clipboard. This helps fixing wrong crop milestone data", ) { GardenCropMilestonesCommunityFix.readDataFromClipboard() } registerCommand( diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java index 8b58e4919..d6a0eb064 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java @@ -132,8 +132,9 @@ public class DebugConfig { public boolean currentAreaDebug = true; @Expose - @ConfigOption(name = "Oreblock Name", desc = "Show the OreBlock you are currently looking at.") + @ConfigOption(name = "OreBlock Name", desc = "Show the OreBlock you are currently looking at.") @ConfigEditorBoolean + // TODO rename to rayTracedOreBlock public boolean raytracedOreblock = true; @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java index 4d1653b89..132c0d827 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/diana/DianaConfig.java @@ -74,7 +74,7 @@ public class DianaConfig { @Expose @ConfigOption(name = "Mythological Creature Tracker", desc = "") @Accordion - // TODO renmae + // TODO rename mythologicalMobTracker public MythologicalMobTrackerConfig mythologicalMobtracker = new MythologicalMobTrackerConfig(); @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/GiftingOpportunitiesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/GiftingOpportunitiesConfig.java index 396ab0217..53c394469 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/GiftingOpportunitiesConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/event/winter/GiftingOpportunitiesConfig.java @@ -15,6 +15,7 @@ public class GiftingOpportunitiesConfig { @Expose @ConfigOption(name = "Only While Holding Gift", desc = "Only highlight players you haven't gifted while holding a gift.") @ConfigEditorBoolean + // TODO highlightWithGiftOnly public boolean highlighWithGiftOnly = true; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java index f2bdf85d5..c4bbfacf3 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java @@ -79,7 +79,7 @@ public class GardenConfig { @Expose @ConfigOption(name = "Armor Drop Tracker", desc = "") @Accordion - // TODO renmae to armorDropTracker + // TODO rename to armorDropTracker public ArmorDropTrackerConfig farmingArmorDrop = new ArmorDropTrackerConfig(); @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/ShoppingListConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/ShoppingListConfig.java index e02ddfcc4..98226eeb1 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/ShoppingListConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/ShoppingListConfig.java @@ -16,7 +16,7 @@ public class ShoppingListConfig { public boolean display = true; @Expose - // TODO renmae "position" + // TODO rename "position" @ConfigLink(owner = ShoppingListConfig.class, field = "display") public Position pos = new Position(180, 170, false, true); diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/ReforgeHelperConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/ReforgeHelperConfig.java index 43bba7f8c..d479149b8 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/ReforgeHelperConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/helper/ReforgeHelperConfig.java @@ -25,7 +25,7 @@ public class ReforgeHelperConfig { public boolean reforgeStonesOnlyHex = true; @Expose - @ConfigOption(name = "Show Diff", desc = "Shows the difference of the new reforge to the current one in the slecetion list.") + @ConfigOption(name = "Show Diff", desc = "Shows the difference of the new reforge to the current one in the selection list.") @ConfigEditorBoolean public boolean showDiff = false; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java index cc606e7aa..4a3aa732e 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/MiscConfig.java @@ -122,6 +122,7 @@ public class MiscConfig { @ConfigOption(name = "Armor Stands", desc = "Hide armor stands that are sometimes visible for a fraction of a second.") @ConfigEditorBoolean @FeatureToggle + // TODO rename to hideTemporaryArmorStands public boolean hideTemporaryArmorstands = true; @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/misc/compacttablist/CompactTabListConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/misc/compacttablist/CompactTabListConfig.java index 34939e567..4bf6d5731 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/misc/compacttablist/CompactTabListConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/misc/compacttablist/CompactTabListConfig.java @@ -20,7 +20,7 @@ public class CompactTabListConfig { @ConfigOption( name = "Toggle Tab", desc = "Use the tab key to toggle the tab list, not show tab list while the key is pressed. " + - "Similar to patcher's feature." + "Similar to Patcher's feature." ) @ConfigEditorBoolean public boolean toggleTab = false; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/stillgorechateau/EffigiesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/stillgorechateau/EffigiesConfig.java index 56fa6e686..668932668 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/stillgorechateau/EffigiesConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/rift/area/stillgorechateau/EffigiesConfig.java @@ -27,6 +27,7 @@ public class EffigiesConfig { maxValue = 15, minStep = 1 ) + // TODO rename respawningSoonTime public int respwningSoonTime = 3; @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt index dd4a91fb9..94b1dc283 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt @@ -86,7 +86,7 @@ object HypixelData { "solo.profile.amount", "^\\s*(?:§.)*Island\\s*$", ) - private val scoreboardVisitingAmoutPattern by patternGroup.pattern( + private val scoreboardVisitingAmountPattern by patternGroup.pattern( "scoreboard.visiting.amount", "\\s+§.✌ §.\\(§.(?<currentamount>\\d+)§./(?<maxamount>\\d+)\\)", ) @@ -201,7 +201,7 @@ object HypixelData { } fun getMaxPlayersForCurrentServer(): Int { - ScoreboardData.sidebarLinesFormatted.matchFirst(scoreboardVisitingAmoutPattern) { + ScoreboardData.sidebarLinesFormatted.matchFirst(scoreboardVisitingAmountPattern) { return group("maxamount").toInt() } @@ -453,7 +453,7 @@ object HypixelData { islandType = getIslandType(foundIsland, guesting) } - // TODO dont send events when one of the arguments is none, at least when not on sb anymore + // TODO don't send events when one of the arguments is none, at least when not on sb anymore if (skyBlockIsland != islandType) { IslandChangeEvent(islandType, skyBlockIsland).postAndCatch() if (islandType == IslandType.UNKNOWN) { diff --git a/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt b/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt index dfbb08164..29a16944c 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt @@ -94,7 +94,7 @@ object HypixelBazaarFetcher { failedAttempts++ if (failedAttempts <= HIDDEN_FAILED_ATTEMPTS) { nextFetchTime = SimpleTimeMark.now() + 15.seconds - ChatUtils.debug("$userMessage. (errorMessage=${e.message}, failedAttepmts=$failedAttempts, $fetchType") + ChatUtils.debug("$userMessage. (errorMessage=${e.message}, failedAttempts=$failedAttempts, $fetchType") e.printStackTrace() } else { nextFetchTime = SimpleTimeMark.now() + 15.minutes @@ -102,7 +102,7 @@ object HypixelBazaarFetcher { e, userMessage, "fetchType" to fetchType, - "failedAttepmts" to failedAttempts, + "failedAttempts" to failedAttempts, "rawResponse" to rawResponse, ) } diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt b/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt index 76c97e662..ab5d1ca2d 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/model/Graph.kt @@ -60,7 +60,7 @@ value class Graph( { reader -> reader.beginObject() val list = mutableListOf<GraphNode>() - val neigbourMap = mutableMapOf<GraphNode, List<Pair<Int, Double>>>() + val neighbourMap = mutableMapOf<GraphNode, List<Pair<Int, Double>>>() while (reader.hasNext()) { val id = reader.nextName().toInt() reader.beginObject() @@ -93,10 +93,10 @@ value class Graph( } val node = GraphNode(id, position!!, name) list.add(node) - neigbourMap[node] = neighbors + neighbourMap[node] = neighbors reader.endObject() } - neigbourMap.forEach { (node, edge) -> + neighbourMap.forEach { (node, edge) -> node.neighbours = edge.associate { (id, distance) -> list.first { it.id == id } to distance } diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt index 161ec76f5..6fd65778e 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt @@ -10,6 +10,7 @@ enum class SkyblockStat(val icon: String) { DEFENSE("§a❈"), STRENGTH("§c❁"), INTELLIGENCE("§b✎"), + CRIT_DAMAGE("§9☠"), CRIT_CHANCE("§9☣"), FEROCITY("§c⫽"), diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt b/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt index 22ac4982b..f1a5001ad 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/model/TextInput.kt @@ -75,23 +75,23 @@ class TextInput { } return } - val tcarriage = carriage + val carriage = carriage if (Keyboard.KEY_LEFT.isKeyClicked()) { - carriage = tcarriage?.moveCarriageLeft() ?: (textBox.length - 1) + this.carriage = carriage?.moveCarriageLeft() ?: (textBox.length - 1) return } if (Keyboard.KEY_RIGHT.isKeyClicked()) { - carriage = when { - tcarriage == null -> null - (tcarriage >= textBox.length - 1) -> null - else -> moveCarriageRight(tcarriage) + this.carriage = when { + carriage == null -> null + (carriage >= textBox.length - 1) -> null + else -> moveCarriageRight(carriage) } return } if (Keyboard.KEY_DELETE.isKeyClicked()) { // Does not work for some reason - if (tcarriage != null) { - textBox.removeRange(tcarriage, tcarriage + 1) + if (carriage != null) { + textBox.removeRange(carriage, carriage + 1) } else { textBox.dropLast(1) } @@ -103,27 +103,27 @@ class TextInput { val char = Keyboard.getEventCharacter() textBox = when (char) { Char(0) -> return - '\b' -> if (tcarriage != null) { - if (tcarriage == 0) { + '\b' -> if (carriage != null) { + if (carriage == 0) { textBox.substring(1) } else { - carriage = tcarriage.minus(1) - textBox.removeRange(tcarriage - 1, tcarriage) + this.carriage = carriage.minus(1) + textBox.removeRange(carriage - 1, carriage) } } else { textBox.dropLast(1) } - else -> if (tcarriage != null) { - carriage = tcarriage + 1 - textBox.insert(tcarriage, char) + else -> if (carriage != null) { + this.carriage = carriage + 1 + textBox.insert(carriage, char) } else { textBox + char } } } - private fun moveCarriageRight(tcarriage: Int) = tcarriage + 1 + private fun moveCarriageRight(carriage: Int) = carriage + 1 private fun Int.moveCarriageLeft(): Int = when { this > 0 -> this - 1 diff --git a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt index 1e9af5d69..74241946f 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt @@ -28,8 +28,8 @@ object RepoUtils { /** * Modified from https://www.journaldev.com/960/java-unzip-file-example */ - fun unzipIgnoreFirstFolder(zipFilePath: String, destDir: String) { - val dir = File(destDir) + fun unzipIgnoreFirstFolder(zipFilePath: String, destinationDirectory: String) { + val dir = File(destinationDirectory) // create output directory if it doesn't exist if (!dir.exists()) dir.mkdirs() val fis: FileInputStream @@ -43,7 +43,7 @@ object RepoUtils { if (!ze.isDirectory) { var fileName = ze.name fileName = fileName.substring(fileName.split("/").toTypedArray()[0].length + 1) - val newFile = File(destDir + File.separator + fileName) + val newFile = File(destinationDirectory + File.separator + fileName) // create directories for sub directories in zip File(newFile.parent).mkdirs() if (!isInTree(dir, newFile)) { @@ -71,7 +71,7 @@ object RepoUtils { e, "unzipIgnoreFirstFolder failed", "zipFilePath" to zipFilePath, - "destDir" to destDir, + "destinationDirectory" to destinationDirectory, ) } } diff --git a/src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelupEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelUpEvent.kt index ac9d14662..d3f356da7 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelupEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelUpEvent.kt @@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events import at.hannibal2.skyhanni.features.skillprogress.SkillType -class SkillOverflowLevelupEvent(val skill: SkillType, val oldLevel: Int, val newLevel: Int) : LorenzEvent() +class SkillOverflowLevelUpEvent(val skill: SkillType, val oldLevel: Int, val newLevel: Int) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt index b04a081ea..1afa6859d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt @@ -73,7 +73,7 @@ object BingoCardReader { } val done = lore.any { it.contains("GOAL REACHED") } - val communtyGoalPercentage = readCommuntyGoalPercentage(lore) + val communityGoalPercentage = readCommunityGoalPercentage(lore) val hiddenGoalData = getHiddenGoalData(name, description, goalType) val visualDescription = hiddenGoalData.tipNote @@ -89,7 +89,7 @@ object BingoCardReader { this.done = done this.hiddenGoalData = hiddenGoalData } - communtyGoalPercentage?.let { + communityGoalPercentage?.let { bingoGoalDifference(bingoGoal, it) bingoGoal.communtyGoalPercentage = it } @@ -111,7 +111,7 @@ object BingoCardReader { ChatUtils.chat("$color${bingoGoal.displayName}: $oldFormat §b->" + " $newFormat") } - private fun readCommuntyGoalPercentage(lore: List<String>): Double? { + private fun readCommunityGoalPercentage(lore: List<String>): Double? { for (line in lore) { percentagePattern.matchMatcher(line) { return group("percentage").toDouble() / 100 diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/BingoGoal.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/BingoGoal.kt index daccd37e3..64148115d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/BingoGoal.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/goals/BingoGoal.kt @@ -25,8 +25,9 @@ class BingoGoal { @Expose lateinit var hiddenGoalData: HiddenGoalData + // TODO rename communityGoalPercentage @Expose - var communtyGoalPercentage: Double? = null // TODO fix typo (Needs changes inside of storage) + var communtyGoalPercentage: Double? = null override fun toString(): String = displayName } diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt index 5ed2cdb8a..fd2b513cf 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/FlareDisplay.kt @@ -80,7 +80,7 @@ object FlareDisplay { if (!entity.canBeSeen()) continue if (entity.ticksExisted.ticks > MAX_FLARE_TIME) continue if (isAlreadyKnownFlare(entity)) continue - getFlareTypeForTexuture(entity)?.let { + getFlareTypeForTexture(entity)?.let { flares.add(Flare(it, entity)) } } @@ -131,7 +131,7 @@ object FlareDisplay { private fun getFlareForType(type: FlareType): Flare? = flares.firstOrNull { it.type == type } - private fun getFlareTypeForTexuture(entity: EntityArmorStand): FlareType? = + private fun getFlareTypeForTexture(entity: EntityArmorStand): FlareType? = flareSkins.entries.firstOrNull { entity.hasSkullTexture(it.key) }?.value private fun isAlreadyKnownFlare(entity: EntityArmorStand): Boolean = diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt index 5562a4bf4..3bc12fa4c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/BossType.kt @@ -84,7 +84,7 @@ enum class BossType( DUNGEON_F6_GIANT_1("§eBoulder Tosser", Type.DUNGEON_FLOOR_6, "§eGiant 1"), DUNGEON_F6_GIANT_2("§eSword Thrower", Type.DUNGEON_FLOOR_6, "§eGiant 2"), DUNGEON_F6_GIANT_3("§eBigfoot Jumper", Type.DUNGEON_FLOOR_6, "§eGiant 3"), - DUNGEON_F6_GIANT_4("§eLazer Shooter", Type.DUNGEON_FLOOR_6, "§eGiant 4"), + DUNGEON_F6_GIANT_4("§eLaser Shooter", Type.DUNGEON_FLOOR_6, "§eGiant 4"), DUNGEON_F6_SADAN("§cSadan", Type.DUNGEON_FLOOR_6), // TODO implement @@ -92,7 +92,7 @@ enum class BossType( MINOS_INQUISITOR("§5Minos Inquisitor", Type.DIANA_MOBS), MINOS_CHAMPION("§2Minos Champion", Type.DIANA_MOBS), - GAIA_CONSTURUCT("§2Gaia Construct", Type.DIANA_MOBS), + GAIA_CONSTRUCT("§2Gaia Construct", Type.DIANA_MOBS), MINOTAUR("§2Minotaur", Type.DIANA_MOBS), THUNDER("§cThunder", Type.SEA_CREATURES), @@ -121,7 +121,7 @@ enum class BossType( // TODO arachne - // TODO corelone + // TODO Corleone // TODO bal /** diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt index fb549e7c2..b7af2d72b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt @@ -888,7 +888,7 @@ object DamageIndicatorManager { } else { if (entityData != null && isEnabled() && config.hideVanillaNametag && entityData.isConfigEnabled()) { val name = entity.name - if (name.contains("Plaesmaflux")) return + if (name.contains("Plasmaflux")) return if (name.contains("Overflux")) return if (name.contains("Mana Flux")) return if (name.contains("Radiant")) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt index 3d54dce1b..e9b2f879b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt @@ -356,7 +356,7 @@ class MobFinder { } entity.hasMaxHealth(1_500_000) -> { - EntityResult(bossType = BossType.GAIA_CONSTURUCT) + EntityResult(bossType = BossType.GAIA_CONSTRUCT) } entity.hasMaxHealth(100_000_000) -> { diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt index 29b3c06e3..3bc3c85d4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt @@ -58,6 +58,7 @@ import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import io.github.moulberry.notenoughupdates.util.Utils import io.github.moulberry.notenoughupdates.util.XPInformation import net.minecraftforge.fml.common.eventhandler.SubscribeEvent +import org.apache.commons.io.FilenameUtils import java.io.File import java.text.NumberFormat import java.util.Locale @@ -70,8 +71,7 @@ object GhostCounter { val config get() = SkyHanniMod.feature.combat.ghostCounter val storage get() = ProfileStorageData.profileSpecific?.ghostCounter private var display = emptyList<List<Any>>() - var ghostCounterV3File = - File("." + File.separator + "config" + File.separator + "ChatTriggers" + File.separator + "modules" + File.separator + "GhostCounterV3" + File.separator + ".persistantData.json") + var ghostCounterV3File = File(FilenameUtils.separatorsToSystem("./config/ChatTriggers/modules/GhostCounterV3/.persistantData.json")) private val patternGroup = RepoPattern.group("combat.ghostcounter") private val skillXPPattern by patternGroup.pattern( diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt index 05b04982d..b6bcff3bd 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyChatCommands.kt @@ -96,7 +96,7 @@ object PartyChatCommands { if (isBlockedUser(name)) { if (config.showIgnoredReminder) ChatUtils.clickableChat( "§cIgnoring chat command from ${event.author}. " + - "Unignore them using /shignore remove <player> or click here!", + "Stop ignoring them using /shignore remove <player> or click here!", onClick = { blacklistModify(event.author) }, "§eClick to ignore ${event.author}!", ) diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt index ff6c277bb..8b2d60069 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusChestTracker.kt @@ -147,7 +147,7 @@ object CroesusChestTracker { unopenedPattern.anyMatches(lore) -> OpenedState.UNOPENED else -> ErrorManager.logErrorStateWithData( "Croesus Chest couldn't be read correctly.", - "Openstate check failed for chest.", + "Open state check failed for chest.", "run" to run, "lore" to lore ).run { null } diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt index d79ac47ce..f8d432613 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt @@ -249,7 +249,7 @@ object DungeonAPI { val bossCollections = bossStorage ?: return if (event.inventoryName == "Boss Collections") { - readallCollections(bossCollections, event.inventoryItems) + readAllCollections(bossCollections, event.inventoryItems) } else if (event.inventoryName.endsWith(" Collection")) { readOneMaxCollection(bossCollections, event.inventoryItems, event.inventoryName) } @@ -278,7 +278,7 @@ object DungeonAPI { } } - private fun readallCollections( + private fun readAllCollections( bossCollections: MutableMap<DungeonFloor, Int>, inventoryItems: Map<Int, ItemStack>, ) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt index 9d2c531a5..f0ce80b1b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt @@ -151,7 +151,7 @@ object DungeonHideItems { } if (config.hideHealerFairy) { - // Healer Fairy texture is stored in id 0, not id 4 for some reasos. + // Healer Fairy texture is stored in id 0, not id 4 for some reasons. if (entity.inventory[0]?.getSkullTexture() == HEALER_FAIRY_TEXTURE) { event.cancel() return diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt index d88f5c017..20cf553b8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaFixChat.kt @@ -120,7 +120,7 @@ object DianaFixChat { if (hasSetToggleMusic) { ChatUtils.chat("Toggling the hypixel music has worked, good job!") } else if (hasSetParticleQuality) { - ChatUtils.chat("Changing the particle qualilty has worked, good job!") + ChatUtils.chat("Changing the particle quality has worked, good job!") } hasSetParticleQuality = false diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt index 6fe287021..35a783f7d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt @@ -380,8 +380,8 @@ object GriffinBurrowHelper { val text = "§bWarp to " + warp.displayName val keybindSuffix = if (config.keyBindWarp != Keyboard.KEY_NONE) { - val keyname = KeyboardManager.getKeyName(config.keyBindWarp) - " §7(§ePress $keyname§7)" + val keyName = KeyboardManager.getKeyName(config.keyBindWarp) + " §7(§ePress $keyName§7)" } else "" if (lastTitleSentTime.passedSince() > 2.seconds) { lastTitleSentTime = SimpleTimeMark.now() diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt index d290c5df8..0bb5e3dc1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt @@ -36,7 +36,7 @@ object SoopyGuessBurrow { private var guessPoint: LorenzVec? = null private var lastSoundPoint: LorenzVec? = null - private var locs = mutableListOf<LorenzVec>() + private var locations = mutableListOf<LorenzVec>() private var dingSlope = mutableListOf<Float>() @@ -81,7 +81,7 @@ object SoopyGuessBurrow { lastSoundPoint = null firstParticlePoint = null distance = null - locs.clear() + locations.clear() } if (lastDingPitch == 0f) { @@ -91,7 +91,7 @@ object SoopyGuessBurrow { lastParticlePoint2 = null lastSoundPoint = null firstParticlePoint = null - locs.clear() + locations.clear() return } @@ -158,19 +158,19 @@ object SoopyGuessBurrow { } } if (run) { - if (locs.size < 100 && locs.isEmpty() || locs.last().distance(currLoc) != 0.0) { + if (locations.size < 100 && locations.isEmpty() || locations.last().distance(currLoc) != 0.0) { var distMultiplier = 1.0 - if (locs.size > 2) { - val predictedDist = 0.06507 * locs.size + 0.259 - val lastPos = locs.last() + if (locations.size > 2) { + val predictedDist = 0.06507 * locations.size + 0.259 + val lastPos = locations.last() val actualDist = currLoc.distance(lastPos) distMultiplier = actualDist / predictedDist } - locs.add(currLoc) + locations.add(currLoc) - if (locs.size > 5 && guessPoint != null) { + if (locations.size > 5 && guessPoint != null) { - val slopeThing = locs.zipWithNext { a, b -> + val slopeThing = locations.zipWithNext { a, b -> atan((a.x - b.x) / (a.z - b.z)) } @@ -186,14 +186,14 @@ object SoopyGuessBurrow { val pr2 = mutableListOf<LorenzVec>() val start = slopeThing.size - 1 - val lastPos = locs[start].toDoubleArray() - val lastPos2 = locs[start].toDoubleArray() + val lastPos = locations[start].toDoubleArray() + val lastPos2 = locations[start].toDoubleArray() var distCovered = 0.0 - val ySpeed = locs[locs.size - 1].x - locs[locs.size - 2].x / hypot( - locs[locs.size - 1].x - locs[locs.size - 2].x, - locs[locs.size - 1].z - locs[locs.size - 2].x + val ySpeed = locations[locations.size - 1].x - locations[locations.size - 2].x / hypot( + locations[locations.size - 1].x - locations[locations.size - 2].x, + locations[locations.size - 1].z - locations[locations.size - 2].x ) var i = start + 1 diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt index 44adceb6d..3ae865ac8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt @@ -360,12 +360,12 @@ object GardenPlotAPI { // Render horizontal val buildLimit = minHeight + 11 - val ints = if (showBuildLimit) { + val iterable = if (showBuildLimit) { (minHeight..maxHeight step 4) + buildLimit } else { minHeight..maxHeight step 4 } - for (y in ints) { + for (y in iterable) { val start = LorenzVec(chunkMinX, y, chunkMinZ) val isRedLine = y == buildLimit val color = if (isRedLine) Color.red else lineColor diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt index b3fd91d32..3e99c2683 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt @@ -116,7 +116,7 @@ object JacobContestTimeNeeded { ) { var lowBPSWarning = listOf<String>() val rawSpeed = speed.toDouble() - val speedForFormular = crop.getBps()?.let { + val speedForFormula = crop.getBps()?.let { if (it < 15) { val v = rawSpeed / it (v * 19.9).toInt() @@ -132,7 +132,7 @@ object JacobContestTimeNeeded { showLine = "§9${crop.cropName} §cBracket not revealed!" continue } - val timeInMinutes = (amount.toDouble() / speedForFormular).seconds + val timeInMinutes = (amount.toDouble() / speedForFormula).seconds val formatDuration = timeInMinutes.format() val color = if (timeInMinutes < 20.minutes) "§b" else "§c" var marking = "" diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/CropPage.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/CropPage.kt index 926f83d50..6494986af 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/CropPage.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/pages/CropPage.kt @@ -53,7 +53,7 @@ class CropPage(val crop0: () -> CropType, sizeX: Int, sizeY: Int, paddingX: Int FortuneStats.entries.filter { it.isActive() && it !in headers }.map { it.getFarmingBar() } private fun equipDisplay(): Renderable = - Renderable.fixedSizeCollum( + Renderable.fixedSizeColumn( Renderable.verticalContainer( listOf( crop.farmingItem.getDisplay(), diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt index 0e891f444..a5b3a97b8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/FixGhostEntities.kt @@ -50,7 +50,7 @@ object FixGhostEntities { recentlySpawnedEntities.addLast(packet.entityID) } else if (packet is S13PacketDestroyEntities) { for (entityID in packet.entityIDs) { - // ingore entities that got properly spawned and then removed + // ignore entities that got properly spawned and then removed if (entityID !in recentlySpawnedEntities) { recentlyRemovedEntities.addLast(entityID) if (recentlyRemovedEntities.size == 10) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt index 1f1f9dadd..9953199c8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PatcherSendCoordinates.kt @@ -55,7 +55,7 @@ object PatcherSendCoordinates { split.first().toFloat() } else end.toFloat() patcherBeacon.add(PatcherBeacon(LorenzVec(x, y, z), description, System.currentTimeMillis() / 1000)) - logger.log("got patcher coords and username") + logger.log("got Patcher coords and username") } } @@ -76,10 +76,10 @@ object PatcherSendCoordinates { if (!event.isMod(10)) return val location = LocationUtils.playerLocation() - // removed patcher beacon! + // removed Patcher beacon! patcherBeacon.removeIf { System.currentTimeMillis() / 1000 > it.time + 5 && location.distanceIgnoreY(it.location) < 5 } - // removed patcher beacon after time! + // removed Patcher beacon after time! patcherBeacon.removeIf { System.currentTimeMillis() / 1000 > it.time + config.duration } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt index ac101a909..518ebbaf9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt @@ -39,9 +39,9 @@ object AdvancedPlayerList { ".*\\[(?<level>.*)] §r(?<name>.*)" ) - private var playerDatas = mutableMapOf<String, PlayerData>() + private var playerData = mutableMapOf<String, PlayerData>() - fun createTabLine(text: String, type: TabStringType) = playerDatas[text]?.let { + fun createTabLine(text: String, type: TabStringType) = playerData[text]?.let { TabLine(text, type, createCustomName(it)) } ?: TabLine(text, type) @@ -90,7 +90,7 @@ object AdvancedPlayerList { currentData[line] = it } } - playerDatas = currentData + playerData = currentData val prepare = currentData.entries val sorted = when (config.playerSortOrder) { @@ -127,7 +127,7 @@ object AdvancedPlayerList { } newList.addAll(newPlayerList) - val rest = original.drop(playerDatas.size + extraTitles + 1) + val rest = original.drop(playerData.size + extraTitles + 1) newList.addAll(rest) return newList } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt index baeb1df04..96759bc7d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt @@ -206,7 +206,7 @@ object DiscordLocationKey { "The Wasteland", "Throne Room" ) - // list of nether locations because there are sooo many (truncated some according to scoreboard) + // list of nether locations because there are soo many (truncated some according to scoreboard) private val specialRiftRPC = mapOf( "Enigma's Crib" to "wyld-woods", diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt index 2888cc707..0a0b6b238 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/limbo/LimboTimeTracker.kt @@ -41,10 +41,10 @@ object LimboTimeTracker { private const val FIRE_MULTIPLIER = 1.01F private var onFire = false - private val bedwarsLobbyLimbo = AxisAlignedBB(-662.0, 43.0, -76.0, -619.0, 86.0, -27.0) + private val bedWarsLobbyLimbo = AxisAlignedBB(-662.0, 43.0, -76.0, -619.0, 86.0, -27.0) private var doMigrate = false - private var unmigratedPB = 0 + private var notMigratedPB = 0 @SubscribeEvent fun onChat(event: LorenzChatEvent) { @@ -74,7 +74,7 @@ object LimboTimeTracker { } val lobbyName: String? = HypixelData.locrawData?.get("lobbyname")?.asString if (lobbyName.toString().startsWith("bedwarslobby")) { - if (bedwarsLobbyLimbo.isPlayerInside()) { + if (bedWarsLobbyLimbo.isPlayerInside()) { if (inFakeLimbo) return limboJoinTime = SimpleTimeMark.now() inLimbo = true @@ -182,23 +182,23 @@ object LimboTimeTracker { fun workaroundMigration(personalBest: Int) { doMigrate = true - unmigratedPB = personalBest + notMigratedPB = personalBest } @SubscribeEvent fun onHypixelJoin(event: HypixelJoinEvent) { if (!doMigrate) return - if (unmigratedPB != 0) { + if (notMigratedPB != 0) { ChatUtils.debug("Migrating limbo personalBest") - storage?.personalBest = unmigratedPB - storage?.userLuck = unmigratedPB * USER_LUCK_MULTIPLIER + storage?.personalBest = notMigratedPB + storage?.userLuck = notMigratedPB * USER_LUCK_MULTIPLIER } if ((storage?.personalBest ?: 0) > (storage?.playtime ?: 0)) { ChatUtils.debug("Migrating limbo playtime") storage?.playtime = (storage?.personalBest ?: 0) } doMigrate = false - unmigratedPB = 0 + notMigratedPB = 0 } fun isEnabled() = config.showTimeInLimbo diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt index 686f46827..c5d4f5ea4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt @@ -173,7 +173,7 @@ class QuestLoader(private val dailyQuestHelper: DailyQuestHelper) { } } - // TODO remove this workaround once hypixel fixes the bug that amount is not in tab list for minibosses + // TODO remove this workaround once hypixel fixes the bug that amount is not in tab list for mini bosses private fun fixMinibossAmount(quest: Quest, stack: ItemStack) { if (quest !is MiniBossQuest) return val storedAmount = quest.needAmount diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt index 647b2280b..ccb432f61 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt @@ -74,7 +74,7 @@ object RiftBloodEffigies { fun onRepoReload(event: RepositoryReloadEvent) { val newLocations = event.getConstant<RiftEffigiesJson>("RiftEffigies").locations if (newLocations.size != 6) { - error("Invalid rift effigies size: ${newLocations.size} (expeced 6)") + error("Invalid rift effigies size: ${newLocations.size} (expected 6)") } locations = newLocations } diff --git a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt index 2e033b7e4..d2a98daed 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt @@ -13,7 +13,7 @@ import at.hannibal2.skyhanni.events.ConfigLoadEvent import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.ProfileJoinEvent import at.hannibal2.skyhanni.events.SecondPassedEvent -import at.hannibal2.skyhanni.events.SkillOverflowLevelupEvent +import at.hannibal2.skyhanni.events.SkillOverflowLevelUpEvent import at.hannibal2.skyhanni.features.skillprogress.SkillUtil.XP_NEEDED_FOR_60 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.ChatUtils.chat @@ -156,7 +156,7 @@ object SkillProgress { } @SubscribeEvent - fun onLevelUp(event: SkillOverflowLevelupEvent) { + fun onLevelUp(event: SkillOverflowLevelUpEvent) { if (!isEnabled()) return if (!config.overflowConfig.enableInChat) return val skillName = event.skill.displayName diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt index 92c76e493..372c7daa9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt @@ -86,7 +86,7 @@ object SlayerProfitTracker { private val ItemTrackerData.TrackedItem.timesDropped get() = timesGained private fun addSlayerCosts(price: Double) { - require(price < 0) { "slayer costs can not be positve" } + require(price < 0) { "slayer costs can not be positive" } getTracker()?.modify { it.slayerSpawnCost += price.toInt() } diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt index 1d434e298..26e0822b1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt @@ -145,11 +145,11 @@ object SlayerRngMeterDisplay { fun onInventoryOpen(event: InventoryFullyOpenedEvent) { if (!isEnabled()) return - readRngmeterInventory(event) + readRngMeterInventory(event) readSlayerInventory(event) } - private fun readRngmeterInventory(event: InventoryFullyOpenedEvent) { + private fun readRngMeterInventory(event: InventoryFullyOpenedEvent) { val name = inventoryNamePattern.matchMatcher(event.inventoryName) { group("name") } ?: return diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt index c59747c09..c57c473c5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt @@ -180,7 +180,7 @@ object EndermanSlayerFeatures { it.isDead } - // Removing the beacon if It's still there after 7 sesconds. + // Removing the beacon if It's still there after 7 seconds. // This is just a workaround for the cases where the ServerBlockChangeEvent don't detect the beacon despawn info. val toRemove = sittingBeacon.filter { it.value.passedSince() > 7.seconds } if (toRemove.isNotEmpty()) { diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorRendererLivingEntity.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorRendererLivingEntity.java index d762dbb22..2635874a3 100644 --- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorRendererLivingEntity.java +++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorRendererLivingEntity.java @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.gen.Invoker; public interface AccessorRendererLivingEntity<T extends EntityLivingBase> extends AccessorRender<T> { @Invoker("setBrightness") - boolean setBrightness_skyhanni(T entitylivingbaseIn, float partialTicks, boolean combineTextures); + boolean setBrightness_skyhanni(T entityLivingBaseIn, float partialTicks, boolean combineTextures); @Invoker("unsetBrightness") void setBrightness_skyhanni(); diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/renderer/MixinContributorRendererEntityLiving.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/renderer/MixinContributorRendererEntityLiving.java index 7ffcfef8f..6fb71ccc0 100644 --- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/renderer/MixinContributorRendererEntityLiving.java +++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/renderer/MixinContributorRendererEntityLiving.java @@ -28,7 +28,7 @@ public class MixinContributorRendererEntityLiving<T extends EntityLivingBase> { @Redirect( method = "rotateCorpse", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/EntityPlayer;isWearing(Lnet/minecraft/entity/player/EnumPlayerModelParts;)Z")) - private boolean alwaysMarkAsHavingCape(EntityPlayer instance, EnumPlayerModelParts p_175148_1_) { + private boolean alwaysMarkAsHavingCape(EntityPlayer instance, EnumPlayerModelParts enumPlayerModelParts) { // Always returning true here ensures maximal compatibility with other mods. This will no longer block other mods from implementing this same mixin. return true; } diff --git a/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt b/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt index 5898b5d98..4bf183d74 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/TestCopyBestiaryValues.kt @@ -24,7 +24,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object TestCopyBestiaryValues { - class BestiarityObject { // TODO fix typo + class BestiaryObject { // TODO fix typo @Expose var name: String = "" @@ -72,7 +72,7 @@ object TestCopyBestiaryValues { private fun copy(titleItem: ItemStack, inventoryItems: Map<Int, ItemStack>) { val titleName = titleItem.name.removeWordsAtEnd(1) - val obj = BestiarityObject() + val obj = BestiaryObject() obj.name = titleName obj.texture = titleItem.getSkullTexture() ?: "no texture found" obj.skullOwner = titleItem.getSkullOwner() ?: "no skullOwner found" diff --git a/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt b/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt index 45b81a1ab..a42a10faf 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/hotswap/HotswapSupportImpl.kt @@ -37,7 +37,7 @@ class HotswapSupportImpl : HotswapSupportHandle { ?.makeAccessible() ?.removeFinal() if (instanceField != null) { - ChatUtils.chat("Reinjected static instance $newInstance!") + ChatUtils.chat("Re-injected static instance $newInstance!") instanceField.set(null, newInstance) } SkyHanniMod.modules.add(newInstance) diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CombatUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/CombatUtils.kt index 5edd33bc0..0ea909851 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/CombatUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/CombatUtils.kt @@ -113,10 +113,10 @@ object CombatUtils { /** * Taken from NotEnoughUpdates */ - fun interp(now: Float, last: Float, lastupdate: Long): Float { + fun interp(now: Float, last: Float, lastUpdate: Long): Float { var interp = now if (last >= 0 && last != now) { - var factor = (System.currentTimeMillis() - lastupdate) / 1000f + var factor = (System.currentTimeMillis() - lastUpdate) / 1000f factor = LerpUtils.clampZeroOne(factor) interp = last + (now - last) * factor } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt index 889530cd6..97225369d 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt @@ -37,7 +37,7 @@ import java.lang.reflect.Method object EntityOutlineRenderer { private val entityRenderCache: CachedInfo = CachedInfo(null, null, null) - private var stopLookingForOptifine = false + private var stopLookingForOptiFine = false private var isMissingMixin = false private var isFastRender: Method? = null private var isShaders: Method? = null @@ -56,13 +56,13 @@ object EntityOutlineRenderer { */ private fun initSwapBuffer(): Framebuffer { val main = mc.framebuffer - val framebuffer = Framebuffer(main.framebufferTextureWidth, main.framebufferTextureHeight, true) - framebuffer.setFramebufferFilter(GL11.GL_NEAREST) - framebuffer.setFramebufferColor(0.0f, 0.0f, 0.0f, 0.0f) - return framebuffer + val frameBuffer = Framebuffer(main.framebufferTextureWidth, main.framebufferTextureHeight, true) + frameBuffer.setFramebufferFilter(GL11.GL_NEAREST) + frameBuffer.setFramebufferColor(0.0f, 0.0f, 0.0f, 0.0f) + return frameBuffer } - private fun updateFramebufferSize() { + private fun updateFrameBufferSize() { val width = mc.displayWidth val height = mc.displayHeight if (swapBuffer.framebufferWidth != width || swapBuffer.framebufferHeight != height) { @@ -94,7 +94,7 @@ object EntityOutlineRenderer { val renderGlobal = mc.renderGlobal as CustomRenderGlobal val renderManager = mc.renderManager mc.theWorld.theProfiler.endStartSection("entityOutlines") - updateFramebufferSize() + updateFrameBufferSize() // Clear and bind the outline framebuffer renderGlobal.frameBuffer.framebufferClear() @@ -216,7 +216,7 @@ object EntityOutlineRenderer { } /** - * Caches optifine settings and determines whether outlines should be rendered + * Caches OptiFine settings and determines whether outlines should be rendered * * @return `true` iff outlines should be rendered */ @@ -232,8 +232,8 @@ object EntityOutlineRenderer { val renderGlobal = mc.renderGlobal as CustomRenderGlobal if (renderGlobal.frameBuffer == null || renderGlobal.shader == null || mc.thePlayer == null) return false - // Optifine Conditions - if (!stopLookingForOptifine && isFastRender == null) { + // OptiFine Conditions + if (!stopLookingForOptiFine && isFastRender == null) { try { val config = Class.forName("Config") try { @@ -241,12 +241,12 @@ object EntityOutlineRenderer { isShaders = config.getMethod("isShaders") isAntialiasing = config.getMethod("isAntialiasing") } catch (ex: Exception) { - logger.log("Couldn't find Optifine methods for entity outlines.") - stopLookingForOptifine = true + logger.log("Couldn't find OptiFine methods for entity outlines.") + stopLookingForOptiFine = true } } catch (ex: Exception) { - logger.log("Couldn't find Optifine for entity outlines.") - stopLookingForOptifine = true + logger.log("Couldn't find OptiFine for entity outlines.") + stopLookingForOptiFine = true } } var isFastRenderValue = false @@ -258,9 +258,9 @@ object EntityOutlineRenderer { isShadersValue = isShaders!!.invoke(null) as Boolean isAntialiasingValue = isAntialiasing!!.invoke(null) as Boolean } catch (ex: IllegalAccessException) { - logger.log("An error occurred while calling Optifine methods for entity outlines... $ex") + logger.log("An error occurred while calling OptiFine methods for entity outlines... $ex") } catch (ex: InvocationTargetException) { - logger.log("An error occurred while calling Optifine methods for entity outlines... $ex") + logger.log("An error occurred while calling OptiFine methods for entity outlines... $ex") } } return !isFastRenderValue && !isShadersValue && !isAntialiasingValue @@ -373,15 +373,15 @@ object EntityOutlineRenderer { val xrayOutlineEvent = RenderEntityOutlineEvent(RenderEntityOutlineEvent.Type.XRAY, null) xrayOutlineEvent.postAndCatch() // Get all entities to render no xray outlines, using pre-filtered entities (no need to test xray outlined entities) - val noxrayOutlineEvent = RenderEntityOutlineEvent( + val noXrayOutlineEvent = RenderEntityOutlineEvent( RenderEntityOutlineEvent.Type.NO_XRAY, xrayOutlineEvent.entitiesToChooseFrom ) - noxrayOutlineEvent.postAndCatch() + noXrayOutlineEvent.postAndCatch() // Cache the entities for future use entityRenderCache.xrayCache = xrayOutlineEvent.entitiesToOutline - entityRenderCache.noXrayCache = noxrayOutlineEvent.entitiesToOutline - entityRenderCache.noOutlineCache = noxrayOutlineEvent.entitiesToChooseFrom + entityRenderCache.noXrayCache = noXrayOutlineEvent.entitiesToOutline + entityRenderCache.noOutlineCache = noXrayOutlineEvent.entitiesToChooseFrom emptyLastTick = if (isCacheEmpty()) { if (!emptyLastTick) { renderGlobal.frameBuffer.framebufferClear() diff --git a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt index ab0afd93c..d2c24ceca 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt @@ -76,7 +76,7 @@ object InventoryUtils { val booleanField = storage.javaClass.getDeclaredField("enableStorageGUI3") booleanField.get(storage) as Boolean } catch (e: Throwable) { - ErrorManager.logErrorWithData(e, "Could not read NEU config to determine if the neu storage is emabled.") + ErrorManager.logErrorWithData(e, "Could not read NEU config to determine if the neu storage is enabled.") false } } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt index c094df489..5edc227dd 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt @@ -295,7 +295,7 @@ object ItemUtils { private val itemAmountCache = mutableMapOf<String, Pair<String, Int>>() fun readItemAmount(originalInput: String): Pair<String, Int>? { - // This workaround fixes 'Tubto Cacti I Book' + // This workaround fixes 'Turbo Cacti I Book' val input = (if (originalInput.endsWith(" Book")) { originalInput.replace(" Book", "") } else originalInput).removeResets() diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt index e322b5ae3..b9a790d31 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/LocationUtils.kt @@ -62,9 +62,9 @@ object LocationUtils { val t1 = (this.minBox() - origin) * rayDirectionInverse val t2 = (this.maxBox() - origin) * rayDirectionInverse - val tmin = max(t1.minOfEachElement(t2).max(), Double.NEGATIVE_INFINITY) - val tmax = min(t1.maxOfEachElement(t2).min(), Double.POSITIVE_INFINITY) - return tmax >= tmin && tmax >= 0.0 + val tMin = max(t1.minOfEachElement(t2).max(), Double.NEGATIVE_INFINITY) + val tMax = min(t1.maxOfEachElement(t2).min(), Double.POSITIVE_INFINITY) + return tMax >= tMin && tMax >= 0.0 } fun AxisAlignedBB.union(aabbs: List<AxisAlignedBB>?): AxisAlignedBB? { diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt index ee9228609..ea2a935a3 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt @@ -126,7 +126,7 @@ object LorenzUtils { val EntityLivingBase.baseMaxHealth: Int get() = this.getEntityAttribute(SharedMonsterAttributes.maxHealth).baseValue.toInt() - // TODO create extenstion function + // TODO create extension function fun formatPercentage(percentage: Double): String = formatPercentage(percentage, "0.00") fun formatPercentage(percentage: Double, format: String?): String = diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt index fe9e9df6a..1f389e51b 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt @@ -215,7 +215,7 @@ object RenderUtils { val bottomOffset = 0 val topOffset = bottomOffset + height val tessellator = Tessellator.getInstance() - val worldrenderer = tessellator.worldRenderer + val worldRenderer = tessellator.worldRenderer Minecraft.getMinecraft().textureManager.bindTexture(beaconBeam) GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, 10497.0f) GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, 10497.0f) @@ -244,59 +244,59 @@ object RenderUtils { val d11 = 0.5 + sin(d2 + 5.497787143782138) * 0.2 val d14 = -1.0 + d1 val d15 = height.toDouble() * 2.5 + d14 - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR) - worldrenderer.pos(x + d4, y + topOffset, z + d5).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier) + worldRenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR) + worldRenderer.pos(x + d4, y + topOffset, z + d5).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + d4, y + bottomOffset, z + d5).tex(1.0, d14).color(r, g, b, 1.0f).endVertex() - worldrenderer.pos(x + d6, y + bottomOffset, z + d7).tex(0.0, d14).color(r, g, b, 1.0f).endVertex() - worldrenderer.pos(x + d6, y + topOffset, z + d7).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier) + worldRenderer.pos(x + d4, y + bottomOffset, z + d5).tex(1.0, d14).color(r, g, b, 1.0f).endVertex() + worldRenderer.pos(x + d6, y + bottomOffset, z + d7).tex(0.0, d14).color(r, g, b, 1.0f).endVertex() + worldRenderer.pos(x + d6, y + topOffset, z + d7).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + d10, y + topOffset, z + d11).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier) + worldRenderer.pos(x + d10, y + topOffset, z + d11).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + d10, y + bottomOffset, z + d11).tex(1.0, d14).color(r, g, b, 1.0f).endVertex() - worldrenderer.pos(x + d8, y + bottomOffset, z + d9).tex(0.0, d14).color(r, g, b, 1.0f).endVertex() - worldrenderer.pos(x + d8, y + topOffset, z + d9).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier) + worldRenderer.pos(x + d10, y + bottomOffset, z + d11).tex(1.0, d14).color(r, g, b, 1.0f).endVertex() + worldRenderer.pos(x + d8, y + bottomOffset, z + d9).tex(0.0, d14).color(r, g, b, 1.0f).endVertex() + worldRenderer.pos(x + d8, y + topOffset, z + d9).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + d6, y + topOffset, z + d7).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier) + worldRenderer.pos(x + d6, y + topOffset, z + d7).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + d6, y + bottomOffset, z + d7).tex(1.0, d14).color(r, g, b, 1.0f).endVertex() - worldrenderer.pos(x + d10, y + bottomOffset, z + d11).tex(0.0, d14).color(r, g, b, 1.0f).endVertex() - worldrenderer.pos(x + d10, y + topOffset, z + d11).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier) + worldRenderer.pos(x + d6, y + bottomOffset, z + d7).tex(1.0, d14).color(r, g, b, 1.0f).endVertex() + worldRenderer.pos(x + d10, y + bottomOffset, z + d11).tex(0.0, d14).color(r, g, b, 1.0f).endVertex() + worldRenderer.pos(x + d10, y + topOffset, z + d11).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + d8, y + topOffset, z + d9).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier) + worldRenderer.pos(x + d8, y + topOffset, z + d9).tex(1.0, d15).color(r, g, b, 1.0f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + d8, y + bottomOffset, z + d9).tex(1.0, d14).color(r, g, b, 1.0f).endVertex() - worldrenderer.pos(x + d4, y + bottomOffset, z + d5).tex(0.0, d14).color(r, g, b, 1.0f).endVertex() - worldrenderer.pos(x + d4, y + topOffset, z + d5).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier) + worldRenderer.pos(x + d8, y + bottomOffset, z + d9).tex(1.0, d14).color(r, g, b, 1.0f).endVertex() + worldRenderer.pos(x + d4, y + bottomOffset, z + d5).tex(0.0, d14).color(r, g, b, 1.0f).endVertex() + worldRenderer.pos(x + d4, y + topOffset, z + d5).tex(0.0, d15).color(r, g, b, 1.0f * alphaMultiplier) .endVertex() tessellator.draw() GlStateManager.disableCull() val d12 = -1.0 + d1 val d13 = height + d12 - worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR) - worldrenderer.pos(x + 0.2, y + topOffset, z + 0.2).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier) + worldRenderer.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR) + worldRenderer.pos(x + 0.2, y + topOffset, z + 0.2).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + 0.2, y + bottomOffset, z + 0.2).tex(1.0, d12).color(r, g, b, 0.25f).endVertex() - worldrenderer.pos(x + 0.8, y + bottomOffset, z + 0.2).tex(0.0, d12).color(r, g, b, 0.25f).endVertex() - worldrenderer.pos(x + 0.8, y + topOffset, z + 0.2).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier) + worldRenderer.pos(x + 0.2, y + bottomOffset, z + 0.2).tex(1.0, d12).color(r, g, b, 0.25f).endVertex() + worldRenderer.pos(x + 0.8, y + bottomOffset, z + 0.2).tex(0.0, d12).color(r, g, b, 0.25f).endVertex() + worldRenderer.pos(x + 0.8, y + topOffset, z + 0.2).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + 0.8, y + topOffset, z + 0.8).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier) + worldRenderer.pos(x + 0.8, y + topOffset, z + 0.8).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + 0.8, y + bottomOffset, z + 0.8).tex(1.0, d12).color(r, g, b, 0.25f).endVertex() - worldrenderer.pos(x + 0.2, y + bottomOffset, z + 0.8).tex(0.0, d12).color(r, g, b, 0.25f).endVertex() - worldrenderer.pos(x + 0.2, y + topOffset, z + 0.8).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier) + worldRenderer.pos(x + 0.8, y + bottomOffset, z + 0.8).tex(1.0, d12).color(r, g, b, 0.25f).endVertex() + worldRenderer.pos(x + 0.2, y + bottomOffset, z + 0.8).tex(0.0, d12).color(r, g, b, 0.25f).endVertex() + worldRenderer.pos(x + 0.2, y + topOffset, z + 0.8).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + 0.8, y + topOffset, z + 0.2).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier) + worldRenderer.pos(x + 0.8, y + topOffset, z + 0.2).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + 0.8, y + bottomOffset, z + 0.2).tex(1.0, d12).color(r, g, b, 0.25f).endVertex() - worldrenderer.pos(x + 0.8, y + bottomOffset, z + 0.8).tex(0.0, d12).color(r, g, b, 0.25f).endVertex() - worldrenderer.pos(x + 0.8, y + topOffset, z + 0.8).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier) + worldRenderer.pos(x + 0.8, y + bottomOffset, z + 0.2).tex(1.0, d12).color(r, g, b, 0.25f).endVertex() + worldRenderer.pos(x + 0.8, y + bottomOffset, z + 0.8).tex(0.0, d12).color(r, g, b, 0.25f).endVertex() + worldRenderer.pos(x + 0.8, y + topOffset, z + 0.8).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + 0.2, y + topOffset, z + 0.8).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier) + worldRenderer.pos(x + 0.2, y + topOffset, z + 0.8).tex(1.0, d13).color(r, g, b, 0.25f * alphaMultiplier) .endVertex() - worldrenderer.pos(x + 0.2, y + bottomOffset, z + 0.8).tex(1.0, d12).color(r, g, b, 0.25f).endVertex() - worldrenderer.pos(x + 0.2, y + bottomOffset, z + 0.2).tex(0.0, d12).color(r, g, b, 0.25f).endVertex() - worldrenderer.pos(x + 0.2, y + topOffset, z + 0.2).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier) + worldRenderer.pos(x + 0.2, y + bottomOffset, z + 0.8).tex(1.0, d12).color(r, g, b, 0.25f).endVertex() + worldRenderer.pos(x + 0.2, y + bottomOffset, z + 0.2).tex(0.0, d12).color(r, g, b, 0.25f).endVertex() + worldRenderer.pos(x + 0.2, y + topOffset, z + 0.2).tex(0.0, d13).color(r, g, b, 0.25f * alphaMultiplier) .endVertex() tessellator.draw() } @@ -809,19 +809,19 @@ object RenderUtils { bindCamera() val tessellator = Tessellator.getInstance() - val worldrenderer = tessellator.worldRenderer - worldrenderer.begin(GL11.GL_QUAD_STRIP, DefaultVertexFormats.POSITION) + val worldRenderer = tessellator.worldRenderer + worldRenderer.begin(GL11.GL_QUAD_STRIP, DefaultVertexFormats.POSITION) var currentAngle = 0f val angleStep = 0.1f while (currentAngle < 2 * Math.PI) { val xOffset = radius * cos(currentAngle.toDouble()).toFloat() val zOffset = radius * sin(currentAngle.toDouble()).toFloat() - worldrenderer.pos(x + xOffset, y + height, z + zOffset).endVertex() - worldrenderer.pos(x + xOffset, y + 0, z + zOffset).endVertex() + worldRenderer.pos(x + xOffset, y + height, z + zOffset).endVertex() + worldRenderer.pos(x + xOffset, y + 0, z + zOffset).endVertex() currentAngle += angleStep } - worldrenderer.pos(x + radius, y + height, z).endVertex() - worldrenderer.pos(x + radius, y + 0.0, z).endVertex() + worldRenderer.pos(x + radius, y + height, z).endVertex() + worldRenderer.pos(x + radius, y + 0.0, z).endVertex() tessellator.draw() GlStateManager.enableCull() @@ -1388,9 +1388,9 @@ object RenderUtils { GlStateManager.depthMask(false) } GlStateManager.color(color.red / 255f, color.green / 255f, color.blue / 255f, color.alpha / 255f) - val ctrlpoints = p1.toFloatArray() + p2.toFloatArray() + p3.toFloatArray() + val ctrlPoints = p1.toFloatArray() + p2.toFloatArray() + p3.toFloatArray() bezier2Buffer.clear() - ctrlpoints.forEach { + ctrlPoints.forEach { bezier2Buffer.put(it) } bezier2Buffer.flip() @@ -1477,8 +1477,6 @@ object RenderUtils { GlStateManager.disableTexture2D() GlStateManager.disableCull() - val tessellator = Tessellator.getInstance() - GlStateManager.pushMatrix() RenderUtils.translate(getViewerPos(partialTicks).negated()) getViewerPos(partialTicks) diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt index 1780764cd..2b3ece2c7 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt @@ -327,7 +327,7 @@ object SkyBlockItemModifierUtils { fun getByName(name: String): GemstoneSlotType = entries.firstOrNull { name.uppercase(Locale.ENGLISH).contains(it.name) } - ?: error("Unknwon GemstoneSlotType: '$name'") + ?: error("Unknown GemstoneSlotType: '$name'") fun getColorCode(name: String) = getByName(name).colorCode } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt index b51c83295..b12668d72 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt @@ -250,10 +250,16 @@ interface Renderable { val openGui = guiScreen?.javaClass?.name ?: "none" val isInNeuPv = openGui == "io.github.moulberry.notenoughupdates.profileviewer.GuiProfileViewer" val neuFocus = NEUItems.neuHasFocus() - val isInSkyTilsPv = openGui == "gg.skytils.skytilsmod.gui.profile.ProfileGui" + val isInSkytilsPv = openGui == "gg.skytils.skytilsmod.gui.profile.ProfileGui" - val result = isGuiScreen && isGuiPositionEditor && inMenu && isNotInSignAndOnSlot && isConfigScreen && - !isInNeuPv && !isInSkyTilsPv && !neuFocus + val result = isGuiScreen && + isGuiPositionEditor && + inMenu && + isNotInSignAndOnSlot && + isConfigScreen && + !isInNeuPv && + !isInSkytilsPv && + !neuFocus if (debug) { if (!result) { @@ -266,7 +272,7 @@ interface Renderable { if (!isConfigScreen) logger.log("isConfigScreen") if (isInNeuPv) logger.log("isInNeuPv") if (neuFocus) logger.log("neuFocus") - if (isInSkyTilsPv) logger.log("isInSkyTilsPv") + if (isInSkytilsPv) logger.log("isInSkytilsPv") logger.log("") } else { logger.log("allowed click") @@ -647,7 +653,7 @@ interface Renderable { } } - fun fixedSizeCollum( + fun fixedSizeColumn( content: Renderable, height: Int, horizontalAlign: HorizontalAlignment = HorizontalAlignment.LEFT, diff --git a/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt index 8f55a8b1f..8d26cf46a 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt @@ -58,7 +58,7 @@ object RepoPatternManager { */ private var usedKeys: NavigableMap<String, CommonPatternInfo<*, *>> = TreeMap() - private var wasPreinitialized = false + private var wasPreInitialized = false private val isInDevEnv = try { Launch.blackboard["fml.deobfuscatedEnvironment"] as Boolean } catch (_: Exception) { @@ -261,7 +261,7 @@ object RepoPatternManager { @HandleEvent fun onPreInitFinished(event: PreInitFinishedEvent) { - wasPreinitialized = true + wasPreInitialized = true val dumpDirective = System.getenv("SKYHANNI_DUMP_REGEXES") if (dumpDirective.isNullOrBlank()) return val (sourceLabel, path) = dumpDirective.split(":", limit = 2) @@ -274,7 +274,7 @@ object RepoPatternManager { fun of(key: String, fallback: String, parentKeyHolder: RepoPatternKeyOwner? = null): RepoPattern { verifyKeyShape(key) - if (wasPreinitialized && !config.tolerateLateRegistration) { + if (wasPreInitialized && !config.tolerateLateRegistration) { crash("Illegal late initialization of repo pattern. Repo pattern needs to be created during pre-initialization.") } if (key in usedKeys) { @@ -289,7 +289,7 @@ object RepoPatternManager { parentKeyHolder: RepoPatternKeyOwner? = null, ): RepoPatternList { verifyKeyShape(key) - if (wasPreinitialized && !config.tolerateLateRegistration) { + if (wasPreInitialized && !config.tolerateLateRegistration) { crash("Illegal late initialization of repo pattern. Repo pattern needs to be created during pre-initialization.") } if (key in usedKeys) { diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt index c110d6d6e..83e812149 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt @@ -66,7 +66,7 @@ abstract class Shader(val vertex: String, val fragment: String) { ShaderHelper.glLinkProgram(shaderProgram) - if (ShaderHelper.glGetProgrami(shaderProgram, ShaderHelper.GL_LINK_STATUS) == GL11.GL_FALSE) { + if (ShaderHelper.glGetProgramInt(shaderProgram, ShaderHelper.GL_LINK_STATUS) == GL11.GL_FALSE) { val errorMessage = "Failed to link vertex shader $vertex and fragment shader $fragment. Features that " + "utilise this shader will not work correctly, if at all" val errorLog = StringUtils.trim(ShaderHelper.glGetShaderInfoLog(shaderProgram, 1024)) diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt index 89efd7d9f..1e8062500 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt @@ -82,11 +82,11 @@ class ShaderHelper { ) else GL20.glGetProgramInfoLog(program, maxLength) } - fun glGetProgrami(program: Int, pname: Int): Int { + fun glGetProgramInt(program: Int, pName: Int): Int { return if (USING_ARB_SHADERS) ARBShaderObjects.glGetObjectParameteriARB( program, - pname - ) else GL20.glGetProgrami(program, pname) + pName + ) else GL20.glGetProgrami(program, pName) } fun glUseProgram(program: Int) { @@ -115,11 +115,11 @@ class ShaderHelper { if (USING_ARB_SHADERS) ARBShaderObjects.glCompileShaderARB(shader) else GL20.glCompileShader(shader) } - fun glGetShaderi(shader: Int, pname: Int): Int { + fun glGetShaderInt(shader: Int, pName: Int): Int { return if (USING_ARB_SHADERS) ARBShaderObjects.glGetObjectParameteriARB( shader, - pname - ) else GL20.glGetShaderi(shader, pname) + pName + ) else GL20.glGetShaderi(shader, pName) } fun glGetShaderInfoLog(shader: Int, maxLength: Int): String { diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt index 057e0a031..39a2fe302 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt @@ -71,7 +71,7 @@ object ShaderManager { ShaderHelper.glShaderSource(shaderID, source.toString()) ShaderHelper.glCompileShader(shaderID) - if (ShaderHelper.glGetShaderi(shaderID, ShaderHelper.GL_COMPILE_STATUS) == 0) { + if (ShaderHelper.glGetShaderInt(shaderID, ShaderHelper.GL_COMPILE_STATUS) == 0) { val errorMessage = "Failed to compile shader $fileName${type.extension}. Features that utilise this " + "shader will not work correctly, if at all" val errorLog = StringUtils.trim(ShaderHelper.glGetShaderInfoLog(shaderID, 1024)) diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt index 5fa12dbb6..4b871377b 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/ItemTrackerData.kt @@ -24,7 +24,7 @@ abstract class ItemTrackerData : TrackerData() { resetItems() } - fun additem(internalName: NEUInternalName, stackSize: Int) { + fun addItem(internalName: NEUInternalName, stackSize: Int) { val item = items.getOrPut(internalName) { TrackedItem() } item.timesGained++ diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt index f7bafb7f3..21f115746 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt @@ -37,7 +37,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>( fun addItem(internalName: NEUInternalName, amount: Int) { modify { - it.additem(internalName, amount) + it.addItem(internalName, amount) } getSharedTracker()?.let { val hidden = it.get(DisplayMode.TOTAL).items[internalName]!!.hidden |