diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-03-29 23:06:37 +0200 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-03-29 23:06:37 +0200 |
| commit | 1241fa6c64a985663371e59c4c1a38ff55bacced (patch) | |
| tree | 7a98e67044a24bfe0b0014a8414980b2afe82934 /src/main/java/at/hannibal2/skyhanni/features | |
| parent | 35ff28ebf5e79481326d87296834709f16d639ba (diff) | |
| download | skyhanni-1241fa6c64a985663371e59c4c1a38ff55bacced.tar.gz skyhanni-1241fa6c64a985663371e59c4c1a38ff55bacced.tar.bz2 skyhanni-1241fa6c64a985663371e59c4c1a38ff55bacced.zip | |
dynamic optimal speed
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt | 6 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt | 21 |
2 files changed, 14 insertions, 13 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt index 769d3b4dd..18e701cb5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt @@ -4,13 +4,13 @@ enum class CropType(val cropName: String, val toolName: String) { WHEAT("Wheat", "THEORETICAL_HOE_WHEAT"), CARROT("Carrot", "THEORETICAL_HOE_CARROT"), POTATO("Potato", "THEORETICAL_HOE_POTATO"), + NETHER_WART("Nether Wart", "THEORETICAL_HOE_WARTS"), PUMPKIN("Pumpkin", "PUMPKIN_DICER"), - SUGAR_CANE("Sugar Cane", "THEORETICAL_HOE_CANE"), MELON("Melon", "MELON_DICER"), - CACTUS("Cactus", "CACTUS_KNIFE"), COCOA_BEANS("Cocoa Beans", "COCO_CHOPPER"), + SUGAR_CANE("Sugar Cane", "THEORETICAL_HOE_CANE"), + CACTUS("Cactus", "CACTUS_KNIFE"), MUSHROOM("Mushroom", "FUNGI_CUTTER"), - NETHER_WART("Nether Wart", "THEORETICAL_HOE_WARTS"), ; companion object { diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt index 41258efc1..1fa138455 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt @@ -13,6 +13,7 @@ import java.util.regex.Pattern class GardenOptimalSpeed { private val config get() = SkyHanniMod.feature.garden + private val configCustomSpeed get() = config.optimalSpeedCustom private var currentSpeed = 100 private var optimalSpeed = -1 private val currentSpeedPattern = Pattern.compile(" Speed: §r§f✦(.*)") @@ -38,16 +39,16 @@ class GardenOptimalSpeed { } private fun CropType.getOptimalSpeed() = when (this) { - CropType.WHEAT -> 93 - CropType.CARROT -> 93 - CropType.POTATO -> 93 - CropType.PUMPKIN -> 155 - CropType.SUGAR_CANE -> 328 - CropType.MELON -> 155 - CropType.CACTUS -> 400 // 500 with racing helmet - CropType.COCOA_BEANS -> 155 - CropType.MUSHROOM -> 233 - CropType.NETHER_WART -> 93 + CropType.WHEAT -> configCustomSpeed.wheat + CropType.CARROT -> configCustomSpeed.carrot + CropType.POTATO -> configCustomSpeed.potato + CropType.NETHER_WART -> configCustomSpeed.netherWart + CropType.PUMPKIN -> configCustomSpeed.pumpkin + CropType.MELON -> configCustomSpeed.melon + CropType.COCOA_BEANS -> configCustomSpeed.cocoaBeans + CropType.SUGAR_CANE -> configCustomSpeed.sugarCane + CropType.CACTUS -> configCustomSpeed.cactus + CropType.MUSHROOM -> configCustomSpeed.mushroom } @SubscribeEvent |