diff options
| author | Obsidian <108832807+Obsidianninja11@users.noreply.github.com> | 2024-04-09 10:31:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-09 20:31:59 +0200 |
| commit | 9ecd6441c1dcf5c19bb391a649e7c9363a676332 (patch) | |
| tree | b5f325b328f5d9fba7d2ccc79a3314eaa04ed016 /src/main/java/at/hannibal2/skyhanni/config | |
| parent | b0030c3fb3c6582ae0c42832d398e40ca1f6988b (diff) | |
| download | skyhanni-9ecd6441c1dcf5c19bb391a649e7c9363a676332.tar.gz skyhanni-9ecd6441c1dcf5c19bb391a649e7c9363a676332.tar.bz2 skyhanni-9ecd6441c1dcf5c19bb391a649e7c9363a676332.zip | |
Improvement + Fix: Added atmospheric display + fixed typo (#1131)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: Cal <cwolfson58@gmail.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/config')
4 files changed, 8 insertions, 7 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt index 9de3e4eba..e762273f0 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt @@ -11,7 +11,7 @@ import com.google.gson.JsonPrimitive object ConfigUpdaterMigrator { val logger = LorenzLogger("ConfigMigration") - const val CONFIG_VERSION = 32 + const val CONFIG_VERSION = 33 fun JsonElement.at(chain: List<String>, init: Boolean): JsonElement? { if (chain.isEmpty()) return this if (this !is JsonObject) return null diff --git a/src/main/java/at/hannibal2/skyhanni/config/enums/OutsideSbFeature.kt b/src/main/java/at/hannibal2/skyhanni/config/enums/OutsideSbFeature.kt index de4296955..c407de4f2 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/enums/OutsideSbFeature.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/enums/OutsideSbFeature.kt @@ -9,9 +9,10 @@ enum class OutsideSbFeature(private val displayName: String) { TPS_DISPLAY("TPS Display"), MARKED_PLAYERS("Marked Players"), FARMING_WEIGHT("Farming Weight"), - NEXT_JACOB_CONTEXT("Next Jacobs's Context"), + NEXT_JACOB_CONTEST("Next Jacobs's Contest"), COMPOSTER_TIME("Composter Time"), YAW_AND_PITCH("Yaw and Pitch"), + ATMOSPHERIC_FILTER("Atmospheric Filter"), QUICK_MOD_MENU_SWITCH("Quick Mod Menu Switch"), FOLLOWING_LINE("Following Line"), ARROW_TRAIL("Arrow Trail"), diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/AtmosphericFilterDisplayConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/AtmosphericFilterDisplayConfig.java index 23a0ae259..543cd252b 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/AtmosphericFilterDisplayConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/AtmosphericFilterDisplayConfig.java @@ -34,13 +34,13 @@ public class AtmosphericFilterDisplayConfig { @Expose @ConfigOption(name = "Outside Garden", desc = "Shows this HUD everywhere, including outside of the Garden.") @ConfigEditorBoolean - public boolean everywhere = false; + public boolean outsideGarden = false; @Expose @ConfigLink(owner = AtmosphericFilterDisplayConfig.class, field = "enabled") public Position position = new Position(10, 10, true, true); @Expose - @ConfigLink(owner = AtmosphericFilterDisplayConfig.class, field = "everywhere") + @ConfigLink(owner = AtmosphericFilterDisplayConfig.class, field = "outsideGarden") public Position positionOutside = new Position(20, 20, true, true); } diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java index 794eb7692..7f1cdf79d 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java @@ -184,7 +184,7 @@ public class GardenConfig { ) @ConfigEditorBoolean @FeatureToggle - public boolean jacobContextTimes = true; + public boolean jacobContestTimes = true; @Expose @ConfigOption( @@ -205,8 +205,8 @@ public class GardenConfig { public double jacobContestCustomBpsValue = 19.9; @Expose - @ConfigLink(owner = GardenConfig.class, field = "jacobContextTimes") - public Position jacobContextTimesPos = new Position(-359, 149, false, true); + @ConfigLink(owner = GardenConfig.class, field = "jacobContestTimes") + public Position jacobContestTimesPosition = new Position(-359, 149, false, true); @Expose @ConfigOption( |