aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsg-programs <msgdoesstuff@gmail.com>2023-09-08 09:54:47 +0200
committermsg-programs <msgdoesstuff@gmail.com>2023-09-08 09:54:47 +0200
commit7df2a590d4b0079f65ef639315d04f63c2f754a7 (patch)
treefb2b0594a7e0b397b8f5afccdfa8ae7409edb9f8
parentb153e75818b5058df9334953d5924c2c82598719 (diff)
parent9c7bf54123f366ad90bfafe81e973b731fd6b5b3 (diff)
downloadSkyblocker-7df2a590d4b0079f65ef639315d04f63c2f754a7.tar.gz
Skyblocker-7df2a590d4b0079f65ef639315d04f63c2f754a7.tar.bz2
Skyblocker-7df2a590d4b0079f65ef639315d04f63c2f754a7.zip
Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into readme-fixes
Pull upstream updates into branch
-rw-r--r--.github/workflows/webhook_translate.yml46
-rw-r--r--build.gradle8
-rw-r--r--gradle.properties6
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java16
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/compatibility/MixinPlugin.java52
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/compatibility/emi/SkyblockEmiRecipe.java38
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/compatibility/emi/SkyblockerEMIPlugin.java29
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/compatibility/modmenu/ModMenuEntry.java (renamed from src/main/java/me/xmrvizzy/skyblocker/config/modmenu/ModMenuEntry.java)3
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/compatibility/rei/SkyblockCategory.java (renamed from src/main/java/me/xmrvizzy/skyblocker/skyblock/rei/SkyblockCategory.java)21
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/compatibility/rei/SkyblockCraftingDisplay.java (renamed from src/main/java/me/xmrvizzy/skyblocker/skyblock/rei/SkyblockCraftingDisplay.java)5
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/compatibility/rei/SkyblockCraftingDisplayGenerator.java (renamed from src/main/java/me/xmrvizzy/skyblocker/skyblock/rei/SkyblockCraftingDisplayGenerator.java)10
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/compatibility/rei/SkyblockerREIClientPlugin.java (renamed from src/main/java/me/xmrvizzy/skyblocker/skyblock/rei/SkyblockerREIClientPlugin.java)10
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/mixin/accessor/FrustumInvoker.java2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/mixin/accessor/HandledScreenAccessor.java7
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/FairySouls.java2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/FishingHelper.java4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/TeleportOverlay.java4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/CroesusHelper.java4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java22
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java8
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/StarredMobGlow.java2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/ThreeWeirdos.java4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/TicTacToe.java60
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/SecretWaypoint.java2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/OrderTerminal.java4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/StartsWithTerminal.java4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java68
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java14
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Fetchur.java4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/Puzzler.java4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/ChronomatronSolver.java2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/ExperimentSolver.java2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/SuperpairsSolver.java2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/UltrasequencerSolver.java2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/filters/AbilityFilter.java (renamed from src/main/java/me/xmrvizzy/skyblocker/chat/filters/AbilityFilter.java)4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/filters/AdFilter.java (renamed from src/main/java/me/xmrvizzy/skyblocker/chat/filters/AdFilter.java)6
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/filters/AoteFilter.java (renamed from src/main/java/me/xmrvizzy/skyblocker/chat/filters/AoteFilter.java)4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/filters/AutopetFilter.java (renamed from src/main/java/me/xmrvizzy/skyblocker/chat/filters/AutopetFilter.java)6
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/filters/ComboFilter.java (renamed from src/main/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilter.java)4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/filters/HealFilter.java (renamed from src/main/java/me/xmrvizzy/skyblocker/chat/filters/HealFilter.java)4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/filters/ImplosionFilter.java (renamed from src/main/java/me/xmrvizzy/skyblocker/chat/filters/ImplosionFilter.java)4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/filters/MoltenWaveFilter.java (renamed from src/main/java/me/xmrvizzy/skyblocker/chat/filters/MoltenWaveFilter.java)4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/filters/ShowOffFilter.java (renamed from src/main/java/me/xmrvizzy/skyblocker/chat/filters/ShowOffFilter.java)4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/filters/SimpleChatFilter.java (renamed from src/main/java/me/xmrvizzy/skyblocker/chat/filters/SimpleChatFilter.java)4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/filters/TeleportPadFilter.java (renamed from src/main/java/me/xmrvizzy/skyblocker/chat/filters/TeleportPadFilter.java)4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/item/WikiLookup.java4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java9
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/rift/EffigyWaypoints.java2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/rift/HealingMelonIndicator.java6
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/rift/ManiaIndicator.java6
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/rift/MirrorverseWaypoints.java2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/rift/StakeIndicator.java9
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/rift/TwinClawsIndicator.java9
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/shortcut/Shortcuts.java3
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/Boxes.java7
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/ItemUtils.java18
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java99
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtilsLiving.java151
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/Vertexer.java164
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/chat/ChatFilterResult.java (renamed from src/main/java/me/xmrvizzy/skyblocker/chat/ChatFilterResult.java)2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/chat/ChatMessageListener.java (renamed from src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java)4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/chat/ChatPatternListener.java (renamed from src/main/java/me/xmrvizzy/skyblocker/chat/ChatPatternListener.java)2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/color/LineColor.java66
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/color/QuadColor.java107
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/color/RenderColor.java27
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/discord/DiscordRPCManager.java (renamed from src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java)2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/render/FrustumUtils.java (renamed from src/main/java/me/xmrvizzy/skyblocker/utils/FrustumUtils.java)5
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/render/RenderHelper.java (renamed from src/main/java/me/xmrvizzy/skyblocker/utils/RenderHelper.java)71
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/render/culling/OcclusionCulling.java (renamed from src/main/java/me/xmrvizzy/skyblocker/utils/culling/OcclusionCulling.java)11
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/render/culling/WorldProvider.java (renamed from src/main/java/me/xmrvizzy/skyblocker/utils/culling/WorldProvider.java)3
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/render/culling/package-info.java (renamed from src/main/java/me/xmrvizzy/skyblocker/utils/culling/package-info.java)2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/render/gui/ColorHighlight.java (renamed from src/main/java/me/xmrvizzy/skyblocker/gui/ColorHighlight.java)2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/render/gui/ContainerSolver.java (renamed from src/main/java/me/xmrvizzy/skyblocker/gui/ContainerSolver.java)2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/render/gui/ContainerSolverManager.java (renamed from src/main/java/me/xmrvizzy/skyblocker/gui/ContainerSolverManager.java)7
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/render/title/Title.java (renamed from src/main/java/me/xmrvizzy/skyblocker/utils/title/Title.java)2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/render/title/TitleContainer.java (renamed from src/main/java/me/xmrvizzy/skyblocker/utils/title/TitleContainer.java)4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/render/title/TitleContainerConfigScreen.java (renamed from src/main/java/me/xmrvizzy/skyblocker/utils/title/TitleContainerConfigScreen.java)6
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/MessageScheduler.java (renamed from src/main/java/me/xmrvizzy/skyblocker/utils/MessageScheduler.java)2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/scheduler/Scheduler.java (renamed from src/main/java/me/xmrvizzy/skyblocker/utils/Scheduler.java)2
-rw-r--r--src/main/resources/assets/skyblocker/lang/en_us.json4
-rw-r--r--src/main/resources/assets/skyblocker/tabhud/readme.md4
-rw-r--r--src/main/resources/fabric.mod.json7
-rw-r--r--src/main/resources/skyblocker.mixins.json1
-rw-r--r--src/test/java/me/xmrvizzy/skyblocker/chat/filters/ChatFilterTest.java10
-rw-r--r--src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/AcceptRepartyTest.java6
-rw-r--r--src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/ThreeWeirdosTest.java2
-rw-r--r--src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/TriviaTest.java2
-rw-r--r--src/test/java/me/xmrvizzy/skyblocker/skyblock/dwarven/FetchurTest.java2
-rw-r--r--src/test/java/me/xmrvizzy/skyblocker/skyblock/dwarven/PuzzlerTest.java2
-rw-r--r--src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/AbilityFilterTest.java (renamed from src/test/java/me/xmrvizzy/skyblocker/chat/filters/AbilityFilterTest.java)2
-rw-r--r--src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/AdFilterTest.java (renamed from src/test/java/me/xmrvizzy/skyblocker/chat/filters/AdFilterTest.java)7
-rw-r--r--src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/AoteFilterTest.java (renamed from src/test/java/me/xmrvizzy/skyblocker/chat/filters/AoteFilterTest.java)2
-rw-r--r--src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/AutopetFilterTest.java (renamed from src/test/java/me/xmrvizzy/skyblocker/chat/filters/AutopetFilterTest.java)4
-rw-r--r--src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/ChatFilterTest.java10
-rw-r--r--src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/ComboFilterTest.java (renamed from src/test/java/me/xmrvizzy/skyblocker/chat/filters/ComboFilterTest.java)2
-rw-r--r--src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/HealFilterTest.java (renamed from src/test/java/me/xmrvizzy/skyblocker/chat/filters/HealFilterTest.java)2
-rw-r--r--src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/ImplosionFilterTest.java (renamed from src/test/java/me/xmrvizzy/skyblocker/chat/filters/ImplosionFilterTest.java)2
-rw-r--r--src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/TeleportPadFilterTest.java (renamed from src/test/java/me/xmrvizzy/skyblocker/chat/filters/TeleportPadFilterTest.java)2
-rw-r--r--src/test/java/me/xmrvizzy/skyblocker/utils/chat/ChatPatternListenerTest.java (renamed from src/test/java/me/xmrvizzy/skyblocker/chat/ChatPatternListenerTest.java)5
107 files changed, 516 insertions, 929 deletions
diff --git a/.github/workflows/webhook_translate.yml b/.github/workflows/webhook_translate.yml
index 6d072634..00534eef 100644
--- a/.github/workflows/webhook_translate.yml
+++ b/.github/workflows/webhook_translate.yml
@@ -12,11 +12,47 @@ jobs:
if