diff --git a/gradle.properties b/gradle.properties index f559447..0030767 100755 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.14.6 # Mod Properties - mod_version = 0.5.2 + mod_version = 0.6.0 maven_group = eu.midnightdust archives_base_name = midnightlib diff --git a/src/main/java/eu/midnightdust/core/MidnightLibServer.java b/src/main/java/eu/midnightdust/core/MidnightLibServer.java index c9e142c..966acb1 100755 --- a/src/main/java/eu/midnightdust/core/MidnightLibServer.java +++ b/src/main/java/eu/midnightdust/core/MidnightLibServer.java @@ -1,6 +1,5 @@ package eu.midnightdust.core; -import eu.midnightdust.core.config.MidnightLibConfig; import eu.midnightdust.lib.config.AutoCommand; import eu.midnightdust.lib.config.MidnightConfig; import net.fabricmc.api.DedicatedServerModInitializer; @@ -13,7 +12,7 @@ public class MidnightLibServer implements DedicatedServerModInitializer { public void onInitializeServer() { MidnightConfig.configClass.forEach((modid, config) -> { for (Field field : config.getFields()) { - if (field.isAnnotationPresent(MidnightConfig.Entry.class) && !field.isAnnotationPresent(MidnightConfig.Client.class)) + if (field.isAnnotationPresent(MidnightConfig.Entry.class) && !field.isAnnotationPresent(MidnightConfig.Client.class) && !field.isAnnotationPresent(MidnightConfig.Hidden.class)) new AutoCommand(field, modid).register(); } }); diff --git a/src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java b/src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java index 3bdb5dc..f9412a2 100755 --- a/src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java +++ b/src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java @@ -4,10 +4,10 @@ import eu.midnightdust.lib.config.MidnightConfig; import net.fabricmc.loader.api.FabricLoader; public class MidnightLibConfig extends MidnightConfig { - @Comment public static Comment midnightlib_description; + @Comment(centered = true) public static Comment midnightlib_description; @Entry // Enable or disable the MidnightConfig overview screen button public static ConfigButton config_screen_list = FabricLoader.getInstance().isModLoaded("modmenu") ? ConfigButton.MODMENU : ConfigButton.TRUE; - @Comment public static Comment midnighthats_description; + @Comment(centered = true) public static Comment midnighthats_description; @Entry // Enable or disable hats for contributors, friends and donors. public static boolean special_hats = true; diff --git a/src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java b/src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java index 8af1ec8..f583572 100755 --- a/src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java +++ b/src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java @@ -33,7 +33,9 @@ public class MidnightConfigOverviewScreen extends Screen { this.list = new MidnightOverviewListWidget(this.client, this.width, this.height, 32, this.height - 32, 25); if (this.client != null && this.client.world != null) this.list.setRenderBackground(false); this.addSelectableChild(this.list); - MidnightConfig.configClass.forEach((modid, configClass) -> { + List sortedMods = new ArrayList<>(MidnightConfig.configClass.keySet()); + Collections.sort(sortedMods); + sortedMods.forEach((modid) -> { if (!MidnightLibClient.hiddenMods.contains(modid)) { list.addButton(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, Text.translatable(modid +".midnightconfig.title"), (button) -> Objects.requireNonNull(client).setScreen(MidnightConfig.getScreen(this,modid)))); diff --git a/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index d128c3c..ed27167 100755 --- a/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -40,7 +40,7 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.regex.Pattern; -/** MidnightConfig v2.1.0 by TeamMidnightDust & Motschen +/** MidnightConfig v2.2.0 by TeamMidnightDust & Motschen * Single class config library - feel free to copy! * * Based on https://github.com/Minenash/TinyConfig @@ -59,6 +59,7 @@ public abstract class MidnightConfig { Object widget; int width; int max; + boolean centered; Map.Entry error; Object defaultValue; Object value; @@ -81,8 +82,9 @@ public abstract class MidnightConfig { for (Field field : config.getFields()) { EntryInfo info = new EntryInfo(); - if ((field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class)) && !field.isAnnotationPresent(Server.class)) + if ((field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class)) && !field.isAnnotationPresent(Server.class) && !field.isAnnotationPresent(Hidden.class)) if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) initClient(modid, field, info); + if (field.isAnnotationPresent(Comment.class)) info.centered = field.getAnnotation(Comment.class).centered(); if (field.isAnnotationPresent(Entry.class)) try { info.defaultValue = field.get(null); @@ -96,8 +98,7 @@ public abstract class MidnightConfig { try { info.value = info.field.get(null); info.tempValue = info.value.toString(); - } catch (IllegalAccessException ignored) { - } + } catch (IllegalAccessException ignored) {} } } @Environment(EnvType.CLIENT) @@ -117,7 +118,7 @@ public abstract class MidnightConfig { info.max = e.max() == Double.MAX_VALUE ? Integer.MAX_VALUE : (int) e.max(); textField(info, String::length, null, Math.min(e.min(), 0), Math.max(e.max(), 1), true); } else if (type == boolean.class) { - Function func = value -> Text.literal((Boolean) value ? "True" : "False").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED); + Function func = value -> Text.translatable((Boolean) value ? "gui.yes" : "gui.no").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED); info.widget = new AbstractMap.SimpleEntry>(button -> { info.value = !(Boolean) info.value; button.setMessage(func.apply(info.value)); @@ -189,18 +190,18 @@ public abstract class MidnightConfig { return new MidnightConfigScreen(parent, modid); } @Environment(EnvType.CLIENT) - private static class MidnightConfigScreen extends Screen { + public static class MidnightConfigScreen extends Screen { protected MidnightConfigScreen(Screen parent, String modid) { super(Text.translatable(modid + ".midnightconfig." + "title")); this.parent = parent; this.modid = modid; this.translationPrefix = modid + ".midnightconfig."; } - private final String translationPrefix; - private final Screen parent; - private final String modid; - private MidnightConfigListWidget list; - private boolean reload = false; + public final String translationPrefix; + public final Screen parent; + public final String modid; + public MidnightConfigListWidget list; + public boolean reload = false; // Real Time config update // @Override @@ -209,8 +210,18 @@ public abstract class MidnightConfig { for (EntryInfo info : entries) { try {info.field.set(null, info.value);} catch (IllegalAccessException ignored) {} } + updateResetButtons(); } - private void loadValues() { + public void updateResetButtons() { + if (this.list != null) { + for (ButtonEntry entry : this.list.children()) { + if (entry.buttons != null && entry.buttons.size() > 1 && entry.buttons.get(1) instanceof ButtonWidget button) { + button.active = !Objects.equals(entry.info.value.toString(), entry.info.defaultValue.toString()); + } + } + } + } + public void loadValues() { try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); } catch (Exception e) { write(modid); } @@ -223,7 +234,7 @@ public abstract class MidnightConfig { } } @Override - protected void init() { + public void init() { super.init(); if (!reload) loadValues(); @@ -262,7 +273,7 @@ public abstract class MidnightConfig { if (info.widget instanceof Map.Entry) { Map.Entry> widget = (Map.Entry>) info.widget; if (info.field.getType().isEnum()) widget.setValue(value -> Text.translatable(translationPrefix + "enum." + info.field.getType().getSimpleName() + "." + info.value.toString())); - this.list.addButton(List.of(new ButtonWidget(width - 160, 0,150, 20, widget.getValue().apply(info.value), widget.getKey()),resetButton), name); + this.list.addButton(List.of(new ButtonWidget(width - 160, 0,150, 20, widget.getValue().apply(info.value), widget.getKey()),resetButton), name, info); } else if (info.field.getType() == List.class) { if (!reload) info.index = 0; TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 160, 0, 150, 20, null); @@ -282,7 +293,7 @@ public abstract class MidnightConfig { Objects.requireNonNull(client).setScreen(this); list.setScrollAmount(scrollAmount); })); - this.list.addButton(List.of(widget, resetButton, cycleButton), name); + this.list.addButton(List.of(widget, resetButton, cycleButton), name, info); } else if (info.widget != null) { TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 160, 0, 150, 20, null); widget.setMaxLength(info.width); @@ -295,13 +306,14 @@ public abstract class MidnightConfig { ButtonWidget colorButton = new ButtonWidget(width - 185, 0, 20, 20, Text.literal("⬛"), (button -> {})); try {colorButton.setMessage(Text.literal("⬛").setStyle(Style.EMPTY.withColor(Color.decode(info.tempValue).getRGB())));} catch (Exception ignored) {} info.colorButton = colorButton; - this.list.addButton(List.of(widget, colorButton, resetButton), name); + this.list.addButton(List.of(widget, colorButton, resetButton), name, info); } - else this.list.addButton(List.of(widget, resetButton), name); + else this.list.addButton(List.of(widget, resetButton), name, info); } else { - this.list.addButton(List.of(),name); + this.list.addButton(List.of(),name, info); } } + updateResetButtons(); } } @@ -344,8 +356,8 @@ public abstract class MidnightConfig { @Override public int getScrollbarPositionX() { return this.width -7; } - public void addButton(List buttons, Text text) { - this.addEntry(ButtonEntry.create(buttons, text)); + public void addButton(List buttons, Text text, EntryInfo info) { + this.addEntry(ButtonEntry.create(buttons, text, info)); } @Override public int getRowWidth() { return 10000; } @@ -362,22 +374,26 @@ public abstract class MidnightConfig { private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer; public final List buttons; private final Text text; + public final EntryInfo info; private final List children = new ArrayList<>(); public static final Map buttonsWithText = new HashMap<>(); - private ButtonEntry(List buttons, Text text) { + private ButtonEntry(List buttons, Text text, EntryInfo info) { if (!buttons.isEmpty()) buttonsWithText.put(buttons.get(0),text); this.buttons = buttons; this.text = text; + this.info = info; children.addAll(buttons); } - public static ButtonEntry create(List buttons, Text text) { - return new ButtonEntry(buttons, text); + public static ButtonEntry create(List buttons, Text text, EntryInfo info) { + return new ButtonEntry(buttons, text, info); } public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { buttons.forEach(b -> { b.y = y; b.render(matrices, mouseX, mouseY, tickDelta); }); - if (text != null && (!text.getString().contains("spacer") || !buttons.isEmpty())) - DrawableHelper.drawTextWithShadow(matrices,textRenderer, text,12,y+5,0xFFFFFF); + if (text != null && (!text.getString().contains("spacer") || !buttons.isEmpty())) { + if (info.centered) textRenderer.drawWithShadow(matrices, text, MinecraftClient.getInstance().getWindow().getScaledWidth() / 2f - (textRenderer.getWidth(text) / 2f), y + 5, 0xFFFFFF); + else DrawableHelper.drawTextWithShadow(matrices, textRenderer, text, 12, y + 5, 0xFFFFFF); + } } public List children() {return children;} public List selectableChildren() {return children;} @@ -391,7 +407,10 @@ public abstract class MidnightConfig { } @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Client {} @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Server {} - @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Comment {} + @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Hidden {} + @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Comment { + boolean centered() default false; + } public static class HiddenAnnotationExclusionStrategy implements ExclusionStrategy { public boolean shouldSkipClass(Class clazz) { return false; } diff --git a/src/main/resources/assets/midnightlib/icon.png b/src/main/resources/assets/midnightlib/icon.png old mode 100755 new mode 100644 index ddc1a49..d31b4c4 Binary files a/src/main/resources/assets/midnightlib/icon.png and b/src/main/resources/assets/midnightlib/icon.png differ