diff --git a/libjf-base/src/main/java/io/gitlab/jfronny/libjf/coprocess/CoProcessManager.java b/libjf-base/src/main/java/io/gitlab/jfronny/libjf/coprocess/CoProcessManager.java index c6b7f00..06127c0 100644 --- a/libjf-base/src/main/java/io/gitlab/jfronny/libjf/coprocess/CoProcessManager.java +++ b/libjf-base/src/main/java/io/gitlab/jfronny/libjf/coprocess/CoProcessManager.java @@ -8,9 +8,7 @@ import net.fabricmc.loader.api.FabricLoader; import java.io.Closeable; import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import java.util.*; public class CoProcessManager implements ModInitializer { private final List coProcesses = new ArrayList<>(); diff --git a/libjf-base/src/main/java/io/gitlab/jfronny/libjf/gson/ClientOnly.java b/libjf-base/src/main/java/io/gitlab/jfronny/libjf/gson/ClientOnly.java index fbe829d..d09d721 100644 --- a/libjf-base/src/main/java/io/gitlab/jfronny/libjf/gson/ClientOnly.java +++ b/libjf-base/src/main/java/io/gitlab/jfronny/libjf/gson/ClientOnly.java @@ -1,9 +1,6 @@ package io.gitlab.jfronny.libjf.gson; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) diff --git a/libjf-base/src/main/java/io/gitlab/jfronny/libjf/gson/ServerOnly.java b/libjf-base/src/main/java/io/gitlab/jfronny/libjf/gson/ServerOnly.java index 3081902..4523b51 100644 --- a/libjf-base/src/main/java/io/gitlab/jfronny/libjf/gson/ServerOnly.java +++ b/libjf-base/src/main/java/io/gitlab/jfronny/libjf/gson/ServerOnly.java @@ -1,9 +1,6 @@ package io.gitlab.jfronny.libjf.gson; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) diff --git a/libjf-config-compiler-plugin/src/main/java/io/gitlab/jfronny/libjf/config/plugin/asm/ConfigInjectClassTransformer.java b/libjf-config-compiler-plugin/src/main/java/io/gitlab/jfronny/libjf/config/plugin/asm/ConfigInjectClassTransformer.java index 35e1688..c8dd7c9 100644 --- a/libjf-config-compiler-plugin/src/main/java/io/gitlab/jfronny/libjf/config/plugin/asm/ConfigInjectClassTransformer.java +++ b/libjf-config-compiler-plugin/src/main/java/io/gitlab/jfronny/libjf/config/plugin/asm/ConfigInjectClassTransformer.java @@ -3,9 +3,9 @@ package io.gitlab.jfronny.libjf.config.plugin.asm; import io.gitlab.jfronny.libjf.config.api.v1.Category; import io.gitlab.jfronny.libjf.config.api.v1.JfConfig; import io.gitlab.jfronny.libjf.config.plugin.BuildMetadata; +import io.gitlab.jfronny.libjf.config.plugin.asm.value.DiscoveredValue; import io.gitlab.jfronny.libjf.config.plugin.util.ClInitInjectVisitor; import io.gitlab.jfronny.libjf.config.plugin.util.GeneratorAdapter2; -import io.gitlab.jfronny.libjf.config.plugin.asm.value.DiscoveredValue; import org.gradle.api.GradleException; import org.objectweb.asm.*; import org.objectweb.asm.commons.GeneratorAdapter; diff --git a/libjf-config-compiler-plugin/src/main/java/io/gitlab/jfronny/libjf/config/plugin/fmj/FabricModJsonTransformer.java b/libjf-config-compiler-plugin/src/main/java/io/gitlab/jfronny/libjf/config/plugin/fmj/FabricModJsonTransformer.java index 4716d05..4cde1c1 100644 --- a/libjf-config-compiler-plugin/src/main/java/io/gitlab/jfronny/libjf/config/plugin/fmj/FabricModJsonTransformer.java +++ b/libjf-config-compiler-plugin/src/main/java/io/gitlab/jfronny/libjf/config/plugin/fmj/FabricModJsonTransformer.java @@ -7,8 +7,8 @@ import io.gitlab.jfronny.libjf.config.impl.ConfigHolderImpl; import io.gitlab.jfronny.libjf.config.plugin.asm.ConfigInjectClassTransformer; import org.objectweb.asm.Type; -import java.util.*; -import java.util.function.Predicate; +import java.util.Iterator; +import java.util.Set; public class FabricModJsonTransformer { private static final Gson INPUT_GSON = new GsonBuilder().setLenient().create(); diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Category.java b/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Category.java index 00ce5e1..65c1a96 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Category.java +++ b/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Category.java @@ -1,9 +1,6 @@ package io.gitlab.jfronny.libjf.config.api.v1; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * Annotation for config subclasses, which are to be shown as categories diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/ConfigInstance.java b/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/ConfigInstance.java index 1604f10..38fd34e 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/ConfigInstance.java +++ b/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/ConfigInstance.java @@ -1,7 +1,7 @@ package io.gitlab.jfronny.libjf.config.api.v1; import java.nio.file.Path; -import java.util.*; +import java.util.Optional; /** * This class represents a configuration. An instance may be obtained through ConfigHolder or the DSL. Do not implement manually! diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Entry.java b/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Entry.java index a8e4353..6c6b18c 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Entry.java +++ b/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Entry.java @@ -1,9 +1,6 @@ package io.gitlab.jfronny.libjf.config.api.v1; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * An annotation for fields in configs or categories which are to be shown diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Preset.java b/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Preset.java index 65ed644..ed45ae6 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Preset.java +++ b/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Preset.java @@ -1,9 +1,6 @@ package io.gitlab.jfronny.libjf.config.api.v1; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * An annotation for static methods in config classes which may be called when the user selects them in-game diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Verifier.java b/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Verifier.java index 72f8625..e23d6a8 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Verifier.java +++ b/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/api/v1/Verifier.java @@ -1,9 +1,6 @@ package io.gitlab.jfronny.libjf.config.api.v1; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; /** * An annotation for methods which are called every time a config is loaded or changed. diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/JfConfigWatchService.java b/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/JfConfigWatchService.java index 44cb171..ba9e239 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/JfConfigWatchService.java +++ b/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/JfConfigWatchService.java @@ -1,6 +1,6 @@ package io.gitlab.jfronny.libjf.config.impl; -import io.gitlab.jfronny.commons.throwable.*; +import io.gitlab.jfronny.commons.throwable.ThrowingRunnable; import io.gitlab.jfronny.libjf.LibJf; import io.gitlab.jfronny.libjf.config.api.v1.ConfigHolder; import io.gitlab.jfronny.libjf.coprocess.ThreadCoProcess; @@ -9,10 +9,7 @@ import net.fabricmc.loader.api.FabricLoader; import java.io.Closeable; import java.io.IOException; import java.nio.file.*; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; +import java.util.*; import static java.nio.file.StandardWatchEventKinds.*; diff --git a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslConfigCategory.java b/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslConfigCategory.java index 69560f4..0178266 100644 --- a/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslConfigCategory.java +++ b/libjf-config-core-v1/src/main/java/io/gitlab/jfronny/libjf/config/impl/dsl/DslConfigCategory.java @@ -3,7 +3,8 @@ package io.gitlab.jfronny.libjf.config.impl.dsl; import io.gitlab.jfronny.libjf.config.api.v1.*; import io.gitlab.jfronny.libjf.config.api.v1.dsl.CategoryBuilder; -import java.util.*; +import java.util.List; +import java.util.Map; import java.util.function.Consumer; import java.util.function.Supplier; import java.util.stream.Collectors; diff --git a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/EntryListWidget.java b/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/EntryListWidget.java index f41e783..8b41583 100644 --- a/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/EntryListWidget.java +++ b/libjf-config-ui-tiny-v1/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/entry/EntryListWidget.java @@ -7,16 +7,15 @@ import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.gui.widget.ClickableWidget; -import net.minecraft.client.gui.widget.ElementListWidget; +import net.minecraft.client.gui.widget.*; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; import java.util.List; import java.util.Optional; -import java.util.function.*; +import java.util.function.BooleanSupplier; +import java.util.function.Supplier; @Environment(EnvType.CLIENT) public class EntryListWidget extends ElementListWidget { diff --git a/libjf-data-manipulation-v0/src/main/java/io/gitlab/jfronny/libjf/data/manipulation/impl/ResourcePackHookPatch.java b/libjf-data-manipulation-v0/src/main/java/io/gitlab/jfronny/libjf/data/manipulation/impl/ResourcePackHookPatch.java index 3e24d1e..cba6db8 100644 --- a/libjf-data-manipulation-v0/src/main/java/io/gitlab/jfronny/libjf/data/manipulation/impl/ResourcePackHookPatch.java +++ b/libjf-data-manipulation-v0/src/main/java/io/gitlab/jfronny/libjf/data/manipulation/impl/ResourcePackHookPatch.java @@ -1,7 +1,8 @@ package io.gitlab.jfronny.libjf.data.manipulation.impl; import io.gitlab.jfronny.libjf.unsafe.asm.AsmConfig; -import io.gitlab.jfronny.libjf.unsafe.asm.patch.*; +import io.gitlab.jfronny.libjf.unsafe.asm.patch.Patch; +import io.gitlab.jfronny.libjf.unsafe.asm.patch.PatchUtil; import io.gitlab.jfronny.libjf.unsafe.asm.patch.modification.MethodModificationPatch; import io.gitlab.jfronny.libjf.unsafe.asm.patch.targeting.InterfaceImplTargetPatch; import org.objectweb.asm.Opcodes; diff --git a/libjf-data-manipulation-v0/src/testmod/java/io/gitlab/jfronny/libjf/data/manipulation/test/TestEntrypoint.java b/libjf-data-manipulation-v0/src/testmod/java/io/gitlab/jfronny/libjf/data/manipulation/test/TestEntrypoint.java index c815358..317a16b 100644 --- a/libjf-data-manipulation-v0/src/testmod/java/io/gitlab/jfronny/libjf/data/manipulation/test/TestEntrypoint.java +++ b/libjf-data-manipulation-v0/src/testmod/java/io/gitlab/jfronny/libjf/data/manipulation/test/TestEntrypoint.java @@ -1,10 +1,8 @@ package io.gitlab.jfronny.libjf.data.manipulation.test; import io.gitlab.jfronny.libjf.LibJf; -import io.gitlab.jfronny.libjf.data.manipulation.api.RecipeUtil; import io.gitlab.jfronny.libjf.data.manipulation.api.UserResourceEvents; import net.fabricmc.api.ModInitializer; -import net.minecraft.item.Items; import net.minecraft.resource.DirectoryResourcePack; public class TestEntrypoint implements ModInitializer { diff --git a/libjf-devutil/src/main/java/io/gitlab/jfronny/libjf/devutil/mixin/ArgumentTypesMixin.java b/libjf-devutil/src/main/java/io/gitlab/jfronny/libjf/devutil/mixin/ArgumentTypesMixin.java index ee3b917..5de4d35 100644 --- a/libjf-devutil/src/main/java/io/gitlab/jfronny/libjf/devutil/mixin/ArgumentTypesMixin.java +++ b/libjf-devutil/src/main/java/io/gitlab/jfronny/libjf/devutil/mixin/ArgumentTypesMixin.java @@ -1,11 +1,13 @@ package io.gitlab.jfronny.libjf.devutil.mixin; -import com.mojang.brigadier.arguments.*; +import com.mojang.brigadier.arguments.ArgumentType; import net.minecraft.command.argument.*; -import net.minecraft.command.argument.serialize.*; +import net.minecraft.command.argument.serialize.ArgumentSerializer; import net.minecraft.registry.Registry; -import org.spongepowered.asm.mixin.*; -import org.spongepowered.asm.mixin.injection.*; +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; @Mixin(ArgumentTypes.class) public abstract class ArgumentTypesMixin { diff --git a/libjf-devutil/src/main/java/io/gitlab/jfronny/libjf/devutil/mixin/CommandManagerMixin.java b/libjf-devutil/src/main/java/io/gitlab/jfronny/libjf/devutil/mixin/CommandManagerMixin.java index 5b3a7f2..fac7c57 100644 --- a/libjf-devutil/src/main/java/io/gitlab/jfronny/libjf/devutil/mixin/CommandManagerMixin.java +++ b/libjf-devutil/src/main/java/io/gitlab/jfronny/libjf/devutil/mixin/CommandManagerMixin.java @@ -1,9 +1,10 @@ package io.gitlab.jfronny.libjf.devutil.mixin; -import com.mojang.brigadier.*; -import net.minecraft.server.command.*; -import org.spongepowered.asm.mixin.*; -import org.spongepowered.asm.mixin.injection.*; +import com.mojang.brigadier.CommandDispatcher; +import net.minecraft.server.command.CommandManager; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(CommandManager.class) public class CommandManagerMixin { diff --git a/libjf-translate-v1/src/main/java/io/gitlab/jfronny/libjf/translate/api/TranslateService.java b/libjf-translate-v1/src/main/java/io/gitlab/jfronny/libjf/translate/api/TranslateService.java index e369d1f..4744bf2 100644 --- a/libjf-translate-v1/src/main/java/io/gitlab/jfronny/libjf/translate/api/TranslateService.java +++ b/libjf-translate-v1/src/main/java/io/gitlab/jfronny/libjf/translate/api/TranslateService.java @@ -6,9 +6,10 @@ import io.gitlab.jfronny.libjf.translate.impl.google.GoogleTranslateService; import io.gitlab.jfronny.libjf.translate.impl.libretranslate.LibreTranslateService; import io.gitlab.jfronny.libjf.translate.impl.noop.NoopTranslateService; -import java.io.*; -import java.net.*; -import java.util.*; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.LinkedList; +import java.util.List; public interface TranslateService { /** diff --git a/libjf-translate-v1/src/testmod/java/io/gitlab/jfronny/libjf/translate/test/TestEntrypoint.java b/libjf-translate-v1/src/testmod/java/io/gitlab/jfronny/libjf/translate/test/TestEntrypoint.java index 9f625e5..c8ef539 100644 --- a/libjf-translate-v1/src/testmod/java/io/gitlab/jfronny/libjf/translate/test/TestEntrypoint.java +++ b/libjf-translate-v1/src/testmod/java/io/gitlab/jfronny/libjf/translate/test/TestEntrypoint.java @@ -1,11 +1,11 @@ package io.gitlab.jfronny.libjf.translate.test; -import io.gitlab.jfronny.libjf.*; -import io.gitlab.jfronny.libjf.translate.impl.google.*; -import io.gitlab.jfronny.libjf.translate.impl.libretranslate.*; -import net.fabricmc.api.*; +import io.gitlab.jfronny.libjf.LibJf; +import io.gitlab.jfronny.libjf.translate.impl.google.GoogleTranslateService; +import io.gitlab.jfronny.libjf.translate.impl.libretranslate.LibreTranslateService; +import net.fabricmc.api.ModInitializer; -import java.util.*; +import java.util.Objects; public class TestEntrypoint implements ModInitializer { @Override diff --git a/libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/DynamicEntry.java b/libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/DynamicEntry.java index 0686f22..c12bce2 100644 --- a/libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/DynamicEntry.java +++ b/libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/DynamicEntry.java @@ -6,10 +6,7 @@ import net.fabricmc.loader.impl.ModContainerImpl; import net.fabricmc.loader.impl.metadata.EntrypointMetadata; import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; +import java.util.*; import java.util.function.Consumer; public class DynamicEntry { diff --git a/libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/JfLanguageAdapter.java b/libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/JfLanguageAdapter.java index 96d6088..c17f50e 100644 --- a/libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/JfLanguageAdapter.java +++ b/libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/JfLanguageAdapter.java @@ -1,6 +1,7 @@ package io.gitlab.jfronny.libjf.unsafe; -import io.gitlab.jfronny.commons.log.*; +import io.gitlab.jfronny.commons.log.Level; +import io.gitlab.jfronny.commons.log.Logger; import io.gitlab.jfronny.libjf.LibJf; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.LanguageAdapter; diff --git a/libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/asm/AsmTransformer.java b/libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/asm/AsmTransformer.java index faf39e2..c289251 100644 --- a/libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/asm/AsmTransformer.java +++ b/libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/asm/AsmTransformer.java @@ -16,9 +16,7 @@ import org.spongepowered.asm.transformers.MixinClassWriter; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; +import java.util.*; public class AsmTransformer implements IMixinTransformer { public static AsmTransformer INSTANCE; diff --git a/libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/asm/patch/method/MethodReplacementPatch.java b/libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/asm/patch/method/MethodReplacementPatch.java index 4c36534..63a6270 100644 --- a/libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/asm/patch/method/MethodReplacementPatch.java +++ b/libjf-unsafe-v0/src/main/java/io/gitlab/jfronny/libjf/unsafe/asm/patch/method/MethodReplacementPatch.java @@ -1,10 +1,7 @@ package io.gitlab.jfronny.libjf.unsafe.asm.patch.method; import io.gitlab.jfronny.libjf.unsafe.asm.patch.MethodPatch; -import org.objectweb.asm.tree.AbstractInsnNode; -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.InsnList; -import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.*; public class MethodReplacementPatch implements MethodPatch { private final InsnList instructions; diff --git a/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/JfWeb.java b/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/JfWeb.java index ee875ee..1641ac2 100644 --- a/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/JfWeb.java +++ b/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/JfWeb.java @@ -7,7 +7,7 @@ import io.gitlab.jfronny.libjf.coprocess.CoProcess; import io.gitlab.jfronny.libjf.web.api.WebServer; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; -import net.minecraft.text.*; +import net.minecraft.text.Text; import static net.minecraft.server.command.CommandManager.literal; diff --git a/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/JfWebServer.java b/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/JfWebServer.java index 8d6acd0..3049646 100644 --- a/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/JfWebServer.java +++ b/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/JfWebServer.java @@ -2,18 +2,12 @@ package io.gitlab.jfronny.libjf.web.impl; import io.gitlab.jfronny.libjf.LibJf; import io.gitlab.jfronny.libjf.web.api.*; -import io.gitlab.jfronny.libjf.web.impl.util.bluemapcore.HttpRequest; -import io.gitlab.jfronny.libjf.web.impl.util.bluemapcore.HttpResponse; -import io.gitlab.jfronny.libjf.web.impl.util.bluemapcore.HttpServer; -import io.gitlab.jfronny.libjf.web.impl.util.bluemapcore.HttpStatusCode; import io.gitlab.jfronny.libjf.web.impl.util.WebPaths; +import io.gitlab.jfronny.libjf.web.impl.util.bluemapcore.*; import net.fabricmc.loader.api.FabricLoader; import javax.management.openmbean.KeyAlreadyExistsException; -import java.io.ByteArrayInputStream; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; +import java.io.*; import java.nio.file.Files; import java.nio.file.Path; import java.util.Objects; diff --git a/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/RequestHandler.java b/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/RequestHandler.java index 65b0c19..3c4953e 100644 --- a/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/RequestHandler.java +++ b/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/RequestHandler.java @@ -3,15 +3,10 @@ package io.gitlab.jfronny.libjf.web.impl; import io.gitlab.jfronny.libjf.LibJf; import io.gitlab.jfronny.libjf.web.api.AdvancedSubServer; import io.gitlab.jfronny.libjf.web.api.ContentProvider; -import io.gitlab.jfronny.libjf.web.impl.util.bluemapcore.HttpRequest; -import io.gitlab.jfronny.libjf.web.impl.util.bluemapcore.HttpRequestHandler; -import io.gitlab.jfronny.libjf.web.impl.util.bluemapcore.HttpResponse; -import io.gitlab.jfronny.libjf.web.impl.util.bluemapcore.HttpStatusCode; import io.gitlab.jfronny.libjf.web.impl.util.WebPaths; +import io.gitlab.jfronny.libjf.web.impl.util.bluemapcore.*; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; +import java.util.*; public class RequestHandler implements HttpRequestHandler { public Map subServers = new HashMap<>(); diff --git a/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/util/bluemapcore/HttpConnection.java b/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/util/bluemapcore/HttpConnection.java index 01d909e..aaab0d8 100644 --- a/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/util/bluemapcore/HttpConnection.java +++ b/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/util/bluemapcore/HttpConnection.java @@ -26,18 +26,12 @@ package io.gitlab.jfronny.libjf.web.impl.util.bluemapcore; import io.gitlab.jfronny.libjf.LibJf; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.ServerSocket; -import java.net.Socket; -import java.net.SocketException; -import java.net.SocketTimeoutException; -import java.util.concurrent.TimeUnit; - +import java.io.*; +import java.net.*; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.concurrent.TimeUnit; public class HttpConnection implements Runnable { private final HttpRequestHandler handler; diff --git a/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/util/bluemapcore/HttpRequest.java b/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/util/bluemapcore/HttpRequest.java index f2c90ed..6e3a09d 100644 --- a/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/util/bluemapcore/HttpRequest.java +++ b/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/util/bluemapcore/HttpRequest.java @@ -24,21 +24,10 @@ */ package io.gitlab.jfronny.libjf.web.impl.util.bluemapcore; -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; +import java.io.*; import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; -import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/util/bluemapcore/HttpResponse.java b/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/util/bluemapcore/HttpResponse.java index 93effbd..5460420 100644 --- a/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/util/bluemapcore/HttpResponse.java +++ b/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/util/bluemapcore/HttpResponse.java @@ -24,22 +24,13 @@ */ package io.gitlab.jfronny.libjf.web.impl.util.bluemapcore; -import java.io.ByteArrayInputStream; -import java.io.Closeable; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.nio.charset.StandardCharsets; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - import org.apache.commons.lang3.StringUtils; +import java.io.*; +import java.nio.charset.StandardCharsets; +import java.util.*; +import java.util.Map.Entry; + public class HttpResponse implements Closeable { private final String version; private final HttpStatusCode statusCode; diff --git a/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/util/bluemapcore/HttpServer.java b/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/util/bluemapcore/HttpServer.java index 3610f7c..cc0e9ac 100644 --- a/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/util/bluemapcore/HttpServer.java +++ b/libjf-web-v0/src/main/java/io/gitlab/jfronny/libjf/web/impl/util/bluemapcore/HttpServer.java @@ -28,10 +28,7 @@ import io.gitlab.jfronny.libjf.LibJf; import java.io.IOException; import java.net.*; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; +import java.util.concurrent.*; public class HttpServer extends Thread { private int port;