diff options
| author | flame-cat <kaldraganov05@gmail.com> | 2020-12-17 21:02:19 -0500 |
|---|---|---|
| committer | flame-cat <kaldraganov05@gmail.com> | 2020-12-17 21:02:19 -0500 |
| commit | 5df12d316ddefa2b32de9e226168469bfd5a03f9 (patch) | |
| tree | a1c25e0a62c48fa47dc0b50d5fba182529c3303e /src/main/java/me/Danker/handlers | |
| parent | 6f3aceaf037be3e21cf7620cc92b10a07cb115c7 (diff) | |
| parent | 5a796d45211dfc9a7cc0a63a753e638dea9fc96c (diff) | |
| download | SkyblockMod-5df12d316ddefa2b32de9e226168469bfd5a03f9.tar.gz SkyblockMod-5df12d316ddefa2b32de9e226168469bfd5a03f9.tar.bz2 SkyblockMod-5df12d316ddefa2b32de9e226168469bfd5a03f9.zip | |
Merge branch 'development' of https://github.com/bowser0000/SkyblockMod into development
Diffstat (limited to 'src/main/java/me/Danker/handlers')
| -rw-r--r-- | src/main/java/me/Danker/handlers/ConfigHandler.java | 2 | ||||
| -rw-r--r-- | src/main/java/me/Danker/handlers/TextRenderer.java | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/me/Danker/handlers/ConfigHandler.java b/src/main/java/me/Danker/handlers/ConfigHandler.java index 531d631..7bf6ce2 100644 --- a/src/main/java/me/Danker/handlers/ConfigHandler.java +++ b/src/main/java/me/Danker/handlers/ConfigHandler.java @@ -194,6 +194,7 @@ public class ConfigHandler { if (!hasKey("toggles", "StopSalvageStarred")) writeBooleanConfig("toggles", "StopSalvageStarred", false); if (!hasKey("toggles", "WatcherReadyMessage")) writeBooleanConfig("toggles", "WatcherReadyMessage", false); if (!hasKey("toggles", "PickBlock")) writeBooleanConfig("toggles", "PickBlock", false); + if (!hasKey("toggles", "FlowerWeapons")) writeBooleanConfig("toggles", "FlowerWeapons", false); if (!hasKey("toggles", "NotifySlayerSlain")) writeBooleanConfig("toggles", "NotifySlayerSlain", false); // Puzzle Solvers if (!hasKey("toggles", "ThreeManPuzzle")) writeBooleanConfig("toggles", "ThreeManPuzzle", false); @@ -462,6 +463,7 @@ public class ConfigHandler { ToggleCommand.watcherReadyToggled = getBoolean("toggles", "WatcherReadyMessage"); ToggleCommand.notifySlayerSlainToggled = getBoolean("toggles", "NotifySlayerSlain"); ToggleCommand.swapToPickBlockToggled = getBoolean("toggles", "PickBlock"); + ToggleCommand.flowerWeaponsToggled = getBoolean("toggles", "FlowerWeapons"); // Puzzle Solvers ToggleCommand.threeManToggled = getBoolean("toggles", "ThreeManPuzzle"); ToggleCommand.oruoToggled = getBoolean("toggles", "OruoPuzzle"); diff --git a/src/main/java/me/Danker/handlers/TextRenderer.java b/src/main/java/me/Danker/handlers/TextRenderer.java index cbf196b..769d164 100644 --- a/src/main/java/me/Danker/handlers/TextRenderer.java +++ b/src/main/java/me/Danker/handlers/TextRenderer.java @@ -3,6 +3,7 @@ package me.Danker.handlers; import me.Danker.commands.ToggleCommand; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.StringUtils; import org.lwjgl.opengl.GL11; @@ -26,5 +27,6 @@ public class TextRenderer extends Gui { } } GL11.glScaled(scaleReset, scaleReset, scaleReset); + GlStateManager.color(1, 1, 1, 1); } } |