virt/Sit
1
0
Fork 0
forked from virt-mirrors/Sit
Code Pull requests Activity

new config locations

Browse source
This commit is contained in:
Oth3r 2024-02-09 18:04:29 -06:00
commit 47087db49e
2 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

94
src/main/java/one/oth3r/sit/ModMenu.java
View file

@ -71,7 +71,7 @@ public class ModMenu implements ModMenuApi {
.name(lang("general.sittable_blocks")) .name(lang("general.sittable_blocks"))
.description(OptionDescription.of( .description(OptionDescription.of(
lang("general.sittable_blocks.description") lang("general.sittable_blocks.description")
.append("\n\n").append(lang("general.sittable_blocks.description_2", .append("\n\n").append(lang("example",
Text.literal("\"") Text.literal("\"")
.append(Text.literal("minecraft:campfire").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA)))) .append(Text.literal("minecraft:campfire").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA))))
.append("|") .append("|")
@ -80,12 +80,12 @@ public class ModMenu implements ModMenuApi {
.append(Text.literal("1").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN)))) .append(Text.literal("1").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN))))
.append("|") .append("|")
.append(Text.literal("lit=false").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GOLD)))) .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("\"").styled(style -> style.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\n").append(lang("general.sittable_blocks.description.2").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.3").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.4").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").append(lang("general.sittable_blocks.description.5").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("\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) .binding(config.defaults.customBlocks, () -> config.customBlocks, n -> config.customBlocks = n)
.controller(StringControllerBuilder::create) .controller(StringControllerBuilder::create)
.initial("") .initial("")
@ -95,49 +95,49 @@ public class ModMenu implements ModMenuApi {
.name(lang("category.main_hand")) .name(lang("category.main_hand"))
.tooltip(lang("category.main_hand.tooltip")) .tooltip(lang("category.main_hand.tooltip"))
.option(Option.<config.HandRequirement>createBuilder() .option(Option.<config.HandRequirement>createBuilder()
.name(lang("hand.requirements")) .name(lang("hand.requirement"))
.description(OptionDescription.of(lang("hand.requirements.description") .description(OptionDescription.of(lang("hand.requirement.description")
.append("\n\n").append(lang("hand.requirements.description_2").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA)))) .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.requirements.description_3").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN)))) .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.requirements.description_4").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.RED)))))) .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) .binding(config.defaults.mainReq, () -> config.mainReq, n -> config.mainReq = n)
.controller(opt -> EnumControllerBuilder.create(opt).enumClass(config.HandRequirement.class) .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()) .build())
.group(OptionGroup.createBuilder() .group(OptionGroup.createBuilder()
.name(lang("hand.restrictions")) .name(lang("hand.restriction"))
.description(OptionDescription.of(lang("hand.restrictions.description"))) .description(OptionDescription.of(lang("hand.restriction.description")))
.option(Option.<Boolean>createBuilder() .option(Option.<Boolean>createBuilder()
.name(lang("hand.restrictions.blocks")) .name(lang("hand.restriction.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()) .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter())
.build()) .build())
.option(Option.<Boolean>createBuilder() .option(Option.<Boolean>createBuilder()
.name(lang("hand.restrictions.food")) .name(lang("hand.restriction.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()) .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter())
.build()) .build())
.option(Option.<Boolean>createBuilder() .option(Option.<Boolean>createBuilder()
.name(lang("hand.restrictions.usable")) .name(lang("hand.restriction.usable"))
.description(OptionDescription.of(lang("hand.restrictions.usable.description"))) .description(OptionDescription.of(lang("hand.restriction.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()) .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter())
.build()) .build())
.build()) .build())
.group(ListOption.<String>createBuilder() .group(ListOption.<String>createBuilder()
.name(lang("hand.whitelist")) .name(lang("hand.restriction.whitelist"))
.description(OptionDescription.of(lang("hand.whitelist.description") .description(OptionDescription.of(lang("hand.restriction.list.description")
.append("\n\n").append(lang("hand.list.description")) .append("\n\n").append(lang("example",
.append(lang("hand.list.description_2").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))) 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) .binding(config.defaults.mainWhitelist, () -> config.mainWhitelist, n -> config.mainWhitelist = n)
.controller(StringControllerBuilder::create) .controller(StringControllerBuilder::create)
.initial("") .initial("")
.build()) .build())
.group(ListOption.<String>createBuilder() .group(ListOption.<String>createBuilder()
.name(lang("hand.blacklist")) .name(lang("hand.restriction.blacklist"))
.description(OptionDescription.of(lang("hand.blacklist.description") .description(OptionDescription.of(lang("hand.restriction.list.description")
.append("\n\n").append(lang("hand.list.description")) .append("\n\n").append(lang("example",
.append(lang("hand.list.description_2").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))) 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) .binding(config.defaults.mainBlacklist, () -> config.mainBlacklist, n -> config.mainBlacklist = n)
.controller(StringControllerBuilder::create) .controller(StringControllerBuilder::create)
.initial("") .initial("")
@ -147,49 +147,49 @@ public class ModMenu implements ModMenuApi {
.name(lang("category.off_hand")) .name(lang("category.off_hand"))
.tooltip(lang("category.off_hand.tooltip")) .tooltip(lang("category.off_hand.tooltip"))
.option(Option.<config.HandRequirement>createBuilder() .option(Option.<config.HandRequirement>createBuilder()
.name(lang("hand.requirements")) .name(lang("hand.requirement"))
.description(OptionDescription.of(lang("hand.requirements.description") .description(OptionDescription.of(lang("hand.requirement.description")
.append("\n\n").append(lang("hand.requirements.description_2").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA)))) .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.requirements.description_3").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN)))) .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.requirements.description_4").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.RED)))))) .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) .binding(config.defaults.offReq, () -> config.offReq, n -> config.offReq = n)
.controller(opt -> EnumControllerBuilder.create(opt).enumClass(config.HandRequirement.class) .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()) .build())
.group(OptionGroup.createBuilder() .group(OptionGroup.createBuilder()
.name(lang("hand.restrictions")) .name(lang("hand.restriction"))
.description(OptionDescription.of(lang("hand.restrictions.description"))) .description(OptionDescription.of(lang("hand.restriction.description")))
.option(Option.<Boolean>createBuilder() .option(Option.<Boolean>createBuilder()
.name(lang("hand.restrictions.blocks")) .name(lang("hand.restriction.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()) .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter())
.build()) .build())
.option(Option.<Boolean>createBuilder() .option(Option.<Boolean>createBuilder()
.name(lang("hand.restrictions.food")) .name(lang("hand.restriction.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()) .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter())
.build()) .build())
.option(Option.<Boolean>createBuilder() .option(Option.<Boolean>createBuilder()
.name(lang("hand.restrictions.usable")) .name(lang("hand.restriction.usable"))
.description(OptionDescription.of(lang("hand.restrictions.usable.description"))) .description(OptionDescription.of(lang("hand.restriction.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()) .controller(opt -> BooleanControllerBuilder.create(opt).trueFalseFormatter())
.build()) .build())
.build()) .build())
.group(ListOption.<String>createBuilder() .group(ListOption.<String>createBuilder()
.name(lang("hand.whitelist")) .name(lang("hand.restriction.whitelist"))
.description(OptionDescription.of(lang("hand.whitelist.description") .description(OptionDescription.of(lang("hand.restriction.list.description")
.append("\n\n").append(lang("hand.list.description")) .append("\n\n").append(lang("example",
.append(lang("hand.list.description_2").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))) 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) .binding(config.defaults.offWhitelist, () -> config.offWhitelist, n -> config.offWhitelist = n)
.controller(StringControllerBuilder::create) .controller(StringControllerBuilder::create)
.initial("") .initial("")
.build()) .build())
.group(ListOption.<String>createBuilder() .group(ListOption.<String>createBuilder()
.name(lang("hand.blacklist")) .name(lang("hand.restriction.blacklist"))
.description(OptionDescription.of(lang("hand.blacklist.description") .description(OptionDescription.of(lang("hand.restriction.list.description")
.append("\n\n").append(lang("hand.list.description")) .append("\n\n").append(lang("example",
.append(lang("hand.list.description_2").styled(style -> style.withItalic(true).withColor(TextColor.fromFormatting(Formatting.GRAY)))))) 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) .binding(config.defaults.offBlacklist, () -> config.offBlacklist, n -> config.offBlacklist = n)
.controller(StringControllerBuilder::create) .controller(StringControllerBuilder::create)
.initial("") .initial("")

6
src/main/java/one/oth3r/sit/SitCommand.java
View file

@ -49,7 +49,7 @@ public class SitCommand {
if (player == null) { if (player == null) {
if (args[0].equalsIgnoreCase("reload")) { if (args[0].equalsIgnoreCase("reload")) {
config.load(); config.load();
Sit.LOGGER.info(Sit.lang("key.sit.command.reloaded").getString()); Sit.LOGGER.info(Sit.lang("key.sit.msg.reloaded").getString());
} }
return 1; return 1;
} }
@ -81,9 +81,9 @@ public class SitCommand {
ParseResults<ServerCommandSource> parse = ParseResults<ServerCommandSource> parse =
Sit.commandManager.getDispatcher().parse(cmd, player.getCommandSource()); Sit.commandManager.getDispatcher().parse(cmd, player.getCommandSource());
Sit.commandManager.getDispatcher().execute(parse); Sit.commandManager.getDispatcher().execute(parse);
player.sendMessage(Sit.lang("key.sit.command.purged")); player.sendMessage(Sit.lang("key.sit.msg.purged"));
} catch (CommandSyntaxException e) { } catch (CommandSyntaxException e) {
player.sendMessage(Sit.lang("key.sit.command.purged")); player.sendMessage(Sit.lang("key.sit.msg.purged"));
e.printStackTrace(); e.printStackTrace();
} }
} }