diff options
Diffstat (limited to 'src')
13 files changed, 26 insertions, 25 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt index 3d5bff605..079565b39 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt @@ -167,7 +167,7 @@ import at.hannibal2.skyhanni.features.garden.contest.JacobFarmingContestsInvento import at.hannibal2.skyhanni.features.garden.farming.ArmorDropTracker import at.hannibal2.skyhanni.features.garden.farming.CropMoneyDisplay import at.hannibal2.skyhanni.features.garden.farming.CropSpeedMeter -import at.hannibal2.skyhanni.features.garden.farming.DicerDropTracker +import at.hannibal2.skyhanni.features.garden.farming.DicerRngDropTracker import at.hannibal2.skyhanni.features.garden.farming.FarmingWeightDisplay import at.hannibal2.skyhanni.features.garden.farming.GardenBurrowingSporesNotifier import at.hannibal2.skyhanni.features.garden.farming.GardenCropMilestoneDisplay @@ -550,7 +550,7 @@ class SkyHanniMod { loadModule(GardenDeskInSBMenu()) loadModule(GardenLevelDisplay()) loadModule(FarmingWeightDisplay()) - loadModule(DicerDropTracker) + loadModule(DicerRngDropTracker) loadModule(CropMoneyDisplay) loadModule(JacobFarmingContestsInventory()) loadModule(GardenNextJacobContest) diff --git a/src/main/java/at/hannibal2/skyhanni/config/Storage.java b/src/main/java/at/hannibal2/skyhanni/config/Storage.java index d18fe3546..07641b44c 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/Storage.java +++ b/src/main/java/at/hannibal2/skyhanni/config/Storage.java @@ -14,7 +14,7 @@ import at.hannibal2.skyhanni.features.garden.CropAccessory; import at.hannibal2.skyhanni.features.garden.CropType; import at.hannibal2.skyhanni.features.garden.GardenPlotAPI; import at.hannibal2.skyhanni.features.garden.farming.ArmorDropTracker; -import at.hannibal2.skyhanni.features.garden.farming.DicerDropTracker; +import at.hannibal2.skyhanni.features.garden.farming.DicerRngDropTracker; import at.hannibal2.skyhanni.features.garden.fortuneguide.FarmingItems; import at.hannibal2.skyhanni.features.garden.visitor.VisitorReward; import at.hannibal2.skyhanni.features.mining.powdertracker.PowderTracker; @@ -182,7 +182,7 @@ public class Storage { public CropAccessory savedCropAccessory = null; @Expose - public DicerDropTracker.Data dicerDropTracker = new DicerDropTracker.Data(); + public DicerRngDropTracker.Data dicerDropTracker = new DicerRngDropTracker.Data(); @Expose public long informedAboutLowMatter = 0; diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt index a8bf4bb20..da54eb54e 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt @@ -29,7 +29,7 @@ import at.hannibal2.skyhanni.features.garden.composter.ComposterOverlay import at.hannibal2.skyhanni.features.garden.farming.ArmorDropTracker import at.hannibal2.skyhanni.features.garden.farming.CropMoneyDisplay import at.hannibal2.skyhanni.features.garden.farming.CropSpeedMeter -import at.hannibal2.skyhanni.features.garden.farming.DicerDropTracker +import at.hannibal2.skyhanni.features.garden.farming.DicerRngDropTracker import at.hannibal2.skyhanni.features.garden.farming.FarmingWeightDisplay import at.hannibal2.skyhanni.features.garden.farming.GardenStartLocation import at.hannibal2.skyhanni.features.garden.fortuneguide.CaptureFarmingGear @@ -173,7 +173,7 @@ object Commands { ) { clearFarmingItems() } registerCommand("shresetghostcounter", "Resets the ghost counter") { GhostUtil.reset() } registerCommand("shresetpowdertracker", "Resets the Powder Tracker") { PowderTracker.resetCommand(it) } - registerCommand("shresetdicertracker", "Resets the Dicer Drop Tracker") { DicerDropTracker.resetCommand(it) } + registerCommand("shresetdicertracker", "Resets the Dicer Drop Tracker") { DicerRngDropTracker.resetCommand(it) } registerCommand( "shresetendernodetracker", "Resets the Ender Node Tracker" diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/FarmingArmorDropsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/ArmorDropTrackerConfig.java index 64d04f932..f1b488b26 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/FarmingArmorDropsConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/ArmorDropTrackerConfig.java @@ -6,12 +6,12 @@ import com.google.gson.annotations.Expose; import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; import io.github.moulberry.moulconfig.annotations.ConfigOption; -public class FarmingArmorDropsConfig { +public class ArmorDropTrackerConfig { @Expose - @ConfigOption(name = "Show Counter", desc = "Count all §9Cropie§7, §5Squash §7and §6Fermento §7dropped.") + @ConfigOption(name = "Enabled", desc = "Track all §9Cropie§7, §5Squash §7and §6Fermento §7dropped.") @ConfigEditorBoolean @FeatureToggle - public boolean enabled = true; + public boolean enabled = false; @Expose @ConfigOption(name = "Hide Chat", desc = "Hide the chat message when receiving a farming armor drop.") diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/DicerCounterConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/DicerRngDropTrackerConfig.java index 63087dab1..fb7614375 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/DicerCounterConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/DicerRngDropTrackerConfig.java @@ -6,9 +6,9 @@ import com.google.gson.annotations.Expose; import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; import io.github.moulberry.moulconfig.annotations.ConfigOption; -public class DicerCounterConfig { +public class DicerRngDropTrackerConfig { @Expose - @ConfigOption(name = "RNG Drop Counter", desc = "Count RNG drops for Melon Dicer and Pumpkin Dicer.") + @ConfigOption(name = "Enable Tracker", desc = "Track RNG drops for Melon Dicer and Pumpkin Dicer.") @ConfigEditorBoolean @FeatureToggle public boolean display = true; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/FarmingFortuneConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/FarmingFortuneConfig.java index ff5f6c62d..73c32a0fa 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/FarmingFortuneConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/FarmingFortuneConfig.java @@ -16,7 +16,7 @@ public class FarmingFortuneConfig { ) @ConfigEditorBoolean @FeatureToggle - public boolean display = true; + public boolean display = false; @ConfigOption(name = "Farming Fortune Guide", desc = "Opens a guide that breaks down your Farming Fortune.\n§eCommand: /ff") @ConfigEditorButton(buttonText = "Open") 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 77e497b5e..b541cd0ee 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 @@ -55,9 +55,10 @@ public class GardenConfig { public EliteFarmingWeightConfig eliteFarmingWeights = new EliteFarmingWeightConfig(); @Expose - @ConfigOption(name = "Dicer Counter", desc = "") + @ConfigOption(name = "Dicer RNG Drop Tracker", desc = "") @Accordion - public DicerCounterConfig dicerCounters = new DicerCounterConfig(); + // TODO rename to dicerRngDropTracker + public DicerRngDropTrackerConfig dicerCounters = new DicerRngDropTrackerConfig(); @Expose @ConfigOption(name = "Money per Hour", desc = "") @@ -70,10 +71,10 @@ public class GardenConfig { public NextJacobContestConfig nextJacobContests = new NextJacobContestConfig(); @Expose - @ConfigOption(name = "Farming Armor Drops", desc = "") - + @ConfigOption(name = "Armor Drop Tracker", desc = "") @Accordion - public FarmingArmorDropsConfig farmingArmorDrop = new FarmingArmorDropsConfig(); + // TODO renmae to armorDropTracker + public ArmorDropTrackerConfig farmingArmorDrop = new ArmorDropTrackerConfig(); @Expose @ConfigOption(name = "Anita Shop", desc = "") diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenLevelConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenLevelConfig.java index 07f330dcd..cbb3bbe7f 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenLevelConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenLevelConfig.java @@ -11,7 +11,7 @@ public class GardenLevelConfig { @ConfigOption(name = "Display", desc = "Show the current Garden level and progress to the next level.") @ConfigEditorBoolean @FeatureToggle - public boolean display = true; + public boolean display = false; @Expose public Position pos = new Position(390, 40, false, true); diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/MoneyPerHourConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/MoneyPerHourConfig.java index 77c9eddc2..5bea2c4ba 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/MoneyPerHourConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/MoneyPerHourConfig.java @@ -24,7 +24,7 @@ public class MoneyPerHourConfig { "Supports Bountiful, Mushroom Cow Perk, Armor Crops and Dicer Drops. Their toggles are below.") @ConfigEditorBoolean @FeatureToggle - public boolean display = true; + public boolean display = false; // TODO moulconfig runnable support @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/composter/ComposterConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/composter/ComposterConfig.java index ab8d1a703..a2be38643 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/composter/ComposterConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/composter/ComposterConfig.java @@ -98,7 +98,7 @@ public class ComposterConfig { ) @ConfigEditorBoolean @FeatureToggle - public boolean displayEnabled = true; + public boolean displayEnabled = false; @Expose @ConfigOption( diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/NextConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/NextConfig.java index 1145ca7d5..d1609e322 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/NextConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/cropmilestones/NextConfig.java @@ -17,7 +17,7 @@ public class NextConfig { desc = "Lists all crops and their ETA till next milestone. Sorts for best crop for getting garden or SkyBlock levels.") @ConfigEditorBoolean @FeatureToggle - public boolean bestDisplay = true; + public boolean bestDisplay = false; // TODO moulconfig runnable support @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/OptimalSpeedConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/OptimalSpeedConfig.java index 672f1f21e..4b3a18b6e 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/OptimalSpeedConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalspeed/OptimalSpeedConfig.java @@ -13,7 +13,7 @@ public class OptimalSpeedConfig { "(Thanks MelonKingDE for the default values).") @ConfigEditorBoolean @FeatureToggle - public boolean showOnHUD = true; + public boolean showOnHUD = false; @Expose @ConfigOption(name = "Warning Title", desc = "Warn via title when you don't have the optimal speed.") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerDropTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt index b347d6dfe..bc6db268c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerDropTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropTracker.kt @@ -19,10 +19,10 @@ import com.google.gson.annotations.Expose import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.util.regex.Pattern -object DicerDropTracker { +object DicerRngDropTracker { private val itemDrops = mutableListOf<ItemDrop>() private val config get() = GardenAPI.config.dicerCounters - private val tracker = SkyHanniTracker("Dicer Drop Tracker", { Data() }, { it.garden.dicerDropTracker }) + private val tracker = SkyHanniTracker("Dicer Rng Drop Tracker", { Data() }, { it.garden.dicerDropTracker }) { drawDisplay(it) } class Data : TrackerData() { @@ -92,7 +92,7 @@ object DicerDropTracker { private fun drawDisplay(storage: Data) = buildList<List<Any>> { val cropInHand = cropInHand ?: return@buildList val items = storage.drops.getOrPut(cropInHand) { mutableMapOf() } - addAsSingletonList("§7Dicer Drop Tracker for $toolName§7:") + addAsSingletonList("§7Dicer Rng Drop Tracker for $toolName§7:") for ((rarity, amount) in items.sortedDesc()) { val displayName = rarity.displayName addAsSingletonList(" §7- §e${amount.addSeparators()}x $displayName") |