Skip to content

Per-dimension settings #4

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

Open
FrCynda wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Per-dimension settings #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96dfe82
Pull the TranslatableComponent boilerplate into a text() helper
Aug 22, 2026
89d4dd5
Add a night vision curve that fades with the light level
Aug 24, 2026
70cecff
Add the curve options to the config screen
Aug 24, 2026
7ea3bcd
Per-dimension settings: overrides map, dimension tracking, screen sub…
Aug 24, 2026
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
13 changes: 5 additions & 8 deletions build.forge.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,11 @@ legacyForge {
}
}

// No mixins exist yet (cat_vision.mixins.json has empty "mixins"/"client").
// moddev's reobfJar (ART) hard-fails looking for the refmap's .mappings.tsrg,
// which the Mixin AP only emits when there is at least one mixin. Re-enable this
// block as soon as the first @Mixin is added.
//mixin {
// add(sourceSets.main.get(), "${prop("mod.id")}.mixins.refmap.json")
// config("${prop("mod.id")}.mixins.json")
//}
// These Forge versions run on SRG names, so the mixins need a refmap to find their targets.
mixin {
add(sourceSets.main.get(), "${prop("mod.id")}.mixins.refmap.json")
config("${prop("mod.id")}.mixins.json")
}

repositories {
mavenCentral()
Expand Down
13 changes: 11 additions & 2 deletions src/main/java/net/marios271/cat_vision/config/ConfigData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,28 @@
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.util.LinkedHashMap;
import java.util.Map;

public class ConfigData {
public class ConfigData extends VisionSettings {
private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();

private transient File file;

public boolean remember_nv = true;
public boolean auto_nv = true;
public boolean blindness_immunity = true;
public boolean nausea_immunity = true;
public boolean darkness_immunity = true;

public boolean has_nv = false;

public Map<String, VisionSettings> dimension_overrides = new LinkedHashMap<>();

public VisionSettings forDimension(String dimension) {
VisionSettings override = dimension == null ? null : dimension_overrides.get(dimension);
return override != null ? override : this;
}

public void save() {
try (FileWriter writer = new FileWriter(file)) {
GSON.toJson(this, writer);
Expand All @@ -43,6 +51,7 @@ public static ConfigData load(File configDir) {
}
}
if (result == null) result = new ConfigData();
if (result.dimension_overrides == null) result.dimension_overrides = new LinkedHashMap<>();
result.file = file;
return result;
}
Expand Down
290 changes: 202 additions & 88 deletions src/main/java/net/marios271/cat_vision/config/ConfigScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,106 +1,220 @@
package net.marios271.cat_vision.config;

import me.shedaniel.clothconfig2.api.AbstractConfigListEntry;
import me.shedaniel.clothconfig2.api.ConfigBuilder;
import me.shedaniel.clothconfig2.api.ConfigCategory;
import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
import net.marios271.cat_vision.handler.VisionHandler;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.Screen;
//? < 1.19 {
/*import net.minecraft.network.chat.TranslatableComponent;
*///?} >= 1.19 {
import net.minecraft.network.chat.Component;
//?}
//? < 1.19 {
/*import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.TranslatableComponent;
*///?}

import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import java.util.function.DoubleConsumer;
import java.util.function.Function;

public class ConfigScreen {
public static Screen create(Screen parent, ConfigData config) {
ConfigBuilder builder = ConfigBuilder.create()
.setParentScreen(parent)
.setTitle(
//? < 1.19 {
/*new TranslatableComponent("text.cat_vision.config.title")
*///?} >= 1.19 {
Component.translatable("text.cat_vision.config.title")
//?}
);

ConfigCategory category = builder.getOrCreateCategory(
//? < 1.19 {
/*new TranslatableComponent("text.cat_vision.config.category")
*///?} >= 1.19 {
Component.translatable("text.cat_vision.config.category")
//?}
);
ConfigEntryBuilder entryBuilder = builder.entryBuilder();

category.addEntry(entryBuilder.startBooleanToggle(
//? < 1.19 {
/*new TranslatableComponent("text.cat_vision.config.option.remember_nv"),
*///?} >= 1.19 {
Component.translatable("text.cat_vision.config.option.remember_nv"),
//?}
config.remember_nv
)
.setDefaultValue(true)
.setSaveConsumer(v -> config.remember_nv = v)
.build());

category.addEntry(entryBuilder.startBooleanToggle(
//? < 1.19 {
/*new TranslatableComponent("text.cat_vision.config.option.auto_nv"),
*///?} >= 1.19 {
Component.translatable("text.cat_vision.config.option.auto_nv"),
//?}
config.auto_nv
)
.setDefaultValue(true)
.setSaveConsumer(v -> config.auto_nv = v)
.build());

category.addEntry(entryBuilder.startBooleanToggle(
//? < 1.19 {
/*new TranslatableComponent("text.cat_vision.config.option.blindness_immunity"),
*///?} >= 1.19 {
Component.translatable("text.cat_vision.config.option.blindness_immunity"),
//?}
config.blindness_immunity
)
.setDefaultValue(true)
.setSaveConsumer(v -> config.blindness_immunity = v)
.setTooltip(
//? < 1.19 {
/*new TranslatableComponent("text.cat_vision.config.tooltip.blindness_disclaimer.1"),
new TranslatableComponent("text.cat_vision.config.tooltip.blindness_disclaimer.2"),
new TranslatableComponent("text.cat_vision.config.tooltip.blindness_disclaimer.3"),
new TranslatableComponent("text.cat_vision.config.tooltip.blindness_disclaimer.4")
*///?} >= 1.19 {
Component.translatable("text.cat_vision.config.tooltip.blindness_disclaimer.1"),
Component.translatable("text.cat_vision.config.tooltip.blindness_disclaimer.2"),
Component.translatable("text.cat_vision.config.tooltip.blindness_disclaimer.3"),
Component.translatable("text.cat_vision.config.tooltip.blindness_disclaimer.4")
//?}
)
.build());

category.addEntry(entryBuilder.startBooleanToggle(
//? < 1.19 {
/*new TranslatableComponent("text.cat_vision.config.option.nausea_immunity"),
*///?} >= 1.19 {
Component.translatable("text.cat_vision.config.option.nausea_immunity"),
//?}
config.nausea_immunity
)
.setDefaultValue(true)
.setSaveConsumer(v -> config.nausea_immunity = v)
.build());
private static final String PREFIX = "text.cat_vision.config.";

public static Screen create(Screen parent, ConfigData config) {
ConfigBuilder builder = ConfigBuilder.create()
.setParentScreen(parent)
.setTitle(text(PREFIX + "title"));

ConfigCategory category = builder.getOrCreateCategory(text(PREFIX + "category"));
ConfigEntryBuilder entryBuilder = builder.entryBuilder();

category.addEntry(entryBuilder.startBooleanToggle(text(PREFIX + "option.remember_nv"), config.remember_nv)
.setDefaultValue(true)
.setSaveConsumer(v -> config.remember_nv = v)
.build());

category.addEntry(autoNvEntry(entryBuilder, config));

category.addEntry(entryBuilder.startBooleanToggle(text(PREFIX + "option.blindness_immunity"), config.blindness_immunity)
.setDefaultValue(true)
.setSaveConsumer(v -> config.blindness_immunity = v)
.setTooltip(
text(PREFIX + "tooltip.blindness_disclaimer.1"),
text(PREFIX + "tooltip.blindness_disclaimer.2"),
text(PREFIX + "tooltip.blindness_disclaimer.3"),
text(PREFIX + "tooltip.blindness_disclaimer.4")
)
.build());

category.addEntry(entryBuilder.startBooleanToggle(text(PREFIX + "option.nausea_immunity"), config.nausea_immunity)
.setDefaultValue(true)
.setSaveConsumer(v -> config.nausea_immunity = v)
.build());

//? >= 1.19 {
category.addEntry(entryBuilder.startBooleanToggle(Component.translatable("text.cat_vision.config.option.darkness_immunity"), config.darkness_immunity)
category.addEntry(entryBuilder.startBooleanToggle(text(PREFIX + "option.darkness_immunity"), config.darkness_immunity)
.setDefaultValue(true)
.setSaveConsumer(v -> config.darkness_immunity = v)
.build());
//?}

builder.setSavingRunnable(config::save);
for (AbstractConfigListEntry entry : curveEntries(entryBuilder, config))
category.addEntry(entry);

List<Runnable> afterSave = new ArrayList<>();
addDimensionEntries(category, entryBuilder, config, afterSave);

builder.setSavingRunnable(() -> {
for (Runnable task : afterSave)
task.run();
config.save();
});
return builder.build();
}

private static void addDimensionEntries(ConfigCategory category, ConfigEntryBuilder entryBuilder,
ConfigData config, List<Runnable> afterSave) {
Set<String> dimensions = new LinkedHashSet<>(Arrays.asList(
"minecraft:overworld",
"minecraft:the_nether",
"minecraft:the_end"
));
dimensions.addAll(config.dimension_overrides.keySet());

String current = VisionHandler.dimensionOf(Minecraft.getInstance());
if (current != null)
dimensions.add(current);

for (String dimension : dimensions) {
VisionSettings existing = config.dimension_overrides.get(dimension);
VisionSettings settings = existing != null ? existing : config.copy();
VisionSettings asShown = settings.copy();

return builder.build();
}
if (existing == null)
afterSave.add(() -> {
if (config.dimension_overrides.get(dimension) == settings && settings.sameAs(asShown))
settings.copyFrom(config);
});

List<AbstractConfigListEntry> entries = new ArrayList<>();
entries.add(entryBuilder.startBooleanToggle(text(PREFIX + "option.dimension_override"), existing != null)
.setDefaultValue(false)
.setTooltip(
text(PREFIX + "tooltip.dimension_override.1"),
text(PREFIX + "tooltip.dimension_override.2"),
text(PREFIX + "tooltip.dimension_override.3")
)
.setSaveConsumer(v -> {
if (v) config.dimension_overrides.put(dimension, settings);
else config.dimension_overrides.remove(dimension);
})
.build());
entries.add(autoNvEntry(entryBuilder, settings));
entries.addAll(curveEntries(entryBuilder, settings));

category.addEntry(entryBuilder.startSubCategory(dimensionName(dimension), entries).build());
}
}

private static Component dimensionName(String dimension) {
switch (dimension) {
case "minecraft:overworld":
return text(PREFIX + "dimension.overworld");
case "minecraft:the_nether":
return text(PREFIX + "dimension.the_nether");
case "minecraft:the_end":
return text(PREFIX + "dimension.the_end");
default:
return literal(dimension);
}
}

private static AbstractConfigListEntry autoNvEntry(ConfigEntryBuilder entryBuilder, VisionSettings settings) {
return entryBuilder.startBooleanToggle(text(PREFIX + "option.auto_nv"), settings.auto_nv)
.setDefaultValue(true)
.setSaveConsumer(v -> settings.auto_nv = v)
.build();
}

private static List<AbstractConfigListEntry> curveEntries(ConfigEntryBuilder entryBuilder, VisionSettings settings) {
List<AbstractConfigListEntry> entries = new ArrayList<>();

entries.add(entryBuilder.startBooleanToggle(text(PREFIX + "option.nv_curve"), settings.nv_curve)
.setDefaultValue(false)
.setTooltip(
text(PREFIX + "tooltip.nv_curve.1"),
text(PREFIX + "tooltip.nv_curve.2"),
text(PREFIX + "tooltip.nv_curve.3"),
text(PREFIX + "tooltip.nv_curve.4")
)
.setSaveConsumer(v -> settings.nv_curve = v)
.build());

entries.add(slider(entryBuilder, "nv_lit", percent(settings.nv_lit), 0, 100, 0,
v -> literal(v + "%"),
v -> settings.nv_lit = v / 100.0,
text(PREFIX + "tooltip.nv_lit.1"),
text(PREFIX + "tooltip.nv_lit.2")));

entries.add(slider(entryBuilder, "nv_dark", percent(settings.nv_dark), 0, 100, 100,
v -> literal(v + "%"),
v -> settings.nv_dark = v / 100.0,
text(PREFIX + "tooltip.nv_dark.1"),
text(PREFIX + "tooltip.nv_dark.2"),
text(PREFIX + "tooltip.nv_dark.3")));

entries.add(slider(entryBuilder, "nv_lit_light", settings.nv_lit_light, 0, 15, 12,
v -> literal(String.valueOf(v)),
v -> settings.nv_lit_light = (int) v,
text(PREFIX + "tooltip.nv_lit_light")));

entries.add(slider(entryBuilder, "nv_shape", (int) Math.round(settings.nv_shape * 10), 1, 50, 10,
v -> literal(String.format(Locale.ROOT, "%.1f", v / 10.0)),
v -> settings.nv_shape = v / 10.0,
text(PREFIX + "tooltip.nv_shape.1"),
text(PREFIX + "tooltip.nv_shape.2")));

entries.add(slider(entryBuilder, "nv_speed", (int) Math.round(settings.nv_speed * 100), 1, 100, 1,
v -> literal(String.format(Locale.ROOT, "%.2f", v / 100.0)),
v -> settings.nv_speed = v / 100.0,
text(PREFIX + "tooltip.nv_speed")));

return entries;
}

private static AbstractConfigListEntry slider(ConfigEntryBuilder entryBuilder, String key, int value,
int min, int max, int defaultValue, Function<Integer, Component> textGetter,
DoubleConsumer save, Component... tooltip) {
return entryBuilder.startIntSlider(text(PREFIX + "option." + key), value, min, max)
.setDefaultValue(defaultValue)
.setTextGetter(textGetter)
.setTooltip(tooltip)
.setSaveConsumer(v -> save.accept(v))
.build();
}

private static int percent(double value) {
return (int) Math.round(value * 100);
}

private static Component text(String key) {
//? < 1.19 {
/*return new TranslatableComponent(key);
*///?} >= 1.19 {
return Component.translatable(key);
//?}
}

private static Component literal(String value) {
//? < 1.19 {
/*return new TextComponent(value);
*///?} >= 1.19 {
return Component.literal(value);
//?}
}
}
Loading