diff --git a/CHANGELOG.md b/CHANGELOG.md index d8aca58..9c4a515 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Forge Recommended Versioning](https://mcforge.readthedocs.io/en/latest/conventions/versioning/). +## [1.21-6.4.1.0] - 2024-08-31 +### Changed +- number config options are now text fields instead of sliders (Fabric) + ## [1.21-6.4.0.0] - 2024-07-18 ### Changed - updated NeoForge to 21.0.102-beta for better model registering diff --git a/common/src/main/resources/assets/usefulhats/lang/en_us.json b/common/src/main/resources/assets/usefulhats/lang/en_us.json index 13e896e..06dfe4a 100644 --- a/common/src/main/resources/assets/usefulhats/lang/en_us.json +++ b/common/src/main/resources/assets/usefulhats/lang/en_us.json @@ -71,43 +71,50 @@ "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.DURABILITY": "Durability", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.DURABILITY.@Tooltip[0]": "§6§lDurability", - "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.DURABILITY.@Tooltip[1]": "§7§oDefault: 600", + "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.DURABILITY.@Tooltip[1]": "§7§oMin: 1; Max: 10000", + "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.DURABILITY.@Tooltip[2]": "§7§oDefault: 600", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_0": "Effect time: No Efficiency", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_0.@Tooltip[0]": "§6§lEffect time: No Efficiency", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_0.@Tooltip[1]": "Aquanaut Helmet effect time of Conduit Power", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_0.@Tooltip[2]": "without Efficiency enchantment. (in seconds)", - "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_0.@Tooltip[3]": "§7§oDefault: 120", + "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_0.@Tooltip[3]": "§7§oMin: 10; Max 120", + "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_0.@Tooltip[4]": "§7§oDefault: 60", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_1": "Effect time: Efficiency I", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_1.@Tooltip[0]": "§6§lEffect time: Efficiency I", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_1.@Tooltip[1]": "Aquanaut Helmet effect time of Conduit Power", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_1.@Tooltip[2]": "with Efficiency I. (in seconds)", - "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_1.@Tooltip[3]": "§7§oDefault: 180", + "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_1.@Tooltip[3]": "§7§oMin: 10; Max 180", + "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_1.@Tooltip[4]": "§7§oDefault: 120", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_2": "Effect time: Efficiency II", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_2.@Tooltip[0]": "§6§lEffect time: Efficiency II", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_2.@Tooltip[1]": "Aquanaut Helmet effect time of Conduit Power", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_2.@Tooltip[2]": "with Efficiency II. (in seconds)", - "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_2.@Tooltip[3]": "§7§oDefault: 240", + "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_2.@Tooltip[3]": "§7§oMin: 10; Max 240", + "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_2.@Tooltip[4]": "§7§oDefault: 180", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_3": "Effect time: Efficiency III", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_3.@Tooltip[0]": "§6§lEffect time: Efficiency III", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_3.@Tooltip[1]": "Aquanaut Helmet effect time of Conduit Power", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_3.@Tooltip[2]": "with Efficiency III. (in seconds)", - "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_3.@Tooltip[3]": "§7§oDefault: 300", + "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_3.@Tooltip[3]": "§7§oMin: 10; Max 300", + "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_3.@Tooltip[4]": "§7§oDefault: 240", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_4": "Effect time: Efficiency IV", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_4.@Tooltip[0]": "§6§lEffect time: Efficiency IV", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_4.@Tooltip[1]": "Aquanaut Helmet effect time of Conduit Power", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_4.@Tooltip[2]": "with Efficiency IV. (in seconds)", - "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_4.@Tooltip[3]": "§7§oDefault: 360", + "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_4.@Tooltip[3]": "§7§oMin: 10; Max 360", + "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_4.@Tooltip[4]": "§7§oDefault: 300", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_5": "Effect time: Efficiency V", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_5.@Tooltip[0]": "§6§lEffect time: Efficiency V", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_5.@Tooltip[1]": "Aquanaut Helmet effect time of Conduit Power", "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_5.@Tooltip[2]": "with Efficiency V. (in seconds)", - "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_5.@Tooltip[3]": "§7§oDefault: 420", + "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_5.@Tooltip[3]": "§7§oMin: 10; Max 420", + "text.autoconfig.usefulhats.option.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_5.@Tooltip[4]": "§7§oDefault: 360", "text.autoconfig.usefulhats.option.BUNNY_EARS": "Bunny Ears", "text.autoconfig.usefulhats.option.BUNNY_EARS.@Tooltip[0]": "§6§lBunny Ears", @@ -120,7 +127,8 @@ "text.autoconfig.usefulhats.option.BUNNY_EARS.DURABILITY": "Durability", "text.autoconfig.usefulhats.option.BUNNY_EARS.DURABILITY.@Tooltip[0]": "§6§lDurability", - "text.autoconfig.usefulhats.option.BUNNY_EARS.DURABILITY.@Tooltip[1]": "§7§oDefault: 450", + "text.autoconfig.usefulhats.option.BUNNY_EARS.DURABILITY.@Tooltip[1]": "§7§oMin: 1; Max: 10000", + "text.autoconfig.usefulhats.option.BUNNY_EARS.DURABILITY.@Tooltip[2]": "§7§oDefault: 450", "text.autoconfig.usefulhats.option.CHOPPING_HAT": "Chopping Hat", "text.autoconfig.usefulhats.option.CHOPPING_HAT.@Tooltip[0]": "§6§lChopping Hat", @@ -133,43 +141,50 @@ "text.autoconfig.usefulhats.option.CHOPPING_HAT.DURABILITY": "Durability", "text.autoconfig.usefulhats.option.CHOPPING_HAT.DURABILITY.@Tooltip[0]": "§6§lDurability", - "text.autoconfig.usefulhats.option.CHOPPING_HAT.DURABILITY.@Tooltip[1]": "§7§oDefault: 300", + "text.autoconfig.usefulhats.option.CHOPPING_HAT.DURABILITY.@Tooltip[1]": "§7§oMin: 1; Max: 10000", + "text.autoconfig.usefulhats.option.CHOPPING_HAT.DURABILITY.@Tooltip[2]": "§7§oDefault: 300", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_0": "Chopping speed increase: no Efficiency", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_0.@Tooltip[0]": "§6§lChopping speed increase: no Efficiency", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_0.@Tooltip[1]": "Chopping speed increase without", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_0.@Tooltip[2]": "Efficiency enchantment. (percent)", - "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_0.@Tooltip[3]": "§7§oDefault: 20", + "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_0.@Tooltip[3]": "§7§oMin: 0; Max: 500", + "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_0.@Tooltip[4]": "§7§oDefault: 20", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_1": "Chopping speed increase: Efficiency I", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_1.@Tooltip[0]": "§6§lChopping speed increase: Efficiency I", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_1.@Tooltip[1]": "Chopping speed increase with", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_1.@Tooltip[2]": "Efficiency I enchantment. (percent)", - "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_1.@Tooltip[3]": "§7§oDefault: 40", + "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_1.@Tooltip[3]": "§7§oMin: 0; Max: 500", + "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_1.@Tooltip[4]": "§7§oDefault: 40", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_2": "Chopping speed increase: Efficiency II", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_2.@Tooltip[0]": "§6§lChopping speed increase: Efficiency II", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_2.@Tooltip[1]": "Chopping speed increase with", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_2.@Tooltip[2]": "Efficiency II enchantment. (percent)", - "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_2.@Tooltip[3]": "§7§oDefault: 60", + "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_2.@Tooltip[3]": "§7§oMin: 0; Max: 500", + "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_2.@Tooltip[4]": "§7§oDefault: 60", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_3": "Chopping speed increase: Efficiency III", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_3.@Tooltip[0]": "§6§lChopping speed increase: Efficiency III", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_3.@Tooltip[1]": "Chopping speed increase with", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_3.@Tooltip[2]": "Efficiency III enchantment. (percent)", - "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_3.@Tooltip[3]": "§7§oDefault: 80", + "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_3.@Tooltip[3]": "§7§oMin: 0; Max: 500", + "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_3.@Tooltip[4]": "§7§oDefault: 80", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_4": "Chopping speed increase: Efficiency IV", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_4.@Tooltip[0]": "§6§lChopping speed increase: Efficiency IV", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_4.@Tooltip[1]": "Chopping speed increase with", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_4.@Tooltip[2]": "Efficiency IV enchantment. (percent)", - "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_4.@Tooltip[3]": "§7§oDefault: 100", + "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_4.@Tooltip[3]": "§7§oMin: 0; Max: 500", + "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_4.@Tooltip[4]": "§7§oDefault: 100", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_5": "Chopping speed increase: Efficiency V", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_5.@Tooltip[0]": "§6§lChopping speed increase: Efficiency V", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_5.@Tooltip[1]": "Chopping speed increase with", "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_5.@Tooltip[2]": "Efficiency V enchantment. (percent)", - "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_5.@Tooltip[3]": "§7§oDefault: 150", + "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_5.@Tooltip[3]": "§7§oMin: 0; Max: 500", + "text.autoconfig.usefulhats.option.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_5.@Tooltip[4]": "§7§oDefault: 150", "text.autoconfig.usefulhats.option.ENDER_HELMET": "Ender Helmet", "text.autoconfig.usefulhats.option.ENDER_HELMET.@Tooltip[0]": "§6§lEnder Helmet", @@ -182,7 +197,8 @@ "text.autoconfig.usefulhats.option.ENDER_HELMET.DURABILITY": "Durability", "text.autoconfig.usefulhats.option.ENDER_HELMET.DURABILITY.@Tooltip[0]": "§6§lDurability", - "text.autoconfig.usefulhats.option.ENDER_HELMET.DURABILITY.@Tooltip[1]": "§7§oDefault: 80", + "text.autoconfig.usefulhats.option.ENDER_HELMET.DURABILITY.@Tooltip[1]": "§7§oMin: 1; Max: 10000", + "text.autoconfig.usefulhats.option.ENDER_HELMET.DURABILITY.@Tooltip[2]": "§7§oDefault: 80", "text.autoconfig.usefulhats.option.ENDER_HELMET.INTERDIMENSIONAL_ENABLED": "Interdimensional teleporting enabled", "text.autoconfig.usefulhats.option.ENDER_HELMET.INTERDIMENSIONAL_ENABLED.@Tooltip[0]": "§6§lInterdimensional teleporting enabled", @@ -201,7 +217,8 @@ "text.autoconfig.usefulhats.option.HALO.DURABILITY": "Durability", "text.autoconfig.usefulhats.option.HALO.DURABILITY.@Tooltip[0]": "§6§lDurability", - "text.autoconfig.usefulhats.option.HALO.DURABILITY.@Tooltip[1]": "§7§oDefault: 600", + "text.autoconfig.usefulhats.option.HALO.DURABILITY.@Tooltip[1]": "§7§oMin: 1; Max: 10000", + "text.autoconfig.usefulhats.option.HALO.DURABILITY.@Tooltip[2]": "§7§oDefault: 600", "text.autoconfig.usefulhats.option.LUCKY_HAT": "Lucky Hat", "text.autoconfig.usefulhats.option.LUCKY_HAT.@Tooltip[0]": "§6§lLucky Hat", @@ -214,7 +231,8 @@ "text.autoconfig.usefulhats.option.LUCKY_HAT.DURABILITY": "Durability", "text.autoconfig.usefulhats.option.LUCKY_HAT.DURABILITY.@Tooltip[0]": "§6§lDurability", - "text.autoconfig.usefulhats.option.LUCKY_HAT.DURABILITY.@Tooltip[1]": "§7§oDefault: 300", + "text.autoconfig.usefulhats.option.LUCKY_HAT.DURABILITY.@Tooltip[1]": "§7§oMin: 1; Max: 10000", + "text.autoconfig.usefulhats.option.LUCKY_HAT.DURABILITY.@Tooltip[2]": "§7§oDefault: 300", "text.autoconfig.usefulhats.option.LUCKY_HAT.UNLUCK_ENABLED": "Unluck effect enabled", "text.autoconfig.usefulhats.option.LUCKY_HAT.UNLUCK_ENABLED.@Tooltip[0]": "§6§lUnluck effect enabled", @@ -233,7 +251,8 @@ "text.autoconfig.usefulhats.option.MINING_HAT.DURABILITY": "Durability", "text.autoconfig.usefulhats.option.MINING_HAT.DURABILITY.@Tooltip[0]": "§6§lDurability", - "text.autoconfig.usefulhats.option.MINING_HAT.DURABILITY.@Tooltip[1]": "§7§oDefault: 450", + "text.autoconfig.usefulhats.option.MINING_HAT.DURABILITY.@Tooltip[1]": "§7§oMin: 1; Max: 10000", + "text.autoconfig.usefulhats.option.MINING_HAT.DURABILITY.@Tooltip[2]": "§7§oDefault: 450", "text.autoconfig.usefulhats.option.MINING_HAT.NIGHT_VISION_ENABLED": "Night Vision effect enabled", "text.autoconfig.usefulhats.option.MINING_HAT.NIGHT_VISION_ENABLED.@Tooltip[0]": "§6§lNight Vision effect enabled", @@ -251,37 +270,43 @@ "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_0.@Tooltip[0]": "§6§lMining Speed increase: no Efficiency", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_0.@Tooltip[1]": "Mining speed increase without", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_0.@Tooltip[2]": "Efficiency enchantment. (percent)", - "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_0.@Tooltip[3]": "§7§oDefault: 20", + "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_0.@Tooltip[3]": "§7§oMin: 0; Max: 500", + "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_0.@Tooltip[4]": "§7§oDefault: 20", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_1": "Mining Speed increase: Efficiency I", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_1.@Tooltip[0]": "§6§lMining Speed increase: Efficiency I", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_1.@Tooltip[1]": "Mining speed increase with", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_1.@Tooltip[2]": "Efficiency I enchantment. (percent)", - "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_1.@Tooltip[3]": "§7§oDefault: 40", + "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_1.@Tooltip[3]": "§7§oMin: 0; Max: 500", + "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_1.@Tooltip[4]": "§7§oDefault: 40", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_2": "Mining Speed increase: Efficiency II", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_2.@Tooltip[0]": "§6§lMining Speed increase: Efficiency II", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_2.@Tooltip[1]": "Mining speed increase with", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_2.@Tooltip[2]": "Efficiency II enchantment. (percent)", - "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_2.@Tooltip[3]": "§7§oDefault: 60", + "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_2.@Tooltip[3]": "§7§oMin: 0; Max: 500", + "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_2.@Tooltip[4]": "§7§oDefault: 60", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_3": "Mining Speed increase: Efficiency III", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_3.@Tooltip[0]": "§6§lMining Speed increase: Efficiency III", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_3.@Tooltip[1]": "Mining speed increase with", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_3.@Tooltip[2]": "Efficiency III enchantment. (percent)", - "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_3.@Tooltip[3]": "§7§oDefault: 80", + "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_3.@Tooltip[3]": "§7§oMin: 0; Max: 500", + "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_3.@Tooltip[4]": "§7§oDefault: 80", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_4": "Mining Speed increase: Efficiency IV", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_4.@Tooltip[0]": "§6§lMining Speed increase: Efficiency IV", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_4.@Tooltip[1]": "Mining speed increase with", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_4.@Tooltip[2]": "Efficiency IV enchantment. (percent)", - "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_4.@Tooltip[3]": "§7§oDefault: 100", + "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_4.@Tooltip[3]": "§7§oMin: 0; Max: 500", + "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_4.@Tooltip[4]": "§7§oDefault: 100", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_5": "Mining Speed increase: Efficiency V", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_5.@Tooltip[0]": "§6§lMining Speed increase: Efficiency V", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_5.@Tooltip[1]": "Mining speed increase with", "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_5.@Tooltip[2]": "Efficiency V enchantment. (percent)", - "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_5.@Tooltip[3]": "§7§oDefault: 150", + "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_5.@Tooltip[3]": "§7§oMin: 0; Max: 500", + "text.autoconfig.usefulhats.option.MINING_HAT.SPEED_WITH_EFFICIENCY_5.@Tooltip[4]": "§7§oDefault: 150", "text.autoconfig.usefulhats.option.MUSHROOM_HAT": "Mushroom Hat", "text.autoconfig.usefulhats.option.MUSHROOM_HAT.@Tooltip[0]": "§6§Mushroom Hat", @@ -294,13 +319,15 @@ "text.autoconfig.usefulhats.option.MUSHROOM_HAT.DURABILITY": "Durability", "text.autoconfig.usefulhats.option.MUSHROOM_HAT.DURABILITY.@Tooltip[0]": "§6§lDurability", - "text.autoconfig.usefulhats.option.MUSHROOM_HAT.DURABILITY.@Tooltip[1]": "§7§oDefault: 80", + "text.autoconfig.usefulhats.option.MUSHROOM_HAT.DURABILITY.@Tooltip[1]": "§7§oMin: 1; Max: 10000", + "text.autoconfig.usefulhats.option.MUSHROOM_HAT.DURABILITY.@Tooltip[2]": "§7§oDefault: 80", "text.autoconfig.usefulhats.option.MUSHROOM_HAT.EAT_INTERVAL": "Eat interval", "text.autoconfig.usefulhats.option.MUSHROOM_HAT.EAT_INTERVAL.@Tooltip[0]": "§6§lEat interval", "text.autoconfig.usefulhats.option.MUSHROOM_HAT.EAT_INTERVAL.@Tooltip[1]": "Interval the Mushroom Hat is eaten", "text.autoconfig.usefulhats.option.MUSHROOM_HAT.EAT_INTERVAL.@Tooltip[2]": "by the player. (in ticks)", - "text.autoconfig.usefulhats.option.MUSHROOM_HAT.EAT_INTERVAL.@Tooltip[3]": "§7§oDefault: 60 (3 seconds)", + "text.autoconfig.usefulhats.option.MUSHROOM_HAT.EAT_INTERVAL.@Tooltip[3]": "§7§oMin: 1; Max: 10000", + "text.autoconfig.usefulhats.option.MUSHROOM_HAT.EAT_INTERVAL.@Tooltip[4]": "§7§oDefault: 60 (3 seconds)", "text.autoconfig.usefulhats.option.POSTMAN_HAT": "Postman Hat", "text.autoconfig.usefulhats.option.POSTMAN_HAT.@Tooltip[0]": "§6§Postman Hat", @@ -313,7 +340,8 @@ "text.autoconfig.usefulhats.option.POSTMAN_HAT.DURABILITY": "Durability", "text.autoconfig.usefulhats.option.POSTMAN_HAT.DURABILITY.@Tooltip[0]": "§6§lDurability", - "text.autoconfig.usefulhats.option.POSTMAN_HAT.DURABILITY.@Tooltip[1]": "§7§oDefault: 600", + "text.autoconfig.usefulhats.option.POSTMAN_HAT.DURABILITY.@Tooltip[1]": "§7§oMin: 1; Max: 10000", + "text.autoconfig.usefulhats.option.POSTMAN_HAT.DURABILITY.@Tooltip[2]": "§7§oDefault: 600", "text.autoconfig.usefulhats.option.POSTMAN_HAT.HUNGER_ENABLED": "Hunger effect enabled", "text.autoconfig.usefulhats.option.POSTMAN_HAT.HUNGER_ENABLED.@Tooltip[0]": "§6§lHunger effect enabled", @@ -332,7 +360,8 @@ "text.autoconfig.usefulhats.option.SHULKER_HELMET.DURABILITY": "Durability", "text.autoconfig.usefulhats.option.SHULKER_HELMET.DURABILITY.@Tooltip[0]": "§6§lDurability", - "text.autoconfig.usefulhats.option.SHULKER_HELMET.DURABILITY.@Tooltip[1]": "§7§oDefault: 600", + "text.autoconfig.usefulhats.option.SHULKER_HELMET.DURABILITY.@Tooltip[1]": "§7§oMin: 1; Max: 10000", + "text.autoconfig.usefulhats.option.SHULKER_HELMET.DURABILITY.@Tooltip[2]": "§7§oDefault: 600", "text.autoconfig.usefulhats.option.STOCKING_CAP": "Stocking Cap", "text.autoconfig.usefulhats.option.STOCKING_CAP.@Tooltip[0]": "§6§Stocking Cap", @@ -345,7 +374,8 @@ "text.autoconfig.usefulhats.option.STOCKING_CAP.DURABILITY": "Durability", "text.autoconfig.usefulhats.option.STOCKING_CAP.DURABILITY.@Tooltip[0]": "§6§lDurability", - "text.autoconfig.usefulhats.option.STOCKING_CAP.DURABILITY.@Tooltip[1]": "§7§oDefault: 600", + "text.autoconfig.usefulhats.option.STOCKING_CAP.DURABILITY.@Tooltip[1]": "§7§oMin: 1; Max: 10000", + "text.autoconfig.usefulhats.option.STOCKING_CAP.DURABILITY.@Tooltip[2]": "§7§oDefault: 600", "text.autoconfig.usefulhats.option.STRAW_HAT": "Straw Hat", "text.autoconfig.usefulhats.option.STRAW_HAT.@Tooltip[0]": "§6§lStraw Hat", @@ -358,43 +388,50 @@ "text.autoconfig.usefulhats.option.STRAW_HAT.DURABILITY": "Durability", "text.autoconfig.usefulhats.option.STRAW_HAT.DURABILITY.@Tooltip[0]": "§6§lDurability", - "text.autoconfig.usefulhats.option.STRAW_HAT.DURABILITY.@Tooltip[1]": "§7§oDefault: 300", + "text.autoconfig.usefulhats.option.STRAW_HAT.DURABILITY.@Tooltip[1]": "§7§oMin: 1; Max: 10000", + "text.autoconfig.usefulhats.option.STRAW_HAT.DURABILITY.@Tooltip[2]": "§7§oDefault: 300", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_0": "Mining Speed increase: no Efficiency", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_0.@Tooltip[0]": "§6§lMining Speed increase: no Efficiency", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_0.@Tooltip[1]": "Mining speed increase without", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_0.@Tooltip[2]": "Efficiency enchantment. (percent)", - "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_0.@Tooltip[3]": "§7§oDefault: 20", + "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_0.@Tooltip[3]": "§7§oMin: 0; Max: 500", + "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_0.@Tooltip[4]": "§7§oDefault: 20", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_1": "Mining Speed increase: Efficiency I", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_1.@Tooltip[0]": "§6§lMining Speed increase: Efficiency I", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_1.@Tooltip[1]": "Mining speed increase with", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_1.@Tooltip[2]": "Efficiency I enchantment. (percent)", - "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_1.@Tooltip[3]": "§7§oDefault: 40", + "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_1.@Tooltip[3]": "§7§oMin: 0; Max: 500", + "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_1.@Tooltip[4]": "§7§oDefault: 40", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_2": "Mining Speed increase: Efficiency II", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_2.@Tooltip[0]": "§6§lMining Speed increase: Efficiency II", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_2.@Tooltip[1]": "Mining speed increase with", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_2.@Tooltip[2]": "Efficiency II enchantment. (percent)", - "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_2.@Tooltip[3]": "§7§oDefault: 60", + "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_2.@Tooltip[3]": "§7§oMin: 0; Max: 500", + "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_2.@Tooltip[4]": "§7§oDefault: 60", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_3": "Mining Speed increase: Efficiency III", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_3.@Tooltip[0]": "§6§lMining Speed increase: Efficiency III", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_3.@Tooltip[1]": "Mining speed increase with", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_3.@Tooltip[2]": "Efficiency III enchantment. (percent)", - "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_3.@Tooltip[3]": "§7§oDefault: 80", + "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_3.@Tooltip[3]": "§7§oMin: 0; Max: 500", + "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_3.@Tooltip[4]": "§7§oDefault: 80", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_4": "Mining Speed increase: Efficiency IV", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_4.@Tooltip[0]": "§6§lMining Speed increase: Efficiency IV", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_4.@Tooltip[1]": "Mining speed increase with", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_4.@Tooltip[2]": "Efficiency IV enchantment. (percent)", - "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_4.@Tooltip[3]": "§7§oDefault: 100", + "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_4.@Tooltip[3]": "§7§oMin: 0; Max: 500", + "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_4.@Tooltip[4]": "§7§oDefault: 100", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_5": "Mining Speed increase: Efficiency V", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_5.@Tooltip[0]": "§6§lMining Speed increase: Efficiency V", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_5.@Tooltip[1]": "Mining speed increase with", "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_5.@Tooltip[2]": "Efficiency V enchantment. (percent)", - "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_5.@Tooltip[3]": "§7§oDefault: 150", + "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_5.@Tooltip[3]": "§7§oMin: 0; Max: 500", + "text.autoconfig.usefulhats.option.STRAW_HAT.SPEED_WITH_EFFICIENCY_5.@Tooltip[4]": "§7§oDefault: 150", "text.autoconfig.usefulhats.option.WING_HELMET": "Wing Helmet", "text.autoconfig.usefulhats.option.WING_HELMET.@Tooltip[0]": "§6§Wing Helmet", @@ -407,7 +444,8 @@ "text.autoconfig.usefulhats.option.WING_HELMET.DURABILITY": "Durability", "text.autoconfig.usefulhats.option.WING_HELMET.DURABILITY.@Tooltip[0]": "§6§lDurability", - "text.autoconfig.usefulhats.option.WING_HELMET.DURABILITY.@Tooltip[1]": "§7§oDefault: 600", + "text.autoconfig.usefulhats.option.WING_HELMET.DURABILITY.@Tooltip[1]": "§7§oMin: 1; Max: 10000", + "text.autoconfig.usefulhats.option.WING_HELMET.DURABILITY.@Tooltip[2]": "§7§oDefault: 600", "text.autoconfig.usefulhats.option.WING_HELMET.LEVITATION_ENABLED": "Levitation effect enabled", "text.autoconfig.usefulhats.option.WING_HELMET.LEVITATION_ENABLED.@Tooltip[0]": "§6§lLevitation effect enabled", diff --git a/fabric/src/main/java/de/cech12/usefulhats/platform/FabricConfigHelper.java b/fabric/src/main/java/de/cech12/usefulhats/platform/FabricConfigHelper.java index 94596b5..13f7db5 100644 --- a/fabric/src/main/java/de/cech12/usefulhats/platform/FabricConfigHelper.java +++ b/fabric/src/main/java/de/cech12/usefulhats/platform/FabricConfigHelper.java @@ -23,26 +23,19 @@ public static final class AquanautHelmet implements ConfigData { @ConfigEntry.Gui.Tooltip(count = 3) public boolean DAMAGE_ENABLED = AQUANAUT_HELMET_DAMAGE_ENABLED_DEFAULT; @ConfigEntry.Gui.Tooltip(count = 2) - @ConfigEntry.BoundedDiscrete(min = AQUANAUT_HELMET_DURABILITY_MIN, max = AQUANAUT_HELMET_DURABILITY_MAX) - public long DURABILITY = AQUANAUT_HELMET_DURABILITY_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_0_MIN, max = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_0_MAX) - public long EFFECT_TIME_WITH_EFFICIENCY_0 = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_0_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_1_MIN, max = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_1_MAX) - public long EFFECT_TIME_WITH_EFFICIENCY_1 = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_1_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_2_MIN, max = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_2_MAX) - public long EFFECT_TIME_WITH_EFFICIENCY_2 = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_2_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_3_MIN, max = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_3_MAX) - public long EFFECT_TIME_WITH_EFFICIENCY_3 = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_3_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_4_MIN, max = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_4_MAX) - public long EFFECT_TIME_WITH_EFFICIENCY_4 = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_4_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_5_MIN, max = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_5_MAX) - public long EFFECT_TIME_WITH_EFFICIENCY_5 = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_5_DEFAULT; + public int DURABILITY = AQUANAUT_HELMET_DURABILITY_DEFAULT; + @ConfigEntry.Gui.Tooltip(count = 5) + public int EFFECT_TIME_WITH_EFFICIENCY_0 = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_0_DEFAULT; + @ConfigEntry.Gui.Tooltip(count = 5) + public int EFFECT_TIME_WITH_EFFICIENCY_1 = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_1_DEFAULT; + @ConfigEntry.Gui.Tooltip(count = 5) + public int EFFECT_TIME_WITH_EFFICIENCY_2 = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_2_DEFAULT; + @ConfigEntry.Gui.Tooltip(count = 5) + public int EFFECT_TIME_WITH_EFFICIENCY_3 = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_3_DEFAULT; + @ConfigEntry.Gui.Tooltip(count = 5) + public int EFFECT_TIME_WITH_EFFICIENCY_4 = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_4_DEFAULT; + @ConfigEntry.Gui.Tooltip(count = 5) + public int EFFECT_TIME_WITH_EFFICIENCY_5 = AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_5_DEFAULT; private AquanautHelmet() {} } @@ -54,9 +47,8 @@ private AquanautHelmet() {} public static final class BunnyEars implements ConfigData { @ConfigEntry.Gui.Tooltip(count = 3) public boolean DAMAGE_ENABLED = BUNNY_EARS_DAMAGE_ENABLED_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 2) - @ConfigEntry.BoundedDiscrete(min = BUNNY_EARS_DURABILITY_MIN, max = BUNNY_EARS_DURABILITY_MAX) - public long DURABILITY = BUNNY_EARS_DURABILITY_DEFAULT; + @ConfigEntry.Gui.Tooltip(count = 3) + public int DURABILITY = BUNNY_EARS_DURABILITY_DEFAULT; private BunnyEars() {} } @@ -68,27 +60,20 @@ private BunnyEars() {} public static final class ChoppingHat implements ConfigData { @ConfigEntry.Gui.Tooltip(count = 3) public boolean DAMAGE_ENABLED = CHOPPING_HAT_DAMAGE_ENABLED_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 2) - @ConfigEntry.BoundedDiscrete(min = CHOPPING_HAT_DURABILITY_MIN, max = CHOPPING_HAT_DURABILITY_MAX) - public long DURABILITY = CHOPPING_HAT_DURABILITY_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = (long) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_0_MIN * 100), max = (long) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_0_MAX * 100)) - public long SPEED_WITH_EFFICIENCY_0 = (long) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_0_DEFAULT * 100); - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = (long) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_1_MIN * 100), max = (long) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_1_MAX * 100)) - public long SPEED_WITH_EFFICIENCY_1 = (long) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_1_DEFAULT * 100); - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = (long) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_2_MIN * 100), max = (long) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_2_MAX * 100)) - public long SPEED_WITH_EFFICIENCY_2 = (long) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_2_DEFAULT * 100); - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = (long) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_3_MIN * 100), max = (long) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_3_MAX * 100)) - public long SPEED_WITH_EFFICIENCY_3 = (long) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_3_DEFAULT * 100); - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = (long) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_4_MIN * 100), max = (long) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_4_MAX * 100)) - public long SPEED_WITH_EFFICIENCY_4 = (long) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_4_DEFAULT * 100); - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = (long) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_5_MIN * 100), max = (long) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_5_MAX * 100)) - public long SPEED_WITH_EFFICIENCY_5 = (long) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_5_DEFAULT * 100); + @ConfigEntry.Gui.Tooltip(count = 3) + public int DURABILITY = CHOPPING_HAT_DURABILITY_DEFAULT; + @ConfigEntry.Gui.Tooltip(count = 5) + public int SPEED_WITH_EFFICIENCY_0 = (int) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_0_DEFAULT * 100); + @ConfigEntry.Gui.Tooltip(count = 5) + public int SPEED_WITH_EFFICIENCY_1 = (int) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_1_DEFAULT * 100); + @ConfigEntry.Gui.Tooltip(count = 5) + public int SPEED_WITH_EFFICIENCY_2 = (int) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_2_DEFAULT * 100); + @ConfigEntry.Gui.Tooltip(count = 5) + public int SPEED_WITH_EFFICIENCY_3 = (int) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_3_DEFAULT * 100); + @ConfigEntry.Gui.Tooltip(count = 5) + public int SPEED_WITH_EFFICIENCY_4 = (int) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_4_DEFAULT * 100); + @ConfigEntry.Gui.Tooltip(count = 5) + public int SPEED_WITH_EFFICIENCY_5 = (int) (CHOPPING_HAT_SPEED_WITH_EFFICIENCY_5_DEFAULT * 100); private ChoppingHat() {} } @@ -100,9 +85,8 @@ private ChoppingHat() {} public static final class EnderHelmet implements ConfigData { @ConfigEntry.Gui.Tooltip(count = 3) public boolean DAMAGE_ENABLED = ENDER_HELMET_DAMAGE_ENABLED_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 2) - @ConfigEntry.BoundedDiscrete(min = ENDER_HELMET_DURABILITY_MIN, max = ENDER_HELMET_DURABILITY_MAX) - public long DURABILITY = ENDER_HELMET_DURABILITY_DEFAULT; + @ConfigEntry.Gui.Tooltip(count = 3) + public int DURABILITY = ENDER_HELMET_DURABILITY_DEFAULT; @ConfigEntry.Gui.Tooltip(count = 4) public boolean INTERDIMENSIONAL_ENABLED = ENDER_HELMET_INTERDIMENSIONAL_ENABLED_DEFAULT; @@ -116,9 +100,8 @@ private EnderHelmet() {} public static final class Halo implements ConfigData { @ConfigEntry.Gui.Tooltip(count = 3) public boolean DAMAGE_ENABLED = HALO_DAMAGE_ENABLED_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 2) - @ConfigEntry.BoundedDiscrete(min = HALO_DURABILITY_MIN, max = HALO_DURABILITY_MAX) - public long DURABILITY = HALO_DURABILITY_DEFAULT; + @ConfigEntry.Gui.Tooltip(count = 3) + public int DURABILITY = HALO_DURABILITY_DEFAULT; } @ConfigEntry.Gui.CollapsibleObject @@ -128,9 +111,8 @@ public static final class Halo implements ConfigData { public static final class LuckyHat implements ConfigData { @ConfigEntry.Gui.Tooltip(count = 3) public boolean DAMAGE_ENABLED = LUCKY_HAT_DAMAGE_ENABLED_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 2) - @ConfigEntry.BoundedDiscrete(min = LUCKY_HAT_DURABILITY_MIN, max = LUCKY_HAT_DURABILITY_MAX) - public long DURABILITY = LUCKY_HAT_DURABILITY_DEFAULT; + @ConfigEntry.Gui.Tooltip(count = 3) + public int DURABILITY = LUCKY_HAT_DURABILITY_DEFAULT; @ConfigEntry.Gui.Tooltip(count = 4) public boolean UNLUCK_ENABLED = LUCKY_HAT_UNLUCK_ENABLED_DEFAULT; @@ -144,31 +126,24 @@ private LuckyHat() {} public static final class MiningHat implements ConfigData { @ConfigEntry.Gui.Tooltip(count = 3) public boolean DAMAGE_ENABLED = MINING_HAT_DAMAGE_ENABLED_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 2) - @ConfigEntry.BoundedDiscrete(min = MINING_HAT_DURABILITY_MIN, max = MINING_HAT_DURABILITY_MAX) - public long DURABILITY = MINING_HAT_DURABILITY_DEFAULT; + @ConfigEntry.Gui.Tooltip(count = 3) + public int DURABILITY = MINING_HAT_DURABILITY_DEFAULT; @ConfigEntry.Gui.Tooltip(count = 4) public boolean NIGHT_VISION_ENABLED = MINING_HAT_NIGHT_VISION_ENABLED_DEFAULT; @ConfigEntry.Gui.Tooltip(count = 4) public boolean MAKE_PIGLINS_NEUTRAL_ENABLED = MINING_HAT_MAKE_PIGLINS_NEUTRAL_ENABLED_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = (long) (MINING_HAT_SPEED_WITH_EFFICIENCY_0_MIN * 100), max = (long) (MINING_HAT_SPEED_WITH_EFFICIENCY_0_MAX * 100)) - public long SPEED_WITH_EFFICIENCY_0 = (long) (MINING_HAT_SPEED_WITH_EFFICIENCY_0_DEFAULT * 100); - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = (long) (MINING_HAT_SPEED_WITH_EFFICIENCY_1_MIN * 100), max = (long) (MINING_HAT_SPEED_WITH_EFFICIENCY_1_MAX * 100)) - public long SPEED_WITH_EFFICIENCY_1 = (long) (MINING_HAT_SPEED_WITH_EFFICIENCY_1_DEFAULT * 100); - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = (long) (MINING_HAT_SPEED_WITH_EFFICIENCY_2_MIN * 100), max = (long) (MINING_HAT_SPEED_WITH_EFFICIENCY_2_MAX * 100)) - public long SPEED_WITH_EFFICIENCY_2 = (long) (MINING_HAT_SPEED_WITH_EFFICIENCY_2_DEFAULT * 100); - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = (long) (MINING_HAT_SPEED_WITH_EFFICIENCY_3_MIN * 100), max = (long) (MINING_HAT_SPEED_WITH_EFFICIENCY_3_MAX * 100)) - public long SPEED_WITH_EFFICIENCY_3 = (long) (MINING_HAT_SPEED_WITH_EFFICIENCY_3_DEFAULT * 100); - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = (long) (MINING_HAT_SPEED_WITH_EFFICIENCY_4_MIN * 100), max = (long) (MINING_HAT_SPEED_WITH_EFFICIENCY_4_MAX * 100)) - public long SPEED_WITH_EFFICIENCY_4 = (long) (MINING_HAT_SPEED_WITH_EFFICIENCY_4_DEFAULT * 100); - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = (long) (MINING_HAT_SPEED_WITH_EFFICIENCY_5_MIN * 100), max = (long) (MINING_HAT_SPEED_WITH_EFFICIENCY_5_MAX * 100)) - public long SPEED_WITH_EFFICIENCY_5 = (long) (MINING_HAT_SPEED_WITH_EFFICIENCY_5_DEFAULT * 100); + @ConfigEntry.Gui.Tooltip(count = 5) + public int SPEED_WITH_EFFICIENCY_0 = (int) (MINING_HAT_SPEED_WITH_EFFICIENCY_0_DEFAULT * 100); + @ConfigEntry.Gui.Tooltip(count = 5) + public int SPEED_WITH_EFFICIENCY_1 = (int) (MINING_HAT_SPEED_WITH_EFFICIENCY_1_DEFAULT * 100); + @ConfigEntry.Gui.Tooltip(count = 5) + public int SPEED_WITH_EFFICIENCY_2 = (int) (MINING_HAT_SPEED_WITH_EFFICIENCY_2_DEFAULT * 100); + @ConfigEntry.Gui.Tooltip(count = 5) + public int SPEED_WITH_EFFICIENCY_3 = (int) (MINING_HAT_SPEED_WITH_EFFICIENCY_3_DEFAULT * 100); + @ConfigEntry.Gui.Tooltip(count = 5) + public int SPEED_WITH_EFFICIENCY_4 = (int) (MINING_HAT_SPEED_WITH_EFFICIENCY_4_DEFAULT * 100); + @ConfigEntry.Gui.Tooltip(count = 5) + public int SPEED_WITH_EFFICIENCY_5 = (int) (MINING_HAT_SPEED_WITH_EFFICIENCY_5_DEFAULT * 100); private MiningHat() {} } @@ -180,12 +155,10 @@ private MiningHat() {} public static final class MushroomHat implements ConfigData { @ConfigEntry.Gui.Tooltip(count = 3) public boolean DAMAGE_ENABLED = MUSHROOM_HAT_DAMAGE_ENABLED_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 2) - @ConfigEntry.BoundedDiscrete(min = MUSHROOM_HAT_DURABILITY_MIN, max = MUSHROOM_HAT_DURABILITY_MAX) - public long DURABILITY = MUSHROOM_HAT_DURABILITY_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = MUSHROOM_HAT_EAT_INTERVAL_MIN, max = MUSHROOM_HAT_EAT_INTERVAL_MAX) - public long EAT_INTERVAL = MUSHROOM_HAT_EAT_INTERVAL_DEFAULT; + @ConfigEntry.Gui.Tooltip(count = 3) + public int DURABILITY = MUSHROOM_HAT_DURABILITY_DEFAULT; + @ConfigEntry.Gui.Tooltip(count = 5) + public int EAT_INTERVAL = MUSHROOM_HAT_EAT_INTERVAL_DEFAULT; private MushroomHat() {} } @@ -197,9 +170,8 @@ private MushroomHat() {} public static final class PostmanHat implements ConfigData { @ConfigEntry.Gui.Tooltip(count = 3) public boolean DAMAGE_ENABLED = POSTMAN_HAT_DAMAGE_ENABLED_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 2) - @ConfigEntry.BoundedDiscrete(min = POSTMAN_HAT_DURABILITY_MIN, max = POSTMAN_HAT_DURABILITY_MAX) - public long DURABILITY = POSTMAN_HAT_DURABILITY_DEFAULT; + @ConfigEntry.Gui.Tooltip(count = 3) + public int DURABILITY = POSTMAN_HAT_DURABILITY_DEFAULT; @ConfigEntry.Gui.Tooltip(count = 4) public boolean HUNGER_ENABLED = POSTMAN_HAT_HUNGER_ENABLED_DEFAULT; @@ -214,9 +186,8 @@ private PostmanHat() {} public static final class ShulkerHelmet implements ConfigData { @ConfigEntry.Gui.Tooltip(count = 3) public boolean DAMAGE_ENABLED = SHULKER_HELMET_DAMAGE_ENABLED_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 2) - @ConfigEntry.BoundedDiscrete(min = SHULKER_HELMET_DURABILITY_MIN, max = SHULKER_HELMET_DURABILITY_MAX) - public long DURABILITY = SHULKER_HELMET_DURABILITY_DEFAULT; + @ConfigEntry.Gui.Tooltip(count = 3) + public int DURABILITY = SHULKER_HELMET_DURABILITY_DEFAULT; private ShulkerHelmet() {} } @@ -228,9 +199,8 @@ private ShulkerHelmet() {} public static final class StockingCap implements ConfigData { @ConfigEntry.Gui.Tooltip(count = 3) public boolean DAMAGE_ENABLED = STOCKING_CAP_DAMAGE_ENABLED_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 2) - @ConfigEntry.BoundedDiscrete(min = STOCKING_CAP_DURABILITY_MIN, max = STOCKING_CAP_DURABILITY_MAX) - public long DURABILITY = STOCKING_CAP_DURABILITY_DEFAULT; + @ConfigEntry.Gui.Tooltip(count = 3) + public int DURABILITY = STOCKING_CAP_DURABILITY_DEFAULT; private StockingCap() {} } @@ -242,27 +212,20 @@ private StockingCap() {} public static final class StrawHat implements ConfigData { @ConfigEntry.Gui.Tooltip(count = 3) public boolean DAMAGE_ENABLED = STRAW_HAT_DAMAGE_ENABLED_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 2) - @ConfigEntry.BoundedDiscrete(min = STRAW_HAT_DURABILITY_MIN, max = STRAW_HAT_DURABILITY_MAX) - public long DURABILITY = STRAW_HAT_DURABILITY_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = (long) (STRAW_HAT_SPEED_WITH_EFFICIENCY_0_MIN * 100), max = (long) (STRAW_HAT_SPEED_WITH_EFFICIENCY_0_MAX * 100)) - public long SPEED_WITH_EFFICIENCY_0 = (long) (STRAW_HAT_SPEED_WITH_EFFICIENCY_0_DEFAULT * 100); - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = (long) (STRAW_HAT_SPEED_WITH_EFFICIENCY_1_MIN * 100), max = (long) (STRAW_HAT_SPEED_WITH_EFFICIENCY_1_MAX * 100)) - public long SPEED_WITH_EFFICIENCY_1 = (long) (STRAW_HAT_SPEED_WITH_EFFICIENCY_1_DEFAULT * 100); - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = (long) (STRAW_HAT_SPEED_WITH_EFFICIENCY_2_MIN * 100), max = (long) (STRAW_HAT_SPEED_WITH_EFFICIENCY_2_MAX * 100)) - public long SPEED_WITH_EFFICIENCY_2 = (long) (STRAW_HAT_SPEED_WITH_EFFICIENCY_2_DEFAULT * 100); - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = (long) (STRAW_HAT_SPEED_WITH_EFFICIENCY_3_MIN * 100), max = (long) (STRAW_HAT_SPEED_WITH_EFFICIENCY_3_MAX * 100)) - public long SPEED_WITH_EFFICIENCY_3 = (long) (STRAW_HAT_SPEED_WITH_EFFICIENCY_3_DEFAULT * 100); - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = (long) (STRAW_HAT_SPEED_WITH_EFFICIENCY_4_MIN * 100), max = (long) (STRAW_HAT_SPEED_WITH_EFFICIENCY_4_MAX * 100)) - public long SPEED_WITH_EFFICIENCY_4 = (long) (STRAW_HAT_SPEED_WITH_EFFICIENCY_4_DEFAULT * 100); - @ConfigEntry.Gui.Tooltip(count = 4) - @ConfigEntry.BoundedDiscrete(min = (long) (STRAW_HAT_SPEED_WITH_EFFICIENCY_5_MIN * 100), max = (long) (STRAW_HAT_SPEED_WITH_EFFICIENCY_5_MAX * 100)) - public long SPEED_WITH_EFFICIENCY_5 = (long) (STRAW_HAT_SPEED_WITH_EFFICIENCY_5_DEFAULT * 100); + @ConfigEntry.Gui.Tooltip(count = 3) + public int DURABILITY = STRAW_HAT_DURABILITY_DEFAULT; + @ConfigEntry.Gui.Tooltip(count = 5) + public int SPEED_WITH_EFFICIENCY_0 = (int) (STRAW_HAT_SPEED_WITH_EFFICIENCY_0_DEFAULT * 100); + @ConfigEntry.Gui.Tooltip(count = 5) + public int SPEED_WITH_EFFICIENCY_1 = (int) (STRAW_HAT_SPEED_WITH_EFFICIENCY_1_DEFAULT * 100); + @ConfigEntry.Gui.Tooltip(count = 5) + public int SPEED_WITH_EFFICIENCY_2 = (int) (STRAW_HAT_SPEED_WITH_EFFICIENCY_2_DEFAULT * 100); + @ConfigEntry.Gui.Tooltip(count = 5) + public int SPEED_WITH_EFFICIENCY_3 = (int) (STRAW_HAT_SPEED_WITH_EFFICIENCY_3_DEFAULT * 100); + @ConfigEntry.Gui.Tooltip(count = 5) + public int SPEED_WITH_EFFICIENCY_4 = (int) (STRAW_HAT_SPEED_WITH_EFFICIENCY_4_DEFAULT * 100); + @ConfigEntry.Gui.Tooltip(count = 5) + public int SPEED_WITH_EFFICIENCY_5 = (int) (STRAW_HAT_SPEED_WITH_EFFICIENCY_5_DEFAULT * 100); private StrawHat() {} } @@ -274,9 +237,8 @@ private StrawHat() {} public static final class WingHelmet implements ConfigData { @ConfigEntry.Gui.Tooltip(count = 3) public boolean DAMAGE_ENABLED = WING_HELMET_DAMAGE_ENABLED_DEFAULT; - @ConfigEntry.Gui.Tooltip(count = 2) - @ConfigEntry.BoundedDiscrete(min = WING_HELMET_DURABILITY_MIN, max = WING_HELMET_DURABILITY_MAX) - public long DURABILITY = WING_HELMET_DURABILITY_DEFAULT; + @ConfigEntry.Gui.Tooltip(count = 3) + public int DURABILITY = WING_HELMET_DURABILITY_DEFAULT; @ConfigEntry.Gui.Tooltip(count = 4) public boolean LEVITATION_ENABLED = WING_HELMET_LEVITATION_ENABLED_DEFAULT; @@ -292,40 +254,36 @@ private FabricConfigHelper getConfig() { return AutoConfig.getConfigHolder(FabricConfigHelper.class).getConfig(); } - private int getInteger(long config) { - return (int) config; - } - - private int getEnchantmentInteger(int enchantmentLevel, long config0, long config1, long config2, long config3, long config4, long config5) { + private int getEnchantmentInteger(int enchantmentLevel, int config0, int config1, int config2, int config3, int config4, int config5) { if (enchantmentLevel < 0) { - return getInteger(config0); + return config0; } - return getInteger(switch (enchantmentLevel) { + return switch (enchantmentLevel) { case 0 -> config0; case 1 -> config1; case 2 -> config2; case 3 -> config3; case 4 -> config4; default -> config5; - }); + }; } - private double getDouble(long config) { + private double getDouble(int config) { return config / 100D; } - private double getEnchantmentDouble(int enchantmentLevel, long config0, long config1, long config2, long config3, long config4, long config5) { + private double getEnchantmentDouble(int enchantmentLevel, double config0, double config1, double config2, double config3, double config4, double config5) { if (enchantmentLevel < 0) { - return getDouble(config0); + return config0; } - return getDouble(switch (enchantmentLevel) { + return switch (enchantmentLevel) { case 0 -> config0; case 1 -> config1; case 2 -> config2; case 3 -> config3; case 4 -> config4; default -> config5; - }); + }; } @Override @@ -335,19 +293,19 @@ public boolean isAquanautHelmetDamageEnabled() { @Override public int getAquanautHelmetDurability() { - return getInteger(getConfig().AQUANAUT_HELMET.DURABILITY); + return Math.clamp(getConfig().AQUANAUT_HELMET.DURABILITY, AQUANAUT_HELMET_DURABILITY_MIN, AQUANAUT_HELMET_DURABILITY_MAX); } @Override public int getAquanautHelmetEffectTimeWithEfficiency(int enchantmentLevel) { FabricConfigHelper config = getConfig(); return getEnchantmentInteger(enchantmentLevel, - config.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_0, - config.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_1, - config.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_2, - config.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_3, - config.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_4, - config.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_5 + Math.clamp(config.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_0, AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_0_MIN, AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_0_MAX), + Math.clamp(config.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_1, AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_1_MIN, AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_1_MAX), + Math.clamp(config.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_2, AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_2_MIN, AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_2_MAX), + Math.clamp(config.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_3, AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_3_MIN, AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_3_MAX), + Math.clamp(config.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_4, AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_4_MIN, AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_4_MAX), + Math.clamp(config.AQUANAUT_HELMET.EFFECT_TIME_WITH_EFFICIENCY_5, AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_5_MIN, AQUANAUT_HELMET_EFFECT_TIME_WITH_EFFICIENCY_5_MAX) ); } @@ -358,7 +316,7 @@ public boolean isBunnyEarsDamageEnabled() { @Override public int getBunnyEarsDurability() { - return getInteger(getConfig().getConfig().BUNNY_EARS.DURABILITY); + return Math.clamp(getConfig().getConfig().BUNNY_EARS.DURABILITY, BUNNY_EARS_DURABILITY_MIN, BUNNY_EARS_DURABILITY_MAX); } @Override @@ -368,19 +326,19 @@ public boolean isChoppingHatDamageEnabled() { @Override public int getChoppingHatDurability() { - return getInteger(getConfig().CHOPPING_HAT.DURABILITY); + return Math.clamp(getConfig().CHOPPING_HAT.DURABILITY, CHOPPING_HAT_DURABILITY_MIN, CHOPPING_HAT_DURABILITY_MAX); } @Override public double getChoppingHatSpeedWithEfficiency(int enchantmentLevel) { FabricConfigHelper config = getConfig(); return getEnchantmentDouble(enchantmentLevel, - config.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_0, - config.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_1, - config.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_2, - config.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_3, - config.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_4, - config.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_5 + Math.clamp(getDouble(config.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_0), CHOPPING_HAT_SPEED_WITH_EFFICIENCY_0_MIN, CHOPPING_HAT_SPEED_WITH_EFFICIENCY_0_MAX), + Math.clamp(getDouble(config.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_1), CHOPPING_HAT_SPEED_WITH_EFFICIENCY_1_MIN, CHOPPING_HAT_SPEED_WITH_EFFICIENCY_1_MAX), + Math.clamp(getDouble(config.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_2), CHOPPING_HAT_SPEED_WITH_EFFICIENCY_2_MIN, CHOPPING_HAT_SPEED_WITH_EFFICIENCY_2_MAX), + Math.clamp(getDouble(config.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_3), CHOPPING_HAT_SPEED_WITH_EFFICIENCY_3_MIN, CHOPPING_HAT_SPEED_WITH_EFFICIENCY_3_MAX), + Math.clamp(getDouble(config.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_4), CHOPPING_HAT_SPEED_WITH_EFFICIENCY_4_MIN, CHOPPING_HAT_SPEED_WITH_EFFICIENCY_4_MAX), + Math.clamp(getDouble(config.CHOPPING_HAT.SPEED_WITH_EFFICIENCY_5), CHOPPING_HAT_SPEED_WITH_EFFICIENCY_5_MIN, CHOPPING_HAT_SPEED_WITH_EFFICIENCY_5_MAX) ); } @@ -391,7 +349,7 @@ public boolean isEnderHelmetDamageEnabled() { @Override public int getEnderHelmetDurability() { - return getInteger(getConfig().ENDER_HELMET.DURABILITY); + return Math.clamp(getConfig().ENDER_HELMET.DURABILITY, ENDER_HELMET_DURABILITY_MIN, ENDER_HELMET_DURABILITY_MAX); } @Override @@ -406,7 +364,7 @@ public boolean isHaloDamageEnabled() { @Override public int getHaloDurability() { - return getInteger(getConfig().HALO.DURABILITY); + return Math.clamp(getConfig().HALO.DURABILITY, HALO_DURABILITY_MIN, HALO_DURABILITY_MAX); } @Override @@ -416,7 +374,7 @@ public boolean isLuckyHatDamageEnabled() { @Override public int getLuckyHatDurability() { - return getInteger(getConfig().LUCKY_HAT.DURABILITY); + return Math.clamp(getConfig().LUCKY_HAT.DURABILITY, LUCKY_HAT_DURABILITY_MIN, LUCKY_HAT_DURABILITY_MAX); } @Override @@ -431,7 +389,7 @@ public boolean isMiningHatDamageEnabled() { @Override public int getMiningHatDurability() { - return getInteger(getConfig().MINING_HAT.DURABILITY); + return Math.clamp(getConfig().MINING_HAT.DURABILITY, MINING_HAT_DURABILITY_MIN, MINING_HAT_DURABILITY_MAX); } @Override @@ -448,12 +406,12 @@ public boolean isMiningHatMakePiglinsNeutralEnabled() { public double getMiningHatSpeedWithEfficiency(int enchantmentLevel) { FabricConfigHelper config = getConfig(); return getEnchantmentDouble(enchantmentLevel, - config.MINING_HAT.SPEED_WITH_EFFICIENCY_0, - config.MINING_HAT.SPEED_WITH_EFFICIENCY_1, - config.MINING_HAT.SPEED_WITH_EFFICIENCY_2, - config.MINING_HAT.SPEED_WITH_EFFICIENCY_3, - config.MINING_HAT.SPEED_WITH_EFFICIENCY_4, - config.MINING_HAT.SPEED_WITH_EFFICIENCY_5 + Math.clamp(getDouble(config.MINING_HAT.SPEED_WITH_EFFICIENCY_0), MINING_HAT_SPEED_WITH_EFFICIENCY_0_MIN, MINING_HAT_SPEED_WITH_EFFICIENCY_0_MAX), + Math.clamp(getDouble(config.MINING_HAT.SPEED_WITH_EFFICIENCY_1), MINING_HAT_SPEED_WITH_EFFICIENCY_1_MIN, MINING_HAT_SPEED_WITH_EFFICIENCY_1_MAX), + Math.clamp(getDouble(config.MINING_HAT.SPEED_WITH_EFFICIENCY_2), MINING_HAT_SPEED_WITH_EFFICIENCY_2_MIN, MINING_HAT_SPEED_WITH_EFFICIENCY_2_MAX), + Math.clamp(getDouble(config.MINING_HAT.SPEED_WITH_EFFICIENCY_3), MINING_HAT_SPEED_WITH_EFFICIENCY_3_MIN, MINING_HAT_SPEED_WITH_EFFICIENCY_3_MAX), + Math.clamp(getDouble(config.MINING_HAT.SPEED_WITH_EFFICIENCY_4), MINING_HAT_SPEED_WITH_EFFICIENCY_4_MIN, MINING_HAT_SPEED_WITH_EFFICIENCY_4_MAX), + Math.clamp(getDouble(config.MINING_HAT.SPEED_WITH_EFFICIENCY_5), MINING_HAT_SPEED_WITH_EFFICIENCY_5_MIN, MINING_HAT_SPEED_WITH_EFFICIENCY_5_MAX) ); } @@ -464,12 +422,12 @@ public boolean isMushroomHatDamageEnabled() { @Override public int getMushroomHatDurability() { - return getInteger(getConfig().MUSHROOM_HAT.DURABILITY); + return Math.clamp(getConfig().MUSHROOM_HAT.DURABILITY, MUSHROOM_HAT_DURABILITY_MIN, MUSHROOM_HAT_DURABILITY_MAX); } @Override public int getMushroomHatEatInterval() { - return getInteger(getConfig().MUSHROOM_HAT.EAT_INTERVAL); + return Math.clamp(getConfig().MUSHROOM_HAT.EAT_INTERVAL, MUSHROOM_HAT_EAT_INTERVAL_MIN, MUSHROOM_HAT_EAT_INTERVAL_MAX); } @Override @@ -479,7 +437,7 @@ public boolean isPostmanHatDamageEnabled() { @Override public int getPostmanHatDurability() { - return getInteger(getConfig().POSTMAN_HAT.DURABILITY); + return Math.clamp(getConfig().POSTMAN_HAT.DURABILITY, POSTMAN_HAT_DURABILITY_MIN, POSTMAN_HAT_DURABILITY_MAX); } @Override @@ -494,7 +452,7 @@ public boolean isShulkerHelmetDamageEnabled() { @Override public int getShulkerHelmetDurability() { - return getInteger(getConfig().SHULKER_HELMET.DURABILITY); + return Math.clamp(getConfig().SHULKER_HELMET.DURABILITY, SHULKER_HELMET_DURABILITY_MIN, SHULKER_HELMET_DURABILITY_MAX); } @Override @@ -504,7 +462,7 @@ public boolean isStockingCapDamageEnabled() { @Override public int getStockingCapDurability() { - return getInteger(getConfig().STOCKING_CAP.DURABILITY); + return Math.clamp(getConfig().STOCKING_CAP.DURABILITY, STOCKING_CAP_DURABILITY_MIN, STOCKING_CAP_DURABILITY_MAX); } @Override @@ -514,19 +472,19 @@ public boolean isStrawHatDamageEnabled() { @Override public int getStrawHatDurability() { - return getInteger(getConfig().STRAW_HAT.DURABILITY); + return Math.clamp(getConfig().STRAW_HAT.DURABILITY, STRAW_HAT_DURABILITY_MIN, STRAW_HAT_DURABILITY_MAX); } @Override public double getStrawHatSpeedWithEfficiency(int enchantmentLevel) { FabricConfigHelper config = getConfig(); return getEnchantmentDouble(enchantmentLevel, - config.STRAW_HAT.SPEED_WITH_EFFICIENCY_0, - config.STRAW_HAT.SPEED_WITH_EFFICIENCY_1, - config.STRAW_HAT.SPEED_WITH_EFFICIENCY_2, - config.STRAW_HAT.SPEED_WITH_EFFICIENCY_3, - config.STRAW_HAT.SPEED_WITH_EFFICIENCY_4, - config.STRAW_HAT.SPEED_WITH_EFFICIENCY_5 + Math.clamp(getDouble(config.STRAW_HAT.SPEED_WITH_EFFICIENCY_0), STRAW_HAT_SPEED_WITH_EFFICIENCY_0_MIN, STRAW_HAT_SPEED_WITH_EFFICIENCY_0_MAX), + Math.clamp(getDouble(config.STRAW_HAT.SPEED_WITH_EFFICIENCY_1), STRAW_HAT_SPEED_WITH_EFFICIENCY_1_MIN, STRAW_HAT_SPEED_WITH_EFFICIENCY_1_MAX), + Math.clamp(getDouble(config.STRAW_HAT.SPEED_WITH_EFFICIENCY_2), STRAW_HAT_SPEED_WITH_EFFICIENCY_2_MIN, STRAW_HAT_SPEED_WITH_EFFICIENCY_2_MAX), + Math.clamp(getDouble(config.STRAW_HAT.SPEED_WITH_EFFICIENCY_3), STRAW_HAT_SPEED_WITH_EFFICIENCY_3_MIN, STRAW_HAT_SPEED_WITH_EFFICIENCY_3_MAX), + Math.clamp(getDouble(config.STRAW_HAT.SPEED_WITH_EFFICIENCY_4), STRAW_HAT_SPEED_WITH_EFFICIENCY_4_MIN, STRAW_HAT_SPEED_WITH_EFFICIENCY_4_MAX), + Math.clamp(getDouble(config.STRAW_HAT.SPEED_WITH_EFFICIENCY_5), STRAW_HAT_SPEED_WITH_EFFICIENCY_5_MIN, STRAW_HAT_SPEED_WITH_EFFICIENCY_5_MAX) ); } @@ -537,7 +495,7 @@ public boolean isWingHelmetDamageEnabled() { @Override public int getWingHelmetDurability() { - return getInteger(getConfig().WING_HELMET.DURABILITY); + return Math.clamp(getConfig().WING_HELMET.DURABILITY, WING_HELMET_DURABILITY_MIN, WING_HELMET_DURABILITY_MAX); } @Override diff --git a/gradle.properties b/gradle.properties index b97968b..8d34b68 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ # Project group=de.cech12.usefulhats -mod_version=6.4.0.0 +mod_version=6.4.1.0 mod_id=usefulhats mod_name=Useful Hats mod_author=Cech12