MidnightLib v0.2.2 - Update to 1.17-pre1

- Not much changed.
- Rough ModMenu port for 1.17-pre1 can be found here: https://github.com/Motschen/ModMenu/releases/tag/v2.0.0-mnd

gradle.properties

@@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=21w19a
+	minecraft_version=1.17-pre1
-    yarn_mappings=21w19a+build.9
+    yarn_mappings=1.17-pre1+build.4
     loader_version=0.11.3
 
 # Mod Properties
-	mod_version = 0.2.0
+	mod_version = 0.2.2
 	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.34.4+1.17
+	fabric_version=0.34.8+1.17
-	mod_menu_version = 2.0.0-beta.4
+	mod_menu_version = 2.0.0-mnd

src/main/java/eu/midnightdust/core/MidnightLibClient.java

@@ -18,6 +18,7 @@ public class MidnightLibClient implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
         MidnightConfig.init("midnightlib", MidnightLibConfig.class);
+        MidnightConfig.useTooltipForTitle = MidnightLibConfig.titleStyle.equals(MidnightLibConfig.TitleStyle.TOOLTIP);
 
         EntityModelLayerRegistry.registerModelLayer(BunnyEarsFeatureRenderer.RABBIT_EARS_MODEL_LAYER, BunnyEarsFeatureRenderer::getTexturedModelData);
         EntityModelLayerRegistry.registerModelLayer(ChristmasHatFeatureRenderer.CHRISTMAS_HAT_MODEL_LAYER, ChristmasHatFeatureRenderer::getTexturedModelData);

src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java

@@ -7,10 +7,15 @@ public class MidnightLibConfig extends MidnightConfig {
     @Comment public static Comment midnightlib_description;
     @Entry // Enable or disable the MidnightConfig overview screen button
     public static boolean config_screen_list = !FabricLoader.getInstance().isModLoaded("modmenu");
+    @Entry // Change the style of the title in MidnightConfig
+    public static TitleStyle titleStyle = MidnightConfig.useTooltipForTitle ? TitleStyle.TOOLTIP : TitleStyle.TEXT;
     @Comment public static Comment midnighthats_description;
     @Entry // Enable or disable event hats
     public static boolean event_hats = true;
     @Entry // Enable or disable hats for contributors, friends and donors.
     public static boolean special_hats = true;
 
+    public enum TitleStyle {
+        TEXT,TOOLTIP
+    }
 }

src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java

@@ -25,6 +25,6 @@ public class MixinOptionsScreen extends Screen {
     @Inject(at = @At("HEAD"),method = "init")
     private void midnightlib$init(CallbackInfo ci) {
         if (MidnightLibConfig.config_screen_list)
-        this.addButton(new TexturedButtonWidget(this.width / 2 + 158, this.height / 6 - 12, 20, 20, 0, 0, 20, MIDNIGHTLIB_ICON_TEXTURE, 32, 64, (buttonWidget) -> Objects.requireNonNull(client).openScreen(new MidnightConfigOverviewScreen(this)), new TranslatableText("narrator.button.midnightlib")));
+        this.addDrawableChild(new TexturedButtonWidget(this.width / 2 + 158, this.height / 6 - 12, 20, 20, 0, 0, 20, MIDNIGHTLIB_ICON_TEXTURE, 32, 64, (buttonWidget) -> Objects.requireNonNull(client).openScreen(new MidnightConfigOverviewScreen(this)), new TranslatableText("narrator.button.midnightlib")));
     }
 }

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

@@ -6,6 +6,7 @@ import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.Selectable;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ScreenTexts;
 import net.minecraft.client.gui.widget.*;
@@ -25,19 +26,16 @@ public class MidnightConfigOverviewScreen extends Screen {
 
     @Override
     protected void init() {
-        super.init();
+        this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).openScreen(parent)));
-
-        this.addButton(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> {
-            Objects.requireNonNull(client).openScreen(parent);
-        }));
 
         this.list = new MidnightOverviewListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
-        this.children.add(this.list);
+        this.addSelectableChild(this.list);
         MidnightConfig.configClass.forEach((modid, configClass) -> {
             list.addButton(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, new TranslatableText(modid +".midnightconfig.title"), (button) -> {
                 Objects.requireNonNull(client).openScreen(MidnightConfig.getScreen(this,modid));
             }));
         });
+        super.init();
     }
     @Override
     public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
@@ -45,9 +43,9 @@ public class MidnightConfigOverviewScreen extends Screen {
         this.list.render(matrices, mouseX, mouseY, delta);
 
         int stringWidth = title.getString().length() + 47;
-        super.render(matrices, mouseX, mouseY, delta);
         if (MidnightConfig.useTooltipForTitle) renderTooltip(matrices, title, width/2 - stringWidth, 27);
         else drawCenteredText(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF);
+        super.render(matrices, mouseX, mouseY, delta);
     }
     @Environment(EnvType.CLIENT)
     public static class MidnightOverviewListWidget extends ElementListWidget<OverviewButtonEntry> {
@@ -61,19 +59,19 @@ public class MidnightConfigOverviewScreen extends Screen {
         @Override
         public int getScrollbarPositionX() { return this.width -7; }
 
-        public void addButton(AbstractButtonWidget button) {
+        public void addButton(ClickableWidget button) {
             this.addEntry(OverviewButtonEntry.create(button));
         }
         @Override
         public int getRowWidth() { return 400; }
     }
     public static class OverviewButtonEntry extends ElementListWidget.Entry<OverviewButtonEntry> {
-        private final List<AbstractButtonWidget> buttons = new ArrayList<>();
+        private final List<ClickableWidget> buttons = new ArrayList<>();
 
-        private OverviewButtonEntry(AbstractButtonWidget button) {
+        private OverviewButtonEntry(ClickableWidget button) {
             this.buttons.add(button);
         }
-        public static OverviewButtonEntry create(AbstractButtonWidget button) {
+        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) {
@@ -85,5 +83,9 @@ public class MidnightConfigOverviewScreen extends Screen {
         public List<? extends Element> children() {
             return buttons;
         }
+
+        public List<? extends Selectable> method_37025() {
+            return buttons;
+        }
     }
 }

src/main/java/eu/midnightdust/hats/bunny/BunnyEarsFeatureRenderer.java

@@ -5,7 +5,6 @@ import eu.midnightdust.core.config.MidnightLibConfig;
 import eu.midnightdust.hats.web.HatLoader;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.model.TexturedModelData;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.render.OverlayTexture;
@@ -35,7 +34,7 @@ public class BunnyEarsFeatureRenderer<T extends LivingEntity, M extends EntityMo
 
     public BunnyEarsFeatureRenderer(FeatureRendererContext<T, M> featureRendererContext, EntityModelLoader entityModelLoader) {
         super(featureRendererContext);
-        this.bunnyEars = new BunnyEarsModel(entityModelLoader.getModelPart(RABBIT_EARS_MODEL_LAYER));
+        this.bunnyEars = new BunnyEarsModel<>(entityModelLoader.getModelPart(RABBIT_EARS_MODEL_LAYER));
     }
 
     public static TexturedModelData getTexturedModelData() {

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

@@ -11,6 +11,7 @@ import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 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.screen.ScreenTexts;
 import net.minecraft.client.gui.widget.*;
@@ -30,9 +31,14 @@ import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-// MidnightConfig v1.0.0
+// MidnightConfig v1.0.2
 // Single class config library - feel free to copy!
 // Changelog:
+// - 1.0.2:
+// - Update to 21w20a
+// - 1.0.1:
+// - Fixed buttons not working in fullscreen
+// - 1.0.0:
 // - The config screen no longer shows the entries of all instances of MidnightConfig
 // - Compatible with servers!
 // - Scrollable!
@@ -40,7 +46,7 @@ import java.util.regex.Pattern;
 // - Fresh New Design
 
 /** Based on https://github.com/Minenash/TinyConfig
- * Credits to Minenash */
+ *  Credits to Minenash */
 
 @SuppressWarnings("unchecked")
 public class MidnightConfig {
@@ -197,7 +203,7 @@ public class MidnightConfig {
         protected void init() {
             super.init();
 
-            this.addButton(new ButtonWidget(this.width / 2 - 154, this.height - 28, 150, 20, ScreenTexts.CANCEL, button -> {
+            this.addDrawableChild(new ButtonWidget(this.width / 2 - 154, this.height - 28, 150, 20, ScreenTexts.CANCEL, button -> {
                 try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); }
                 catch (Exception e) { write(modid); }
 
@@ -213,7 +219,7 @@ public class MidnightConfig {
                 Objects.requireNonNull(client).openScreen(parent);
             }));
 
-            ButtonWidget done = this.addButton(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> {
+            ButtonWidget done = this.addDrawableChild(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> {
                 for (EntryInfo info : entries)
                     if (info.id.equals(modid)) {
                         try {
@@ -225,7 +231,7 @@ public class MidnightConfig {
             }));
 
             this.list = new MidnightConfigListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
-            this.children.add(this.list);
+            this.addSelectableChild(this.list);
             for (EntryInfo info : entries) {
                 if (info.id.equals(modid)) {
                     TranslatableText name = new TranslatableText(translationPrefix + info.field.getName());
@@ -262,14 +268,13 @@ public class MidnightConfig {
             this.list.render(matrices, mouseX, mouseY, delta);
 
             int stringWidth = (int) (title.getString().length() * 2.75f);
-            super.render(matrices, mouseX, mouseY, delta);
             if (useTooltipForTitle) renderTooltip(matrices, title, width/2 - stringWidth, 27);
             else drawCenteredText(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF);
 
             for (EntryInfo info : entries) {
                 if (info.id.equals(modid)) {
                     if (list.getHoveredButton(mouseX,mouseY).isPresent()) {
-                        AbstractButtonWidget buttonWidget = list.getHoveredButton(mouseX,mouseY).get();
+                        ClickableWidget buttonWidget = list.getHoveredButton(mouseX,mouseY).get();
                         Text text = ButtonEntry.buttonsWithText.get(buttonWidget);
                         TranslatableText name = new TranslatableText(this.translationPrefix + info.field.getName());
                         String key = translationPrefix + info.field.getName() + ".tooltip";
@@ -284,6 +289,7 @@ public class MidnightConfig {
                     }
                 }
             }
+            super.render(matrices,mouseX,mouseY,delta);
         }
     }
     @Environment(EnvType.CLIENT)
@@ -298,16 +304,16 @@ public class MidnightConfig {
         @Override
         public int getScrollbarPositionX() { return this.width -7; }
 
-        public void addButton(AbstractButtonWidget button, AbstractButtonWidget resetButton, Text text) {
+        public void addButton(ClickableWidget button, ClickableWidget resetButton, Text text) {
             this.addEntry(ButtonEntry.create(button, text, resetButton));
         }
         @Override
-        public int getRowWidth() { return 400; }
+        public int getRowWidth() { return 10000; }
-        public Optional<AbstractButtonWidget> getHoveredButton(double mouseX, double mouseY) {
+        public Optional<ClickableWidget> getHoveredButton(double mouseX, double mouseY) {
             for (ButtonEntry buttonEntry : this.children()) {
-                for (AbstractButtonWidget abstractButtonWidget : buttonEntry.buttons) {
+                for (ClickableWidget ClickableWidget : buttonEntry.buttons) {
-                    if (abstractButtonWidget.isMouseOver(mouseX, mouseY)) {
+                    if (ClickableWidget.isMouseOver(mouseX, mouseY)) {
-                        return Optional.of(abstractButtonWidget);
+                        return Optional.of(ClickableWidget);
                     }
                 }
             }
@@ -316,13 +322,13 @@ public class MidnightConfig {
     }
     public static class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> {
         private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
-        private final List<AbstractButtonWidget> buttons = new ArrayList<>();
+        private final List<ClickableWidget> buttons = new ArrayList<>();
-        private final List<AbstractButtonWidget> resetButtons = new ArrayList<>();
+        private final List<ClickableWidget> resetButtons = new ArrayList<>();
         private final List<Text> texts = new ArrayList<>();
-        private final List<AbstractButtonWidget> buttonsWithResetButtons = new ArrayList<>();
+        private final List<ClickableWidget> buttonsWithResetButtons = new ArrayList<>();
-        public static final Map<AbstractButtonWidget, Text> buttonsWithText = new HashMap<>();
+        public static final Map<ClickableWidget, Text> buttonsWithText = new HashMap<>();
 
-        private ButtonEntry(AbstractButtonWidget button, Text text, AbstractButtonWidget resetButton) {
+        private ButtonEntry(ClickableWidget button, Text text, ClickableWidget resetButton) {
             buttonsWithText.put(button,text);
             this.buttons.add(button);
             this.resetButtons.add(resetButton);
@@ -330,15 +336,15 @@ public class MidnightConfig {
             this.buttonsWithResetButtons.add(button);
             this.buttonsWithResetButtons.add(resetButton);
         }
-        public static ButtonEntry create(AbstractButtonWidget button, Text text, AbstractButtonWidget resetButton) {
+        public static ButtonEntry create(ClickableWidget button, Text text, ClickableWidget resetButton) {
             return new ButtonEntry(button, text, resetButton);
         }
         public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
-            this.buttons.forEach((button) -> {
+            this.buttons.forEach(button -> {
                 button.y = y;
                 button.render(matrices, mouseX, mouseY, tickDelta);
             });
-            this.texts.forEach((text) -> DrawableHelper.drawTextWithShadow(matrices,textRenderer, text,12,y+5,0xFFFFFF));
+            this.texts.forEach(text -> DrawableHelper.drawTextWithShadow(matrices,textRenderer, text,12,y+5,0xFFFFFF));
             this.resetButtons.forEach((button) -> {
                 button.y = y;
                 button.render(matrices, mouseX, mouseY, tickDelta);
@@ -347,6 +353,10 @@ public class MidnightConfig {
         public List<? extends Element> children() {
             return buttonsWithResetButtons;
         }
+
+        public List<? extends Selectable> method_37025() {
+            return buttonsWithResetButtons;
+        }
     }
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.FIELD)

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

@@ -1,9 +1,13 @@
 {
 	"midnightlib.overview.title":"MidnightConfig Overview",
 	"midnightlib.midnightconfig.title":"MidnightLib Config",
-	"midnightlib.midnightconfig.midnightlib_description":"MidnightLib",
+	"midnightlib.midnightconfig.midnightlib_description":"§nMidnightLib",
 	"midnightlib.midnightconfig.config_screen_list":"Enable Config Screen List",
-	"midnightlib.midnightconfig.midnighthats_description":"MidnightHats",
+	"midnightlib.midnightconfig.titleStyle":"Style of config screen titles",
+	"midnightlib.midnightconfig.titleStyle.tooltip":"§cRequires restart!",
+	"midnightlib.midnightconfig.enum.TitleStyle.TEXT":"Text",
+	"midnightlib.midnightconfig.enum.TitleStyle.TOOLTIP":"Tooltip",
+	"midnightlib.midnightconfig.midnighthats_description":"§nMidnightHats",
 	"midnightlib.midnightconfig.event_hats":"Enable Event Hats",
 	"midnightlib.midnightconfig.special_hats":"Enable Special Hats",
 	"midnightlib.modrinth":"Modrinth",

src/main/resources/fabric.mod.json

@@ -34,7 +34,7 @@
   ],
 
   "depends": {
-    "fabric": "*"
+    "fabric-renderer-registries-v1": "*"
   },
 
   "custom": {

src/main/resources/midnightcore.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "eu.midnightdust.core.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "client": [
     "MixinOptionsScreen"
   ],

src/main/resources/midnighthats.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "package": "eu.midnightdust.hats.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "client": [
     "PlayerEntityRendererMixin"
   ],