forked from virt-mirrors/Sit
new config locations
This commit is contained in:
Oth3r
parent
d5504310f0
commit
47087db49e
2 changed files with 50 additions and 50 deletions
|
|
@ -71,7 +71,7 @@ public class ModMenu implements ModMenuApi {
|
|||
.name(lang("general.sittable_blocks"))
|
||||
.description(OptionDescription.of(
|
||||
lang("general.sittable_blocks.description")
|
||||
.append("\n\n").append(lang("general.sittable_blocks.description_2",
|
||||
.append("\n\n").append(lang("example",
|
||||
Text.literal("\"")
|
||||
.append(Text.literal("minecraft:campfire").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA))))
|
||||
.append("|")
|
||||
|
|
@ -80,12 +80,12 @@ public class ModMenu implements ModMenuApi {
|
|||
.append(Text.literal("1").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN))))
|
||||
.append("|")
|
||||
.append(Text.literal("lit=false").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GOLD))))
|
||||
.append("\"").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))
|
||||
.append("\n\n").append(lang("general.sittable_blocks.description_4").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA))))
|
||||
.append("\n").append(lang("general.sittable_blocks.description_5").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.RED))))
|
||||
.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))))))
|
||||
.append("\"").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GRAY)))))
|
||||
.append("\n\n").append(lang("general.sittable_blocks.description.2").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA))))
|
||||
.append("\n").append(lang("general.sittable_blocks.description.3").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.RED))))
|
||||
.append("\n").append(lang("general.sittable_blocks.description.4").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN))))
|
||||
.append("\n").append(lang("general.sittable_blocks.description.5").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GOLD))))
|
||||
.append("\n\n").append(lang("general.sittable_blocks.description.6").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.YELLOW))))))
|
||||
.binding(config.defaults.customBlocks, () -> config.customBlocks, n -> config.customBlocks = n)
|
||||
.controller(StringControllerBuilder::create)
|
||||
.initial("")
|
||||
|
|
@ -95,49 +95,49 @@ public class ModMenu implements ModMenuApi {
|
|||
.name(lang("category.main_hand"))
|
||||
.tooltip(lang("category.main_hand.tooltip"))
|
||||
.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))))))
|
||||
.name(lang("hand.requirement"))
|
||||
.description(OptionDescription.of(lang("hand.requirement.description")
|
||||
.append("\n\n").append(lang("hand.requirement.description.2",lang("hand.requirement.empty")).styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA))))
|
||||
.append("\n").append(lang("hand.requirement.description.3",lang("hand.requirement.restrictive")).styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN))))
|
||||
.append("\n").append(lang("hand.requirement.description.4",lang("hand.requirement.none")).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)
|
||||
.formatValue(v -> Text.translatable("config.sit."+v.name().toLowerCase())))
|
||||
.formatValue(v -> lang("hand.requirement."+v.toString())))
|
||||
.build())
|
||||
.group(OptionGroup.createBuilder()
|
||||
.name(lang("hand.restrictions"))
|
||||
.description(OptionDescription.of(lang("hand.restrictions.description")))
|
||||
.name(lang("hand.restriction"))
|
||||
.description(OptionDescription.of(lang("hand.restriction.description")))
|
||||
.option(Option.<Boolean>createBuilder()
|
||||
.name(lang("hand.restrictions.blocks"))
|
||||
.name(lang("hand.restriction.blocks"))
|
||||
.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"))
|
||||
.name(lang("hand.restriction.food"))
|
||||
.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")))
|
||||
.name(lang("hand.restriction.usable"))
|
||||
.description(OptionDescription.of(lang("hand.restriction.usable.description")))
|
||||
.binding(config.defaults.mainUsable,()-> config.mainUsable,n -> config.mainUsable = n)
|
||||
.controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter())
|
||||
.build())
|
||||
.build())
|
||||
.group(ListOption.<String>createBuilder()
|
||||
.name(lang("hand.whitelist"))
|
||||
.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))))))
|
||||
.name(lang("hand.restriction.whitelist"))
|
||||
.description(OptionDescription.of(lang("hand.restriction.list.description")
|
||||
.append("\n\n").append(lang("example",
|
||||
Text.empty().append(Utl.Assets.LIST).styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))))
|
||||
.binding(config.defaults.mainWhitelist, () -> config.mainWhitelist, n -> config.mainWhitelist = n)
|
||||
.controller(StringControllerBuilder::create)
|
||||
.initial("")
|
||||
.build())
|
||||
.group(ListOption.<String>createBuilder()
|
||||
.name(lang("hand.blacklist"))
|
||||
.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))))))
|
||||
.name(lang("hand.restriction.blacklist"))
|
||||
.description(OptionDescription.of(lang("hand.restriction.list.description")
|
||||
.append("\n\n").append(lang("example",
|
||||
Text.empty().append(Utl.Assets.LIST).styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))))
|
||||
.binding(config.defaults.mainBlacklist, () -> config.mainBlacklist, n -> config.mainBlacklist = n)
|
||||
.controller(StringControllerBuilder::create)
|
||||
.initial("")
|
||||
|
|
@ -147,49 +147,49 @@ public class ModMenu implements ModMenuApi {
|
|||
.name(lang("category.off_hand"))
|
||||
.tooltip(lang("category.off_hand.tooltip"))
|
||||
.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))))))
|
||||
.name(lang("hand.requirement"))
|
||||
.description(OptionDescription.of(lang("hand.requirement.description")
|
||||
.append("\n\n").append(lang("hand.requirement.description.2",lang("hand.requirement.empty")).styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA))))
|
||||
.append("\n").append(lang("hand.requirement.description.3",lang("hand.requirement.restrictive")).styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN))))
|
||||
.append("\n").append(lang("hand.requirement.description.4",lang("hand.requirement.none")).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)
|
||||
.formatValue(v -> Text.translatable("config.sit."+v.name().toLowerCase())))
|
||||
.formatValue(v -> lang("hand.requirement."+v.toString())))
|
||||
.build())
|
||||
.group(OptionGroup.createBuilder()
|
||||
.name(lang("hand.restrictions"))
|
||||
.description(OptionDescription.of(lang("hand.restrictions.description")))
|
||||
.name(lang("hand.restriction"))
|
||||
.description(OptionDescription.of(lang("hand.restriction.description")))
|
||||
.option(Option.<Boolean>createBuilder()
|
||||
.name(lang("hand.restrictions.blocks"))
|
||||
.name(lang("hand.restriction.blocks"))
|
||||
.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"))
|
||||
.name(lang("hand.restriction.food"))
|
||||
.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")))
|
||||
.name(lang("hand.restriction.usable"))
|
||||
.description(OptionDescription.of(lang("hand.restriction.usable.description")))
|
||||
.binding(config.defaults.offUsable,()-> config.offUsable,n -> config.offUsable = n)
|
||||
.controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter())
|
||||
.build())
|
||||
.build())
|
||||
.group(ListOption.<String>createBuilder()
|
||||
.name(lang("hand.whitelist"))
|
||||
.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))))))
|
||||
.name(lang("hand.restriction.whitelist"))
|
||||
.description(OptionDescription.of(lang("hand.restriction.list.description")
|
||||
.append("\n\n").append(lang("example",
|
||||
Text.empty().append(Utl.Assets.LIST).styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))))
|
||||
.binding(config.defaults.offWhitelist, () -> config.offWhitelist, n -> config.offWhitelist = n)
|
||||
.controller(StringControllerBuilder::create)
|
||||
.initial("")
|
||||
.build())
|
||||
.group(ListOption.<String>createBuilder()
|
||||
.name(lang("hand.blacklist"))
|
||||
.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))))))
|
||||
.name(lang("hand.restriction.blacklist"))
|
||||
.description(OptionDescription.of(lang("hand.restriction.list.description")
|
||||
.append("\n\n").append(lang("example",
|
||||
Text.empty().append(Utl.Assets.LIST).styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))))
|
||||
.binding(config.defaults.offBlacklist, () -> config.offBlacklist, n -> config.offBlacklist = n)
|
||||
.controller(StringControllerBuilder::create)
|
||||
.initial("")
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ public class SitCommand {
|
|||
if (player == null) {
|
||||
if (args[0].equalsIgnoreCase("reload")) {
|
||||
config.load();
|
||||
Sit.LOGGER.info(Sit.lang("key.sit.command.reloaded").getString());
|
||||
Sit.LOGGER.info(Sit.lang("key.sit.msg.reloaded").getString());
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -81,9 +81,9 @@ public class SitCommand {
|
|||
ParseResults<ServerCommandSource> parse =
|
||||
Sit.commandManager.getDispatcher().parse(cmd, player.getCommandSource());
|
||||
Sit.commandManager.getDispatcher().execute(parse);
|
||||
player.sendMessage(Sit.lang("key.sit.command.purged"));
|
||||
player.sendMessage(Sit.lang("key.sit.msg.purged"));
|
||||
} catch (CommandSyntaxException e) {
|
||||
player.sendMessage(Sit.lang("key.sit.command.purged"));
|
||||
player.sendMessage(Sit.lang("key.sit.msg.purged"));
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue