forked from virt-mirrors/Sit
config to file package, and capitalize
This commit is contained in:
Oth3r
parent
8b78bf4651
commit
132c9dc55a
6 changed files with 46 additions and 44 deletions
|
|
@ -10,6 +10,7 @@ import net.minecraft.text.MutableText;
|
|||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.TextColor;
|
||||
import net.minecraft.util.Formatting;
|
||||
import one.oth3r.sit.file.Config;
|
||||
|
||||
public class ModMenu implements ModMenuApi {
|
||||
private static MutableText lang(String key) {
|
||||
|
|
@ -20,7 +21,7 @@ public class ModMenu implements ModMenuApi {
|
|||
}
|
||||
@Override
|
||||
public ConfigScreenFactory<?> getModConfigScreenFactory() {
|
||||
return parent -> YetAnotherConfigLib.createBuilder().save(config::save)
|
||||
return parent -> YetAnotherConfigLib.createBuilder().save(Config::save)
|
||||
.title(Text.of("Sit!"))
|
||||
.category(ConfigCategory.createBuilder()
|
||||
.name(lang("category.general"))
|
||||
|
|
@ -28,13 +29,13 @@ public class ModMenu implements ModMenuApi {
|
|||
.option(Option.<Boolean>createBuilder()
|
||||
.name(lang("general.keep_active"))
|
||||
.description(OptionDescription.of(lang("general.keep_active.description")))
|
||||
.binding(config.defaults.keepActive, () -> config.keepActive, n -> config.keepActive = n)
|
||||
.binding(Config.defaults.keepActive, () -> Config.keepActive, n -> Config.keepActive = n)
|
||||
.controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter())
|
||||
.build())
|
||||
.option(Option.<Boolean>createBuilder()
|
||||
.name(lang("general.sit_while_seated"))
|
||||
.description(OptionDescription.of(lang("general.sit_while_seated.description")))
|
||||
.binding(config.defaults.sitWhileSeated, () -> config.sitWhileSeated, n -> config.sitWhileSeated = n)
|
||||
.binding(Config.defaults.sitWhileSeated, () -> Config.sitWhileSeated, n -> Config.sitWhileSeated = n)
|
||||
.controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter())
|
||||
.build())
|
||||
.group(OptionGroup.createBuilder()
|
||||
|
|
@ -42,28 +43,28 @@ public class ModMenu implements ModMenuApi {
|
|||
.description(OptionDescription.of(lang("general.sittable.description")))
|
||||
.option(Option.<Boolean>createBuilder()
|
||||
.name(lang("general.sittable.stairs"))
|
||||
.binding(config.defaults.stairsOn, () -> config.stairsOn, n -> config.stairsOn = n)
|
||||
.binding(Config.defaults.stairsOn, () -> Config.stairsOn, n -> Config.stairsOn = n)
|
||||
.controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter())
|
||||
.build())
|
||||
.option(Option.<Boolean>createBuilder()
|
||||
.name(lang("general.sittable.slabs"))
|
||||
.binding(config.defaults.slabsOn, () -> config.slabsOn, n -> config.slabsOn = n)
|
||||
.binding(Config.defaults.slabsOn, () -> Config.slabsOn, n -> Config.slabsOn = n)
|
||||
.controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter())
|
||||
.build())
|
||||
.option(Option.<Boolean>createBuilder()
|
||||
.name(lang("general.sittable.carpets"))
|
||||
.binding(config.defaults.carpetsOn, () -> config.carpetsOn, n -> config.carpetsOn = n)
|
||||
.binding(Config.defaults.carpetsOn, () -> Config.carpetsOn, n -> Config.carpetsOn = n)
|
||||
.controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter())
|
||||
.build())
|
||||
.option(Option.<Boolean>createBuilder()
|
||||
.name(lang("general.sittable.full_blocks"))
|
||||
.binding(config.defaults.fullBlocksOn, () -> config.fullBlocksOn, n -> config.fullBlocksOn = n)
|
||||
.binding(Config.defaults.fullBlocksOn, () -> Config.fullBlocksOn, n -> Config.fullBlocksOn = n)
|
||||
.controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter())
|
||||
.build())
|
||||
.option(Option.<Boolean>createBuilder()
|
||||
.name(lang("general.sittable.custom"))
|
||||
.description(OptionDescription.of(lang("general.sittable.custom.description")))
|
||||
.binding(config.defaults.customOn, () -> config.customOn, n -> config.customOn = n)
|
||||
.binding(Config.defaults.customOn, () -> Config.customOn, n -> Config.customOn = n)
|
||||
.controller(opt -> BooleanControllerBuilder.create(opt).onOffFormatter())
|
||||
.build())
|
||||
.build())
|
||||
|
|
@ -86,7 +87,7 @@ public class ModMenu implements ModMenuApi {
|
|||
.append("\n").append(lang("general.sittable_blocks.description_6").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN))))
|
||||
.append("\n").append(lang("general.sittable_blocks.description_7").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GOLD))))
|
||||
.append("\n\n").append(lang("general.sittable_blocks.description_8").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.YELLOW))))))
|
||||
.binding(config.defaults.customBlocks, () -> config.customBlocks, n -> config.customBlocks = n)
|
||||
.binding(Config.defaults.customBlocks, () -> Config.customBlocks, n -> Config.customBlocks = n)
|
||||
.controller(StringControllerBuilder::create)
|
||||
.initial("")
|
||||
.build())
|
||||
|
|
@ -94,14 +95,14 @@ public class ModMenu implements ModMenuApi {
|
|||
.category(ConfigCategory.createBuilder()
|
||||
.name(lang("category.main_hand"))
|
||||
.tooltip(lang("category.main_hand.tooltip"))
|
||||
.option(Option.<config.HandRequirement>createBuilder()
|
||||
.option(Option.<Config.HandRequirement>createBuilder()
|
||||
.name(lang("hand.requirements"))
|
||||
.description(OptionDescription.of(lang("hand.requirements.description")
|
||||
.append("\n\n").append(lang("hand.requirements.description_2").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA))))
|
||||
.append("\n").append(lang("hand.requirements.description_3").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN))))
|
||||
.append("\n").append(lang("hand.requirements.description_4").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.RED))))))
|
||||
.binding(config.defaults.mainReq, () -> config.mainReq, n -> config.mainReq = n)
|
||||
.controller(opt -> EnumControllerBuilder.create(opt).enumClass(config.HandRequirement.class)
|
||||
.binding(Config.defaults.mainReq, () -> Config.mainReq, n -> Config.mainReq = n)
|
||||
.controller(opt -> EnumControllerBuilder.create(opt).enumClass(Config.HandRequirement.class)
|
||||
.formatValue(v -> Text.translatable("config.sit."+v.name().toLowerCase())))
|
||||
.build())
|
||||
.group(OptionGroup.createBuilder()
|
||||
|
|
@ -109,18 +110,18 @@ public class ModMenu implements ModMenuApi {
|
|||
.description(OptionDescription.of(lang("hand.restrictions.description")))
|
||||
.option(Option.<Boolean>createBuilder()
|
||||
.name(lang("hand.restrictions.blocks"))
|
||||
.binding(config.defaults.mainBlock,()-> config.mainBlock,n -> config.mainBlock = n)
|
||||
.binding(Config.defaults.mainBlock,()-> Config.mainBlock, n -> Config.mainBlock = n)
|
||||
.controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter())
|
||||
.build())
|
||||
.option(Option.<Boolean>createBuilder()
|
||||
.name(lang("hand.restrictions.food"))
|
||||
.binding(config.defaults.mainFood,()-> config.mainFood,n -> config.mainFood = n)
|
||||
.binding(Config.defaults.mainFood,()-> Config.mainFood, n -> Config.mainFood = n)
|
||||
.controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter())
|
||||
.build())
|
||||
.option(Option.<Boolean>createBuilder()
|
||||
.name(lang("hand.restrictions.usable"))
|
||||
.description(OptionDescription.of(lang("hand.restrictions.usable.description")))
|
||||
.binding(config.defaults.mainUsable,()-> config.mainUsable,n -> config.mainUsable = n)
|
||||
.binding(Config.defaults.mainUsable,()-> Config.mainUsable, n -> Config.mainUsable = n)
|
||||
.controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter())
|
||||
.build())
|
||||
.build())
|
||||
|
|
@ -129,7 +130,7 @@ public class ModMenu implements ModMenuApi {
|
|||
.description(OptionDescription.of(lang("hand.whitelist.description")
|
||||
.append("\n\n").append(lang("hand.list.description"))
|
||||
.append(lang("hand.list.description_2").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY))))))
|
||||
.binding(config.defaults.mainWhitelist, () -> config.mainWhitelist, n -> config.mainWhitelist = n)
|
||||
.binding(Config.defaults.mainWhitelist, () -> Config.mainWhitelist, n -> Config.mainWhitelist = n)
|
||||
.controller(StringControllerBuilder::create)
|
||||
.initial("")
|
||||
.build())
|
||||
|
|
@ -138,7 +139,7 @@ public class ModMenu implements ModMenuApi {
|
|||
.description(OptionDescription.of(lang("hand.blacklist.description")
|
||||
.append("\n\n").append(lang("hand.list.description"))
|
||||
.append(lang("hand.list.description_2").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY))))))
|
||||
.binding(config.defaults.mainBlacklist, () -> config.mainBlacklist, n -> config.mainBlacklist = n)
|
||||
.binding(Config.defaults.mainBlacklist, () -> Config.mainBlacklist, n -> Config.mainBlacklist = n)
|
||||
.controller(StringControllerBuilder::create)
|
||||
.initial("")
|
||||
.build())
|
||||
|
|
@ -146,14 +147,14 @@ public class ModMenu implements ModMenuApi {
|
|||
.category(ConfigCategory.createBuilder()
|
||||
.name(lang("category.off_hand"))
|
||||
.tooltip(lang("category.off_hand.tooltip"))
|
||||
.option(Option.<config.HandRequirement>createBuilder()
|
||||
.option(Option.<Config.HandRequirement>createBuilder()
|
||||
.name(lang("hand.requirements"))
|
||||
.description(OptionDescription.of(lang("hand.requirements.description")
|
||||
.append("\n\n").append(lang("hand.requirements.description_2").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA))))
|
||||
.append("\n").append(lang("hand.requirements.description_3").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN))))
|
||||
.append("\n").append(lang("hand.requirements.description_4").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.RED))))))
|
||||
.binding(config.defaults.offReq, () -> config.offReq, n -> config.offReq = n)
|
||||
.controller(opt -> EnumControllerBuilder.create(opt).enumClass(config.HandRequirement.class)
|
||||
.binding(Config.defaults.offReq, () -> Config.offReq, n -> Config.offReq = n)
|
||||
.controller(opt -> EnumControllerBuilder.create(opt).enumClass(Config.HandRequirement.class)
|
||||
.formatValue(v -> Text.translatable("config.sit."+v.name().toLowerCase())))
|
||||
.build())
|
||||
.group(OptionGroup.createBuilder()
|
||||
|
|
@ -161,18 +162,18 @@ public class ModMenu implements ModMenuApi {
|
|||
.description(OptionDescription.of(lang("hand.restrictions.description")))
|
||||
.option(Option.<Boolean>createBuilder()
|
||||
.name(lang("hand.restrictions.blocks"))
|
||||
.binding(config.defaults.offBlock,()-> config.offBlock,n -> config.offBlock = n)
|
||||
.binding(Config.defaults.offBlock,()-> Config.offBlock, n -> Config.offBlock = n)
|
||||
.controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter())
|
||||
.build())
|
||||
.option(Option.<Boolean>createBuilder()
|
||||
.name(lang("hand.restrictions.food"))
|
||||
.binding(config.defaults.offFood,()-> config.offFood,n -> config.offFood = n)
|
||||
.binding(Config.defaults.offFood,()-> Config.offFood, n -> Config.offFood = n)
|
||||
.controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter())
|
||||
.build())
|
||||
.option(Option.<Boolean>createBuilder()
|
||||
.name(lang("hand.restrictions.usable"))
|
||||
.description(OptionDescription.of(lang("hand.restrictions.usable.description")))
|
||||
.binding(config.defaults.offUsable,()-> config.offUsable,n -> config.offUsable = n)
|
||||
.binding(Config.defaults.offUsable,()-> Config.offUsable, n -> Config.offUsable = n)
|
||||
.controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter())
|
||||
.build())
|
||||
.build())
|
||||
|
|
@ -181,7 +182,7 @@ public class ModMenu implements ModMenuApi {
|
|||
.description(OptionDescription.of(lang("hand.whitelist.description")
|
||||
.append("\n\n").append(lang("hand.list.description"))
|
||||
.append(lang("hand.list.description_2").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY))))))
|
||||
.binding(config.defaults.offWhitelist, () -> config.offWhitelist, n -> config.offWhitelist = n)
|
||||
.binding(Config.defaults.offWhitelist, () -> Config.offWhitelist, n -> Config.offWhitelist = n)
|
||||
.controller(StringControllerBuilder::create)
|
||||
.initial("")
|
||||
.build())
|
||||
|
|
@ -190,7 +191,7 @@ public class ModMenu implements ModMenuApi {
|
|||
.description(OptionDescription.of(lang("hand.blacklist.description")
|
||||
.append("\n\n").append(lang("hand.list.description"))
|
||||
.append(lang("hand.list.description_2").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY))))))
|
||||
.binding(config.defaults.offBlacklist, () -> config.offBlacklist, n -> config.offBlacklist = n)
|
||||
.binding(Config.defaults.offBlacklist, () -> Config.offBlacklist, n -> Config.offBlacklist = n)
|
||||
.controller(StringControllerBuilder::create)
|
||||
.initial("")
|
||||
.build())
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue