mirror of
https://github.com/TeamMidnightDust/MidnightLib.git
synced 2025-12-16 17:25:09 +01:00
Compare commits
3 Commits
v0.6.0
...
fabric-1.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c805d03630 | ||
|
|
23ab3ea9f8 | ||
|
|
5ef681693e |
11
build.gradle
11
build.gradle
@@ -1,15 +1,18 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'fabric-loom' version '0.11-SNAPSHOT'
|
id 'fabric-loom' version '0.8-SNAPSHOT'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceCompatibility = JavaVersion.VERSION_17
|
sourceCompatibility = JavaVersion.VERSION_16
|
||||||
targetCompatibility = JavaVersion.VERSION_17
|
targetCompatibility = JavaVersion.VERSION_16
|
||||||
|
|
||||||
archivesBaseName = project.archives_base_name
|
archivesBaseName = project.archives_base_name
|
||||||
version = project.mod_version
|
version = project.mod_version
|
||||||
group = project.maven_group
|
group = project.maven_group
|
||||||
|
|
||||||
|
minecraft {
|
||||||
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven { url "https://maven.terraformersmc.com/releases" }
|
maven { url "https://maven.terraformersmc.com/releases" }
|
||||||
maven { url "https://jitpack.io" }
|
maven { url "https://jitpack.io" }
|
||||||
@@ -42,7 +45,7 @@ tasks.withType(JavaCompile).configureEach {
|
|||||||
it.options.encoding = "UTF-8"
|
it.options.encoding = "UTF-8"
|
||||||
|
|
||||||
// Minecraft 1.17 (21w19a) upwards uses Java 16.
|
// Minecraft 1.17 (21w19a) upwards uses Java 16.
|
||||||
it.options.release = 17
|
it.options.release = 16
|
||||||
}
|
}
|
||||||
|
|
||||||
java {
|
java {
|
||||||
|
|||||||
@@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx1G
|
|||||||
|
|
||||||
# Fabric Properties
|
# Fabric Properties
|
||||||
# check these on https://fabricmc.net/use
|
# check these on https://fabricmc.net/use
|
||||||
minecraft_version=1.19-rc2
|
minecraft_version=1.17.1
|
||||||
yarn_mappings=1.19-rc2+build.1
|
yarn_mappings=1.17.1+build.63
|
||||||
loader_version=0.14.6
|
loader_version=0.11.7
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version = 0.6.0
|
mod_version = 0.4.4
|
||||||
maven_group = eu.midnightdust
|
maven_group = eu.midnightdust
|
||||||
archives_base_name = midnightlib
|
archives_base_name = midnightlib
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
|
# 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.41.0+1.17
|
||||||
mod_menu_version = 4.0.0-beta.4
|
mod_menu_version = 2.0.2
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ public class MidnightLibClient implements ClientModInitializer {
|
|||||||
@Override
|
@Override
|
||||||
public void onInitializeClient() {
|
public void onInitializeClient() {
|
||||||
MidnightConfig.init("midnightlib", MidnightLibConfig.class);
|
MidnightConfig.init("midnightlib", MidnightLibConfig.class);
|
||||||
hiddenMods.add("puzzle");
|
if (hiddenMods.contains("puzzle")) hiddenMods.add("puzzle");
|
||||||
|
|
||||||
EntityModelLayerRegistry.registerModelLayer(WitchHatFeatureRenderer.WITCH_HAT_MODEL_LAYER, WitchHatFeatureRenderer::getTexturedModelData);
|
EntityModelLayerRegistry.registerModelLayer(WitchHatFeatureRenderer.WITCH_HAT_MODEL_LAYER, WitchHatFeatureRenderer::getTexturedModelData);
|
||||||
if (MidnightLibConfig.special_hats) HatLoader.init();
|
if (MidnightLibConfig.special_hats) HatLoader.init();
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ public class MidnightLibServer implements DedicatedServerModInitializer {
|
|||||||
public void onInitializeServer() {
|
public void onInitializeServer() {
|
||||||
MidnightConfig.configClass.forEach((modid, config) -> {
|
MidnightConfig.configClass.forEach((modid, config) -> {
|
||||||
for (Field field : config.getFields()) {
|
for (Field field : config.getFields()) {
|
||||||
if (field.isAnnotationPresent(MidnightConfig.Entry.class) && !field.isAnnotationPresent(MidnightConfig.Client.class) && !field.isAnnotationPresent(MidnightConfig.Hidden.class))
|
if (field.isAnnotationPresent(MidnightConfig.Entry.class) && !field.isAnnotationPresent(MidnightConfig.Client.class))
|
||||||
new AutoCommand(field, modid).register();
|
new AutoCommand(field, modid).register();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ import eu.midnightdust.lib.config.MidnightConfig;
|
|||||||
import net.fabricmc.loader.api.FabricLoader;
|
import net.fabricmc.loader.api.FabricLoader;
|
||||||
|
|
||||||
public class MidnightLibConfig extends MidnightConfig {
|
public class MidnightLibConfig extends MidnightConfig {
|
||||||
@Comment(centered = true) public static Comment midnightlib_description;
|
@Comment public static Comment midnightlib_description;
|
||||||
@Entry // Enable or disable the MidnightConfig overview screen button
|
@Entry // Enable or disable the MidnightConfig overview screen button
|
||||||
public static ConfigButton config_screen_list = FabricLoader.getInstance().isModLoaded("modmenu") ? ConfigButton.MODMENU : ConfigButton.TRUE;
|
public static ConfigButton config_screen_list = FabricLoader.getInstance().isModLoaded("modmenu") ? ConfigButton.MODMENU : ConfigButton.TRUE;
|
||||||
@Comment(centered = true) public static Comment midnighthats_description;
|
@Comment public static Comment midnighthats_description;
|
||||||
@Entry // Enable or disable hats for contributors, friends and donors.
|
@Entry // Enable or disable hats for contributors, friends and donors.
|
||||||
public static boolean special_hats = true;
|
public static boolean special_hats = true;
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import net.fabricmc.loader.api.FabricLoader;
|
|||||||
import net.minecraft.client.gui.screen.Screen;
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
import net.minecraft.client.gui.screen.option.OptionsScreen;
|
import net.minecraft.client.gui.screen.option.OptionsScreen;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
|
import net.minecraft.text.TranslatableText;
|
||||||
import net.minecraft.util.Identifier;
|
import net.minecraft.util.Identifier;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
@@ -25,6 +26,6 @@ public class MixinOptionsScreen extends Screen {
|
|||||||
@Inject(at = @At("HEAD"),method = "init")
|
@Inject(at = @At("HEAD"),method = "init")
|
||||||
private void midnightlib$init(CallbackInfo ci) {
|
private void midnightlib$init(CallbackInfo ci) {
|
||||||
if (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.TRUE) || (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.MODMENU) && !FabricLoader.getInstance().isModLoaded("modmenu")))
|
if (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.TRUE) || (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.MODMENU) && !FabricLoader.getInstance().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")));
|
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)), new TranslatableText("midnightlib.overview.title")));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package eu.midnightdust.core.screen;
|
package eu.midnightdust.core.screen;
|
||||||
|
|
||||||
import eu.midnightdust.core.MidnightLibClient;
|
import eu.midnightdust.core.MidnightLibClient;
|
||||||
import eu.midnightdust.core.config.MidnightLibConfig;
|
|
||||||
import eu.midnightdust.lib.config.MidnightConfig;
|
import eu.midnightdust.lib.config.MidnightConfig;
|
||||||
import net.fabricmc.api.EnvType;
|
import net.fabricmc.api.EnvType;
|
||||||
import net.fabricmc.api.Environment;
|
import net.fabricmc.api.Environment;
|
||||||
@@ -10,9 +9,9 @@ import net.minecraft.client.font.TextRenderer;
|
|||||||
import net.minecraft.client.gui.Element;
|
import net.minecraft.client.gui.Element;
|
||||||
import net.minecraft.client.gui.Selectable;
|
import net.minecraft.client.gui.Selectable;
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
|
import net.minecraft.client.gui.screen.ScreenTexts;
|
||||||
import net.minecraft.client.gui.widget.*;
|
import net.minecraft.client.gui.widget.*;
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
import net.minecraft.client.util.math.MatrixStack;
|
||||||
import net.minecraft.screen.ScreenTexts;
|
|
||||||
import net.minecraft.text.*;
|
import net.minecraft.text.*;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
@@ -20,7 +19,7 @@ import java.util.*;
|
|||||||
public class MidnightConfigOverviewScreen extends Screen {
|
public class MidnightConfigOverviewScreen extends Screen {
|
||||||
|
|
||||||
public MidnightConfigOverviewScreen(Screen parent) {
|
public MidnightConfigOverviewScreen(Screen parent) {
|
||||||
super(Text.translatable( "midnightlib.overview.title"));
|
super(new TranslatableText( "midnightlib.overview.title"));
|
||||||
this.parent = parent;
|
this.parent = parent;
|
||||||
}
|
}
|
||||||
private final Screen parent;
|
private final Screen parent;
|
||||||
@@ -33,11 +32,9 @@ public class MidnightConfigOverviewScreen extends Screen {
|
|||||||
this.list = new MidnightOverviewListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
|
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);
|
if (this.client != null && this.client.world != null) this.list.setRenderBackground(false);
|
||||||
this.addSelectableChild(this.list);
|
this.addSelectableChild(this.list);
|
||||||
List<String> sortedMods = new ArrayList<>(MidnightConfig.configClass.keySet());
|
MidnightConfig.configClass.forEach((modid, configClass) -> {
|
||||||
Collections.sort(sortedMods);
|
|
||||||
sortedMods.forEach((modid) -> {
|
|
||||||
if (!MidnightLibClient.hiddenMods.contains(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(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, new TranslatableText(modid +".midnightconfig.title"), (button) ->
|
||||||
Objects.requireNonNull(client).setScreen(MidnightConfig.getScreen(this,modid))));
|
Objects.requireNonNull(client).setScreen(MidnightConfig.getScreen(this,modid))));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ import com.mojang.brigadier.arguments.DoubleArgumentType;
|
|||||||
import com.mojang.brigadier.arguments.IntegerArgumentType;
|
import com.mojang.brigadier.arguments.IntegerArgumentType;
|
||||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||||
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
|
import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
|
||||||
import net.minecraft.server.command.CommandManager;
|
import net.minecraft.server.command.CommandManager;
|
||||||
import net.minecraft.server.command.ServerCommandSource;
|
import net.minecraft.server.command.ServerCommandSource;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.LiteralText;
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
@@ -27,7 +27,7 @@ public class AutoCommand {
|
|||||||
command();
|
command();
|
||||||
LiteralArgumentBuilder<ServerCommandSource> finalized = CommandManager.literal("midnightconfig").requires(source -> source.hasPermissionLevel(2)).then(command);
|
LiteralArgumentBuilder<ServerCommandSource> finalized = CommandManager.literal("midnightconfig").requires(source -> source.hasPermissionLevel(2)).then(command);
|
||||||
|
|
||||||
CommandRegistrationCallback.EVENT.register((dispatcher, dedicated, registrationEnvironment) -> dispatcher.register(finalized));
|
CommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> dispatcher.register(finalized));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void command() {
|
private void command() {
|
||||||
@@ -73,16 +73,16 @@ public class AutoCommand {
|
|||||||
MidnightConfig.write(modid);
|
MidnightConfig.write(modid);
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
catch (Exception e) {
|
||||||
source.sendError(Text.literal("Could not set "+entry.getName()+" to value "+value+": " + e));
|
source.sendError(new LiteralText("Could not set "+entry.getName()+" to value "+value+": " + e));
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
source.sendFeedback(Text.literal("Successfully set " + entry.getName()+" to "+value), true);
|
source.sendFeedback(new LiteralText("Successfully set " + entry.getName()+" to "+value), true);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
private int getValue(ServerCommandSource source) {
|
private int getValue(ServerCommandSource source) {
|
||||||
try {
|
try {
|
||||||
source.sendFeedback(Text.literal("The value of "+entry.getName()+" is "+entry.get(null)), false);
|
source.sendFeedback(new LiteralText("The value of "+entry.getName()+" is "+entry.get(null)), false);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
catch (IllegalAccessException ignored) {}
|
catch (IllegalAccessException ignored) {}
|
||||||
|
|||||||
@@ -13,15 +13,17 @@ import net.minecraft.client.gui.DrawableHelper;
|
|||||||
import net.minecraft.client.gui.Element;
|
import net.minecraft.client.gui.Element;
|
||||||
import net.minecraft.client.gui.Selectable;
|
import net.minecraft.client.gui.Selectable;
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
|
import net.minecraft.client.gui.screen.ScreenTexts;
|
||||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
import net.minecraft.client.gui.widget.ButtonWidget;
|
||||||
import net.minecraft.client.gui.widget.ClickableWidget;
|
import net.minecraft.client.gui.widget.ClickableWidget;
|
||||||
import net.minecraft.client.gui.widget.ElementListWidget;
|
import net.minecraft.client.gui.widget.ElementListWidget;
|
||||||
import net.minecraft.client.gui.widget.TextFieldWidget;
|
import net.minecraft.client.gui.widget.TextFieldWidget;
|
||||||
import net.minecraft.client.resource.language.I18n;
|
import net.minecraft.client.resource.language.I18n;
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
import net.minecraft.client.util.math.MatrixStack;
|
||||||
import net.minecraft.screen.ScreenTexts;
|
import net.minecraft.text.LiteralText;
|
||||||
import net.minecraft.text.Style;
|
import net.minecraft.text.Style;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
|
import net.minecraft.text.TranslatableText;
|
||||||
import net.minecraft.util.Formatting;
|
import net.minecraft.util.Formatting;
|
||||||
|
|
||||||
import java.awt.Color;
|
import java.awt.Color;
|
||||||
@@ -40,7 +42,7 @@ import java.util.function.Function;
|
|||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
/** MidnightConfig v2.2.0 by TeamMidnightDust & Motschen
|
/** MidnightConfig v2.1.0 by TeamMidnightDust & Motschen
|
||||||
* Single class config library - feel free to copy!
|
* Single class config library - feel free to copy!
|
||||||
*
|
*
|
||||||
* Based on https://github.com/Minenash/TinyConfig
|
* Based on https://github.com/Minenash/TinyConfig
|
||||||
@@ -59,14 +61,13 @@ public abstract class MidnightConfig {
|
|||||||
Object widget;
|
Object widget;
|
||||||
int width;
|
int width;
|
||||||
int max;
|
int max;
|
||||||
boolean centered;
|
|
||||||
Map.Entry<TextFieldWidget,Text> error;
|
Map.Entry<TextFieldWidget,Text> error;
|
||||||
Object defaultValue;
|
Object defaultValue;
|
||||||
Object value;
|
Object value;
|
||||||
String tempValue;
|
String tempValue;
|
||||||
boolean inLimits = true;
|
boolean inLimits = true;
|
||||||
String id;
|
String id;
|
||||||
Text name;
|
TranslatableText name;
|
||||||
int index;
|
int index;
|
||||||
ClickableWidget colorButton;
|
ClickableWidget colorButton;
|
||||||
}
|
}
|
||||||
@@ -82,9 +83,8 @@ public abstract class MidnightConfig {
|
|||||||
|
|
||||||
for (Field field : config.getFields()) {
|
for (Field field : config.getFields()) {
|
||||||
EntryInfo info = new EntryInfo();
|
EntryInfo info = new EntryInfo();
|
||||||
if ((field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class)) && !field.isAnnotationPresent(Server.class) && !field.isAnnotationPresent(Hidden.class))
|
if ((field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class)) && !field.isAnnotationPresent(Server.class))
|
||||||
if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) initClient(modid, field, info);
|
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))
|
if (field.isAnnotationPresent(Entry.class))
|
||||||
try {
|
try {
|
||||||
info.defaultValue = field.get(null);
|
info.defaultValue = field.get(null);
|
||||||
@@ -98,7 +98,8 @@ public abstract class MidnightConfig {
|
|||||||
try {
|
try {
|
||||||
info.value = info.field.get(null);
|
info.value = info.field.get(null);
|
||||||
info.tempValue = info.value.toString();
|
info.tempValue = info.value.toString();
|
||||||
} catch (IllegalAccessException ignored) {}
|
} catch (IllegalAccessException ignored) {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@Environment(EnvType.CLIENT)
|
@Environment(EnvType.CLIENT)
|
||||||
@@ -110,7 +111,7 @@ public abstract class MidnightConfig {
|
|||||||
info.id = modid;
|
info.id = modid;
|
||||||
|
|
||||||
if (e != null) {
|
if (e != null) {
|
||||||
if (!e.name().equals("")) info.name = Text.translatable(e.name());
|
if (!e.name().equals("")) info.name = new TranslatableText(e.name());
|
||||||
if (type == int.class) textField(info, Integer::parseInt, INTEGER_ONLY, (int) e.min(), (int) e.max(), true);
|
if (type == int.class) textField(info, Integer::parseInt, INTEGER_ONLY, (int) e.min(), (int) e.max(), true);
|
||||||
else if (type == float.class) textField(info, Float::parseFloat, DECIMAL_ONLY, (float) e.min(), (float) e.max(), false);
|
else if (type == float.class) textField(info, Float::parseFloat, DECIMAL_ONLY, (float) e.min(), (float) e.max(), false);
|
||||||
else if (type == double.class) textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(), false);
|
else if (type == double.class) textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(), false);
|
||||||
@@ -118,14 +119,14 @@ public abstract class MidnightConfig {
|
|||||||
info.max = e.max() == Double.MAX_VALUE ? Integer.MAX_VALUE : (int) e.max();
|
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);
|
textField(info, String::length, null, Math.min(e.min(), 0), Math.max(e.max(), 1), true);
|
||||||
} else if (type == boolean.class) {
|
} else if (type == boolean.class) {
|
||||||
Function<Object, Text> func = value -> Text.translatable((Boolean) value ? "gui.yes" : "gui.no").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED);
|
Function<Object, Text> func = value -> new LiteralText((Boolean) value ? "True" : "False").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED);
|
||||||
info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object, Text>>(button -> {
|
info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object, Text>>(button -> {
|
||||||
info.value = !(Boolean) info.value;
|
info.value = !(Boolean) info.value;
|
||||||
button.setMessage(func.apply(info.value));
|
button.setMessage(func.apply(info.value));
|
||||||
}, func);
|
}, func);
|
||||||
} else if (type.isEnum()) {
|
} else if (type.isEnum()) {
|
||||||
List<?> values = Arrays.asList(field.getType().getEnumConstants());
|
List<?> values = Arrays.asList(field.getType().getEnumConstants());
|
||||||
Function<Object, Text> func = value -> Text.translatable(modid + ".midnightconfig." + "enum." + type.getSimpleName() + "." + info.value.toString());
|
Function<Object, Text> func = value -> new TranslatableText(modid + ".midnightconfig." + "enum." + type.getSimpleName() + "." + info.value.toString());
|
||||||
info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object, Text>>(button -> {
|
info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object, Text>>(button -> {
|
||||||
int index = values.indexOf(info.value) + 1;
|
int index = values.indexOf(info.value) + 1;
|
||||||
info.value = values.get(index >= values.size() ? 0 : index);
|
info.value = values.get(index >= values.size() ? 0 : index);
|
||||||
@@ -148,7 +149,7 @@ public abstract class MidnightConfig {
|
|||||||
if (!(isNumber && s.isEmpty()) && !s.equals("-") && !s.equals(".")) {
|
if (!(isNumber && s.isEmpty()) && !s.equals("-") && !s.equals(".")) {
|
||||||
value = f.apply(s);
|
value = f.apply(s);
|
||||||
inLimits = value.doubleValue() >= min && value.doubleValue() <= max;
|
inLimits = value.doubleValue() >= min && value.doubleValue() <= max;
|
||||||
info.error = inLimits? null : new AbstractMap.SimpleEntry<>(t, Text.literal(value.doubleValue() < min ?
|
info.error = inLimits? null : new AbstractMap.SimpleEntry<>(t, new LiteralText(value.doubleValue() < min ?
|
||||||
"§cMinimum " + (isNumber? "value" : "length") + (cast? " is " + (int)min : " is " + min) :
|
"§cMinimum " + (isNumber? "value" : "length") + (cast? " is " + (int)min : " is " + min) :
|
||||||
"§cMaximum " + (isNumber? "value" : "length") + (cast? " is " + (int)max : " is " + max)));
|
"§cMaximum " + (isNumber? "value" : "length") + (cast? " is " + (int)max : " is " + max)));
|
||||||
}
|
}
|
||||||
@@ -169,7 +170,7 @@ public abstract class MidnightConfig {
|
|||||||
if (!s.contains("#")) s = '#' + s;
|
if (!s.contains("#")) s = '#' + s;
|
||||||
if (!HEXADECIMAL_ONLY.matcher(s).matches()) return false;
|
if (!HEXADECIMAL_ONLY.matcher(s).matches()) return false;
|
||||||
try {
|
try {
|
||||||
info.colorButton.setMessage(Text.literal("⬛").setStyle(Style.EMPTY.withColor(Color.decode(info.tempValue).getRGB())));
|
info.colorButton.setMessage(new LiteralText("⬛").setStyle(Style.EMPTY.withColor(Color.decode(info.tempValue).getRGB())));
|
||||||
} catch (Exception ignored) {}
|
} catch (Exception ignored) {}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
@@ -190,18 +191,18 @@ public abstract class MidnightConfig {
|
|||||||
return new MidnightConfigScreen(parent, modid);
|
return new MidnightConfigScreen(parent, modid);
|
||||||
}
|
}
|
||||||
@Environment(EnvType.CLIENT)
|
@Environment(EnvType.CLIENT)
|
||||||
public static class MidnightConfigScreen extends Screen {
|
private static class MidnightConfigScreen extends Screen {
|
||||||
protected MidnightConfigScreen(Screen parent, String modid) {
|
protected MidnightConfigScreen(Screen parent, String modid) {
|
||||||
super(Text.translatable(modid + ".midnightconfig." + "title"));
|
super(new TranslatableText(modid + ".midnightconfig." + "title"));
|
||||||
this.parent = parent;
|
this.parent = parent;
|
||||||
this.modid = modid;
|
this.modid = modid;
|
||||||
this.translationPrefix = modid + ".midnightconfig.";
|
this.translationPrefix = modid + ".midnightconfig.";
|
||||||
}
|
}
|
||||||
public final String translationPrefix;
|
private final String translationPrefix;
|
||||||
public final Screen parent;
|
private final Screen parent;
|
||||||
public final String modid;
|
private final String modid;
|
||||||
public MidnightConfigListWidget list;
|
private MidnightConfigListWidget list;
|
||||||
public boolean reload = false;
|
private boolean reload = false;
|
||||||
|
|
||||||
// Real Time config update //
|
// Real Time config update //
|
||||||
@Override
|
@Override
|
||||||
@@ -210,18 +211,8 @@ public abstract class MidnightConfig {
|
|||||||
for (EntryInfo info : entries) {
|
for (EntryInfo info : entries) {
|
||||||
try {info.field.set(null, info.value);} catch (IllegalAccessException ignored) {}
|
try {info.field.set(null, info.value);} catch (IllegalAccessException ignored) {}
|
||||||
}
|
}
|
||||||
updateResetButtons();
|
|
||||||
}
|
}
|
||||||
public void updateResetButtons() {
|
private void loadValues() {
|
||||||
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)); }
|
try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); }
|
||||||
catch (Exception e) { write(modid); }
|
catch (Exception e) { write(modid); }
|
||||||
|
|
||||||
@@ -234,7 +225,7 @@ public abstract class MidnightConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void init() {
|
protected void init() {
|
||||||
super.init();
|
super.init();
|
||||||
if (!reload) loadValues();
|
if (!reload) loadValues();
|
||||||
|
|
||||||
@@ -259,8 +250,8 @@ public abstract class MidnightConfig {
|
|||||||
this.addSelectableChild(this.list);
|
this.addSelectableChild(this.list);
|
||||||
for (EntryInfo info : entries) {
|
for (EntryInfo info : entries) {
|
||||||
if (info.id.equals(modid)) {
|
if (info.id.equals(modid)) {
|
||||||
Text name = Objects.requireNonNullElseGet(info.name, () -> Text.translatable(translationPrefix + info.field.getName()));
|
TranslatableText name = Objects.requireNonNullElseGet(info.name, () -> new TranslatableText(translationPrefix + info.field.getName()));
|
||||||
ButtonWidget resetButton = new ButtonWidget(width - 205, 0, 40, 20, Text.translatable("Reset").formatted(Formatting.RED), (button -> {
|
ButtonWidget resetButton = new ButtonWidget(width - 205, 0, 40, 20, new LiteralText("Reset").formatted(Formatting.RED), (button -> {
|
||||||
info.value = info.defaultValue;
|
info.value = info.defaultValue;
|
||||||
info.tempValue = info.defaultValue.toString();
|
info.tempValue = info.defaultValue.toString();
|
||||||
info.index = 0;
|
info.index = 0;
|
||||||
@@ -272,8 +263,8 @@ public abstract class MidnightConfig {
|
|||||||
|
|
||||||
if (info.widget instanceof Map.Entry) {
|
if (info.widget instanceof Map.Entry) {
|
||||||
Map.Entry<ButtonWidget.PressAction, Function<Object, Text>> widget = (Map.Entry<ButtonWidget.PressAction, Function<Object, Text>>) info.widget;
|
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()));
|
if (info.field.getType().isEnum()) widget.setValue(value -> new TranslatableText(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(new ButtonWidget(width - 160, 0,150, 20, widget.getValue().apply(info.value), widget.getKey()),resetButton), name);
|
||||||
} else if (info.field.getType() == List.class) {
|
} else if (info.field.getType() == List.class) {
|
||||||
if (!reload) info.index = 0;
|
if (!reload) info.index = 0;
|
||||||
TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 160, 0, 150, 20, null);
|
TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 160, 0, 150, 20, null);
|
||||||
@@ -283,8 +274,8 @@ public abstract class MidnightConfig {
|
|||||||
Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.widget).apply(widget, done);
|
Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.widget).apply(widget, done);
|
||||||
widget.setTextPredicate(processor);
|
widget.setTextPredicate(processor);
|
||||||
resetButton.setWidth(20);
|
resetButton.setWidth(20);
|
||||||
resetButton.setMessage(Text.literal("R").formatted(Formatting.RED));
|
resetButton.setMessage(new LiteralText("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 = new ButtonWidget(width - 185, 0, 20, 20, new LiteralText(String.valueOf(info.index)).formatted(Formatting.GOLD), (button -> {
|
||||||
((List<String>)info.value).remove("");
|
((List<String>)info.value).remove("");
|
||||||
double scrollAmount = list.getScrollAmount();
|
double scrollAmount = list.getScrollAmount();
|
||||||
this.reload = true;
|
this.reload = true;
|
||||||
@@ -293,7 +284,7 @@ public abstract class MidnightConfig {
|
|||||||
Objects.requireNonNull(client).setScreen(this);
|
Objects.requireNonNull(client).setScreen(this);
|
||||||
list.setScrollAmount(scrollAmount);
|
list.setScrollAmount(scrollAmount);
|
||||||
}));
|
}));
|
||||||
this.list.addButton(List.of(widget, resetButton, cycleButton), name, info);
|
this.list.addButton(List.of(widget, resetButton, cycleButton), name);
|
||||||
} else if (info.widget != null) {
|
} else if (info.widget != null) {
|
||||||
TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 160, 0, 150, 20, null);
|
TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 160, 0, 150, 20, null);
|
||||||
widget.setMaxLength(info.width);
|
widget.setMaxLength(info.width);
|
||||||
@@ -302,18 +293,17 @@ public abstract class MidnightConfig {
|
|||||||
widget.setTextPredicate(processor);
|
widget.setTextPredicate(processor);
|
||||||
if (info.field.getAnnotation(Entry.class).isColor()) {
|
if (info.field.getAnnotation(Entry.class).isColor()) {
|
||||||
resetButton.setWidth(20);
|
resetButton.setWidth(20);
|
||||||
resetButton.setMessage(Text.literal("R").formatted(Formatting.RED));
|
resetButton.setMessage(new LiteralText("R").formatted(Formatting.RED));
|
||||||
ButtonWidget colorButton = new ButtonWidget(width - 185, 0, 20, 20, Text.literal("⬛"), (button -> {}));
|
ButtonWidget colorButton = new ButtonWidget(width - 185, 0, 20, 20, new LiteralText("⬛"), (button -> {}));
|
||||||
try {colorButton.setMessage(Text.literal("⬛").setStyle(Style.EMPTY.withColor(Color.decode(info.tempValue).getRGB())));} catch (Exception ignored) {}
|
try {colorButton.setMessage(new LiteralText("⬛").setStyle(Style.EMPTY.withColor(Color.decode(info.tempValue).getRGB())));} catch (Exception ignored) {}
|
||||||
info.colorButton = colorButton;
|
info.colorButton = colorButton;
|
||||||
this.list.addButton(List.of(widget, colorButton, resetButton), name, info);
|
this.list.addButton(List.of(widget, colorButton, resetButton), name);
|
||||||
}
|
}
|
||||||
else this.list.addButton(List.of(widget, resetButton), name, info);
|
else this.list.addButton(List.of(widget, resetButton), name);
|
||||||
} else {
|
} else {
|
||||||
this.list.addButton(List.of(),name, info);
|
this.list.addButton(List.of(),name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
updateResetButtons();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -328,14 +318,14 @@ public abstract class MidnightConfig {
|
|||||||
if (list.getHoveredButton(mouseX,mouseY).isPresent()) {
|
if (list.getHoveredButton(mouseX,mouseY).isPresent()) {
|
||||||
ClickableWidget buttonWidget = list.getHoveredButton(mouseX,mouseY).get();
|
ClickableWidget buttonWidget = list.getHoveredButton(mouseX,mouseY).get();
|
||||||
Text text = ButtonEntry.buttonsWithText.get(buttonWidget);
|
Text text = ButtonEntry.buttonsWithText.get(buttonWidget);
|
||||||
Text name = Text.translatable(this.translationPrefix + info.field.getName());
|
TranslatableText name = new TranslatableText(this.translationPrefix + info.field.getName());
|
||||||
String key = translationPrefix + info.field.getName() + ".tooltip";
|
String key = translationPrefix + info.field.getName() + ".tooltip";
|
||||||
|
|
||||||
if (info.error != null && text.equals(name)) renderTooltip(matrices, info.error.getValue(), mouseX, mouseY);
|
if (info.error != null && text.equals(name)) renderTooltip(matrices, info.error.getValue(), mouseX, mouseY);
|
||||||
else if (I18n.hasTranslation(key) && text.equals(name)) {
|
else if (I18n.hasTranslation(key) && text.equals(name)) {
|
||||||
List<Text> list = new ArrayList<>();
|
List<Text> list = new ArrayList<>();
|
||||||
for (String str : I18n.translate(key).split("\n"))
|
for (String str : I18n.translate(key).split("\n"))
|
||||||
list.add(Text.literal(str));
|
list.add(new LiteralText(str));
|
||||||
renderTooltip(matrices, list, mouseX, mouseY);
|
renderTooltip(matrices, list, mouseX, mouseY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -356,8 +346,8 @@ public abstract class MidnightConfig {
|
|||||||
@Override
|
@Override
|
||||||
public int getScrollbarPositionX() { return this.width -7; }
|
public int getScrollbarPositionX() { return this.width -7; }
|
||||||
|
|
||||||
public void addButton(List<ClickableWidget> buttons, Text text, EntryInfo info) {
|
public void addButton(List<ClickableWidget> buttons, Text text) {
|
||||||
this.addEntry(ButtonEntry.create(buttons, text, info));
|
this.addEntry(ButtonEntry.create(buttons, text));
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public int getRowWidth() { return 10000; }
|
public int getRowWidth() { return 10000; }
|
||||||
@@ -374,26 +364,22 @@ public abstract class MidnightConfig {
|
|||||||
private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
|
private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
|
||||||
public final List<ClickableWidget> buttons;
|
public final List<ClickableWidget> buttons;
|
||||||
private final Text text;
|
private final Text text;
|
||||||
public final EntryInfo info;
|
|
||||||
private final List<ClickableWidget> children = new ArrayList<>();
|
private final List<ClickableWidget> children = new ArrayList<>();
|
||||||
public static final Map<ClickableWidget, Text> buttonsWithText = new HashMap<>();
|
public static final Map<ClickableWidget, Text> buttonsWithText = new HashMap<>();
|
||||||
|
|
||||||
private ButtonEntry(List<ClickableWidget> buttons, Text text, EntryInfo info) {
|
private ButtonEntry(List<ClickableWidget> buttons, Text text) {
|
||||||
if (!buttons.isEmpty()) buttonsWithText.put(buttons.get(0),text);
|
if (!buttons.isEmpty()) buttonsWithText.put(buttons.get(0),text);
|
||||||
this.buttons = buttons;
|
this.buttons = buttons;
|
||||||
this.text = text;
|
this.text = text;
|
||||||
this.info = info;
|
|
||||||
children.addAll(buttons);
|
children.addAll(buttons);
|
||||||
}
|
}
|
||||||
public static ButtonEntry create(List<ClickableWidget> buttons, Text text, EntryInfo info) {
|
public static ButtonEntry create(List<ClickableWidget> buttons, Text text) {
|
||||||
return new ButtonEntry(buttons, text, info);
|
return new ButtonEntry(buttons, text);
|
||||||
}
|
}
|
||||||
public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
|
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.y = y; b.render(matrices, mouseX, mouseY, tickDelta); });
|
||||||
if (text != null && (!text.getString().contains("spacer") || !buttons.isEmpty())) {
|
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);
|
DrawableHelper.drawTextWithShadow(matrices,textRenderer, text,12,y+5,0xFFFFFF);
|
||||||
else DrawableHelper.drawTextWithShadow(matrices, textRenderer, text, 12, y + 5, 0xFFFFFF);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
public List<? extends Element> children() {return children;}
|
public List<? extends Element> children() {return children;}
|
||||||
public List<? extends Selectable> selectableChildren() {return children;}
|
public List<? extends Selectable> selectableChildren() {return children;}
|
||||||
@@ -407,10 +393,7 @@ public abstract class MidnightConfig {
|
|||||||
}
|
}
|
||||||
@Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Client {}
|
@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 Server {}
|
||||||
@Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Hidden {}
|
@Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Comment {}
|
||||||
@Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Comment {
|
|
||||||
boolean centered() default false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class HiddenAnnotationExclusionStrategy implements ExclusionStrategy {
|
public static class HiddenAnnotationExclusionStrategy implements ExclusionStrategy {
|
||||||
public boolean shouldSkipClass(Class<?> clazz) { return false; }
|
public boolean shouldSkipClass(Class<?> clazz) { return false; }
|
||||||
|
|||||||
0
src/main/java/eu/midnightdust/lib/config/MidnightConfigExample.java
Normal file → Executable file
0
src/main/java/eu/midnightdust/lib/config/MidnightConfigExample.java
Normal file → Executable file
BIN
src/main/resources/assets/midnightlib/icon.png
Normal file → Executable file
BIN
src/main/resources/assets/midnightlib/icon.png
Normal file → Executable file
Binary file not shown.
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 4.6 KiB |
@@ -1,17 +0,0 @@
|
|||||||
{
|
|
||||||
"midnightlib.overview.title":"Огляд MidnightConfig",
|
|
||||||
"midnightlib.midnightconfig.title":"Конфігурація MidnightLib",
|
|
||||||
"midnightlib.midnightconfig.midnightlib_description":"§nMidnightLib",
|
|
||||||
"midnightlib.midnightconfig.config_screen_list":"Увімкнути список екрана конфігурації",
|
|
||||||
"midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§aTrue",
|
|
||||||
"midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cFalse",
|
|
||||||
"midnightlib.midnightconfig.enum.ConfigButton.MODMENU":"§bModMenu",
|
|
||||||
"midnightlib.midnightconfig.background_texture":"Текстура фону екрана конфігурації",
|
|
||||||
"midnightlib.midnightconfig.midnighthats_description":"§nMidnightHats",
|
|
||||||
"midnightlib.midnightconfig.special_hats":"Увімкнути капелюхи спонсорів",
|
|
||||||
"midnightlib.modrinth":"Modrinth",
|
|
||||||
"midnightlib.curseforge":"CurseForge",
|
|
||||||
"midnightlib.wiki":"Вікі",
|
|
||||||
"modmenu.descriptionTranslation.midnightlib": "Загальна бібліотека для модів команди MidnightDust.\nНадає конфігураційний API, автоматичну інтеграцію з іншими модами, загальні утиліти та косметику.",
|
|
||||||
"modmenu.summaryTranslation.midnightlib": "Загальна бібліотека для модів команди MidnightDust."
|
|
||||||
}
|
|
||||||
@@ -35,6 +35,10 @@
|
|||||||
"midnightlib.mixins.json"
|
"midnightlib.mixins.json"
|
||||||
],
|
],
|
||||||
|
|
||||||
|
"depends": {
|
||||||
|
"fabric-renderer-registries-v1": "*"
|
||||||
|
},
|
||||||
|
|
||||||
"custom": {
|
"custom": {
|
||||||
"modmenu": {
|
"modmenu": {
|
||||||
"links": {
|
"links": {
|
||||||
|
|||||||
Reference in New Issue
Block a user