diff options
13 files changed, 99 insertions, 68 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 a239e741..b16092ab 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java @@ -12,7 +12,7 @@ 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.options.seperateSections.*; -import io.github.moulberry.notenoughupdates.overlays.CustomArmour; +import io.github.moulberry.notenoughupdates.options.seperateSections.CustomArmour; import io.github.moulberry.notenoughupdates.overlays.MiningOverlay; import io.github.moulberry.notenoughupdates.overlays.OverlayManager; import io.github.moulberry.notenoughupdates.overlays.TextOverlay; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfigEditor.java b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfigEditor.java index da94d1e1..41739ece 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfigEditor.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfigEditor.java @@ -40,6 +40,7 @@ public class NEUConfigEditor extends GuiElement { GITHUB, TWITTER, YOUTUBE, + PATREON, TWITCH }; private static final String[] socialsLink = new String[]{ @@ -47,6 +48,7 @@ public class NEUConfigEditor extends GuiElement { "https://github.com/Moulberry/NotEnoughUpdates", "https://twitter.com/moulberry/", "https://www.youtube.com/channel/UCPh-OKmRSS3IQi9p6YppLcw", + "https://patreon.com/moulberry", "https://www.twitch.tv/moulberry2" }; diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHGraph.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHGraph.java index ce4c8f09..3e9cb4e4 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHGraph.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/AHGraph.java @@ -7,7 +7,7 @@ import org.lwjgl.input.Keyboard; public class AHGraph { @Expose @ConfigOption( - name = "Enabled", + name = "Enable AH/BZ Price Graph", desc = "Enable or disable the graph. Disabling this will also make it so that no price data is stored." ) @ConfigEditorBoolean diff --git a/src/main/java/io/github/moulberry/notenoughupdates/overlays/CustomArmour.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/CustomArmour.java index 35e325bb..5ebbeb46 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/overlays/CustomArmour.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/CustomArmour.java @@ -1,4 +1,4 @@ -package io.github.moulberry.notenoughupdates.overlays; +package io.github.moulberry.notenoughupdates.options.seperateSections; import com.google.gson.annotations.Expose; import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigEditorBoolean; @@ -9,7 +9,7 @@ public class CustomArmour { @Expose @ConfigOption( - name = "Enables Custom Amour Hud", + name = "Enable Custom Armour Hud", desc = "Shows an overlay in your inventory showing your 4 extra armour slots" ) @ConfigEditorBoolean diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Fishing.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Fishing.java index 61fcc559..e04bfe57 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Fishing.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Fishing.java @@ -22,7 +22,7 @@ public class Fishing { @Expose
@ConfigOption(
- name = "Fish Warning (R)",
+ name = "Enable Fish Warning (R)",
desc = "Display a red '!' when you need to pull the fish up. The warning takes your ping into account"
)
@ConfigEditorBoolean
@@ -31,7 +31,7 @@ public class Fishing { @Expose
@ConfigOption(
- name = "Fish Warning (Y)",
+ name = "Enable Fish Warning (Y)",
desc = "Display a yellow '!' when a fish is approaching your bobber"
)
@ConfigEditorBoolean
@@ -40,7 +40,7 @@ public class Fishing { @Expose
@ConfigOption(
- name = "Hooked Sound",
+ name = "Enable Hooked Sound",
desc = "Play a high-pitched ding sound when the '!' turns red"
)
@ConfigEditorBoolean
@@ -49,7 +49,7 @@ public class Fishing { @Expose
@ConfigOption(
- name = "Approach Sound",
+ name = "Enable Approach Sound",
desc = "Play low-pitched ding sounds while the yellow '!' is visible"
)
@ConfigEditorBoolean
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/LocationEdit.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/LocationEdit.java index dd5fcd64..6b9f6bee 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/LocationEdit.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/LocationEdit.java @@ -2,9 +2,7 @@ package io.github.moulberry.notenoughupdates.options.seperateSections; import com.google.gson.annotations.Expose; import io.github.moulberry.notenoughupdates.core.config.Position; -import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigAccordionId; -import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigEditorButton; -import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigOption; +import io.github.moulberry.notenoughupdates.core.config.annotations.*; public class LocationEdit { @Expose @@ -21,65 +19,62 @@ public class LocationEdit { @Expose @ConfigOption( - name = "Overlay Position", - desc = "Change the position of the Dwarven Mines information Overlay (commisions, powder & forge statuses)" + name = "Edit Pet Info Position", + desc = "The position of the pet info overlay." ) @ConfigEditorButton( - runnableId = 1, + runnableId = 4, buttonText = "Edit" ) - public Position overlayPosition = new Position(10, 100); + public Position petInfoPosition = new Position(-1, -1); @Expose @ConfigOption( - name = "Fuel Bar Position", - desc = "Set the position of the drill fuel bar" + name = "Edit Todo Position", + desc = "Change the position of the Todo overlay" ) @ConfigEditorButton( - runnableId = 2, + runnableId = 5, buttonText = "Edit" ) - public Position drillFuelBarPosition = new Position(0, -100, true, false); + @ConfigAccordionId(id = 0) + public Position todoPosition = new Position(100, 0); @Expose @ConfigOption( - name = "Farming Position", - desc = "Change the position of the Farming overlay" + name = "Edit Bonemerang Overlay Position", + desc = "The position of the Bonemerang overlay." ) @ConfigEditorButton( - runnableId = 3, + runnableId = 9, buttonText = "Edit" ) - public Position farmingPosition = new Position(10, 200); + public Position bonemerangPosition = new Position(-1, -1); @Expose @ConfigOption( - name = "Pet Info Position", - desc = "The position of the pet info." + name = "Edit Slayer Overlay Position", + desc = "Change the position of the Slayer overlay" ) @ConfigEditorButton( - runnableId = 4, + runnableId = 18, buttonText = "Edit" ) - public Position petInfoPosition = new Position(-1, -1); + public Position slayerPosition = new Position(10, 200); - @Expose @ConfigOption( - name = "Todo Position", - desc = "Change the position of the Todo overlay" - ) - @ConfigEditorButton( - runnableId = 5, - buttonText = "Edit" + name = "Inventory", + desc = "" ) - @ConfigAccordionId(id = 0) - public Position todoPosition = new Position(100, 0); + @ConfigEditorAccordion(id = 1) + public boolean inventoryAccordion = false; @Expose @ConfigOption( name = "Edit Toolbar Positions", desc = "Edit the position of the QuickCommands / Search Bar" ) + @ConfigAccordionId(id = 1) @ConfigEditorButton(runnableId = 6, buttonText = "Edit") public boolean positionButton = true; @@ -88,72 +83,105 @@ public class LocationEdit { name = "Open Button Editor", desc = "Open button editor GUI (/neubuttons)" ) + @ConfigAccordionId(id = 1) @ConfigEditorButton(runnableId = 7, buttonText = "Open") public boolean openEditorButton = true; + @ConfigOption( + name = "Mining Overlays", + desc = "" + ) + @ConfigEditorAccordion(id = 2) + public boolean miningoverlayAccordion = false; + @Expose @ConfigOption( - name = "Bonemerang Overlay Position", - desc = "The position of the Bonemerang overlay." + name = "Edit Dwarven Overlay Position", + desc = "Change the position of the Dwarven Mines information Overlay (commisions, powder & forge statuses)" ) @ConfigEditorButton( - runnableId = 9, + runnableId = 1, buttonText = "Edit" ) - public Position bonemerangPosition = new Position(-1, -1); + @ConfigAccordionId(id = 2) + public Position overlayPosition = new Position(10, 100); @Expose @ConfigOption( - name = "Overlay Position", + name = "Edit Crystal Overlay Position", desc = "Change the position of the Crystal Hollows Overlay." ) @ConfigEditorButton( runnableId = 10, buttonText = "Edit" ) + @ConfigAccordionId(id = 2) public Position crystalHollowOverlayPosition = new Position(200, 0); @Expose @ConfigOption( - name = "Mining Position", - desc = "Change the position of the Mining overlay" + name = "Edit Fuel Bar Position", + desc = "Set the position of the drill fuel bar" ) @ConfigEditorButton( - runnableId = 11, + runnableId = 2, buttonText = "Edit" ) - public Position miningPosition = new Position(10, 200); + @ConfigAccordionId(id = 2) + public Position drillFuelBarPosition = new Position(0, -100, true, false); + + @ConfigOption( + name = "Skill Overlays", + desc = "" + ) + @ConfigEditorAccordion(id = 3) + public boolean skilloverlayAccordion = false; @Expose @ConfigOption( - name = "Fishing Position", - desc = "Change the position of the Fishing overlay" + name = "Edit Farming Overlay Position", + desc = "Change the position of the Farming overlay" ) @ConfigEditorButton( - runnableId = 14, + runnableId = 3, buttonText = "Edit" ) - public Position fishingPosition = new Position(10, 200); + @ConfigAccordionId(id = 3) + public Position farmingPosition = new Position(10, 200); @Expose @ConfigOption( - name = "Slayer Position", - desc = "Change the position of the Slayer overlay" + name = "Edit Mining Overlay Position", + desc = "Change the position of the Mining overlay" ) @ConfigEditorButton( - runnableId = 18, + runnableId = 11, buttonText = "Edit" ) - public Position slayerPosition = new Position(10, 200); + @ConfigAccordionId(id = 3) + public Position miningPosition = new Position(10, 200); + + @Expose + @ConfigOption( + name = "Edit Fishing Overlay Position", + desc = "Change the position of the Fishing overlay" + ) + @ConfigEditorButton( + runnableId = 14, + buttonText = "Edit" + ) + @ConfigAccordionId(id = 3) + public Position fishingPosition = new Position(10, 200); @Expose @ConfigOption( - name = "Combat Position", + name = "Edit Combat Overlay Position", desc = "Change the position of the Combat overlay" ) @ConfigEditorButton( runnableId = 19, buttonText = "Edit" ) + @ConfigAccordionId(id = 3) public Position combatPosition = new Position(10, 200); } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Mining.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Mining.java index c5580011..eea442b5 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Mining.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/Mining.java @@ -83,7 +83,7 @@ public class Mining { @Expose
@ConfigOption(
- name = "Fuel Bar Position",
+ name = "Edit Fuel Bar Position",
desc = "Set the position of the drill fuel bar"
)
@ConfigEditorButton(
@@ -102,7 +102,7 @@ public class Mining { @Expose
@ConfigOption(
- name = "Dwarven Overlay",
+ name = "Enable Dwarven Overlay",
desc = "Show an Overlay with useful information on the screen while in Dwarven Mines"
)
@ConfigEditorBoolean
@@ -127,7 +127,7 @@ public class Mining { @Expose
@ConfigOption(
- name = "Overlay Position",
+ name = "Edit Dwarven Overlay Position",
desc = "Change the position of the Dwarven Mines information Overlay (commisions, powder & forge statuses)"
)
@ConfigEditorButton(
@@ -214,7 +214,7 @@ public class Mining { @Expose
@ConfigOption(
- name = "Enable Overlay",
+ name = "Enable Crystal Overlay",
desc = "Enables the Crystal Hollows Overlay."
)
@ConfigEditorBoolean
@@ -223,7 +223,7 @@ public class Mining { @Expose
@ConfigOption(
- name = "Overlay Position",
+ name = "Edit Crystal Overlay Position",
desc = "Change the position of the Crystal Hollows Overlay."
)
@ConfigEditorButton(
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/MiscOverlays.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/MiscOverlays.java index aec7b326..5749ced1 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/MiscOverlays.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/MiscOverlays.java @@ -247,7 +247,7 @@ public class MiscOverlays { @Expose @ConfigOption( - name = "Todo Position", + name = "Edit Todo Overlay Position", desc = "Change the position of the Todo overlay" ) @ConfigEditorButton( diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/PetOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/PetOverlay.java index a9140fe3..e8d385b5 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/PetOverlay.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/PetOverlay.java @@ -19,7 +19,7 @@ public class PetOverlay { @Expose
@ConfigOption(
- name = "Pet Info Position",
+ name = "Edit Pet Info Position",
desc = "The position of the pet info."
)
@ConfigEditorButton(
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SkillOverlays.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SkillOverlays.java index cc419380..92697cb4 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SkillOverlays.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SkillOverlays.java @@ -77,7 +77,7 @@ public class SkillOverlays { @Expose
@ConfigOption(
- name = "Farming Position",
+ name = "Edit Farming Overlay Position",
desc = "Change the position of the Farming overlay"
)
@ConfigEditorButton(
@@ -134,7 +134,7 @@ public class SkillOverlays { @Expose
@ConfigOption(
- name = "Mining Position",
+ name = "Edit Mining Overlay Position",
desc = "Change the position of the Mining overlay"
)
@ConfigEditorButton(
@@ -193,7 +193,7 @@ public class SkillOverlays { @Expose
@ConfigOption(
- name = "Fishing Position",
+ name = "Edit Fishing Overlay Position",
desc = "Change the position of the Fishing overlay"
)
@ConfigEditorButton(
@@ -284,7 +284,7 @@ public class SkillOverlays { @Expose
@ConfigOption(
- name = "Combat Position",
+ name = "Edit Combat Overlay Position",
desc = "Change the position of the Combat overlay"
)
@ConfigEditorButton(
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SlayerOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SlayerOverlay.java index de05c0f2..32da4691 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SlayerOverlay.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/SlayerOverlay.java @@ -21,7 +21,7 @@ public class SlayerOverlay { @Expose @ConfigOption( - name = "Slayer Overlay", + name = "Enable Slayer Overlay", desc = "Toggles the slayer overlay" ) @ConfigEditorBoolean @@ -46,7 +46,7 @@ public class SlayerOverlay { @Expose @ConfigOption( - name = "Slayer Position", + name = "Edit Slayer Overlay Position", desc = "Change the position of the Slayer overlay" ) @ConfigEditorButton( diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/GuiTextures.java b/src/main/java/io/github/moulberry/notenoughupdates/util/GuiTextures.java index fad58b17..60fd7f13 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/util/GuiTextures.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/util/GuiTextures.java @@ -24,9 +24,10 @@ public class GuiTextures { public static final ResourceLocation DISCORD = new ResourceLocation("notenoughupdates:social/discord.png"); public static final ResourceLocation GITHUB = new ResourceLocation("notenoughupdates:social/github.png"); - public static final ResourceLocation TWITCH = new ResourceLocation("notenoughupdates:social/twitch.png"); + public static final ResourceLocation PATREON = new ResourceLocation("notenoughupdates:social/patreon.png"); public static final ResourceLocation TWITTER = new ResourceLocation("notenoughupdates:social/twitter.png"); public static final ResourceLocation YOUTUBE = new ResourceLocation("notenoughupdates:social/youtube.png"); + public static final ResourceLocation TWITCH = new ResourceLocation("notenoughupdates:social/twitch.png"); public static final ResourceLocation item_mask = new ResourceLocation("notenoughupdates:item_mask.png"); public static final ResourceLocation item_haschild = new ResourceLocation("notenoughupdates:item_haschild.png"); diff --git a/src/main/resources/assets/notenoughupdates/social/patreon.png b/src/main/resources/assets/notenoughupdates/social/patreon.png Binary files differnew file mode 100644 index 00000000..00a169de --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/social/patreon.png |
