Motschen/MidnightLib
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/MidnightLib.git synced 2025-12-17 01:35:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Various renames and fixes

Browse Source
This commit is contained in:
Motschen
2022-10-31 00:03:25 +01:00
parent 0c23fa4f53
commit 0e7478b5e5
10 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/eu/midnightdust/lib/config/AutoCommand.java
View File

@@ -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<ServerCommandSource> 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() {

8
common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java
View File

@@ -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());

2
common/src/main/java/eu/midnightdust/lib/util/MidnightColorUtil.java
View File

@@ -1,6 +1,6 @@
package eu.midnightdust.lib.util;
import java.awt.*;
import java.awt.Color;
public class MidnightColorUtil {
public static float hue;

4
common/src/main/java/eu/midnightdust/lib/util/PlatformVariables.java → common/src/main/java/eu/midnightdust/lib/util/PlatformFunctions.java
View File

@@ -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.