Better versioning scheme

build.gradle

@@ -23,7 +23,7 @@ dependencies {
 
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 	
-	modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}")
+	modCompileOnlyApi ("com.terraformersmc:modmenu:${project.mod_menu_version}")
 }
 
 processResources {

gradle.properties

@@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.19-rc2
+	minecraft_version=22w43a
-	yarn_mappings=1.19-rc2+build.1
+	yarn_mappings=22w43a+build.4
-	loader_version=0.14.6
+	loader_version=0.14.10
 
 # Mod Properties
-	mod_version = 0.6.2
+	mod_version = 0.6.1+22w43a
 	maven_group = eu.midnightdust
 	archives_base_name = midnightlib
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.55.1+1.19
+	fabric_version=0.65.1+1.19.3
 	mod_menu_version = 4.0.0-beta.4

src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java

@@ -28,7 +28,7 @@ public class MidnightConfigOverviewScreen extends Screen {
 
     @Override
     protected void init() {
-        this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)));
+        this.addDrawableChild(ButtonWidget.method_46430(ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)).method_46434(this.width / 2 - 100, this.height - 28, 200, 20).method_46431());
 
         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);
@@ -37,8 +37,8 @@ public class MidnightConfigOverviewScreen extends Screen {
         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) ->
+                list.addButton(ButtonWidget.method_46430(Text.translatable(modid +".midnightconfig.title"), (button) ->
-                        Objects.requireNonNull(client).setScreen(MidnightConfig.getScreen(this,modid))));
+                        Objects.requireNonNull(client).setScreen(MidnightConfig.getScreen(this,modid))).method_46434(this.width / 2 - 100, this.height - 28, 200, 20).method_46431());
             }
         });
         super.init();
@@ -78,7 +78,7 @@ public class MidnightConfigOverviewScreen extends Screen {
         }
         public static OverviewButtonEntry create(ClickableWidget button) {return new OverviewButtonEntry(button);}
         public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
-            button.y = y;
+            button.method_46419(y);
             button.render(matrices, mouseX, mouseY, tickDelta);
         }
         public List<? extends Element> children() {return buttonList;}

src/main/java/eu/midnightdust/lib/config/MidnightConfig.java

@@ -13,7 +13,10 @@ import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.Selectable;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.*;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.gui.widget.ClickableWidget;
+import net.minecraft.client.gui.widget.ElementListWidget;
+import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.screen.ScreenTexts;
@@ -37,9 +40,9 @@ import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-/** MidnightConfig v2.3.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
  *  Credits to Minenash */
 
@@ -235,12 +238,12 @@ public abstract class MidnightConfig {
             super.init();
             if (!reload) loadValues();
 
-            this.addDrawableChild(new ButtonWidget(this.width / 2 - 154, this.height - 28, 150, 20, ScreenTexts.CANCEL, button -> {
+            this.addDrawableChild(ButtonWidget.method_46430(ScreenTexts.CANCEL, button -> {
                 loadValues();
                 Objects.requireNonNull(client).setScreen(parent);
-            }));
+            }).method_46434(this.width / 2 - 154, this.height - 28, 150, 20).method_46431());
 
-            ButtonWidget done = this.addDrawableChild(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> {
+            ButtonWidget done = this.addDrawableChild(ButtonWidget.method_46430(ScreenTexts.DONE, (button) -> {
                 for (EntryInfo info : entries)
                     if (info.id.equals(modid)) {
                         try {
@@ -249,7 +252,7 @@ public abstract class MidnightConfig {
                     }
                 write(modid);
                 Objects.requireNonNull(client).setScreen(parent);
-            }));
+            }).method_46434(this.width / 2 + 4, this.height - 28, 150, 20).method_46431());
 
             this.list = new MidnightConfigListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
             if (this.client != null && this.client.world != null) this.list.setRenderBackground(false);
@@ -257,7 +260,7 @@ public abstract class MidnightConfig {
             for (EntryInfo info : entries) {
                 if (info.id.equals(modid)) {
                     Text name = Objects.requireNonNullElseGet(info.name, () -> Text.translatable(translationPrefix + info.field.getName()));
-                    ButtonWidget resetButton = new ButtonWidget(width - 205, 0, 40, 20, Text.literal("Reset").formatted(Formatting.RED), (button -> {
+                    ButtonWidget resetButton = ButtonWidget.method_46430(Text.translatable("Reset").formatted(Formatting.RED), (button -> {
                         info.value = info.defaultValue;
                         info.tempValue = info.defaultValue.toString();
                         info.index = 0;
@@ -265,22 +268,23 @@ public abstract class MidnightConfig {
                         this.reload = true;
                         Objects.requireNonNull(client).setScreen(this);
                         list.setScrollAmount(scrollAmount);
-                    }));
+                    })).method_46434(width - 205, 0, 40, 20).method_46431();
 
                     if (info.widget instanceof Map.Entry) {
                         Map.Entry<ButtonWidget.PressAction, Function<Object, Text>> widget = (Map.Entry<ButtonWidget.PressAction, Function<Object, Text>>) 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, info);
+                        this.list.addButton(List.of(ButtonWidget.method_46430(widget.getValue().apply(info.value), widget.getKey()).method_46434(width - 160, 0,150, 20).method_46431(),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, Text.empty());
+                        TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 160, 0, 150, 20, null);
                         widget.setMaxLength(info.width);
                         if (info.index < ((List<String>)info.value).size()) widget.setText((String.valueOf(((List<String>)info.value).get(info.index))));
+                        else widget.setText("");
                         Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.widget).apply(widget, done);
                         widget.setTextPredicate(processor);
                         resetButton.setWidth(20);
                         resetButton.setMessage(Text.literal("R").formatted(Formatting.RED));
-                        ButtonWidget cycleButton = new ButtonWidget(width - 185, 0, 20, 20, Text.literal(String.valueOf(info.index)).formatted(Formatting.GOLD), (button -> {
+                        ButtonWidget cycleButton = ButtonWidget.method_46430(Text.literal(String.valueOf(info.index)).formatted(Formatting.GOLD), (button -> {
                             ((List<String>)info.value).remove("");
                             double scrollAmount = list.getScrollAmount();
                             this.reload = true;
@@ -288,23 +292,18 @@ public abstract class MidnightConfig {
                             if (info.index > ((List<String>)info.value).size()) info.index = 0;
                             Objects.requireNonNull(client).setScreen(this);
                             list.setScrollAmount(scrollAmount);
-                        }));
+                        })).method_46434(width - 185, 0, 20, 20).method_46431();
                         this.list.addButton(List.of(widget, resetButton, cycleButton), name, info);
                     } else if (info.widget != null) {
-                        ClickableWidget widget;
+                        TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 160, 0, 150, 20, null);
-                        Entry e = info.field.getAnnotation(Entry.class);
+                        widget.setMaxLength(info.width);
-                        if (e.isSlider()) widget = new MidnightSliderWidget(width - 160, 0, 150, 20, Text.of(info.tempValue), (Double.parseDouble(info.tempValue)-e.min()) / (e.max() - e.min()), info);
+                        widget.setText(info.tempValue);
-                        else widget = new TextFieldWidget(textRenderer, width - 160, 0, 150, 20, null, Text.of(info.tempValue));
+                        Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.widget).apply(widget, done);
-                        if (widget instanceof TextFieldWidget textField) {
+                        widget.setTextPredicate(processor);
-                            textField.setMaxLength(info.width);
+                        if (info.field.getAnnotation(Entry.class).isColor()) {
-                            textField.setText(info.tempValue);
-                            Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.widget).apply(textField, done);
-                            textField.setTextPredicate(processor);
-                        }
-                        if (e.isColor()) {
                             resetButton.setWidth(20);
                             resetButton.setMessage(Text.literal("R").formatted(Formatting.RED));
-                            ButtonWidget colorButton = new ButtonWidget(width - 185, 0, 20, 20, Text.literal("⬛"), (button -> {}));
+                            ButtonWidget colorButton = ButtonWidget.method_46430(Text.literal("⬛"), (button -> {})).method_46434(width - 185, 0, 20, 20).method_46431();
                             try {colorButton.setMessage(Text.literal("⬛").setStyle(Style.EMPTY.withColor(Color.decode(info.tempValue).getRGB())));} catch (Exception ignored) {}
                             info.colorButton = colorButton;
                             colorButton.active = false;
@@ -359,7 +358,7 @@ public abstract class MidnightConfig {
         public int getScrollbarPositionX() { return this.width -7; }
 
         public void addButton(List<ClickableWidget> buttons, Text text, EntryInfo info) {
-            this.addEntry(new ButtonEntry(buttons, text, info));
+            this.addEntry(ButtonEntry.create(buttons, text, info));
         }
         @Override
         public int getRowWidth() { return 10000; }
@@ -387,8 +386,11 @@ public abstract class MidnightConfig {
             this.info = info;
             children.addAll(buttons);
         }
+        public static ButtonEntry create(List<ClickableWidget> 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); });
+            buttons.forEach(b -> { b.method_46419(y); b.render(matrices, mouseX, mouseY, tickDelta); });
             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);
@@ -397,35 +399,12 @@ public abstract class MidnightConfig {
         public List<? extends Element> children() {return children;}
         public List<? extends Selectable> selectableChildren() {return children;}
     }
-    private static class MidnightSliderWidget extends SliderWidget {
-        private final EntryInfo info; private final Entry e;
-        public MidnightSliderWidget(int x, int y, int width, int height, Text text, double value, EntryInfo info) {
-            super(x, y, width, height, text, value);
-            this.e = info.field.getAnnotation(Entry.class);
-            this.info = info;
-        }
-
-        @Override
-        protected void updateMessage() {
-            this.setMessage(Text.of(info.tempValue));
-        }
-
-        @Override
-        protected void applyValue() {
-            if (info.field.getType() == int.class) info.value = ((Number) (e.min() + value * (e.max() - e.min()))).intValue();
-            else if (info.field.getType() == double.class) info.value = Math.round((e.min() + value * (e.max() - e.min())) * (double) e.precision()) / (double) e.precision();
-            else if (info.field.getType() == float.class) info.value = Math.round((e.min() + value * (e.max() - e.min())) * (float) e.precision()) / (float) e.precision();
-            info.tempValue = String.valueOf(info.value);
-        }
-    }
     @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Entry {
         int width() default 100;
         double min() default Double.MIN_NORMAL;
         double max() default Double.MAX_VALUE;
         String name() default "";
         boolean isColor() default false;
-        boolean isSlider() default false;
-        int precision() default 100;
     }
     @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Client {}
     @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Server {}

src/main/java/eu/midnightdust/lib/util/screen/TexturedOverlayButtonWidget.java

@@ -32,8 +32,8 @@ public class TexturedOverlayButtonWidget extends TexturedButtonWidget {
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
         RenderSystem.enableDepthTest();
-        this.drawTexture(matrices, this.x, this.y, 0, 46 + i * 20, this.width / 2, this.height);
+        this.drawTexture(matrices, this.method_46426(), this.method_46427(), 0, 46 + i * 20, this.width / 2, this.height);
-        this.drawTexture(matrices, this.x + this.width / 2, this.y, 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
+        this.drawTexture(matrices, this.method_46426() + this.width / 2, this.method_46427(), 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
 
         super.renderButton(matrices, mouseX, mouseY, delta);
     }

src/main/resources/assets/midnightlib/lang/en_us.json

@@ -3,8 +3,8 @@
 	"midnightlib.midnightconfig.title":"MidnightLib Config",
 	"midnightlib.midnightconfig.midnightlib_description":"§nMidnightLib",
 	"midnightlib.midnightconfig.config_screen_list":"Enable Config Screen List",
-	"midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§aYes",
+	"midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§aTrue",
-	"midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cNo",
+	"midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cFalse",
 	"midnightlib.midnightconfig.enum.ConfigButton.MODMENU":"§bModMenu",
 	"midnightlib.midnightconfig.background_texture":"Texture of config screen backgrounds",
 	"midnightlib.midnightconfig.midnighthats_description":"§nMidnightHats",

src/main/resources/assets/midnightlib/lang/pt_br.json

@@ -1,17 +0,0 @@
-{
-	"midnightlib.overview.title":"Visão geral do MidnightConfig",
-	"midnightlib.midnightconfig.title":"Configuração MidnightLib",
-	"midnightlib.midnightconfig.midnightlib_description":"§nMidnightLib",
-	"midnightlib.midnightconfig.config_screen_list":"Ativar lista de telas de configuração",
-	"midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§aVerdadeiro",
-	"midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cFalso",
-	"midnightlib.midnightconfig.enum.ConfigButton.MODMENU":"§bModMenu",
-	"midnightlib.midnightconfig.background_texture":"Textura dos fundos da tela de configuração",
-	"midnightlib.midnightconfig.midnighthats_description":"§nMidnightHats",
-	"midnightlib.midnightconfig.special_hats":"Ativar chapéus de torcedor",
-	"midnightlib.modrinth":"Modrinth",
-	"midnightlib.curseforge":"CurseForge",
-	"midnightlib.wiki":"Wiki",
-	"modmenu.descriptionTranslation.midnightlib": "Biblioteca comum para mods do Team MidnightDust.\nFornece uma API de configuração, integração automática com outros mods, utilitários comuns e cosméticos.",
-	"modmenu.summaryTranslation.midnightlib": "Biblioteca comum para mods do Team MidnightDust."
-}