diff options
| author | DoKM <mcazzyman@gmail.com> | 2021-07-23 10:37:57 +0200 |
|---|---|---|
| committer | DoKM <mcazzyman@gmail.com> | 2021-07-23 10:37:57 +0200 |
| commit | f69a7b921079d0cf6bd29fa8912e687ee3bc6d29 (patch) | |
| tree | c58bd2287a76bed751a6e2169d4a626f8409f98b /src/main/java/io/github/moulberry/notenoughupdates/options | |
| parent | cb3c51f303672d350354a32cf504a4a242f9f4aa (diff) | |
| parent | 0f48092ef19488a43114478095f1d4a2040d369c (diff) | |
| download | notenoughupdates-f69a7b921079d0cf6bd29fa8912e687ee3bc6d29.tar.gz notenoughupdates-f69a7b921079d0cf6bd29fa8912e687ee3bc6d29.tar.bz2 notenoughupdates-f69a7b921079d0cf6bd29fa8912e687ee3bc6d29.zip | |
Merge remote-tracking branch 'Moulberry/master'
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/options')
3 files changed, 42 insertions, 4 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 5b0e0128..58deef74 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java @@ -177,7 +177,7 @@ public class NEUConfig extends Config { name = "Enchanting GUI/Solvers", desc = "Enchanting GUI/Solvers" ) - public Enchanting enchanting = new Enchanting(); + public Enchanting enchantingSolvers = new Enchanting(); @Expose @Category( diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ItemOverlays.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ItemOverlays.java index 92e9ca27..f6cc91ec 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ItemOverlays.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/ItemOverlays.java @@ -98,7 +98,7 @@ public class ItemOverlays { public String zapperOverlayColour = "0:102:171:5:0";
@ConfigOption(
- name = "Smooth AOTE",
+ name = "Smooth AOTE/AOTV/Hyp",
desc = ""
)
@ConfigEditorAccordion(id = 2)
@@ -133,7 +133,20 @@ public class ItemOverlays { minStep = 25
)
@ConfigAccordionId(id = 2)
- public int smoothTpMillis = 175;
+ public int smoothTpMillis = 125;
+
+ @Expose
+ @ConfigOption(
+ name = "Smooth TP Time (Etherwarp)",
+ desc = "Teleport smoothly to your destination when using AOTV Etherwarp"
+ )
+ @ConfigEditorSlider(
+ minValue = 0,
+ maxValue = 500,
+ minStep = 25
+ )
+ @ConfigAccordionId(id = 2)
+ public int smoothTpMillisEtherwarp = 50;
@Expose
@ConfigOption(
@@ -145,6 +158,31 @@ public class ItemOverlays { public boolean disableHyperionParticles = true;
@ConfigOption(
+ name = "Etherwarp",
+ desc = ""
+ )
+ @ConfigEditorAccordion(id = 7)
+ public boolean etherwarpAccordion = false;
+
+ @Expose
+ @ConfigOption(
+ name = "Etherwarp Zoom",
+ desc = "Zoom in on targeted blocks with etherwarp, making it easier to adjust at a distance"
+ )
+ @ConfigEditorBoolean
+ @ConfigAccordionId(id = 7)
+ public boolean etherwarpZoom = true;
+
+ @Expose
+ @ConfigOption(
+ name = "Highlight Colour",
+ desc = "Change the colour of the etherwarp target block outline"
+ )
+ @ConfigEditorColour
+ @ConfigAccordionId(id = 7)
+ public String etherwarpHighlightColour = "00:70:156:8:96";
+
+ @ConfigOption(
name = "Bonemerang Overlay",
desc = ""
)
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/StorageGUI.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/StorageGUI.java index 07e4ef86..114183d3 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/StorageGUI.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/StorageGUI.java @@ -23,7 +23,7 @@ public class StorageGUI { )
@ConfigEditorBoolean
@ConfigAccordionId(id = 1)
- public boolean enableStorageGUI2 = false;
+ public boolean enableStorageGUI3 = true;
@Expose
@ConfigOption(
|