diff options
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java')
| -rw-r--r-- | src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java | 277 |
1 files changed, 227 insertions, 50 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java index 7b565ef5..44488a5e 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java @@ -8,11 +8,13 @@ import io.github.moulberry.notenoughupdates.core.config.Config; import io.github.moulberry.notenoughupdates.core.config.Position; import io.github.moulberry.notenoughupdates.core.config.annotations.*; import io.github.moulberry.notenoughupdates.core.config.gui.GuiPositionEditor; +import io.github.moulberry.notenoughupdates.miscgui.GuiEnchantColour; import io.github.moulberry.notenoughupdates.miscgui.GuiInvButtonEditor; import io.github.moulberry.notenoughupdates.miscgui.NEUOverlayPlacements; import io.github.moulberry.notenoughupdates.overlays.*; import io.github.moulberry.notenoughupdates.util.SBInfo; import net.minecraft.client.Minecraft; +import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.client.ClientCommandHandler; import org.lwjgl.input.Keyboard; import org.lwjgl.util.vector.Vector2f; @@ -79,6 +81,9 @@ public class NEUConfig extends Config { case 7: NotEnoughUpdates.INSTANCE.openGui = new GuiInvButtonEditor(); return; + case 8: + NotEnoughUpdates.INSTANCE.openGui = new GuiEnchantColour(); + return; } } @@ -155,10 +160,10 @@ public class NEUConfig extends Config { public MiscOverlays miscOverlays = new MiscOverlays(); @Expose - @Category( + /*@Category( name = "Storage GUI", desc = "Storage GUI" - ) + )*/ public StorageGUI storageGUI = new StorageGUI(); @Expose @@ -183,6 +188,14 @@ public class NEUConfig extends Config { ) public Mining mining = new Mining(); + + @Expose + @Category( + name = "Fishing", + desc = "Fishing" + ) + public Fishing fishing = new Fishing(); + @Expose @Category( name = "NEU Auction House", @@ -272,7 +285,7 @@ public class NEUConfig extends Config { @Expose @ConfigOption( - name = "Gui Click Sounds", + name = "GUI Click Sounds", desc = "Play click sounds in various NEU-related GUIs when pressing buttons" ) @ConfigEditorBoolean @@ -287,6 +300,14 @@ public class NEUConfig extends Config { values = {"Off", "Commas", "Shortened"} ) public int damageIndicatorStyle = 1; + + @Expose + @ConfigOption( + name = "Edit Enchant Colours", + desc = "Change the colours of certain skyblock enchants" + ) + @ConfigEditorButton(runnableId = 8, buttonText = "Open") + public boolean editEnchantColoursButton = true; } public static class Notifications { @@ -511,19 +532,38 @@ public class NEUConfig extends Config { } public static class SlotLocking { + @Expose @ConfigOption( name = "Enable Slot Locking", - desc = "Allows you to lock slots and create slot pairings" + desc = "Allows you to lock slots and create slot bindings" ) + @ConfigEditorBoolean public boolean enableSlotLocking = false; @Expose @ConfigOption( + name = "Enable Slot Binding", + desc = "Allows you to create slot bindings\nNote: \"Enable Slot Locking\" must be on" + ) + @ConfigEditorBoolean + public boolean enableSlotBinding = true; + + @Expose + @ConfigOption( + name = "Don't Drop Bound Slots", + desc = "Slot bindings also act as locked slots (prevents dropping / moving in inventory)" + ) + @ConfigEditorBoolean + public boolean bindingAlsoLocks = false; + + @Expose + @ConfigOption( name = "Slot Lock Key", - desc = "" + desc = "Click this key to LOCK a slot\n" + + "Hold this key and drag to BIND a slot" ) @ConfigEditorKeybind(defaultKey = Keyboard.KEY_L) - public int backpackScrollKey = Keyboard.KEY_L; + public int slotLockKey = Keyboard.KEY_L; } public static class TooltipTweaks { @@ -681,7 +721,7 @@ public class NEUConfig extends Config { name = "Block Zapper Overlay", desc = "" ) - @ConfigEditorAccordion(id = 5) + @ConfigEditorAccordion(id = 6) public boolean zapperAccordion = false; @Expose @@ -690,7 +730,7 @@ public class NEUConfig extends Config { desc = "Show which blocks will be destroyed when using the Block Zapper" ) @ConfigEditorBoolean - @ConfigAccordionId(id = 5) + @ConfigAccordionId(id = 6) public boolean enableZapperOverlay = true; @Expose @@ -699,7 +739,7 @@ public class NEUConfig extends Config { desc = "Change the colour of the ghost block outline" ) @ConfigEditorColour - @ConfigAccordionId(id = 5) + @ConfigAccordionId(id = 6) public String zapperOverlayColour = "0:102:171:5:0"; @ConfigOption( @@ -775,41 +815,6 @@ public class NEUConfig extends Config { public boolean showBreak = true; @ConfigOption( - name = "Custom Rod Colours", - desc = "" - ) - @ConfigEditorAccordion(id = 4) - public boolean rodAccordion = false; - - @Expose - @ConfigOption( - name = "Enable Rod Colours", - desc = "Change the colour of your and other players' rod lines\n" + - "Also fixes the position of the rod line" - ) - @ConfigEditorBoolean - @ConfigAccordionId(id = 4) - public boolean enableRodColours = true; - - @Expose - @ConfigOption( - name = "Own Rod Colour", - desc = "Change the colour of your own rod lines" - ) - @ConfigEditorColour - @ConfigAccordionId(id = 4) - public String ownRodColour = "0:255:0:0:0"; - - @Expose - @ConfigOption( - name = "Other Rod Colour", - desc = "Change the colour of other players' rod lines" - ) - @ConfigEditorColour - @ConfigAccordionId(id = 4) - public String otherRodColour = "0:255:0:0:0"; - - @ConfigOption( name = "Minion Crystal Radius Overlay", desc = "" ) @@ -1164,8 +1169,8 @@ public class NEUConfig extends Config { @Expose @ConfigOption( name = "Enable Storage GUI", - desc = "Show a custom storage overlay when accessing /storage." + - "Makes switching between pages much easier and also allows for searching through all storages" + desc = "THIS FEATURE IS CURRENTLY DISABLED BECAUSE HYPIXEL IS TOO LAZY TO ADD A SINGLE COMMAND LMFAO"/*"Show a custom storage overlay when accessing /storage." + + "Makes switching between pages much easier and also allows for searching through all storages"*/ ) @ConfigEditorBoolean @ConfigAccordionId(id = 1) @@ -1204,14 +1209,14 @@ public class NEUConfig extends Config { @ConfigAccordionId(id = 1) public boolean enderchestPreview = true; - @Expose + //@Expose @ConfigOption( name = "Backpack Preview", - desc = "Preview Backpacks when hovering over the selector on the left side" + desc = "THIS FEATURE IS CURRENTLY DISABLED BECAUSE HYPIXEL IS TOO LAZY TO ADD A SINGLE COMMAND LMFAO"//"Preview Backpacks when hovering over the selector on the left side" ) @ConfigEditorBoolean @ConfigAccordionId(id = 1) - public boolean backpackPreview = true; + public boolean backpackPreview = false; @ConfigOption( name = "Inventory Backpacks", @@ -1227,7 +1232,9 @@ public class NEUConfig extends Config { ) @ConfigEditorBoolean @ConfigAccordionId(id = 0) - public boolean showInvBackpack = true; + public boolean showInvBackpack = false; + + //public boolean showInvBackpack = false; @Expose @ConfigOption( @@ -1273,6 +1280,15 @@ public class NEUConfig extends Config { @Expose @ConfigOption( + name = "Backpack Hotkey", + desc = "Hotkey to quickly switch to the backpack slot" + ) + @ConfigEditorKeybind(defaultKey = Keyboard.KEY_GRAVE) + @ConfigAccordionId(id = 0) + public int backpackHotkey = Keyboard.KEY_GRAVE; + + @Expose + @ConfigOption( name = "Arrow Key Backpacks", desc = "Use arrow keys [LEFT],[RIGHT] to move between backpacks and [DOWN] to navigate backpack even when the slot is not selected. Keys are customizable below" ) @@ -1588,6 +1604,167 @@ public class NEUConfig extends Config { public boolean revealMistCreepers = true;*/ } + public static class Fishing { + @Expose + @ConfigOption( + name = "Hide Other Players Fishing", + desc = "Convenience option to easily hide \u00a7lother players'\u00a7r bobbers, rod lines and fishing particles\n" + + "The advanced options below allow you to set the precise colour, particles, etc." + ) + @ConfigEditorBoolean + public boolean hideOtherPlayerAll = false; + + @ConfigOption( + name = "Incoming Fish Warning", + desc = "" + ) + @ConfigEditorAccordion(id = 3) + public boolean incomingFishAccordion = false; + + @Expose + @ConfigOption( + name = "Incoming Fish Warning", + desc = "Display a yellow '!' when a fish is incoming and a red '!' when you need to pull the fish up. " + + "The red '!' also takes your ping into account" + ) + @ConfigEditorBoolean + @ConfigAccordionId(id = 3) + public boolean incomingFishWarning = true; + + @Expose + @ConfigOption( + name = "Hooked Sound", + desc = "Play a high-pitched ding sound when the '!' turns red" + ) + @ConfigEditorBoolean + @ConfigAccordionId(id = 3) + public boolean incomingFishHookedSounds = true; + + @Expose + @ConfigOption( + name = "Approaching Sound", + desc = "Play low-pitched ding sounds while the yellow '!' is visible" + ) + @ConfigEditorBoolean + @ConfigAccordionId(id = 3) + public boolean incomingFishIncSounds = false; + + @ConfigOption( + name = "Fishing Particles", + desc = "" + ) + @ConfigEditorAccordion(id = 0) + public boolean particleAccordion = false; + + @Expose + @ConfigOption( + name = "Enable Custom Particles", + desc = "Allow you to modify the particles that appear when a fish is incoming for you and other players" + ) + @ConfigEditorBoolean + @ConfigAccordionId(id = 0) + public boolean enableCustomParticles = false; + + @ConfigOption( + name = "Your Particles", + desc = "" + ) + @ConfigEditorAccordion(id = 1) + @ConfigAccordionId(id = 0) + public boolean yourParticlesAccordion = false; + + @Expose + @ConfigOption( + name = "Particle Type", + desc = "Change the type of the particle that is spawned\n" + + "Particle types with (RGB) support custom colours" + + "Set to 'NONE' to disable particles" + ) + @ConfigEditorDropdown( + values = {"Default", "None", "Spark (RGB)", "Swirl (RGB)", "Dust (RGB)", "Flame", "Crit", "Magic Crit"} + ) + @ConfigAccordionId(id = 1) + public int yourParticleType = 0; + + @Expose + @ConfigOption( + name = "Custom Colour", + desc = "Set a custom colour for the particle\n" + + "Only works for particle types with (RGB)" + ) + @ConfigEditorColour + @ConfigAccordionId(id = 1) + public String yourParticleColour = "0:255:255:255:255"; + + @ConfigOption( + name = "Other Players' Particles", + desc = "" + ) + @ConfigEditorAccordion(id = 2) + @ConfigAccordionId(id = 0) + public boolean otherParticlesAccordion = false; + + @Expose + @ConfigOption( + name = "Particle Type", + desc = "Change the type of the particle that is spawned\n" + + "Particle types with (RGB) support custom colours" + + "Set to 'NONE' to disable particles" + ) + @ConfigEditorDropdown( + values = {"Default", "None", "Spark (RGB)", "Swirl (RGB)", "Dust (RGB)", "Flame", "Crit", "Magic Crit"} + ) + @ConfigAccordionId(id = 2) + public int otherParticleType = 0; + + @Expose + @ConfigOption( + name = "Custom Colour", + desc = "Set a custom colour for the particle\n" + + "Only works for particle types with (RGB)" + ) + @ConfigEditorColour + @ConfigAccordionId(id = 2) + public String otherParticleColour = "0:255:255:255:255"; + + @ConfigOption( + name = "Rod Line Colours", + desc = "" + ) + @ConfigEditorAccordion(id = 4) + public boolean rodAccordion = false; + + @Expose + @ConfigOption( + name = "Enable Rod Line Colours", + desc = "Change the colour of your and other players' rod lines\n" + + "Also fixes the position of the rod line" + ) + @ConfigEditorBoolean + @ConfigAccordionId(id = 4) + public boolean enableRodColours = true; + + @Expose + @ConfigOption( + name = "Own Rod Colour", + desc = "Change the colour of your own rod lines\n" + + "You can set the opacity to '0' to HIDE" + ) + @ConfigEditorColour + @ConfigAccordionId(id = 4) + public String ownRodColour = "0:255:0:0:0"; + + @Expose + @ConfigOption( + name = "Other Rod Colour", + desc = "Change the colour of other players' rod lines\n" + + "You can set the opacity to '0' to HIDE" + ) + @ConfigEditorColour + @ConfigAccordionId(id = 4) + public String otherRodColour = "0:255:0:0:0"; + } + public static class NeuAuctionHouse { @Expose @ConfigOption( |