🐺📖

KessokuTeaTime · Nov 8, 2024 · 5bc9c72 · 5bc9c72
1 parent 80157f7
commit 5bc9c72
Show file tree

Hide file tree

Showing 131 changed files with 305 additions and 402 deletions.
diff --git a/base/common/src/main/java/band/kessoku/lib/api/KessokuLib.java b/base/common/src/main/java/band/kessoku/lib/api/KessokuLib.java
@@ -15,14 +15,17 @@
  */
 package band.kessoku.lib.api;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.*;
-
 import org.jetbrains.annotations.UnmodifiableView;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.ServiceLoader;
+
 public final class KessokuLib {
     private static final List<Class<?>> initializedModules = new ArrayList<>();
 

diff --git a/base/common/src/main/java/band/kessoku/lib/api/base/KessokuUtils.java b/base/common/src/main/java/band/kessoku/lib/api/base/KessokuUtils.java
@@ -15,11 +15,14 @@
  */
 package band.kessoku.lib.api.base;
 
-import java.lang.reflect.Constructor;
-import java.util.*;
-
 import org.jetbrains.annotations.NotNull;
 
+import java.lang.reflect.Constructor;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 public final class KessokuUtils {
     private KessokuUtils() {
     }

diff --git a/base/fabric/src/main/java/band/kessoku/lib/impl/base/fabric/KessokuBaseFabric.java b/base/fabric/src/main/java/band/kessoku/lib/impl/base/fabric/KessokuBaseFabric.java
@@ -17,7 +17,6 @@
 
 import band.kessoku.lib.api.KessokuLib;
 import band.kessoku.lib.api.base.KessokuBase;
-
 import net.fabricmc.api.ModInitializer;
 
 public final class KessokuBaseFabric implements ModInitializer {

diff --git a/base/neo/src/main/java/band/kessoku/lib/api/base/neoforge/NeoEventUtils.java b/base/neo/src/main/java/band/kessoku/lib/api/base/neoforge/NeoEventUtils.java
@@ -15,12 +15,12 @@
  */
 package band.kessoku.lib.api.base.neoforge;
 
-import java.util.function.Consumer;
-
 import net.neoforged.bus.api.Event;
 import net.neoforged.bus.api.EventPriority;
 import net.neoforged.bus.api.IEventBus;
 
+import java.util.function.Consumer;
+
 public final class NeoEventUtils {
     private NeoEventUtils() {
     }

diff --git a/base/neo/src/main/java/band/kessoku/lib/impl/base/neoforge/KessokuBaseNeoforge.java b/base/neo/src/main/java/band/kessoku/lib/impl/base/neoforge/KessokuBaseNeoforge.java
@@ -17,7 +17,6 @@
 
 import band.kessoku.lib.api.KessokuLib;
 import band.kessoku.lib.api.base.KessokuBase;
-
 import net.neoforged.fml.common.Mod;
 
 @Mod(KessokuBase.MOD_ID)

diff --git a/...d/common/src/main/java/band/kessoku/lib/api/event/command/ClientCommandRegistryEvent.java b/...d/common/src/main/java/band/kessoku/lib/api/event/command/ClientCommandRegistryEvent.java
@@ -18,9 +18,8 @@
 import band.kessoku.lib.api.util.command.ClientCommandSourceExtension;
 import band.kessoku.lib.event.api.Event;
 import com.mojang.brigadier.CommandDispatcher;
-import org.jetbrains.annotations.ApiStatus;
-
 import net.minecraft.command.CommandRegistryAccess;
+import org.jetbrains.annotations.ApiStatus;
 
 @ApiStatus.NonExtendable
 public interface ClientCommandRegistryEvent {

diff --git a/command/common/src/main/java/band/kessoku/lib/api/event/command/CommandRegistryEvent.java b/command/common/src/main/java/band/kessoku/lib/api/event/command/CommandRegistryEvent.java
@@ -17,11 +17,10 @@
 
 import band.kessoku.lib.event.api.Event;
 import com.mojang.brigadier.CommandDispatcher;
-import org.jetbrains.annotations.ApiStatus;
-
 import net.minecraft.command.CommandRegistryAccess;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
+import org.jetbrains.annotations.ApiStatus;
 
 @ApiStatus.NonExtendable
 public interface CommandRegistryEvent {

diff --git a/command/common/src/main/java/band/kessoku/lib/api/util/command/ClientCommandUtils.java b/command/common/src/main/java/band/kessoku/lib/api/util/command/ClientCommandUtils.java
@@ -15,10 +15,6 @@
  */
 package band.kessoku.lib.api.util.command;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import band.kessoku.lib.api.KessokuLib;
 import band.kessoku.lib.command.KessokuCommand;
 import band.kessoku.lib.mixin.command.HelpCommandAccessor;
@@ -34,11 +30,14 @@
 import com.mojang.brigadier.exceptions.CommandExceptionType;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.tree.CommandNode;
-import org.jetbrains.annotations.Nullable;
-
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.Text;
 import net.minecraft.text.Texts;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public final class ClientCommandUtils {
     private static @Nullable CommandDispatcher<ClientCommandSourceExtension> activeDispatcher;

diff --git a/command/common/src/main/java/band/kessoku/lib/mixin/command/HelpCommandAccessor.java b/command/common/src/main/java/band/kessoku/lib/mixin/command/HelpCommandAccessor.java
@@ -16,11 +16,10 @@
 package band.kessoku.lib.mixin.command;
 
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
+import net.minecraft.server.command.HelpCommand;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-import net.minecraft.server.command.HelpCommand;
-
 @Mixin(HelpCommand.class)
 public interface HelpCommandAccessor {
     @Accessor("FAILED_EXCEPTION")

diff --git a/command/common/src/test/java/kessoku/testmod/command/KessokuTestCommand.java b/command/common/src/test/java/kessoku/testmod/command/KessokuTestCommand.java
@@ -17,7 +17,6 @@
 
 import band.kessoku.lib.api.entrypoint.entrypoints.KessokuModInitializer;
 import band.kessoku.lib.api.event.command.CommandRegistryEvent;
-
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.text.Text;
 

diff --git a/command/fabric/src/main/java/band/kessoku/lib/impl/command/fabric/KessokuCommandFabric.java b/command/fabric/src/main/java/band/kessoku/lib/impl/command/fabric/KessokuCommandFabric.java
@@ -17,7 +17,6 @@
 
 import band.kessoku.lib.api.KessokuLib;
 import band.kessoku.lib.command.KessokuCommand;
-
 import net.fabricmc.api.ModInitializer;
 
 public final class KessokuCommandFabric implements ModInitializer {

diff --git a/command/fabric/src/main/java/band/kessoku/lib/impl/command/fabric/KessokuCommandImpl.java b/command/fabric/src/main/java/band/kessoku/lib/impl/command/fabric/KessokuCommandImpl.java
@@ -19,7 +19,6 @@
 import band.kessoku.lib.api.event.command.CommandRegistryEvent;
 import band.kessoku.lib.api.util.command.ClientCommandSourceExtension;
 import com.mojang.brigadier.CommandDispatcher;
-
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 

diff --git a/...c/src/main/java/band/kessoku/lib/mixin/command/fabric/FabricClientCommandSourceMixin.java b/...c/src/main/java/band/kessoku/lib/mixin/command/fabric/FabricClientCommandSourceMixin.java
@@ -16,17 +16,15 @@
 package band.kessoku.lib.mixin.command.fabric;
 
 import band.kessoku.lib.api.util.command.ClientCommandSourceExtension;
-import org.spongepowered.asm.mixin.Mixin;
-
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.Entity;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.Vec2f;
 import net.minecraft.util.math.Vec3d;
-
-import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
+import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(FabricClientCommandSource.class)
 public interface FabricClientCommandSourceMixin extends ClientCommandSourceExtension {

diff --git a/command/neo/src/main/java/band/kessoku/lib/impl/command/neoforge/KessokuCommandImpl.java b/command/neo/src/main/java/band/kessoku/lib/impl/command/neoforge/KessokuCommandImpl.java
@@ -20,7 +20,6 @@
 import band.kessoku.lib.api.event.command.CommandRegistryEvent;
 import band.kessoku.lib.api.util.command.ClientCommandSourceExtension;
 import com.mojang.brigadier.CommandDispatcher;
-
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.neoforge.client.event.RegisterClientCommandsEvent;
 import net.neoforged.neoforge.event.RegisterCommandsEvent;

diff --git a/command/neo/src/main/java/band/kessoku/lib/impl/command/neoforge/KessokuCommandNeoforge.java b/command/neo/src/main/java/band/kessoku/lib/impl/command/neoforge/KessokuCommandNeoforge.java
@@ -17,7 +17,6 @@
 
 import band.kessoku.lib.api.KessokuLib;
 import band.kessoku.lib.command.KessokuCommand;
-
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.loading.FMLLoader;
 import net.neoforged.neoforge.common.NeoForge;

diff --git a/...d/neo/src/main/java/band/kessoku/lib/mixin/command/neoforge/ClientCommandSourceMixin.java b/...d/neo/src/main/java/band/kessoku/lib/mixin/command/neoforge/ClientCommandSourceMixin.java
@@ -16,16 +16,15 @@
 package band.kessoku.lib.mixin.command.neoforge;
 
 import band.kessoku.lib.api.util.command.ClientCommandSourceExtension;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientCommandSource;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(ClientCommandSource.class)
 abstract class ClientCommandSourceMixin implements ClientCommandSourceExtension {

diff --git a/config/common/src/main/java/band/kessoku/lib/api/config/AbstractConfig.java b/config/common/src/main/java/band/kessoku/lib/api/config/AbstractConfig.java
@@ -15,17 +15,6 @@
  */
 package band.kessoku.lib.api.config;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.util.*;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-
 import band.kessoku.lib.api.KessokuLib;
 import band.kessoku.lib.api.base.reflect.ModifiersUtil;
 import band.kessoku.lib.api.base.reflect.ReflectUtil;
@@ -38,6 +27,17 @@
 import org.apache.commons.io.FilenameUtils;
 import org.apache.logging.log4j.core.util.ReflectionUtil;
 
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+
 @SuppressWarnings({"rawtypes", "unused"})
 public abstract class AbstractConfig {
     private final List<Consumer<AbstractConfig>> preSave = new ArrayList<>();

diff --git a/config/common/src/main/java/band/kessoku/lib/api/config/ConfigValue.java b/config/common/src/main/java/band/kessoku/lib/api/config/ConfigValue.java
@@ -55,7 +55,8 @@ public static Type asType(Object o) {
                 case Float ignored -> FLOAT;
                 case Double ignored -> DOUBLE;
 
-                /* AmarokIce Note:
+                /*
+                AmarokIce Note:
                     try catch 对性能会造成额外影响。此处 throw 后在 { @code AbstractConfig } 中捕获是无意义的。
                     因此，改用 NULL 作为空置对象。
                  */

diff --git a/config/common/src/main/java/band/kessoku/lib/api/config/KessokuConfig.java b/config/common/src/main/java/band/kessoku/lib/api/config/KessokuConfig.java
@@ -15,18 +15,18 @@
  */
 package band.kessoku.lib.api.config;
 
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
 import org.apache.commons.io.FileUtils;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Marker;
 import org.slf4j.MarkerFactory;
 
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
 public final class KessokuConfig {
     private static final Map<AbstractConfig, Class<ConfigSerializer>> configs = new HashMap<>();
     private static final Map<Class<? extends ConfigSerializer>, ConfigSerializer> serializerCache = new HashMap<>();

diff --git a/config/common/src/main/java/band/kessoku/lib/api/config/serializers/Json5Serializer.java b/config/common/src/main/java/band/kessoku/lib/api/config/serializers/Json5Serializer.java
@@ -15,14 +15,14 @@
  */
 package band.kessoku.lib.api.config.serializers;
 
-import java.util.Map;
-
 import band.kessoku.lib.api.config.AbstractConfig;
 import band.kessoku.lib.api.config.ConfigSerializer;
 import club.someoneice.json.JSON;
 import club.someoneice.json.node.JsonNode;
 import club.someoneice.json.processor.Json5Builder;
 
+import java.util.Map;
+
 // TODO
 public class Json5Serializer implements ConfigSerializer {
     @Override

diff --git a/config/common/src/main/java/band/kessoku/lib/api/config/serializers/JsonSerializer.java b/config/common/src/main/java/band/kessoku/lib/api/config/serializers/JsonSerializer.java
@@ -15,8 +15,6 @@
  */
 package band.kessoku.lib.api.config.serializers;
 
-import java.util.Map;
-
 import band.kessoku.lib.api.config.AbstractConfig;
 import band.kessoku.lib.api.config.ConfigSerializer;
 import club.someoneice.json.JSON;
@@ -25,6 +23,8 @@
 import club.someoneice.json.node.MapNode;
 import club.someoneice.json.processor.JsonBuilder;
 
+import java.util.Map;
+
 public class JsonSerializer implements ConfigSerializer {
     @Override
     public String serialize(Map<String, AbstractConfig.ValueWithComment> value) {

diff --git a/config/common/src/main/java/band/kessoku/lib/api/config/serializers/TomlSerializer.java b/config/common/src/main/java/band/kessoku/lib/api/config/serializers/TomlSerializer.java
@@ -15,12 +15,12 @@
  */
 package band.kessoku.lib.api.config.serializers;
 
-import java.util.Map;
-
 import band.kessoku.lib.api.config.AbstractConfig;
 import band.kessoku.lib.api.config.ConfigSerializer;
 import com.electronwill.nightconfig.core.CommentedConfig;
 
+import java.util.Map;
+
 //todo
 public class TomlSerializer implements ConfigSerializer {
     @Override

diff --git a/config/common/src/main/java/band/kessoku/lib/api/config/values/BooleanValue.java b/config/common/src/main/java/band/kessoku/lib/api/config/values/BooleanValue.java
@@ -15,11 +15,11 @@
  */
 package band.kessoku.lib.api.config.values;
 
-import java.util.function.Supplier;
-
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.function.Supplier;
+
 public final class BooleanValue extends DefaultConfigValue<Boolean> {
     private BooleanValue(Supplier<Boolean> defaultValue) {
         super(defaultValue);

diff --git a/config/common/src/main/java/band/kessoku/lib/api/config/values/DefaultConfigValue.java b/config/common/src/main/java/band/kessoku/lib/api/config/values/DefaultConfigValue.java
@@ -15,10 +15,10 @@
  */
 package band.kessoku.lib.api.config.values;
 
-import java.util.function.Supplier;
-
 import band.kessoku.lib.api.config.ConfigValue;
 
+import java.util.function.Supplier;
+
 sealed abstract class DefaultConfigValue<T> implements ConfigValue<T, T> permits BooleanValue, DoubleValue, FloatValue, IntegerValue, ListValue, LongValue, MapValue, StringValue {
     public final Supplier<T> defaultValue;
     public T value;

diff --git a/config/common/src/main/java/band/kessoku/lib/api/config/values/DoubleValue.java b/config/common/src/main/java/band/kessoku/lib/api/config/values/DoubleValue.java
@@ -15,11 +15,11 @@
  */
 package band.kessoku.lib.api.config.values;
 
-import java.util.function.Supplier;
-
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.function.Supplier;
+
 public final class DoubleValue extends DefaultConfigValue<Double> {
     private DoubleValue(Supplier<Double> defaultValue) {
         super(defaultValue);

diff --git a/config/common/src/main/java/band/kessoku/lib/api/config/values/FloatValue.java b/config/common/src/main/java/band/kessoku/lib/api/config/values/FloatValue.java
@@ -15,11 +15,11 @@
  */
 package band.kessoku.lib.api.config.values;
 
-import java.util.function.Supplier;
-
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.function.Supplier;
+
 public final class FloatValue extends DefaultConfigValue<Float> {
     private FloatValue(Supplier<Float> defaultValue) {
         super(defaultValue);