From 0d20721213294d76b39b09804e86bc30db98a85f Mon Sep 17 00:00:00 2001 From: Motschen Date: Sat, 15 May 2021 12:46:19 +0200 Subject: [PATCH] MidnightLib v0.2.1 - Fix some bugs - Fixed MidnightConfig buttons not working in full screen - Make MidnightConfig title style configurable --- gradle.properties | 2 +- src/main/java/eu/midnightdust/core/MidnightLibClient.java | 1 + .../eu/midnightdust/core/config/MidnightLibConfig.java | 5 +++++ .../midnightdust/hats/bunny/BunnyEarsFeatureRenderer.java | 3 +-- .../java/eu/midnightdust/lib/config/MidnightConfig.java | 7 +++++-- src/main/resources/assets/midnightlib/lang/en_us.json | 8 ++++++-- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 213e0af..29cccd5 100755 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.11.3 # Mod Properties - mod_version = 0.2.0 + mod_version = 0.2.1 maven_group = eu.midnightdust archives_base_name = midnightlib diff --git a/src/main/java/eu/midnightdust/core/MidnightLibClient.java b/src/main/java/eu/midnightdust/core/MidnightLibClient.java index 5e5f062..145e5e6 100755 --- a/src/main/java/eu/midnightdust/core/MidnightLibClient.java +++ b/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); diff --git a/src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java b/src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java index e863c49..134ef4c 100755 --- a/src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java +++ b/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 + } } diff --git a/src/main/java/eu/midnightdust/hats/bunny/BunnyEarsFeatureRenderer.java b/src/main/java/eu/midnightdust/hats/bunny/BunnyEarsFeatureRenderer.java index 8318b19..7cecc3e 100755 --- a/src/main/java/eu/midnightdust/hats/bunny/BunnyEarsFeatureRenderer.java +++ b/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 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() { diff --git a/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index b9691e1..faa91f9 100755 --- a/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -30,9 +30,12 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.regex.Pattern; -// MidnightConfig v1.0.0 +// MidnightConfig v1.0.1 // Single class config library - feel free to copy! // Changelog: +// - 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! @@ -302,7 +305,7 @@ public class MidnightConfig { this.addEntry(ButtonEntry.create(button, text, resetButton)); } @Override - public int getRowWidth() { return 400; } + public int getRowWidth() { return 10000; } public Optional getHoveredButton(double mouseX, double mouseY) { for (ButtonEntry buttonEntry : this.children()) { for (AbstractButtonWidget abstractButtonWidget : buttonEntry.buttons) { diff --git a/src/main/resources/assets/midnightlib/lang/en_us.json b/src/main/resources/assets/midnightlib/lang/en_us.json index 8bb1712..4f4dc75 100755 --- a/src/main/resources/assets/midnightlib/lang/en_us.json +++ b/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",