[*] optimize imports
ci/woodpecker/push/docs Pipeline was successful Details
ci/woodpecker/push/jfmod Pipeline was successful Details

This commit is contained in:
Johannes Frohnmeyer 2023-03-11 21:24:59 +01:00
parent e640fe5145
commit 93fe8a6828
Signed by: Johannes
GPG Key ID: E76429612C2929F4
30 changed files with 61 additions and 128 deletions

View File

@ -8,9 +8,7 @@ import net.fabricmc.loader.api.FabricLoader;
import java.io.Closeable; import java.io.Closeable;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.*;
import java.util.Iterator;
import java.util.List;
public class CoProcessManager implements ModInitializer { public class CoProcessManager implements ModInitializer {
private final List<CoProcess> coProcesses = new ArrayList<>(); private final List<CoProcess> coProcesses = new ArrayList<>();

View File

@ -1,9 +1,6 @@
package io.gitlab.jfronny.libjf.gson; package io.gitlab.jfronny.libjf.gson;
import java.lang.annotation.ElementType; import java.lang.annotation.*;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD) @Target(ElementType.FIELD)

View File

@ -1,9 +1,6 @@
package io.gitlab.jfronny.libjf.gson; package io.gitlab.jfronny.libjf.gson;
import java.lang.annotation.ElementType; import java.lang.annotation.*;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD) @Target(ElementType.FIELD)

View File

@ -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.Category;
import io.gitlab.jfronny.libjf.config.api.v1.JfConfig; import io.gitlab.jfronny.libjf.config.api.v1.JfConfig;
import io.gitlab.jfronny.libjf.config.plugin.BuildMetadata; 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.ClInitInjectVisitor;
import io.gitlab.jfronny.libjf.config.plugin.util.GeneratorAdapter2; 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.gradle.api.GradleException;
import org.objectweb.asm.*; import org.objectweb.asm.*;
import org.objectweb.asm.commons.GeneratorAdapter; import org.objectweb.asm.commons.GeneratorAdapter;

View File

@ -7,8 +7,8 @@ import io.gitlab.jfronny.libjf.config.impl.ConfigHolderImpl;
import io.gitlab.jfronny.libjf.config.plugin.asm.ConfigInjectClassTransformer; import io.gitlab.jfronny.libjf.config.plugin.asm.ConfigInjectClassTransformer;
import org.objectweb.asm.Type; import org.objectweb.asm.Type;
import java.util.*; import java.util.Iterator;
import java.util.function.Predicate; import java.util.Set;
public class FabricModJsonTransformer { public class FabricModJsonTransformer {
private static final Gson INPUT_GSON = new GsonBuilder().setLenient().create(); private static final Gson INPUT_GSON = new GsonBuilder().setLenient().create();

View File

@ -1,9 +1,6 @@
package io.gitlab.jfronny.libjf.config.api.v1; package io.gitlab.jfronny.libjf.config.api.v1;
import java.lang.annotation.ElementType; import java.lang.annotation.*;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/** /**
* Annotation for config subclasses, which are to be shown as categories * Annotation for config subclasses, which are to be shown as categories

View File

@ -1,7 +1,7 @@
package io.gitlab.jfronny.libjf.config.api.v1; package io.gitlab.jfronny.libjf.config.api.v1;
import java.nio.file.Path; 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! * This class represents a configuration. An instance may be obtained through ConfigHolder or the DSL. Do not implement manually!

View File

@ -1,9 +1,6 @@
package io.gitlab.jfronny.libjf.config.api.v1; package io.gitlab.jfronny.libjf.config.api.v1;
import java.lang.annotation.ElementType; import java.lang.annotation.*;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/** /**
* An annotation for fields in configs or categories which are to be shown * An annotation for fields in configs or categories which are to be shown

View File

@ -1,9 +1,6 @@
package io.gitlab.jfronny.libjf.config.api.v1; package io.gitlab.jfronny.libjf.config.api.v1;
import java.lang.annotation.ElementType; import java.lang.annotation.*;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/** /**
* An annotation for static methods in config classes which may be called when the user selects them in-game * An annotation for static methods in config classes which may be called when the user selects them in-game

View File

@ -1,9 +1,6 @@
package io.gitlab.jfronny.libjf.config.api.v1; package io.gitlab.jfronny.libjf.config.api.v1;
import java.lang.annotation.ElementType; import java.lang.annotation.*;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/** /**
* An annotation for methods which are called every time a config is loaded or changed. * An annotation for methods which are called every time a config is loaded or changed.

View File

@ -1,6 +1,6 @@
package io.gitlab.jfronny.libjf.config.impl; 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.LibJf;
import io.gitlab.jfronny.libjf.config.api.v1.ConfigHolder; import io.gitlab.jfronny.libjf.config.api.v1.ConfigHolder;
import io.gitlab.jfronny.libjf.coprocess.ThreadCoProcess; import io.gitlab.jfronny.libjf.coprocess.ThreadCoProcess;
@ -9,10 +9,7 @@ import net.fabricmc.loader.api.FabricLoader;
import java.io.Closeable; import java.io.Closeable;
import java.io.IOException; import java.io.IOException;
import java.nio.file.*; import java.nio.file.*;
import java.util.HashMap; import java.util.*;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import static java.nio.file.StandardWatchEventKinds.*; import static java.nio.file.StandardWatchEventKinds.*;

View File

@ -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.*;
import io.gitlab.jfronny.libjf.config.api.v1.dsl.CategoryBuilder; 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.Consumer;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;

View File

@ -7,16 +7,15 @@ import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Element;
import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.Selectable;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.*;
import net.minecraft.client.gui.widget.ClickableWidget;
import net.minecraft.client.gui.widget.ElementListWidget;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.function.*; import java.util.function.BooleanSupplier;
import java.util.function.Supplier;
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)
public class EntryListWidget extends ElementListWidget<EntryListWidget.ConfigEntry> { public class EntryListWidget extends ElementListWidget<EntryListWidget.ConfigEntry> {

View File

@ -1,7 +1,8 @@
package io.gitlab.jfronny.libjf.data.manipulation.impl; package io.gitlab.jfronny.libjf.data.manipulation.impl;
import io.gitlab.jfronny.libjf.unsafe.asm.AsmConfig; 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.modification.MethodModificationPatch;
import io.gitlab.jfronny.libjf.unsafe.asm.patch.targeting.InterfaceImplTargetPatch; import io.gitlab.jfronny.libjf.unsafe.asm.patch.targeting.InterfaceImplTargetPatch;
import org.objectweb.asm.Opcodes; import org.objectweb.asm.Opcodes;

View File

@ -1,10 +1,8 @@
package io.gitlab.jfronny.libjf.data.manipulation.test; package io.gitlab.jfronny.libjf.data.manipulation.test;
import io.gitlab.jfronny.libjf.LibJf; 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 io.gitlab.jfronny.libjf.data.manipulation.api.UserResourceEvents;
import net.fabricmc.api.ModInitializer; import net.fabricmc.api.ModInitializer;
import net.minecraft.item.Items;
import net.minecraft.resource.DirectoryResourcePack; import net.minecraft.resource.DirectoryResourcePack;
public class TestEntrypoint implements ModInitializer { public class TestEntrypoint implements ModInitializer {

View File

@ -1,11 +1,13 @@
package io.gitlab.jfronny.libjf.devutil.mixin; 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.*;
import net.minecraft.command.argument.serialize.*; import net.minecraft.command.argument.serialize.ArgumentSerializer;
import net.minecraft.registry.Registry; import net.minecraft.registry.Registry;
import org.spongepowered.asm.mixin.*; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.*; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(ArgumentTypes.class) @Mixin(ArgumentTypes.class)
public abstract class ArgumentTypesMixin { public abstract class ArgumentTypesMixin {

View File

@ -1,9 +1,10 @@
package io.gitlab.jfronny.libjf.devutil.mixin; package io.gitlab.jfronny.libjf.devutil.mixin;
import com.mojang.brigadier.*; import com.mojang.brigadier.CommandDispatcher;
import net.minecraft.server.command.*; import net.minecraft.server.command.CommandManager;
import org.spongepowered.asm.mixin.*; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.*; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(CommandManager.class) @Mixin(CommandManager.class)
public class CommandManagerMixin { public class CommandManagerMixin {

View File

@ -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.libretranslate.LibreTranslateService;
import io.gitlab.jfronny.libjf.translate.impl.noop.NoopTranslateService; import io.gitlab.jfronny.libjf.translate.impl.noop.NoopTranslateService;
import java.io.*; import java.io.IOException;
import java.net.*; import java.net.URISyntaxException;
import java.util.*; import java.util.LinkedList;
import java.util.List;
public interface TranslateService<T extends Language> { public interface TranslateService<T extends Language> {
/** /**

View File

@ -1,11 +1,11 @@
package io.gitlab.jfronny.libjf.translate.test; package io.gitlab.jfronny.libjf.translate.test;
import io.gitlab.jfronny.libjf.*; import io.gitlab.jfronny.libjf.LibJf;
import io.gitlab.jfronny.libjf.translate.impl.google.*; import io.gitlab.jfronny.libjf.translate.impl.google.GoogleTranslateService;
import io.gitlab.jfronny.libjf.translate.impl.libretranslate.*; import io.gitlab.jfronny.libjf.translate.impl.libretranslate.LibreTranslateService;
import net.fabricmc.api.*; import net.fabricmc.api.ModInitializer;
import java.util.*; import java.util.Objects;
public class TestEntrypoint implements ModInitializer { public class TestEntrypoint implements ModInitializer {
@Override @Override

View File

@ -6,10 +6,7 @@ import net.fabricmc.loader.impl.ModContainerImpl;
import net.fabricmc.loader.impl.metadata.EntrypointMetadata; import net.fabricmc.loader.impl.metadata.EntrypointMetadata;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList; import java.util.*;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
public class DynamicEntry { public class DynamicEntry {

View File

@ -1,6 +1,7 @@
package io.gitlab.jfronny.libjf.unsafe; 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 io.gitlab.jfronny.libjf.LibJf;
import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.FabricLoader;
import net.fabricmc.loader.api.LanguageAdapter; import net.fabricmc.loader.api.LanguageAdapter;

View File

@ -16,9 +16,7 @@ import org.spongepowered.asm.transformers.MixinClassWriter;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.LinkedHashSet; import java.util.*;
import java.util.List;
import java.util.Set;
public class AsmTransformer implements IMixinTransformer { public class AsmTransformer implements IMixinTransformer {
public static AsmTransformer INSTANCE; public static AsmTransformer INSTANCE;

View File

@ -1,10 +1,7 @@
package io.gitlab.jfronny.libjf.unsafe.asm.patch.method; package io.gitlab.jfronny.libjf.unsafe.asm.patch.method;
import io.gitlab.jfronny.libjf.unsafe.asm.patch.MethodPatch; import io.gitlab.jfronny.libjf.unsafe.asm.patch.MethodPatch;
import org.objectweb.asm.tree.AbstractInsnNode; import org.objectweb.asm.tree.*;
import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.InsnList;
import org.objectweb.asm.tree.MethodNode;
public class MethodReplacementPatch implements MethodPatch { public class MethodReplacementPatch implements MethodPatch {
private final InsnList instructions; private final InsnList instructions;

View File

@ -7,7 +7,7 @@ import io.gitlab.jfronny.libjf.coprocess.CoProcess;
import io.gitlab.jfronny.libjf.web.api.WebServer; import io.gitlab.jfronny.libjf.web.api.WebServer;
import net.fabricmc.api.ModInitializer; import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; 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; import static net.minecraft.server.command.CommandManager.literal;

View File

@ -2,18 +2,12 @@ package io.gitlab.jfronny.libjf.web.impl;
import io.gitlab.jfronny.libjf.LibJf; import io.gitlab.jfronny.libjf.LibJf;
import io.gitlab.jfronny.libjf.web.api.*; 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.WebPaths;
import io.gitlab.jfronny.libjf.web.impl.util.bluemapcore.*;
import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.FabricLoader;
import javax.management.openmbean.KeyAlreadyExistsException; import javax.management.openmbean.KeyAlreadyExistsException;
import java.io.ByteArrayInputStream; import java.io.*;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.Objects; import java.util.Objects;

View File

@ -3,15 +3,10 @@ package io.gitlab.jfronny.libjf.web.impl;
import io.gitlab.jfronny.libjf.LibJf; import io.gitlab.jfronny.libjf.LibJf;
import io.gitlab.jfronny.libjf.web.api.AdvancedSubServer; import io.gitlab.jfronny.libjf.web.api.AdvancedSubServer;
import io.gitlab.jfronny.libjf.web.api.ContentProvider; 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.WebPaths;
import io.gitlab.jfronny.libjf.web.impl.util.bluemapcore.*;
import java.util.Arrays; import java.util.*;
import java.util.HashMap;
import java.util.Map;
public class RequestHandler implements HttpRequestHandler { public class RequestHandler implements HttpRequestHandler {
public Map<String, AdvancedSubServer> subServers = new HashMap<>(); public Map<String, AdvancedSubServer> subServers = new HashMap<>();

View File

@ -26,18 +26,12 @@ package io.gitlab.jfronny.libjf.web.impl.util.bluemapcore;
import io.gitlab.jfronny.libjf.LibJf; import io.gitlab.jfronny.libjf.LibJf;
import java.io.IOException; import java.io.*;
import java.io.InputStream; import java.net.*;
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.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.concurrent.TimeUnit;
public class HttpConnection implements Runnable { public class HttpConnection implements Runnable {
private final HttpRequestHandler handler; private final HttpRequestHandler handler;

View File

@ -24,21 +24,10 @@
*/ */
package io.gitlab.jfronny.libjf.web.impl.util.bluemapcore; package io.gitlab.jfronny.libjf.web.impl.util.bluemapcore;
import java.io.BufferedReader; import java.io.*;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.*;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;

View File

@ -24,22 +24,13 @@
*/ */
package io.gitlab.jfronny.libjf.web.impl.util.bluemapcore; 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 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 { public class HttpResponse implements Closeable {
private final String version; private final String version;
private final HttpStatusCode statusCode; private final HttpStatusCode statusCode;

View File

@ -28,10 +28,7 @@ import io.gitlab.jfronny.libjf.LibJf;
import java.io.IOException; import java.io.IOException;
import java.net.*; import java.net.*;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.*;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
public class HttpServer extends Thread { public class HttpServer extends Thread {
private int port; private int port;