diff --git a/common/src/main/java/eu/midnightdust/core/MidnightLibClient.java b/common/src/main/java/eu/midnightdust/core/MidnightLibClient.java index 8d6df02..2cfdd0d 100755 --- a/common/src/main/java/eu/midnightdust/core/MidnightLibClient.java +++ b/common/src/main/java/eu/midnightdust/core/MidnightLibClient.java @@ -1,7 +1,6 @@ package eu.midnightdust.core; import eu.midnightdust.core.config.MidnightLibConfig; -import eu.midnightdust.lib.config.MidnightConfig; import java.util.ArrayList; import java.util.List; @@ -10,6 +9,6 @@ public class MidnightLibClient { public static List hiddenMods = new ArrayList<>(); public static void onInitializeClient() { - MidnightConfig.init("midnightlib", MidnightLibConfig.class); + MidnightLibConfig.init("midnightlib", MidnightLibConfig.class); } } diff --git a/common/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java b/common/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java index 1f3da97..f6af033 100755 --- a/common/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java +++ b/common/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java @@ -3,9 +3,9 @@ package eu.midnightdust.core.mixin; import eu.midnightdust.core.config.MidnightLibConfig; import eu.midnightdust.core.screen.MidnightConfigOverviewScreen; import eu.midnightdust.lib.util.PlatformFunctions; -import eu.midnightdust.lib.util.screen.TexturedOverlayButtonWidget; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.option.OptionsScreen; +import net.minecraft.client.gui.widget.TextIconButtonWidget; import net.minecraft.text.Text; import net.minecraft.util.Identifier; import org.spongepowered.asm.mixin.Mixin; @@ -17,14 +17,18 @@ import java.util.Objects; @Mixin(OptionsScreen.class) public class MixinOptionsScreen extends Screen { - private static final Identifier MIDNIGHTLIB_ICON_TEXTURE = new Identifier("midnightlib","textures/gui/midnightlib_button.png"); protected MixinOptionsScreen(Text title) { super(title); } @Inject(at = @At("HEAD"),method = "init") private void midnightlib$init(CallbackInfo ci) { - if (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.TRUE) || (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.MODMENU) && !PlatformFunctions.isModLoaded("modmenu"))) - this.addDrawableChild(new TexturedOverlayButtonWidget(this.width / 2 + 158, this.height / 6 - 12, 20, 20, 0, 0, 20, MIDNIGHTLIB_ICON_TEXTURE, 32, 64, (buttonWidget) -> Objects.requireNonNull(client).setScreen(new MidnightConfigOverviewScreen(this)), Text.translatable("midnightlib.overview.title"))); + if (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.TRUE) || (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.MODMENU) && !PlatformFunctions.isModLoaded("modmenu"))) { + TextIconButtonWidget button = TextIconButtonWidget.builder(Text.translatable("midnightlib.overview.title"), ( + buttonWidget) -> Objects.requireNonNull(client).setScreen(new MidnightConfigOverviewScreen(this)), true) + .texture(new Identifier("midnightlib","icon/midnightlib"), 16, 16).dimension(20, 20).build(); + button.setPosition(this.width / 2 + 158, this.height / 6 - 12); + this.addDrawableChild(button); + } } } diff --git a/common/src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java b/common/src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java index c115063..9ec56c7 100755 --- a/common/src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java +++ b/common/src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java @@ -5,13 +5,11 @@ import eu.midnightdust.lib.config.MidnightConfig; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; 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.util.math.MatrixStack; import net.minecraft.screen.ScreenTexts; import net.minecraft.text.*; import java.util.*; @@ -45,19 +43,15 @@ public class MidnightConfigOverviewScreen extends Screen { } @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { - this.renderBackground(context); + super.render(context, mouseX, mouseY, delta); this.list.render(context, mouseX, mouseY, delta); context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xFFFFFF); - super.render(context, mouseX, mouseY, delta); } @Environment(EnvType.CLIENT) public static class MidnightOverviewListWidget extends ElementListWidget { - TextRenderer textRenderer; - public MidnightOverviewListWidget(MinecraftClient minecraftClient, int i, int j, int k, int l, int m) { super(minecraftClient, i, j, k, l, m); this.centerListVertically = false; - textRenderer = minecraftClient.textRenderer; } @Override public int getScrollbarPositionX() {return this.width-7;} @@ -70,18 +64,16 @@ public class MidnightConfigOverviewScreen extends Screen { } public static class OverviewButtonEntry extends ElementListWidget.Entry { private final ClickableWidget button; - private final List buttonList = new ArrayList<>(); private OverviewButtonEntry(ClickableWidget button) { this.button = button; - this.buttonList.add(button); } public static OverviewButtonEntry create(ClickableWidget button) {return new OverviewButtonEntry(button);} public void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { button.setY(y); button.render(context, mouseX, mouseY, tickDelta); } - public List children() {return buttonList;} - public List selectableChildren() {return buttonList;} + public List children() {return List.of(button);} + public List selectableChildren() {return List.of(button);} } } \ No newline at end of file diff --git a/common/src/main/java/eu/midnightdust/lib/config/AutoCommand.java b/common/src/main/java/eu/midnightdust/lib/config/AutoCommand.java index c948a69..5598308 100644 --- a/common/src/main/java/eu/midnightdust/lib/config/AutoCommand.java +++ b/common/src/main/java/eu/midnightdust/lib/config/AutoCommand.java @@ -1,6 +1,7 @@ package eu.midnightdust.lib.config; import com.mojang.brigadier.arguments.DoubleArgumentType; +import com.mojang.brigadier.arguments.FloatArgumentType; import com.mojang.brigadier.arguments.IntegerArgumentType; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; @@ -14,9 +15,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@SuppressWarnings("unchecked") public class AutoCommand { public static List> commands = new ArrayList<>(); - private LiteralArgumentBuilder command; final Field entry; final String modid; @@ -26,14 +27,7 @@ public class AutoCommand { } public void register() { - command = CommandManager.literal(modid); - command(); - LiteralArgumentBuilder finalized = CommandManager.literal("midnightconfig").requires(source -> source.hasPermissionLevel(2)).then(command); - - PlatformFunctions.registerCommand(finalized); commands.add(finalized); - } - - private void command() { + LiteralArgumentBuilder command = CommandManager.literal(modid); if (entry.getType() == int.class) command = command.then(CommandManager.literal(this.entry.getName()).executes(ctx -> getValue(ctx.getSource())).then( CommandManager.argument("value", IntegerArgumentType.integer((int) entry.getAnnotation(MidnightConfig.Entry.class).min(),(int) entry.getAnnotation(MidnightConfig.Entry.class).max())) @@ -44,15 +38,18 @@ public class AutoCommand { CommandManager.argument("value", DoubleArgumentType.doubleArg(entry.getAnnotation(MidnightConfig.Entry.class).min(),entry.getAnnotation(MidnightConfig.Entry.class).max())) .executes(ctx -> this.setValue(ctx.getSource(), DoubleArgumentType.getDouble(ctx, "value"))) )); + else if (entry.getType() == float.class) + command = command.then(CommandManager.literal(this.entry.getName()).executes(ctx -> getValue(ctx.getSource())).then( + CommandManager.argument("value", FloatArgumentType.floatArg((float) entry.getAnnotation(MidnightConfig.Entry.class).min(), (float) entry.getAnnotation(MidnightConfig.Entry.class).max())) + .executes(ctx -> this.setValue(ctx.getSource(), FloatArgumentType.getFloat(ctx, "value"))) + )); else if (entry.getType() == boolean.class) { - command = command.then(CommandManager.literal(this.entry.getName()).executes(ctx -> getValue(ctx.getSource())).then( - CommandManager.literal("true") - .executes(ctx -> this.setValue(ctx.getSource(), true)) - )); - command = command.then(CommandManager.literal(this.entry.getName()).executes(ctx -> getValue(ctx.getSource())).then( - CommandManager.literal("false") - .executes(ctx -> this.setValue(ctx.getSource(), false)) - )); + for (int i = 0; i < 2; i++) { + command = command.then(CommandManager.literal(this.entry.getName()).executes(ctx -> getValue(ctx.getSource())).then( + CommandManager.literal(i==0 ? "true":"false") + .executes(ctx -> this.setValue(ctx.getSource(), ctx.getInput().endsWith("true"))) + )); + } } else if (entry.getType().isEnum()) { for (int i = 0; i < entry.getType().getEnumConstants().length; ++i) { @@ -63,16 +60,28 @@ public class AutoCommand { )); } } - else + else if (entry.getType() == List.class) { + for (int i = 0; i < 2; i++) { + int finalI = i; + command = command.then(CommandManager.literal(this.entry.getName()).executes(ctx -> getValue(ctx.getSource())).then(CommandManager.literal(i==0 ? "add":"remove").then( + CommandManager.argument("value", StringArgumentType.string()) + .executes(ctx -> this.setList(ctx.getSource(), StringArgumentType.getString(ctx, "value"), finalI==0)) + ))); + } + } + else { command = command.then(CommandManager.literal(this.entry.getName()).executes(ctx -> getValue(ctx.getSource())).then( CommandManager.argument("value", StringArgumentType.string()) .executes(ctx -> this.setValue(ctx.getSource(), StringArgumentType.getString(ctx, "value"))) )); - } + } + LiteralArgumentBuilder finalized = CommandManager.literal("midnightconfig").requires(source -> source.hasPermissionLevel(2)).then(command); + PlatformFunctions.registerCommand(finalized); commands.add(finalized); + } private int setValue(ServerCommandSource source, Object value) { try { - entry.set(null,value); + if (entry.getType() != List.class) entry.set(null,value); MidnightConfig.write(modid); } catch (Exception e) { @@ -83,14 +92,26 @@ public class AutoCommand { source.sendFeedback(() -> Text.literal("Successfully set " + entry.getName()+" to "+value), true); return 1; } + private int setList(ServerCommandSource source, String value, boolean add) { + try { + List e = (List)entry.get(null); + if (add) e.add(value); + else if (!e.contains(value)) throw new IllegalArgumentException("List does not contain this string!"); + else e.remove(value); + MidnightConfig.write(modid); + } + catch (Exception e) { + source.sendError(Text.literal((add ? "Could not add "+value+" to " : "Could not remove "+value+" from ")+entry.getName() +": " + e)); + return 0; + } + source.sendFeedback(() -> Text.literal((add ? "Successfully added " +value+" to " : "Successfully removed " +value+" from ") +entry.getName()), true); + return 1; + } private int getValue(ServerCommandSource source) { source.sendFeedback(() -> { - try { - return Text.literal("The value of "+entry.getName()+" is "+entry.get(null)); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } - }, false); + try {return Text.literal("The value of "+entry.getName()+" is "+entry.get(null)); + } catch (IllegalAccessException e) {throw new RuntimeException(e);} + }, true); return 0; } } diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index e62e529..d842ddd 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -24,6 +24,7 @@ import net.minecraft.text.OrderedText; import net.minecraft.text.Style; import net.minecraft.text.Text; import net.minecraft.util.Formatting; +import net.minecraft.util.Identifier; import java.awt.Color; import java.lang.annotation.ElementType; @@ -41,7 +42,7 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.regex.Pattern; -/** MidnightConfig v2.4.1 by TeamMidnightDust & Motschen +/** MidnightConfig v2.5.0 by TeamMidnightDust & Motschen * Single class config library - feel free to copy! * Based on ... * Credits to Minenash */ @@ -49,7 +50,7 @@ import java.util.regex.Pattern; @SuppressWarnings("unchecked") public abstract class MidnightConfig { private static final Pattern INTEGER_ONLY = Pattern.compile("(-?[0-9]*)"); - private static final Pattern DECIMAL_ONLY = Pattern.compile("-?([\\d]+\\.?[\\d]*|[\\d]*\\.?[\\d]+|\\.)"); + private static final Pattern DECIMAL_ONLY = Pattern.compile("-?(\\d+\\.?\\d*|\\d*\\.?\\d+|\\.)"); private static final Pattern HEXADECIMAL_ONLY = Pattern.compile("(-?[#0-9a-fA-F]*)"); private static final List entries = new ArrayList<>(); @@ -71,12 +72,12 @@ public abstract class MidnightConfig { Tab tab; } - public static final Map> configClass = new HashMap<>(); + public static final Map> configClass = new HashMap<>(); private static Path path; private static final Gson gson = new GsonBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE).addSerializationExclusionStrategy(new HiddenAnnotationExclusionStrategy()).setPrettyPrinting().create(); - public static void init(String modid, Class config) { + public static void init(String modid, Class config) { path = PlatformFunctions.getConfigDirectory().resolve(modid + ".json"); configClass.put(modid, config); @@ -177,12 +178,18 @@ public abstract class MidnightConfig { return true; }; } - + public static MidnightConfig getClass(String modid) { + try { return configClass.get(modid).getDeclaredConstructor().newInstance(); } catch (Exception e) {throw new RuntimeException(e);} + } public static void write(String modid) { + getClass(modid).writeChanges(modid); + } + + public void writeChanges(String modid) { path = PlatformFunctions.getConfigDirectory().resolve(modid + ".json"); try { if (!Files.exists(path)) Files.createFile(path); - Files.write(path, gson.toJson(configClass.get(modid).getDeclaredConstructor().newInstance()).getBytes()); + Files.write(path, gson.toJson(getClass(modid)).getBytes()); } catch (Exception e) { e.printStackTrace(); } @@ -251,6 +258,8 @@ public abstract class MidnightConfig { 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()); + if (button.active) button.setTooltip(Tooltip.of(Text.translatable("controls.reset").formatted(Formatting.RED))); + else button.setTooltip(Tooltip.of(Text.empty())); } } } @@ -305,13 +314,14 @@ public abstract class MidnightConfig { for (EntryInfo info : entries) { if (info.id.equals(modid) && (info.tab == null || info.tab == tabManager.getCurrentTab())) { Text name = Objects.requireNonNullElseGet(info.name, () -> Text.translatable(translationPrefix + info.field.getName())); - ButtonWidget resetButton = ButtonWidget.builder(Text.literal("Reset").formatted(Formatting.RED), (button -> { + TextIconButtonWidget resetButton = TextIconButtonWidget.builder(Text.translatable("controls.reset"), (button -> { info.value = info.defaultValue; info.tempValue = info.defaultValue.toString(); info.index = 0; list.clear(); fillList(); - })).dimensions(width - 205, 0, 40, 20).build(); + }), true).texture(new Identifier("midnightlib","icon/reset"), 12, 12).dimension(40, 20).build(); + resetButton.setPosition(width - 205, 0); if (info.widget instanceof Map.Entry) { Map.Entry> widget = (Map.Entry>) info.widget; @@ -327,7 +337,6 @@ public abstract class MidnightConfig { Predicate processor = ((BiFunction>) info.widget).apply(widget, done); widget.setTextPredicate(processor); resetButton.setWidth(20); - resetButton.setMessage(Text.literal("R").formatted(Formatting.RED)); ButtonWidget cycleButton = ButtonWidget.builder(Text.literal(String.valueOf(info.index)).formatted(Formatting.GOLD), (button -> { if (((List) info.value).contains("")) ((List) info.value).remove(""); info.index = info.index + 1; @@ -353,7 +362,6 @@ public abstract class MidnightConfig { widget.setTooltip(getTooltip(info)); if (e.isColor()) { resetButton.setWidth(20); - resetButton.setMessage(Text.literal("R").formatted(Formatting.RED)); ButtonWidget colorButton = ButtonWidget.builder(Text.literal("⬛"), (button -> { })).dimensions(width - 185, 0, 20, 20).build(); try { @@ -374,11 +382,10 @@ public abstract class MidnightConfig { } @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { - this.renderBackground(context); + super.render(context,mouseX,mouseY,delta); this.list.render(context, mouseX, mouseY, delta); if (tabs.size() < 2) context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xFFFFFF); - super.render(context,mouseX,mouseY,delta); } } @Environment(EnvType.CLIENT) diff --git a/common/src/main/java/eu/midnightdust/lib/util/MidnightColorUtil.java b/common/src/main/java/eu/midnightdust/lib/util/MidnightColorUtil.java index f46f972..f858bc7 100755 --- a/common/src/main/java/eu/midnightdust/lib/util/MidnightColorUtil.java +++ b/common/src/main/java/eu/midnightdust/lib/util/MidnightColorUtil.java @@ -3,12 +3,6 @@ package eu.midnightdust.lib.util; import java.awt.Color; public class MidnightColorUtil { - public static float hue; - public static void tick() { - if (hue > 1) hue = 0f; - hue = hue + 0.01f; - } - /** * @param colorStr e.g. "FFFFFF" or "#FFFFFF" * @return Color as RGB @@ -19,8 +13,4 @@ public class MidnightColorUtil { } catch (Exception ignored) {} return Color.BLACK; } - - public static Color radialRainbow(float saturation, float brightness) { - return Color.getHSBColor(hue, saturation, brightness); - } } diff --git a/common/src/main/java/eu/midnightdust/lib/util/screen/TexturedOverlayButtonWidget.java b/common/src/main/java/eu/midnightdust/lib/util/screen/TexturedOverlayButtonWidget.java deleted file mode 100644 index e5f1f38..0000000 --- a/common/src/main/java/eu/midnightdust/lib/util/screen/TexturedOverlayButtonWidget.java +++ /dev/null @@ -1,40 +0,0 @@ -package eu.midnightdust.lib.util.screen; - -import com.mojang.blaze3d.systems.RenderSystem; -import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.gui.widget.TexturedButtonWidget; -import net.minecraft.client.render.GameRenderer; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.Text; -import net.minecraft.util.Identifier; - -public class TexturedOverlayButtonWidget extends TexturedButtonWidget { - - public TexturedOverlayButtonWidget(int x, int y, int width, int height, int u, int v, Identifier texture, PressAction pressAction) { - super(x, y, width, height, u, v, texture, pressAction); - } - - public TexturedOverlayButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, PressAction pressAction) { - super(x, y, width, height, u, v, hoveredVOffset, texture, pressAction); - } - - public TexturedOverlayButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, int textureWidth, int textureHeight, PressAction pressAction) { - super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction); - } - - public TexturedOverlayButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, int textureWidth, int textureHeight, PressAction pressAction, Text text) { - super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, text); - } - - @Override - public void renderButton(DrawContext context, int mouseX, int mouseY, float delta) { - int i = 66; - if (!this.isNarratable()) { - i += hoveredVOffset * 2; - } else if (this.isSelected()) { - i += hoveredVOffset; - } - context.drawNineSlicedTexture(WIDGETS_TEXTURE, this.getX(), this.getY(), this.width, this.height, 4, 200, 20, 0, i); - super.renderButton(context, mouseX, mouseY, delta); - } -} diff --git a/common/src/main/resources/assets/midnightlib/lang/de_de.json b/common/src/main/resources/assets/midnightlib/lang/de_de.json index b425e31..6d5212d 100755 --- a/common/src/main/resources/assets/midnightlib/lang/de_de.json +++ b/common/src/main/resources/assets/midnightlib/lang/de_de.json @@ -2,7 +2,6 @@ "midnightlib.overview.title":"MidnightConfig Übersicht", "midnightlib.midnightconfig.title":"MidnightLib Konfiguration", "midnightlib.midnightconfig.config_screen_list":"Konfigurationsübersicht", - "midnightlib.midnightconfig.background_texture":"Textur der Konfigurationsbildschirme", - "modmenu.descriptionTranslation.midnightlib": "Code-Bibliothek für Mods von MidnightDust.\nStellt eine Konfigurationsschnittstelle, automatische Kompatibilität, oft genutzten Code und Hüte für Unterstützer bereit.", - "modmenu.summaryTranslation.midnightlib": "Code-Bibliothek für Mods von MidnightDust." + "modmenu.descriptionTranslation.midnightlib": "Code-Bibliothek für einfache Konfiguration.\nStellt eine Konfigurationsschnittstelle, automatische Kompatibilität und oft genutzten Code bereit.", + "modmenu.summaryTranslation.midnightlib": "Code-Bibliothek für einfache Konfiguration." } \ No newline at end of file diff --git a/common/src/main/resources/assets/midnightlib/lang/en_us.json b/common/src/main/resources/assets/midnightlib/lang/en_us.json index 326564a..871eb57 100755 --- a/common/src/main/resources/assets/midnightlib/lang/en_us.json +++ b/common/src/main/resources/assets/midnightlib/lang/en_us.json @@ -5,10 +5,9 @@ "midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§aYes", "midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cNo", "midnightlib.midnightconfig.enum.ConfigButton.MODMENU":"§bModMenu", - "midnightlib.midnightconfig.background_texture":"Texture of config screen backgrounds", "midnightlib.modrinth":"Modrinth", "midnightlib.curseforge":"CurseForge", "midnightlib.wiki":"Wiki", - "modmenu.descriptionTranslation.midnightlib": "Common Library for Team MidnightDust's mods.\nProvides a config api, automatic integration with other mods, common utils, and cosmetics.", - "modmenu.summaryTranslation.midnightlib": "Common Library for Team MidnightDust's mods." + "modmenu.descriptionTranslation.midnightlib": "Common Library for easy configuration.\nProvides a config api, automatic integration with other mods and common utils.", + "modmenu.summaryTranslation.midnightlib": "Common Library for easy configuration." } \ No newline at end of file diff --git a/common/src/main/resources/assets/midnightlib/lang/fr_fr.json b/common/src/main/resources/assets/midnightlib/lang/fr_fr.json index 143b2eb..49e7a92 100644 --- a/common/src/main/resources/assets/midnightlib/lang/fr_fr.json +++ b/common/src/main/resources/assets/midnightlib/lang/fr_fr.json @@ -4,7 +4,6 @@ "midnightlib.midnightconfig.config_screen_list":"Activer la liste de l'écran de configuration", "midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§aOui", "midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cNon", - "midnightlib.midnightconfig.background_texture":"Texture d'arrière-plan de l'écran de configuration", - "modmenu.descriptionTranslation.midnightlib": "Bibliothèque commune pour les mods de la Team MidnightDust.\nFournit une API de configuration, une intégration automatique avec d'autres mods, des utilitaires courants et des cosmétiques.", + "modmenu.descriptionTranslation.midnightlib": "Bibliothèque commune pour les mods de la Team MidnightDust.\nFournit une API de configuration, une intégration automatique avec d'autres mods et des utilitaires courants.", "modmenu.summaryTranslation.midnightlib": "Bibliothèque commune pour les mods de la Team MidnightDust." } diff --git a/common/src/main/resources/assets/midnightlib/lang/pt_br.json b/common/src/main/resources/assets/midnightlib/lang/pt_br.json index 79cd680..3a47a49 100644 --- a/common/src/main/resources/assets/midnightlib/lang/pt_br.json +++ b/common/src/main/resources/assets/midnightlib/lang/pt_br.json @@ -4,7 +4,6 @@ "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.background_texture":"Textura dos fundos da tela de configuração", - "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.descriptionTranslation.midnightlib": "Biblioteca comum para mods do Team MidnightDust.\nFornece uma API de configuração, integração automática com outros mods e utilitários comuns.", "modmenu.summaryTranslation.midnightlib": "Biblioteca comum para mods do Team MidnightDust." } \ No newline at end of file diff --git a/common/src/main/resources/assets/midnightlib/lang/tt_ru.json b/common/src/main/resources/assets/midnightlib/lang/tt_ru.json index ce648ee..9118e46 100644 --- a/common/src/main/resources/assets/midnightlib/lang/tt_ru.json +++ b/common/src/main/resources/assets/midnightlib/lang/tt_ru.json @@ -4,7 +4,6 @@ "midnightlib.midnightconfig.config_screen_list":"Көйләүләр экранының исемлеген кушу", "midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§aӘйе", "midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cЮк", - "midnightlib.midnightconfig.background_texture":"Көйләүләр экранының фонының текстурасы", "midnightlib.wiki":"Вики", "modmenu.descriptionTranslation.midnightlib": "MidnightDust төркеменең модлары өчен гомуми китапханә.\nКөйләүләр API-ын, башка модлар белән автоматик интеграцияне, гомуми хезмәти программаларны һәм бизәнүләрне тәэмин ителә.", "modmenu.summaryTranslation.midnightlib": "MidnightDust төркеменең модлары өчен гомуми китапханә." diff --git a/common/src/main/resources/assets/midnightlib/lang/uk_ua.json b/common/src/main/resources/assets/midnightlib/lang/uk_ua.json index 6aee0e9..41e542f 100644 --- a/common/src/main/resources/assets/midnightlib/lang/uk_ua.json +++ b/common/src/main/resources/assets/midnightlib/lang/uk_ua.json @@ -2,7 +2,6 @@ "midnightlib.overview.title":"Огляд MidnightConfig", "midnightlib.midnightconfig.title":"Конфігурація MidnightLib", "midnightlib.midnightconfig.config_screen_list":"Увімкнути список екрана конфігурації", - "midnightlib.midnightconfig.background_texture":"Текстура фону екрана конфігурації", "midnightlib.wiki":"Вікі", "modmenu.descriptionTranslation.midnightlib": "Загальна бібліотека для модів команди MidnightDust.\nНадає конфігураційний API, автоматичну інтеграцію з іншими модами, загальні утиліти та косметику.", "modmenu.summaryTranslation.midnightlib": "Загальна бібліотека для модів команди MidnightDust." diff --git a/common/src/main/resources/assets/midnightlib/lang/zh_tw.json b/common/src/main/resources/assets/midnightlib/lang/zh_tw.json index 4b8207c..9b689cb 100644 --- a/common/src/main/resources/assets/midnightlib/lang/zh_tw.json +++ b/common/src/main/resources/assets/midnightlib/lang/zh_tw.json @@ -5,9 +5,6 @@ "midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§a是", "midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§c否", "midnightlib.midnightconfig.enum.ConfigButton.MODMENU":"§b模組選單", - "midnightlib.midnightconfig.background_texture":"設定背景畫面的材質", - "midnightlib.modrinth":"Modrinth", - "midnightlib.curseforge":"CurseForge", "midnightlib.wiki":"維基", "modmenu.descriptionTranslation.midnightlib": "MidnightDust 團隊的常用程式庫模組。\n提供設定 API、與其他模組自動整合、常用工具和美觀。", "modmenu.summaryTranslation.midnightlib": "MidnightDust 團隊的常用程式庫模組。" diff --git a/common/src/main/resources/assets/midnightlib/textures/gui/midnightlib_button.png b/common/src/main/resources/assets/midnightlib/textures/gui/midnightlib_button.png deleted file mode 100644 index 0828266..0000000 Binary files a/common/src/main/resources/assets/midnightlib/textures/gui/midnightlib_button.png and /dev/null differ diff --git a/common/src/main/resources/assets/midnightlib/textures/gui/sprites/icon/midnightlib.png b/common/src/main/resources/assets/midnightlib/textures/gui/sprites/icon/midnightlib.png new file mode 100644 index 0000000..4997713 Binary files /dev/null and b/common/src/main/resources/assets/midnightlib/textures/gui/sprites/icon/midnightlib.png differ diff --git a/common/src/main/resources/assets/midnightlib/textures/gui/sprites/icon/reset.png b/common/src/main/resources/assets/midnightlib/textures/gui/sprites/icon/reset.png new file mode 100644 index 0000000..7678297 Binary files /dev/null and b/common/src/main/resources/assets/midnightlib/textures/gui/sprites/icon/reset.png differ diff --git a/common/src/main/resources/midnightlib.mixins.json b/common/src/main/resources/midnightlib.mixins.json index 3a29fd8..20c4305 100644 --- a/common/src/main/resources/midnightlib.mixins.json +++ b/common/src/main/resources/midnightlib.mixins.json @@ -1,12 +1 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "eu.midnightdust.core.mixin", - "compatibilityLevel": "JAVA_17", - "client": [ - "MixinOptionsScreen" - ], - "injectors": { - "defaultRequire": 1 - } -} \ No newline at end of file +{"required": true,"minVersion": "0.8","package": "eu.midnightdust.core.mixin","compatibilityLevel": "JAVA_17","client": ["MixinOptionsScreen"],"injectors": {"defaultRequire": 1}} \ No newline at end of file diff --git a/fabric/src/main/java/eu/midnightdust/fabric/core/MidnightLibClientFabric.java b/fabric/src/main/java/eu/midnightdust/fabric/core/MidnightLibClientFabric.java index 9cbb33e..5a01dbc 100644 --- a/fabric/src/main/java/eu/midnightdust/fabric/core/MidnightLibClientFabric.java +++ b/fabric/src/main/java/eu/midnightdust/fabric/core/MidnightLibClientFabric.java @@ -9,8 +9,5 @@ public class MidnightLibClientFabric implements ClientModInitializer { @Override public void onInitializeClient() { MidnightLibClient.onInitializeClient(); - ClientTickEvents.END_CLIENT_TICK.register( - client -> MidnightColorUtil.tick() - ); } } diff --git a/forge/src/main/java/eu/midnightdust/forge/MidnightLibClientEvents.java b/forge/src/main/java/eu/midnightdust/forge/MidnightLibClientEvents.java index c21b2c7..af1ff6e 100644 --- a/forge/src/main/java/eu/midnightdust/forge/MidnightLibClientEvents.java +++ b/forge/src/main/java/eu/midnightdust/forge/MidnightLibClientEvents.java @@ -13,13 +13,8 @@ import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; @Mod.EventBusSubscriber(modid = "midnightlib", bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) public class MidnightLibClientEvents { - public static void registerClientTick(TickEvent.ClientTickEvent event) { - MidnightColorUtil.tick(); - } - @SubscribeEvent public static void onPostInit(FMLClientSetupEvent event) { - MinecraftForge.EVENT_BUS.addListener(MidnightLibClientEvents::registerClientTick); ModList.get().forEachModContainer((modid, modContainer) -> { if (MidnightConfig.configClass.containsKey(modid)) { modContainer.registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> diff --git a/gradle.properties b/gradle.properties index 3afe1a9..a9f37e3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,15 +1,15 @@ org.gradle.jvmargs=-Xmx4096M -minecraft_version=1.20 -yarn_mappings=1.20+build.1 -enabled_platforms=quilt,fabric,forge +minecraft_version=1.20.2-rc1 +yarn_mappings=1.20.2-rc1+build.2 +enabled_platforms=fabric archives_base_name=midnightlib -mod_version=1.4.1 +mod_version=1.5.0 maven_group=eu.midnightdust -fabric_loader_version=0.14.21 -fabric_api_version=0.83.0+1.20 +fabric_loader_version=0.14.22 +fabric_api_version=0.88.5+1.20.2 forge_version=1.20-46.0.2 diff --git a/quilt/src/main/java/eu/midnightdust/quilt/core/MidnightLibClientQuilt.java b/quilt/src/main/java/eu/midnightdust/quilt/core/MidnightLibClientQuilt.java index fe7491a..6899896 100644 --- a/quilt/src/main/java/eu/midnightdust/quilt/core/MidnightLibClientQuilt.java +++ b/quilt/src/main/java/eu/midnightdust/quilt/core/MidnightLibClientQuilt.java @@ -10,8 +10,5 @@ public class MidnightLibClientQuilt implements ClientModInitializer { @Override public void onInitializeClient(ModContainer mod) { MidnightLibClient.onInitializeClient(); - ClientTickEvents.END.register( - client -> MidnightColorUtil.tick() - ); } } diff --git a/settings.gradle b/settings.gradle index c86c020..f83aad5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,7 +10,7 @@ pluginManagement { include("common") include("fabric-like") include("fabric") -include("quilt") -include("forge") +//include("quilt") +//include("forge") rootProject.name = "midnightlib"