chore: optimize imports

src/client/java/io/gitlab/jfronny/respackopts/RespackoptsClient.java

@@ -1,8 +1,11 @@
 package io.gitlab.jfronny.respackopts;
 
-import io.gitlab.jfronny.respackopts.integration.*;
+import io.gitlab.jfronny.respackopts.integration.FrexCompat;
+import io.gitlab.jfronny.respackopts.integration.SaveHook;
 import io.gitlab.jfronny.respackopts.util.MetaCache;
-import net.fabricmc.api.*;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.server.integrated.IntegratedServer;

src/client/java/io/gitlab/jfronny/respackopts/RpoClientCommand.java

@@ -6,13 +6,11 @@ import com.mojang.brigadier.arguments.StringArgumentType;
 import io.gitlab.jfronny.commons.throwable.ThrowingConsumer;
 import io.gitlab.jfronny.commons.throwable.ThrowingSupplier;
 import io.gitlab.jfronny.muscript.ast.Expr;
-import io.gitlab.jfronny.muscript.ast.context.ExprUtils;
 import io.gitlab.jfronny.muscript.core.LocationalException;
 import io.gitlab.jfronny.muscript.data.additional.DataExprMapper;
 import io.gitlab.jfronny.muscript.data.dynamic.Dynamic;
 import io.gitlab.jfronny.muscript.parser.Parser;
 import io.gitlab.jfronny.muscript.runtime.Runtime;
-import io.gitlab.jfronny.muscript.serialize.Decompiler;
 import io.gitlab.jfronny.respackopts.muscript.ScopeVersion;
 import io.gitlab.jfronny.respackopts.util.MetaCache;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
@@ -25,13 +23,18 @@ import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import org.apache.commons.io.IOUtils;
 
-import java.io.*;
-import java.nio.file.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
 import java.util.concurrent.CompletableFuture;
 
 import static io.gitlab.jfronny.muscript.ast.context.ExprUtils.asString;
 import static io.gitlab.jfronny.muscript.serialize.Decompiler.decompile;
-import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.*;
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument;
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
 
 public class RpoClientCommand {
     private static final Version VERSION = FabricLoader.getInstance().getModContainer(Respackopts.ID).orElseThrow().getMetadata().getVersion();

src/client/java/io/gitlab/jfronny/respackopts/mixin/LanguageManagerMixin.java

@@ -11,7 +11,9 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Mixin(LanguageManager.class)
 public class LanguageManagerMixin {

src/client/java/io/gitlab/jfronny/respackopts/mixin/OptionsScreenMixin.java

@@ -1,10 +1,14 @@
 package io.gitlab.jfronny.respackopts.mixin;
 
-import io.gitlab.jfronny.respackopts.*;
+import io.gitlab.jfronny.respackopts.Respackopts;
+import io.gitlab.jfronny.respackopts.RespackoptsClient;
+import io.gitlab.jfronny.respackopts.RespackoptsConfig;
 import net.minecraft.client.gui.screen.option.OptionsScreen;
 import net.minecraft.client.option.GameOptions;
 import net.minecraft.resource.ResourcePackManager;
-import org.spongepowered.asm.mixin.*;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

src/client/java/io/gitlab/jfronny/respackopts/mixin/PackScreenMixin.java

@@ -1,11 +1,15 @@
 package io.gitlab.jfronny.respackopts.mixin;
 
 import io.gitlab.jfronny.respackopts.Respackopts;
-import org.spongepowered.asm.mixin.*;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-import java.nio.file.*;
+import java.nio.file.Path;
+import java.nio.file.WatchEvent;
+import java.nio.file.WatchKey;
 import java.util.ArrayList;
 import java.util.List;
 

src/client/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackEntryMixin.java

@@ -11,7 +11,10 @@ import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.pack.PackListWidget;
 import net.minecraft.client.gui.screen.pack.ResourcePackOrganizer;
 import net.minecraft.util.Identifier;
-import org.spongepowered.asm.mixin.*;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java

@@ -1,7 +1,10 @@
 package io.gitlab.jfronny.respackopts;
 
 import io.gitlab.jfronny.commons.logger.SystemLoggerPlus;
-import io.gitlab.jfronny.respackopts.filters.*;
+import io.gitlab.jfronny.respackopts.filters.DirFilterEvents;
+import io.gitlab.jfronny.respackopts.filters.FileFilterEvents;
+import io.gitlab.jfronny.respackopts.filters.IOLogEvents;
+import io.gitlab.jfronny.respackopts.filters.ValidationLayer;
 import io.gitlab.jfronny.respackopts.integration.SaveHook;
 import io.gitlab.jfronny.respackopts.server.ServerInstanceHolder;
 import net.fabricmc.api.EnvType;

src/main/java/io/gitlab/jfronny/respackopts/filters/DirFilterEvents.java

@@ -13,11 +13,18 @@ import io.gitlab.jfronny.respackopts.model.cache.CachedPackState;
 import io.gitlab.jfronny.respackopts.model.enums.PackCapability;
 import io.gitlab.jfronny.respackopts.muscript.RespackoptsFS;
 import io.gitlab.jfronny.respackopts.util.MetaCache;
-import net.minecraft.resource.*;
-import net.minecraft.util.Identifier;
+import net.minecraft.resource.InputSupplier;
+import net.minecraft.resource.ResourcePack;
+import net.minecraft.resource.ResourceType;
 
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
 
 public enum DirFilterEvents implements IEvents {
     INSTANCE;

src/main/java/io/gitlab/jfronny/respackopts/filters/FileFilterEvents.java

@@ -2,12 +2,16 @@ package io.gitlab.jfronny.respackopts.filters;
 
 import io.gitlab.jfronny.libjf.data.manipulation.api.UserResourceEvents;
 import io.gitlab.jfronny.respackopts.Respackopts;
-import io.gitlab.jfronny.respackopts.filters.util.*;
+import io.gitlab.jfronny.respackopts.filters.util.FileExclusionProvider;
+import io.gitlab.jfronny.respackopts.filters.util.FileExpansionProvider;
+import io.gitlab.jfronny.respackopts.filters.util.FileFallbackProvider;
 import io.gitlab.jfronny.respackopts.model.cache.CacheKey;
 import io.gitlab.jfronny.respackopts.model.enums.PackCapability;
 import io.gitlab.jfronny.respackopts.muscript.RespackoptsFS;
 import io.gitlab.jfronny.respackopts.util.MetaCache;
-import net.minecraft.resource.*;
+import net.minecraft.resource.InputSupplier;
+import net.minecraft.resource.ResourcePack;
+import net.minecraft.resource.ResourceType;
 import net.minecraft.util.Identifier;
 
 import java.io.InputStream;

src/main/java/io/gitlab/jfronny/respackopts/filters/IOLogEvents.java

@@ -2,7 +2,9 @@ package io.gitlab.jfronny.respackopts.filters;
 
 import io.gitlab.jfronny.commons.logger.SystemLoggerPlus;
 import io.gitlab.jfronny.libjf.data.manipulation.api.UserResourceEvents;
-import net.minecraft.resource.*;
+import net.minecraft.resource.InputSupplier;
+import net.minecraft.resource.ResourcePack;
+import net.minecraft.resource.ResourceType;
 import net.minecraft.resource.metadata.ResourceMetadataReader;
 import net.minecraft.util.Identifier;
 

src/main/java/io/gitlab/jfronny/respackopts/filters/util/FileDependencyTracker.java

@@ -2,7 +2,10 @@ package io.gitlab.jfronny.respackopts.filters.util;
 
 import io.gitlab.jfronny.respackopts.Respackopts;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
 public class FileDependencyTracker {
     private final String pack;

src/main/java/io/gitlab/jfronny/respackopts/filters/util/FileExpansionProvider.java

@@ -3,14 +3,15 @@ package io.gitlab.jfronny.respackopts.filters.util;
 import io.gitlab.jfronny.muscript.ast.StringExpr;
 import io.gitlab.jfronny.muscript.data.additional.context.Scope;
 import io.gitlab.jfronny.muscript.data.dynamic.DObject;
-import io.gitlab.jfronny.muscript.data.dynamic.Dynamic;
 import io.gitlab.jfronny.muscript.runtime.Runtime;
 import io.gitlab.jfronny.respackopts.model.cache.CacheKey;
 import io.gitlab.jfronny.respackopts.muscript.RespackoptsFS;
 import io.gitlab.jfronny.respackopts.util.MetaCache;
 import net.minecraft.resource.InputSupplier;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Map;
 
 public class FileExpansionProvider {

src/main/java/io/gitlab/jfronny/respackopts/filters/util/FileFallbackProvider.java

@@ -4,7 +4,9 @@ import io.gitlab.jfronny.respackopts.Respackopts;
 import io.gitlab.jfronny.respackopts.model.cache.CacheKey;
 import io.gitlab.jfronny.respackopts.muscript.RespackoptsFS;
 import io.gitlab.jfronny.respackopts.util.MetaCache;
-import net.minecraft.resource.*;
+import net.minecraft.resource.InputSupplier;
+import net.minecraft.resource.ResourcePack;
+import net.minecraft.resource.ResourceType;
 import net.minecraft.util.Identifier;
 
 import java.io.InputStream;

src/main/java/io/gitlab/jfronny/respackopts/filters/util/FileRpoSearchProvider.java

@@ -11,7 +11,9 @@ import io.gitlab.jfronny.respackopts.muscript.RespackoptsFS;
 import io.gitlab.jfronny.respackopts.util.MetaCache;
 import net.minecraft.resource.InputSupplier;
 
-import java.io.*;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.util.Map;
 
 public class FileRpoSearchProvider {

src/main/java/io/gitlab/jfronny/respackopts/gson/BoolExprDeserializer.java

@@ -5,14 +5,23 @@ import io.gitlab.jfronny.commons.serialize.SerializeReader;
 import io.gitlab.jfronny.commons.serialize.SerializeWriter;
 import io.gitlab.jfronny.commons.serialize.databind.api.SerializerFor;
 import io.gitlab.jfronny.commons.serialize.databind.api.TypeAdapter;
+import io.gitlab.jfronny.muscript.ast.BoolExpr;
+import io.gitlab.jfronny.muscript.ast.DynamicExpr;
+import io.gitlab.jfronny.muscript.ast.Expr;
+import io.gitlab.jfronny.muscript.ast.bool.And;
+import io.gitlab.jfronny.muscript.ast.bool.Not;
+import io.gitlab.jfronny.muscript.ast.bool.Or;
 import io.gitlab.jfronny.muscript.ast.context.ExprUtils;
-import io.gitlab.jfronny.muscript.parser.lexer.Token;
-import io.gitlab.jfronny.muscript.ast.*;
-import io.gitlab.jfronny.muscript.ast.bool.*;
-import io.gitlab.jfronny.muscript.ast.dynamic.*;
+import io.gitlab.jfronny.muscript.ast.dynamic.Call;
+import io.gitlab.jfronny.muscript.ast.dynamic.Equals;
+import io.gitlab.jfronny.muscript.ast.dynamic.Get;
+import io.gitlab.jfronny.muscript.ast.dynamic.Variable;
 import io.gitlab.jfronny.muscript.core.CodeLocation;
+import io.gitlab.jfronny.muscript.parser.lexer.Token;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
 
 @SerializerFor(targets = BoolExpr.class)
 public class BoolExprDeserializer extends TypeAdapter<BoolExpr> {

src/main/java/io/gitlab/jfronny/respackopts/gson/entry/ConfigBranchSerializer.java

@@ -6,7 +6,9 @@ import io.gitlab.jfronny.commons.serialize.SerializeWriter;
 import io.gitlab.jfronny.commons.serialize.Token;
 import io.gitlab.jfronny.commons.serialize.databind.api.SerializerFor;
 import io.gitlab.jfronny.commons.serialize.databind.api.TypeAdapter;
-import io.gitlab.jfronny.respackopts.model.tree.*;
+import io.gitlab.jfronny.respackopts.model.tree.ConfigBranch;
+import io.gitlab.jfronny.respackopts.model.tree.ConfigEntry;
+import io.gitlab.jfronny.respackopts.model.tree.GC_ConfigEntry;
 
 import java.util.Map;
 

src/main/java/io/gitlab/jfronny/respackopts/mixin/FileResourcePackProviderMixin.java

@@ -7,7 +7,9 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
 import java.io.IOException;
-import java.nio.file.*;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 @Mixin(FileResourcePackProvider.class)
 public class FileResourcePackProviderMixin {

src/main/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackManagerMixin.java

@@ -3,24 +3,29 @@ package io.gitlab.jfronny.respackopts.mixin;
 import io.gitlab.jfronny.libjf.LibJf;
 import io.gitlab.jfronny.respackopts.Respackopts;
 import io.gitlab.jfronny.respackopts.RespackoptsConfig;
-import io.gitlab.jfronny.respackopts.integration.SaveHook;
 import io.gitlab.jfronny.respackopts.model.DiscoveredPack;
 import io.gitlab.jfronny.respackopts.model.GC_PackMeta;
 import io.gitlab.jfronny.respackopts.model.PackMeta;
-import io.gitlab.jfronny.respackopts.model.cache.CacheKey;
 import io.gitlab.jfronny.respackopts.util.FallbackI18n;
 import io.gitlab.jfronny.respackopts.util.MetaCache;
 import net.minecraft.resource.*;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.*;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 @Mixin(ResourcePackManager.class)
 public class ResourcePackManagerMixin {

src/main/java/io/gitlab/jfronny/respackopts/model/DirRpo.java

@@ -1,8 +1,8 @@
 package io.gitlab.jfronny.respackopts.model;
 
-import io.gitlab.jfronny.commons.serialize.generator.annotations.GSerializable;
 import io.gitlab.jfronny.commons.serialize.annotations.Ignore;
 import io.gitlab.jfronny.commons.serialize.annotations.SerializedName;
+import io.gitlab.jfronny.commons.serialize.generator.annotations.GSerializable;
 
 @GSerializable
 public class DirRpo {

src/main/java/io/gitlab/jfronny/respackopts/model/FileRpo.java

@@ -1,8 +1,8 @@
 package io.gitlab.jfronny.respackopts.model;
 
-import io.gitlab.jfronny.commons.serialize.generator.annotations.GSerializable;
 import io.gitlab.jfronny.commons.serialize.annotations.Ignore;
 import io.gitlab.jfronny.commons.serialize.annotations.SerializedName;
+import io.gitlab.jfronny.commons.serialize.generator.annotations.GSerializable;
 import io.gitlab.jfronny.muscript.ast.StringExpr;
 
 import java.util.Map;

src/main/java/io/gitlab/jfronny/respackopts/model/PackMeta.java

@@ -1,8 +1,6 @@
 package io.gitlab.jfronny.respackopts.model;
 
-import io.gitlab.jfronny.commons.serialize.databind.api.SerializeWithAdapter;
 import io.gitlab.jfronny.commons.serialize.generator.annotations.GSerializable;
-import io.gitlab.jfronny.respackopts.gson.entry.ConfigBranchSerializer;
 import io.gitlab.jfronny.respackopts.model.enums.PackCapability;
 import io.gitlab.jfronny.respackopts.model.tree.ConfigBranch;
 

src/main/java/io/gitlab/jfronny/respackopts/model/cache/CachedPackState.java

@@ -4,12 +4,16 @@ import io.gitlab.jfronny.muscript.ast.context.Script;
 import io.gitlab.jfronny.muscript.data.additional.context.Scope;
 import io.gitlab.jfronny.respackopts.RespackoptsConfig;
 import io.gitlab.jfronny.respackopts.filters.util.FileDependencyTracker;
-import io.gitlab.jfronny.respackopts.model.*;
+import io.gitlab.jfronny.respackopts.model.DirRpo;
+import io.gitlab.jfronny.respackopts.model.FileRpo;
+import io.gitlab.jfronny.respackopts.model.PackMeta;
 import io.gitlab.jfronny.respackopts.model.tree.ConfigBranch;
 import io.gitlab.jfronny.respackopts.muscript.MuScriptScope;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public record CachedPackState(
         String packId,

src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigBooleanEntry.java

@@ -6,7 +6,6 @@ import io.gitlab.jfronny.muscript.data.dynamic.DBool;
 import io.gitlab.jfronny.respackopts.Respackopts;
 import io.gitlab.jfronny.respackopts.RespackoptsConfig;
 import io.gitlab.jfronny.respackopts.gson.entry.BooleanEntrySerializer;
-import io.gitlab.jfronny.respackopts.gson.entry.ConfigBranchSerializer;
 
 import java.util.Objects;
 

src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigEnumEntry.java

@@ -7,12 +7,14 @@ import io.gitlab.jfronny.muscript.data.additional.DelegateDynamic;
 import io.gitlab.jfronny.muscript.data.dynamic.Dynamic;
 import io.gitlab.jfronny.respackopts.Respackopts;
 import io.gitlab.jfronny.respackopts.RespackoptsConfig;
-import io.gitlab.jfronny.respackopts.gson.entry.ConfigBranchSerializer;
 import io.gitlab.jfronny.respackopts.gson.entry.EnumEntrySerializer;
 import io.gitlab.jfronny.respackopts.model.enums.ConfigSyncMode;
 import io.gitlab.jfronny.respackopts.util.IndentingStringBuilder;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
 
 @SerializeWithAdapter(adapter = EnumEntrySerializer.class)
 public class ConfigEnumEntry extends ConfigEntry<String> implements DelegateDynamic {

src/main/java/io/gitlab/jfronny/respackopts/model/tree/ConfigNumericEntry.java

@@ -5,7 +5,6 @@ import io.gitlab.jfronny.libjf.config.api.v2.dsl.CategoryBuilder;
 import io.gitlab.jfronny.muscript.data.dynamic.DNumber;
 import io.gitlab.jfronny.respackopts.Respackopts;
 import io.gitlab.jfronny.respackopts.RespackoptsConfig;
-import io.gitlab.jfronny.respackopts.gson.entry.ConfigBranchSerializer;
 import io.gitlab.jfronny.respackopts.gson.entry.NumericEntrySerializer;
 import io.gitlab.jfronny.respackopts.model.enums.ConfigSyncMode;
 import io.gitlab.jfronny.respackopts.util.IndentingStringBuilder;

src/main/java/io/gitlab/jfronny/respackopts/muscript/RespackoptsFS.java

@@ -3,7 +3,9 @@ package io.gitlab.jfronny.respackopts.muscript;
 import io.gitlab.jfronny.libjf.ResourcePath;
 import io.gitlab.jfronny.muscript.core.SourceFS;
 import io.gitlab.jfronny.respackopts.Respackopts;
-import net.minecraft.resource.*;
+import net.minecraft.resource.InputSupplier;
+import net.minecraft.resource.ResourcePack;
+import net.minecraft.resource.ResourceType;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
 

src/main/java/io/gitlab/jfronny/respackopts/util/MetaCache.java

@@ -23,7 +23,9 @@ import net.minecraft.resource.ResourcePack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;