Skip to content

feat: config-related changes #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RedVortexDev merged 1 commit into from
Nov 7, 2024
Merged

feat: config-related changes #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/main/java/dev/dfonline/codeclient/command/impl/CommandCCConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,24 @@ public LiteralArgumentBuilder<FabricClientCommandSource> create(LiteralArgumentB
for (Object member : field.getType().getEnumConstants()) {
if (((Enum<?>) member).name().equalsIgnoreCase(value)) {
field.set(Config.getConfig(), member);
Utility.sendMessage(Text.translatable("codeclient.config.command.enum", Text.literal(option).formatted(Formatting.AQUA), Text.literal(value).formatted(Formatting.AQUA)), ChatType.SUCCESS);
Utility.sendMessage(Text.translatable("codeclient.config.command.set", Text.literal(option).formatted(Formatting.AQUA), Text.literal(value).formatted(Formatting.AQUA)), ChatType.SUCCESS);
Config.getConfig().save();
return 0;
}
}
Utility.sendMessage(Text.translatable("codeclient.config.command.enum.fail", Text.literal(option).formatted(Formatting.YELLOW), Text.literal(value).formatted(Formatting.YELLOW)), ChatType.FAIL);
Utility.sendMessage(Text.translatable("codeclient.config.command.set.fail", Text.literal(option).formatted(Formatting.YELLOW), Text.literal(value).formatted(Formatting.YELLOW)), ChatType.FAIL);
return -1;
} else if (field.getType().equals(int.class)) {
try {
var number = Integer.parseInt(value);
field.set(Config.getConfig(), number);
Utility.sendMessage(Text.translatable("codeclient.config.command.set", Text.literal(option).formatted(Formatting.AQUA), Text.literal(String.valueOf(number)).formatted(Formatting.AQUA)), ChatType.SUCCESS);
Config.getConfig().save();
return 0;
} catch (NumberFormatException e) {
Utility.sendMessage(Text.translatable("codeclient.config.command.set.fail", Text.literal(option).formatted(Formatting.YELLOW), Text.literal(value).formatted(Formatting.YELLOW)), ChatType.FAIL);
return -1;
}
}
Utility.sendMessage(Text.translatable("codeclient.config.command.fail"), ChatType.FAIL);
} catch (Exception ignored) {
Expand Down
42 changes: 14 additions & 28 deletions src/main/java/dev/dfonline/codeclient/config/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

public class Config {
private static Config instance;
public boolean NoClipEnabled = true;
public boolean NoClipEnabled = false;
public boolean PlaceOnAir = false;
public int AirSpeed = 10;
public boolean CodeClientAPI = false;
Expand All @@ -37,7 +37,6 @@ public class Config {
public float ReachDistance = 5;
public boolean AutoFly = false;
public LayerInteractionMode CodeLayerInteractionMode = LayerInteractionMode.AUTO;
public boolean AirControl = false;
public boolean FocusSearch = false;
public CharSetOption SaveCharSet = CharSetOption.UTF_8;
public boolean RecentChestInsert = true;
Expand Down Expand Up @@ -78,7 +77,7 @@ public class Config {
public boolean DevNodes = false;
public boolean GiveUuidNameStrings = true;
public boolean CPUDisplay = true;
public CPUDisplayCorner CPUDisplayCornerOption = CPUDisplayCorner.TOP_LEFT;
public CPUDisplayCornerOption CPUDisplayCorner = CPUDisplayCornerOption.TOP_LEFT;
public boolean HideScopeChangeMessages = true;
public boolean HighlighterEnabled = true;
public boolean HighlightExpressions = true;
Expand Down Expand Up @@ -125,7 +124,6 @@ public void save() {
object.addProperty("ReachDistance", ReachDistance);
object.addProperty("AutoFly", AutoFly);
object.addProperty("CodeLayerInteractionMode", CodeLayerInteractionMode.name());
object.addProperty("AirControl", AirControl);
object.addProperty("FocusSearch", FocusSearch);
object.addProperty("SaveCharSet", SaveCharSet.name());
object.addProperty("RecentChestInsert", RecentChestInsert);
Expand Down Expand Up @@ -165,7 +163,7 @@ public void save() {
object.addProperty("DevNodes", DevNodes);
object.addProperty("GiveUuidNameStrings", GiveUuidNameStrings);
object.addProperty("CPUDisplay", CPUDisplay);
object.addProperty("CPUDisplayCorner", CPUDisplayCornerOption.name());
object.addProperty("CPUDisplayCorner", CPUDisplayCorner.name());
object.addProperty("HideScopeChangeMessages", HideScopeChangeMessages);

object.addProperty("HighlighterEnabled", HighlighterEnabled);
Expand Down Expand Up @@ -337,7 +335,7 @@ public YetAnotherConfigLib getLibConfig() {
.text(Text.translatable("codeclient.config.noclip.description"))
.build())
.binding(
true,
false,
() -> NoClipEnabled,
opt -> NoClipEnabled = opt
)
Expand All @@ -360,7 +358,7 @@ public YetAnotherConfigLib getLibConfig() {
.build())
.option(Option.createBuilder(float.class)
.name(Text.translatable("codeclient.config.angle_up"))
.description(OptionDescription.of(Text.translatable("codeclient.config.angle_up.description")))
.description(OptionDescription.of(Text.translatable("codeclient.config.angle_up.description"), Text.translatable("codeclient.config.requires_noclip")))
.binding(
50F,
() -> UpAngle,
Expand All @@ -370,7 +368,7 @@ public YetAnotherConfigLib getLibConfig() {
.build())
.option(Option.createBuilder(float.class)
.name(Text.translatable("codeclient.config.angle_down"))
.description(OptionDescription.of(Text.translatable("codeclient.config.angle_down.description")))
.description(OptionDescription.of(Text.translatable("codeclient.config.angle_down.description"), Text.translatable("codeclient.config.requires_noclip")))
.binding(50F,
() -> DownAngle,
opt -> DownAngle = opt
Expand All @@ -379,7 +377,7 @@ public YetAnotherConfigLib getLibConfig() {
.build())
.option(Option.createBuilder(boolean.class)
.name(Text.translatable("codeclient.config.tp_up"))
.description(OptionDescription.of(Text.translatable("codeclient.config.tp_up.description")))
.description(OptionDescription.of(Text.translatable("codeclient.config.tp_up.description"), Text.translatable("codeclient.config.requires_noclip")))
.binding(
false,
() -> TeleportUp,
Expand All @@ -389,7 +387,7 @@ public YetAnotherConfigLib getLibConfig() {
.build())
.option(Option.createBuilder(boolean.class)
.name(Text.translatable("codeclient.config.tp_down"))
.description(OptionDescription.of(Text.translatable("codeclient.config.tp_down.description")))
.description(OptionDescription.of(Text.translatable("codeclient.config.tp_down.description"), Text.translatable("codeclient.config.requires_noclip")))
.binding(
false,
() -> TeleportDown,
Expand All @@ -409,18 +407,6 @@ public YetAnotherConfigLib getLibConfig() {
)
.controller(TickBoxControllerBuilder::create)
.build())
// .option(Option.createBuilder(boolean.class)
// .name(Text.literal("Air Control"))
// .description(OptionDescription.createBuilder()
// .text(Text.literal("Gives you the same control in air as walking."))
// .build())
// .binding(
// false,
// () -> AirControl,
// opt -> AirControl = opt
// )
// .controller(TickBoxController::new)
// .build())
.build())
//</editor-fold>
//<editor-fold desc="Interaction">
Expand Down Expand Up @@ -672,15 +658,15 @@ public YetAnotherConfigLib getLibConfig() {
)
.controller(TickBoxControllerBuilder::create)
.build())
.option(Option.createBuilder(Config.CPUDisplayCorner.class)
.option(Option.createBuilder(CPUDisplayCornerOption.class)
.name(Text.translatable("codeclient.config.cpu_display_corner.name"))
.description(OptionDescription.of(Text.translatable("codeclient.config.cpu_display_corner.description")))
.binding(
CPUDisplayCorner.TOP_LEFT,
() -> CPUDisplayCornerOption,
opt -> CPUDisplayCornerOption = opt
CPUDisplayCornerOption.TOP_LEFT,
() -> CPUDisplayCorner,
opt -> CPUDisplayCorner = opt
)
.controller(nodeOption -> () -> new EnumController<>(nodeOption, Config.CPUDisplayCorner.class))
.controller(nodeOption -> () -> new EnumController<>(nodeOption, CPUDisplayCornerOption.class))
.build())
.option(Option.createBuilder(Boolean.class)
.name(Text.translatable("codeclient.config.hide_scope_change_messages"))
Expand Down Expand Up @@ -1017,7 +1003,7 @@ public enum DestroyItemReset {
}
}

public enum CPUDisplayCorner {
public enum CPUDisplayCornerOption {
TOP_LEFT,
TOP_RIGHT,
BOTTOM_LEFT,
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/dev/dfonline/codeclient/dev/Navigation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public boolean shouldTeleportUp() {
public boolean onCrouch(boolean lastSneaking) {
var player = CodeClient.MC.player;
if (CodeClient.location instanceof Dev dev
&& Config.getConfig().NoClipEnabled
&& Config.getConfig().TeleportDown
&& player != null
&& dev.isInDevSpace()
Expand All @@ -53,6 +54,7 @@ public boolean onCrouch(boolean lastSneaking) {
public Float jumpHeight() {
if (CodeClient.location instanceof Dev dev
&& dev.isInDev(CodeClient.MC.player.getPos())
&& Config.getConfig().NoClipEnabled
&& CodeClient.MC.player.getPitch() <= Config.getConfig().UpAngle - 90)
return 0.91f;
return null;
Expand Down
14 changes: 9 additions & 5 deletions src/main/java/dev/dfonline/codeclient/mixin/render/hud/MInGameHud.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,28 @@ private void onRender(DrawContext context, float tickDelta, CallbackInfo ci) {

List<Text> overlay = new ArrayList<>(List.copyOf(OverlayManager.getOverlayText()));
Text cpuUsage = OverlayManager.getCpuUsage();
if (!overlay.isEmpty()) {
if (cpuUsage != null && Config.getConfig().CPUDisplayCornerOption == Config.CPUDisplayCorner.TOP_LEFT) {
if (cpuUsage != null && Config.getConfig().CPUDisplayCorner == Config.CPUDisplayCornerOption.TOP_LEFT) {
if (overlay.isEmpty()) overlay.add(cpuUsage);
else {
overlay.add(0, cpuUsage);
overlay.add(1, Text.empty());
}
}
if (!overlay.isEmpty()) {
int index = 0;
for (Text text : overlay) {
context.drawTextWithShadow(textRenderer, Objects.requireNonNullElseGet(text, () -> Text.literal("NULL")), 30, 30 + (index * 9), -1);
index++;
}
}
if (cpuUsage != null && Config.getConfig().CPUDisplayCornerOption != Config.CPUDisplayCorner.TOP_LEFT) {

if (cpuUsage != null && Config.getConfig().CPUDisplayCorner != Config.CPUDisplayCornerOption.TOP_LEFT) {
int margin = 30;
int x = switch (Config.getConfig().CPUDisplayCornerOption) {
int x = switch (Config.getConfig().CPUDisplayCorner) {
case TOP_LEFT, BOTTOM_LEFT -> margin;
case TOP_RIGHT, BOTTOM_RIGHT -> scaledWidth - margin - textRenderer.getWidth(cpuUsage);
};
int y = switch (Config.getConfig().CPUDisplayCornerOption) {
int y = switch (Config.getConfig().CPUDisplayCorner) {
case TOP_LEFT, TOP_RIGHT -> margin;
case BOTTOM_LEFT, BOTTOM_RIGHT -> scaledHeight - margin - 3;
};
Expand Down
7 changes: 4 additions & 3 deletions src/main/resources/assets/codeclient/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"codeclient.config": "CodeClient Config",

"codeclient.config.requires_restart": "(requires restart)",
"codeclient.config.requires_noclip": "(requires NoClip)",
"codeclient.config.default_recommended": "Default recommended.",

"codeclient.config.tab.general": "General",
Expand Down Expand Up @@ -57,7 +58,7 @@
"codeclient.config.tab.navigation.description": "How you move about in the codespace and the likes.",

"codeclient.config.noclip": "NoClip",
"codeclient.config.noclip.description": "If you can NoClip in the dev space.",
"codeclient.config.noclip.description": "Whether you can walk through codeblocks, additionally enables codespace travel by looking up/down and jumping/sneaking.",
"codeclient.config.airstrafe_modifier": "AirStrafe Modifier",
"codeclient.config.airstrafe_modifier.description1": "How much faster you go when jumping in dev space.",
"codeclient.config.airstrafe_modifier.description2": "Your jump speed will be based of walking speed.",
Expand Down Expand Up @@ -190,8 +191,8 @@
"codeclient.config.command.query.fail": "There is no option with name %s.",
"codeclient.config.command.enable": "Enabled option %s.",
"codeclient.config.command.disable": "Disabled option %s.",
"codeclient.config.command.enum": "Set option %s to %s.",
"codeclient.config.command.enum.fail": "Couldn't set option %s to %s.",
"codeclient.config.command.set": "Set option %s to %s.",
"codeclient.config.command.set.fail": "Couldn't set option %s to %s.",
"codeclient.config.command.fail": "You cannot set this config option.",

"codeclient.config.destroy_item_reset.name": "Destroy Item Reset",
Expand Down