summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author zaaarf <me@zaaarf.foo>2024-05-31 19:36:42 +0200
committer zaaarf <me@zaaarf.foo>2024-05-31 19:36:42 +0200
commit85b3aeea1a2bff99fddb4bff5d290c942b6e338c (patch)
treec66eba492310dbd00e096f6d79c4649291c844ff
parent8d26063266b8cdbacd23ae9abdec4cf3810a2049 (diff)
fix: updated to new mapper library0.6.2
-rw-r--r--build.gradle6
-rw-r--r--settings.gradle2
-rw-r--r--src/main/java/ftbsc/lll/processor/LilleroProcessor.java2
-rw-r--r--src/main/java/ftbsc/lll/processor/ProcessorOptions.java2
-rw-r--r--src/main/java/ftbsc/lll/processor/containers/ClassContainer.java2
-rw-r--r--src/main/java/ftbsc/lll/processor/containers/FieldContainer.java4
-rw-r--r--src/main/java/ftbsc/lll/processor/containers/MethodContainer.java4
-rw-r--r--src/main/java/ftbsc/lll/processor/utils/ASTUtils.java8
8 files changed, 14 insertions, 16 deletions
diff --git a/build.gradle b/build.gradle
index 6ecc5eb..9890529 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ repositories {
dependencies {
implementation 'com.squareup:javapoet:1.13.0'
- implementation 'org.ow2.asm:asm-commons:9.5'
- implementation 'ftbsc:lll:0.5.0'
- implementation 'ftbsc.lll:mapper:0.3.0'
+ implementation 'org.ow2.asm:asm-commons:9.7'
+ implementation 'ftbsc:lll:0.5.1'
+ implementation 'ftbsc.lll:mapper:0.4.1'
}
diff --git a/settings.gradle b/settings.gradle
index 6ee7ea3..bd392a6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
-rootProject.name = 'lillero-processor'
+rootProject.name = 'processor'
diff --git a/src/main/java/ftbsc/lll/processor/LilleroProcessor.java b/src/main/java/ftbsc/lll/processor/LilleroProcessor.java
index b693592..b0a6fc5 100644
--- a/src/main/java/ftbsc/lll/processor/LilleroProcessor.java
+++ b/src/main/java/ftbsc/lll/processor/LilleroProcessor.java
@@ -15,7 +15,6 @@ import ftbsc.lll.proxies.ProxyType;
import ftbsc.lll.proxies.impl.TypeProxy;
import javax.annotation.processing.*;
-import javax.lang.model.SourceVersion;
import javax.lang.model.element.*;
import javax.lang.model.type.ExecutableType;
import javax.lang.model.type.TypeMirror;
@@ -36,7 +35,6 @@ import static ftbsc.lll.processor.utils.JavaPoetUtils.*;
* It (implicitly) implements the {@link Processor} interface by extending {@link AbstractProcessor}.
*/
@SupportedAnnotationTypes({"ftbsc.lll.processor.annotations.Patch", "ftbsc.lll.processor.annotations.BareInjector"})
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
public class LilleroProcessor extends AbstractProcessor {
/**
* A {@link Set} of {@link String}s that will contain the fully qualified names
diff --git a/src/main/java/ftbsc/lll/processor/ProcessorOptions.java b/src/main/java/ftbsc/lll/processor/ProcessorOptions.java
index 5972631..d6b0468 100644
--- a/src/main/java/ftbsc/lll/processor/ProcessorOptions.java
+++ b/src/main/java/ftbsc/lll/processor/ProcessorOptions.java
@@ -2,7 +2,7 @@ package ftbsc.lll.processor;
import ftbsc.lll.IInjector;
import ftbsc.lll.mapper.MapperProvider;
-import ftbsc.lll.mapper.tools.Mapper;
+import ftbsc.lll.mapper.utils.Mapper;
import javax.annotation.processing.ProcessingEnvironment;
import java.util.Arrays;
diff --git a/src/main/java/ftbsc/lll/processor/containers/ClassContainer.java b/src/main/java/ftbsc/lll/processor/containers/ClassContainer.java
index 297349a..f19c0c4 100644
--- a/src/main/java/ftbsc/lll/processor/containers/ClassContainer.java
+++ b/src/main/java/ftbsc/lll/processor/containers/ClassContainer.java
@@ -1,7 +1,7 @@
package ftbsc.lll.processor.containers;
import ftbsc.lll.exceptions.TargetNotFoundException;
-import ftbsc.lll.mapper.tools.data.ClassData;
+import ftbsc.lll.mapper.data.ClassData;
import ftbsc.lll.processor.annotations.Find;
import ftbsc.lll.processor.annotations.Patch;
import ftbsc.lll.processor.ProcessorOptions;
diff --git a/src/main/java/ftbsc/lll/processor/containers/FieldContainer.java b/src/main/java/ftbsc/lll/processor/containers/FieldContainer.java
index 2299c93..a9c56ee 100644
--- a/src/main/java/ftbsc/lll/processor/containers/FieldContainer.java
+++ b/src/main/java/ftbsc/lll/processor/containers/FieldContainer.java
@@ -1,8 +1,8 @@
package ftbsc.lll.processor.containers;
import ftbsc.lll.exceptions.AmbiguousDefinitionException;
-import ftbsc.lll.mapper.tools.MappingUtils;
-import ftbsc.lll.mapper.tools.data.FieldData;
+import ftbsc.lll.mapper.utils.MappingUtils;
+import ftbsc.lll.mapper.data.FieldData;
import ftbsc.lll.processor.annotations.Find;
import ftbsc.lll.processor.annotations.Patch;
import ftbsc.lll.processor.ProcessorOptions;
diff --git a/src/main/java/ftbsc/lll/processor/containers/MethodContainer.java b/src/main/java/ftbsc/lll/processor/containers/MethodContainer.java
index 7d15599..78c5a5a 100644
--- a/src/main/java/ftbsc/lll/processor/containers/MethodContainer.java
+++ b/src/main/java/ftbsc/lll/processor/containers/MethodContainer.java
@@ -2,8 +2,8 @@ package ftbsc.lll.processor.containers;
import ftbsc.lll.exceptions.AmbiguousDefinitionException;
import ftbsc.lll.exceptions.TargetNotFoundException;
-import ftbsc.lll.mapper.tools.MappingUtils;
-import ftbsc.lll.mapper.tools.data.MethodData;
+import ftbsc.lll.mapper.utils.MappingUtils;
+import ftbsc.lll.mapper.data.MethodData;
import ftbsc.lll.processor.annotations.Find;
import ftbsc.lll.processor.annotations.Patch;
import ftbsc.lll.processor.annotations.Target;
diff --git a/src/main/java/ftbsc/lll/processor/utils/ASTUtils.java b/src/main/java/ftbsc/lll/processor/utils/ASTUtils.java
index 04da70e..e75d5e9 100644
--- a/src/main/java/ftbsc/lll/processor/utils/ASTUtils.java
+++ b/src/main/java/ftbsc/lll/processor/utils/ASTUtils.java
@@ -4,10 +4,10 @@ import ftbsc.lll.exceptions.AmbiguousDefinitionException;
import ftbsc.lll.exceptions.MappingNotFoundException;
import ftbsc.lll.exceptions.NotAProxyException;
import ftbsc.lll.exceptions.TargetNotFoundException;
-import ftbsc.lll.mapper.tools.Mapper;
-import ftbsc.lll.mapper.tools.data.ClassData;
-import ftbsc.lll.mapper.tools.data.FieldData;
-import ftbsc.lll.mapper.tools.data.MethodData;
+import ftbsc.lll.mapper.utils.Mapper;
+import ftbsc.lll.mapper.data.ClassData;
+import ftbsc.lll.mapper.data.FieldData;
+import ftbsc.lll.mapper.data.MethodData;
import ftbsc.lll.processor.annotations.Target;
import ftbsc.lll.processor.containers.ClassContainer;
import ftbsc.lll.proxies.ProxyType;