chore: internal reorganisation

This commit is contained in:
zaaarf 2024-01-24 17:21:42 +01:00
parent 3dd86a4187
commit bf32e56a86
No known key found for this signature in database
GPG key ID: 102E445F4C3F829B
8 changed files with 28 additions and 28 deletions

View file

@ -8,10 +8,9 @@ import ftbsc.lll.IInjector;
import ftbsc.lll.exceptions.AmbiguousDefinitionException; import ftbsc.lll.exceptions.AmbiguousDefinitionException;
import ftbsc.lll.exceptions.OrphanElementException; import ftbsc.lll.exceptions.OrphanElementException;
import ftbsc.lll.processor.annotations.*; import ftbsc.lll.processor.annotations.*;
import ftbsc.lll.processor.tools.ProcessorOptions; import ftbsc.lll.processor.containers.ClassContainer;
import ftbsc.lll.processor.tools.containers.ClassContainer; import ftbsc.lll.processor.containers.InjectorInfo;
import ftbsc.lll.processor.tools.containers.InjectorInfo; import ftbsc.lll.processor.containers.MethodContainer;
import ftbsc.lll.processor.tools.containers.MethodContainer;
import ftbsc.lll.proxies.ProxyType; import ftbsc.lll.proxies.ProxyType;
import ftbsc.lll.proxies.impl.TypeProxy; import ftbsc.lll.proxies.impl.TypeProxy;
@ -29,8 +28,8 @@ import java.io.PrintWriter;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static ftbsc.lll.processor.tools.ASTUtils.*; import static ftbsc.lll.processor.utils.ASTUtils.*;
import static ftbsc.lll.processor.tools.JavaPoetUtils.*; import static ftbsc.lll.processor.utils.JavaPoetUtils.*;
/** /**
* The actual annotation processor behind the magic. * The actual annotation processor behind the magic.

View file

@ -1,4 +1,4 @@
package ftbsc.lll.processor.tools; package ftbsc.lll.processor;
import ftbsc.lll.IInjector; import ftbsc.lll.IInjector;
import ftbsc.lll.mapper.MapperProvider; import ftbsc.lll.mapper.MapperProvider;

View file

@ -1,10 +1,10 @@
package ftbsc.lll.processor.tools.containers; package ftbsc.lll.processor.containers;
import ftbsc.lll.exceptions.TargetNotFoundException; import ftbsc.lll.exceptions.TargetNotFoundException;
import ftbsc.lll.mapper.tools.data.ClassData; import ftbsc.lll.mapper.tools.data.ClassData;
import ftbsc.lll.processor.annotations.Find; import ftbsc.lll.processor.annotations.Find;
import ftbsc.lll.processor.annotations.Patch; import ftbsc.lll.processor.annotations.Patch;
import ftbsc.lll.processor.tools.ProcessorOptions; import ftbsc.lll.processor.ProcessorOptions;
import javax.lang.model.element.Element; import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement; import javax.lang.model.element.TypeElement;
@ -12,7 +12,7 @@ import javax.tools.Diagnostic;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.util.function.Function; import java.util.function.Function;
import static ftbsc.lll.processor.tools.ASTUtils.*; import static ftbsc.lll.processor.utils.ASTUtils.*;
/** /**
* Container for information about a class. * Container for information about a class.

View file

@ -1,11 +1,11 @@
package ftbsc.lll.processor.tools.containers; package ftbsc.lll.processor.containers;
import ftbsc.lll.exceptions.AmbiguousDefinitionException; import ftbsc.lll.exceptions.AmbiguousDefinitionException;
import ftbsc.lll.mapper.tools.MappingUtils; import ftbsc.lll.mapper.tools.MappingUtils;
import ftbsc.lll.mapper.tools.data.FieldData; import ftbsc.lll.mapper.tools.data.FieldData;
import ftbsc.lll.processor.annotations.Find; import ftbsc.lll.processor.annotations.Find;
import ftbsc.lll.processor.annotations.Patch; import ftbsc.lll.processor.annotations.Patch;
import ftbsc.lll.processor.tools.ProcessorOptions; import ftbsc.lll.processor.ProcessorOptions;
import org.objectweb.asm.Type; import org.objectweb.asm.Type;
import javax.lang.model.element.TypeElement; import javax.lang.model.element.TypeElement;
@ -13,7 +13,7 @@ import javax.lang.model.element.VariableElement;
import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror; import javax.lang.model.type.TypeMirror;
import static ftbsc.lll.processor.tools.ASTUtils.*; import static ftbsc.lll.processor.utils.ASTUtils.*;
/** /**
* Container for information about a field. * Container for information about a field.

View file

@ -1,8 +1,8 @@
package ftbsc.lll.processor.tools.containers; package ftbsc.lll.processor.containers;
import ftbsc.lll.processor.annotations.Injector; import ftbsc.lll.processor.annotations.Injector;
import ftbsc.lll.processor.annotations.Target; import ftbsc.lll.processor.annotations.Target;
import ftbsc.lll.processor.tools.ProcessorOptions; import ftbsc.lll.processor.ProcessorOptions;
import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.ExecutableElement;
@ -43,4 +43,4 @@ public class InjectorInfo {
this.reason = injector.getAnnotation(Injector.class).reason(); this.reason = injector.getAnnotation(Injector.class).reason();
this.target = MethodContainer.from(targetStub, targetAnn, null, options); this.target = MethodContainer.from(targetStub, targetAnn, null, options);
} }
} }

View file

@ -1,4 +1,4 @@
package ftbsc.lll.processor.tools.containers; package ftbsc.lll.processor.containers;
import ftbsc.lll.exceptions.AmbiguousDefinitionException; import ftbsc.lll.exceptions.AmbiguousDefinitionException;
import ftbsc.lll.exceptions.TargetNotFoundException; import ftbsc.lll.exceptions.TargetNotFoundException;
@ -7,12 +7,12 @@ import ftbsc.lll.mapper.tools.data.MethodData;
import ftbsc.lll.processor.annotations.Find; import ftbsc.lll.processor.annotations.Find;
import ftbsc.lll.processor.annotations.Patch; import ftbsc.lll.processor.annotations.Patch;
import ftbsc.lll.processor.annotations.Target; import ftbsc.lll.processor.annotations.Target;
import ftbsc.lll.processor.tools.ProcessorOptions; import ftbsc.lll.processor.ProcessorOptions;
import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement; import javax.lang.model.element.TypeElement;
import static ftbsc.lll.processor.tools.ASTUtils.*; import static ftbsc.lll.processor.utils.ASTUtils.*;
/** /**
* Container for information about a method. * Container for information about a method.

View file

@ -1,4 +1,4 @@
package ftbsc.lll.processor.tools; package ftbsc.lll.processor.utils;
import ftbsc.lll.exceptions.AmbiguousDefinitionException; import ftbsc.lll.exceptions.AmbiguousDefinitionException;
import ftbsc.lll.exceptions.MappingNotFoundException; import ftbsc.lll.exceptions.MappingNotFoundException;
@ -9,7 +9,7 @@ import ftbsc.lll.mapper.tools.data.ClassData;
import ftbsc.lll.mapper.tools.data.FieldData; import ftbsc.lll.mapper.tools.data.FieldData;
import ftbsc.lll.mapper.tools.data.MethodData; import ftbsc.lll.mapper.tools.data.MethodData;
import ftbsc.lll.processor.annotations.Target; import ftbsc.lll.processor.annotations.Target;
import ftbsc.lll.processor.tools.containers.ClassContainer; import ftbsc.lll.processor.containers.ClassContainer;
import ftbsc.lll.proxies.ProxyType; import ftbsc.lll.proxies.ProxyType;
import javax.annotation.processing.ProcessingEnvironment; import javax.annotation.processing.ProcessingEnvironment;

View file

@ -1,12 +1,13 @@
package ftbsc.lll.processor.tools; package ftbsc.lll.processor.utils;
import com.squareup.javapoet.*; import com.squareup.javapoet.*;
import ftbsc.lll.processor.ProcessorOptions;
import ftbsc.lll.processor.annotations.Find; import ftbsc.lll.processor.annotations.Find;
import ftbsc.lll.processor.annotations.Target; import ftbsc.lll.processor.annotations.Target;
import ftbsc.lll.processor.tools.containers.ClassContainer; import ftbsc.lll.processor.containers.ClassContainer;
import ftbsc.lll.processor.tools.containers.FieldContainer; import ftbsc.lll.processor.containers.FieldContainer;
import ftbsc.lll.processor.tools.containers.InjectorInfo; import ftbsc.lll.processor.containers.InjectorInfo;
import ftbsc.lll.processor.tools.containers.MethodContainer; import ftbsc.lll.processor.containers.MethodContainer;
import ftbsc.lll.proxies.ProxyType; import ftbsc.lll.proxies.ProxyType;
import ftbsc.lll.proxies.impl.FieldProxy; import ftbsc.lll.proxies.impl.FieldProxy;
import ftbsc.lll.proxies.impl.MethodProxy; import ftbsc.lll.proxies.impl.MethodProxy;
@ -15,8 +16,8 @@ import javax.annotation.processing.ProcessingEnvironment;
import javax.lang.model.element.*; import javax.lang.model.element.*;
import java.util.HashSet; import java.util.HashSet;
import static ftbsc.lll.processor.tools.ASTUtils.getProxyType; import static ftbsc.lll.processor.utils.ASTUtils.getProxyType;
import static ftbsc.lll.processor.tools.ASTUtils.mapModifiers; import static ftbsc.lll.processor.utils.ASTUtils.mapModifiers;
/** /**
* Collection of static utils that rely on JavaPoet to function. * Collection of static utils that rely on JavaPoet to function.