diff --git a/common/src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java b/common/src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java index 8c7e80e..710c5ac 100644 --- a/common/src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java +++ b/common/src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java @@ -1,12 +1,12 @@ package eu.midnightdust.core.config; import eu.midnightdust.lib.config.MidnightConfig; -import eu.midnightdust.lib.util.PlatformVariables; +import eu.midnightdust.lib.util.PlatformFunctions; public class MidnightLibConfig extends MidnightConfig { @Comment(centered = true) public static Comment midnightlib_description; @Entry // Enable or disable the MidnightConfig overview screen button - public static ConfigButton config_screen_list = PlatformVariables.isModLoaded("modmenu") ? ConfigButton.MODMENU : ConfigButton.TRUE; + public static ConfigButton config_screen_list = PlatformFunctions.isModLoaded("modmenu") ? ConfigButton.MODMENU : ConfigButton.TRUE; @Comment(centered = true) public static Comment midnighthats_description; @Entry // Enable or disable hats for contributors, friends and donors. public static boolean special_hats = true; 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 c5d2cdd..1f3da97 100755 --- a/common/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java +++ b/common/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java @@ -2,7 +2,7 @@ package eu.midnightdust.core.mixin; import eu.midnightdust.core.config.MidnightLibConfig; import eu.midnightdust.core.screen.MidnightConfigOverviewScreen; -import eu.midnightdust.lib.util.PlatformVariables; +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; @@ -24,7 +24,7 @@ public class MixinOptionsScreen extends Screen { @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) && !PlatformVariables.isModLoaded("modmenu"))) + 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"))); } } 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 a94b984..db82093 100644 --- a/common/src/main/java/eu/midnightdust/lib/config/AutoCommand.java +++ b/common/src/main/java/eu/midnightdust/lib/config/AutoCommand.java @@ -4,7 +4,7 @@ import com.mojang.brigadier.arguments.DoubleArgumentType; import com.mojang.brigadier.arguments.IntegerArgumentType; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import eu.midnightdust.lib.util.PlatformVariables; +import eu.midnightdust.lib.util.PlatformFunctions; import net.minecraft.server.command.CommandManager; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.text.Text; @@ -30,7 +30,7 @@ public class AutoCommand { command(); LiteralArgumentBuilder finalized = CommandManager.literal("midnightconfig").requires(source -> source.hasPermissionLevel(2)).then(command); - PlatformVariables.registerCommand(finalized); commands.add(finalized); + PlatformFunctions.registerCommand(finalized); commands.add(finalized); } private void command() { 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 f2a89e4..3f3eef9 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -4,7 +4,7 @@ import com.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import eu.midnightdust.lib.util.PlatformVariables; +import eu.midnightdust.lib.util.PlatformFunctions; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; @@ -74,13 +74,13 @@ public abstract class MidnightConfig { 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) { - path = PlatformVariables.getConfigDirectory().resolve(modid + ".json"); + path = PlatformFunctions.getConfigDirectory().resolve(modid + ".json"); configClass.put(modid, config); for (Field field : config.getFields()) { EntryInfo info = new EntryInfo(); if ((field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class)) && !field.isAnnotationPresent(Server.class) && !field.isAnnotationPresent(Hidden.class)) - if (PlatformVariables.isClientEnv()) initClient(modid, field, info); + if (PlatformFunctions.isClientEnv()) initClient(modid, field, info); if (field.isAnnotationPresent(Comment.class)) info.centered = field.getAnnotation(Comment.class).centered(); if (field.isAnnotationPresent(Entry.class)) try { @@ -174,7 +174,7 @@ public abstract class MidnightConfig { } public static void write(String modid) { - path = PlatformVariables.getConfigDirectory().resolve(modid + ".json"); + 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()); 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 b627121..f46f972 100755 --- a/common/src/main/java/eu/midnightdust/lib/util/MidnightColorUtil.java +++ b/common/src/main/java/eu/midnightdust/lib/util/MidnightColorUtil.java @@ -1,6 +1,6 @@ package eu.midnightdust.lib.util; -import java.awt.*; +import java.awt.Color; public class MidnightColorUtil { public static float hue; diff --git a/common/src/main/java/eu/midnightdust/lib/util/PlatformVariables.java b/common/src/main/java/eu/midnightdust/lib/util/PlatformFunctions.java similarity index 89% rename from common/src/main/java/eu/midnightdust/lib/util/PlatformVariables.java rename to common/src/main/java/eu/midnightdust/lib/util/PlatformFunctions.java index a30488d..7cc3b5b 100644 --- a/common/src/main/java/eu/midnightdust/lib/util/PlatformVariables.java +++ b/common/src/main/java/eu/midnightdust/lib/util/PlatformFunctions.java @@ -1,14 +1,12 @@ package eu.midnightdust.lib.util; -import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.server.command.ServerCommandSource; import java.nio.file.Path; -import java.util.function.Supplier; -public class PlatformVariables { +public class PlatformFunctions { @ExpectPlatform public static Path getConfigDirectory() { // Just throw an error, the content should get replaced at runtime. diff --git a/fabric/src/main/java/eu/midnightdust/lib/util/fabric/PlatformVariablesImpl.java b/fabric/src/main/java/eu/midnightdust/lib/util/fabric/PlatformFunctionsImpl.java similarity index 86% rename from fabric/src/main/java/eu/midnightdust/lib/util/fabric/PlatformVariablesImpl.java rename to fabric/src/main/java/eu/midnightdust/lib/util/fabric/PlatformFunctionsImpl.java index 918d448..2ade0c4 100644 --- a/fabric/src/main/java/eu/midnightdust/lib/util/fabric/PlatformVariablesImpl.java +++ b/fabric/src/main/java/eu/midnightdust/lib/util/fabric/PlatformFunctionsImpl.java @@ -1,7 +1,7 @@ package eu.midnightdust.lib.util.fabric; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import eu.midnightdust.lib.util.PlatformVariables; +import eu.midnightdust.lib.util.PlatformFunctions; import net.fabricmc.api.EnvType; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.loader.api.FabricLoader; @@ -9,9 +9,9 @@ import net.minecraft.server.command.ServerCommandSource; import java.nio.file.Path; -public class PlatformVariablesImpl { +public class PlatformFunctionsImpl { /** - * This is our actual method to {@link PlatformVariables#getConfigDirectory()}. + * This is our actual method to {@link PlatformFunctions#getConfigDirectory()}. */ public static Path getConfigDirectory() { return FabricLoader.getInstance().getConfigDir(); diff --git a/forge/src/main/java/eu/midnightdust/lib/util/forge/PlatformVariablesImpl.java b/forge/src/main/java/eu/midnightdust/lib/util/forge/PlatformFunctionsImpl.java similarity index 79% rename from forge/src/main/java/eu/midnightdust/lib/util/forge/PlatformVariablesImpl.java rename to forge/src/main/java/eu/midnightdust/lib/util/forge/PlatformFunctionsImpl.java index 33f9fd3..a55811d 100644 --- a/forge/src/main/java/eu/midnightdust/lib/util/forge/PlatformVariablesImpl.java +++ b/forge/src/main/java/eu/midnightdust/lib/util/forge/PlatformFunctionsImpl.java @@ -1,18 +1,17 @@ package eu.midnightdust.lib.util.forge; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import eu.midnightdust.lib.util.PlatformVariables; +import eu.midnightdust.lib.util.PlatformFunctions; import net.minecraft.server.command.ServerCommandSource; -import net.minecraftforge.event.RegisterCommandsEvent; import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.loading.FMLEnvironment; import net.minecraftforge.fml.loading.FMLPaths; import java.nio.file.Path; -public class PlatformVariablesImpl { +public class PlatformFunctionsImpl { /** - * This is our actual method to {@link PlatformVariables#getConfigDirectory()}. + * This is our actual method to {@link PlatformFunctions#getConfigDirectory()}. */ public static Path getConfigDirectory() { return FMLPaths.CONFIGDIR.get(); diff --git a/quilt/src/main/java/eu/midnightdust/lib/util/quilt/PlatformVariablesImpl.java b/quilt/src/main/java/eu/midnightdust/lib/util/fabric/PlatformFunctionsImpl.java similarity index 79% rename from quilt/src/main/java/eu/midnightdust/lib/util/quilt/PlatformVariablesImpl.java rename to quilt/src/main/java/eu/midnightdust/lib/util/fabric/PlatformFunctionsImpl.java index bb0bbff..5f4500f 100644 --- a/quilt/src/main/java/eu/midnightdust/lib/util/quilt/PlatformVariablesImpl.java +++ b/quilt/src/main/java/eu/midnightdust/lib/util/fabric/PlatformFunctionsImpl.java @@ -1,9 +1,8 @@ -package eu.midnightdust.lib.util.quilt; +package eu.midnightdust.lib.util.fabric; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import eu.midnightdust.lib.util.PlatformVariables; +import eu.midnightdust.lib.util.PlatformFunctions; import net.fabricmc.api.EnvType; -import net.fabricmc.loader.api.FabricLoader; import net.minecraft.server.command.ServerCommandSource; import org.quiltmc.loader.api.QuiltLoader; import org.quiltmc.loader.impl.QuiltLoaderImpl; @@ -11,9 +10,9 @@ import org.quiltmc.qsl.command.api.CommandRegistrationCallback; import java.nio.file.Path; -public class PlatformVariablesImpl { +public class PlatformFunctionsImpl { /** - * This is our actual method to {@link PlatformVariables#getConfigDirectory()}. + * This is our actual method to {@link PlatformFunctions#getConfigDirectory()}. */ public static Path getConfigDirectory() { return QuiltLoader.getConfigDir(); diff --git a/quilt/src/main/resources/quilt.mod.json b/quilt/src/main/resources/quilt.mod.json index 215efb6..0107236 100644 --- a/quilt/src/main/resources/quilt.mod.json +++ b/quilt/src/main/resources/quilt.mod.json @@ -17,17 +17,17 @@ "intermediate_mappings": "net.fabricmc:intermediary", "environment": "*", "entrypoints": { - "client": [ + "client_init": [ "eu.midnightdust.quilt.core.MidnightLibClientQuilt" ], - "server": [ + "server_init": [ "eu.midnightdust.quilt.core.MidnightLibServerQuilt" ], "modmenu": [ "eu.midnightdust.lib.config.AutoModMenu" ] }, - "mixins": [ + "mixin": [ "midnightlib.mixins.json" ], "depends": [ @@ -39,6 +39,18 @@ "id": "quilt_base", "version": "*" } - ] + ], + "custom": { + "modmenu": { + "links": { + "modmenu.discord": "https://discord.midnightdust.eu/", + "modmenu.website": "https://www.midnightdust.eu/", + "midnightlib.curseforge": "https://www.curseforge.com/minecraft/mc-mods/midnightlib", + "midnightlib.modrinth": "https://modrinth.com/mod/midnightlib", + "midnightlib.wiki": "https://github.com/TeamMidnightDust/MidnightLib/wiki" + }, + "badges": [ "library" ] + } + } } } \ No newline at end of file