summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
author zaaarf <me@zaaarf.foo>2024-01-24 17:35:09 +0100
committer zaaarf <me@zaaarf.foo>2024-01-24 17:35:09 +0100
commit16508aff77569c683baaaf42d32cf482b6a8a386 (patch)
treed25dea27a5b34990e47efd072b3cda778930cdbd /src
parentae63aef390db222448787db5f5998e77fc46bd2a (diff)
chore: version bump + internal reorganisation0.4.0
Diffstat (limited to 'src')
-rw-r--r--src/main/java/ftbsc/lll/mapper/IMappingFormat.java2
-rw-r--r--src/main/java/ftbsc/lll/mapper/data/ClassData.java (renamed from src/main/java/ftbsc/lll/mapper/tools/data/ClassData.java)8
-rw-r--r--src/main/java/ftbsc/lll/mapper/data/FieldData.java (renamed from src/main/java/ftbsc/lll/mapper/tools/data/FieldData.java)3
-rw-r--r--src/main/java/ftbsc/lll/mapper/data/MethodData.java (renamed from src/main/java/ftbsc/lll/mapper/tools/data/MethodData.java)2
-rw-r--r--src/main/java/ftbsc/lll/mapper/data/MethodSignature.java (renamed from src/main/java/ftbsc/lll/mapper/tools/data/MethodSignature.java)2
-rw-r--r--src/main/java/ftbsc/lll/mapper/impl/MultiMapper.java6
-rw-r--r--src/main/java/ftbsc/lll/mapper/impl/SRGMapper.java6
-rw-r--r--src/main/java/ftbsc/lll/mapper/impl/TSRGMapper.java4
-rw-r--r--src/main/java/ftbsc/lll/mapper/impl/TinyV2Mapper.java4
-rw-r--r--src/main/java/ftbsc/lll/mapper/utils/Mapper.java (renamed from src/main/java/ftbsc/lll/mapper/tools/Mapper.java)8
-rw-r--r--src/main/java/ftbsc/lll/mapper/utils/MappingUtils.java (renamed from src/main/java/ftbsc/lll/mapper/tools/MappingUtils.java)4
11 files changed, 24 insertions, 25 deletions
diff --git a/src/main/java/ftbsc/lll/mapper/IMappingFormat.java b/src/main/java/ftbsc/lll/mapper/IMappingFormat.java
index f691bfe..f5d2bcc 100644
--- a/src/main/java/ftbsc/lll/mapper/IMappingFormat.java
+++ b/src/main/java/ftbsc/lll/mapper/IMappingFormat.java
@@ -1,7 +1,7 @@
package ftbsc.lll.mapper;
import ftbsc.lll.exceptions.MalformedMappingsException;
-import ftbsc.lll.mapper.tools.Mapper;
+import ftbsc.lll.mapper.utils.Mapper;
import java.util.List;
diff --git a/src/main/java/ftbsc/lll/mapper/tools/data/ClassData.java b/src/main/java/ftbsc/lll/mapper/data/ClassData.java
index 4b4f58e..04592fd 100644
--- a/src/main/java/ftbsc/lll/mapper/tools/data/ClassData.java
+++ b/src/main/java/ftbsc/lll/mapper/data/ClassData.java
@@ -1,8 +1,8 @@
-package ftbsc.lll.mapper.tools.data;
+package ftbsc.lll.mapper.data;
import ftbsc.lll.exceptions.MappingNotFoundException;
-import ftbsc.lll.mapper.tools.Mapper;
-import ftbsc.lll.mapper.tools.MappingUtils;
+import ftbsc.lll.mapper.utils.Mapper;
+import ftbsc.lll.mapper.utils.MappingUtils;
import java.util.HashMap;
import java.util.List;
@@ -141,4 +141,4 @@ public class ClassData {
public Map<String, FieldData> getFields() {
return this.fields;
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/ftbsc/lll/mapper/tools/data/FieldData.java b/src/main/java/ftbsc/lll/mapper/data/FieldData.java
index e239d66..3e6cf6c 100644
--- a/src/main/java/ftbsc/lll/mapper/tools/data/FieldData.java
+++ b/src/main/java/ftbsc/lll/mapper/data/FieldData.java
@@ -1,5 +1,4 @@
-
-package ftbsc.lll.mapper.tools.data;
+package ftbsc.lll.mapper.data;
/**
* Container class for method data.
diff --git a/src/main/java/ftbsc/lll/mapper/tools/data/MethodData.java b/src/main/java/ftbsc/lll/mapper/data/MethodData.java
index 699b0b0..670ecd2 100644
--- a/src/main/java/ftbsc/lll/mapper/tools/data/MethodData.java
+++ b/src/main/java/ftbsc/lll/mapper/data/MethodData.java
@@ -1,4 +1,4 @@
-package ftbsc.lll.mapper.tools.data;
+package ftbsc.lll.mapper.data;
/**
* Container class for method data.
diff --git a/src/main/java/ftbsc/lll/mapper/tools/data/MethodSignature.java b/src/main/java/ftbsc/lll/mapper/data/MethodSignature.java
index 08770be..d7515a8 100644
--- a/src/main/java/ftbsc/lll/mapper/tools/data/MethodSignature.java
+++ b/src/main/java/ftbsc/lll/mapper/data/MethodSignature.java
@@ -1,4 +1,4 @@
-package ftbsc.lll.mapper.tools.data;
+package ftbsc.lll.mapper.data;
import java.util.Objects;
diff --git a/src/main/java/ftbsc/lll/mapper/impl/MultiMapper.java b/src/main/java/ftbsc/lll/mapper/impl/MultiMapper.java
index 1ff1459..d7e1eba 100644
--- a/src/main/java/ftbsc/lll/mapper/impl/MultiMapper.java
+++ b/src/main/java/ftbsc/lll/mapper/impl/MultiMapper.java
@@ -4,9 +4,9 @@ import com.google.auto.service.AutoService;
import ftbsc.lll.exceptions.MalformedMappingsException;
import ftbsc.lll.mapper.IMappingFormat;
import ftbsc.lll.mapper.MapperProvider;
-import ftbsc.lll.mapper.tools.Mapper;
-import ftbsc.lll.mapper.tools.MappingUtils;
-import ftbsc.lll.mapper.tools.data.ClassData;
+import ftbsc.lll.mapper.utils.Mapper;
+import ftbsc.lll.mapper.utils.MappingUtils;
+import ftbsc.lll.mapper.data.ClassData;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/ftbsc/lll/mapper/impl/SRGMapper.java b/src/main/java/ftbsc/lll/mapper/impl/SRGMapper.java
index c92dba7..b4d51af 100644
--- a/src/main/java/ftbsc/lll/mapper/impl/SRGMapper.java
+++ b/src/main/java/ftbsc/lll/mapper/impl/SRGMapper.java
@@ -3,8 +3,8 @@ package ftbsc.lll.mapper.impl;
import com.google.auto.service.AutoService;
import ftbsc.lll.exceptions.MalformedMappingsException;
import ftbsc.lll.mapper.IMappingFormat;
-import ftbsc.lll.mapper.tools.Mapper;
-import ftbsc.lll.mapper.tools.data.ClassData;
+import ftbsc.lll.mapper.utils.Mapper;
+import ftbsc.lll.mapper.data.ClassData;
import java.util.List;
@@ -138,4 +138,4 @@ public class SRGMapper implements IMappingFormat {
public Mapper getInvertedMapper(List<String> lines, boolean ignoreErrors) {
return this.buildMapper(lines, ignoreErrors, true);
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/ftbsc/lll/mapper/impl/TSRGMapper.java b/src/main/java/ftbsc/lll/mapper/impl/TSRGMapper.java
index 222fafc..c15bfa6 100644
--- a/src/main/java/ftbsc/lll/mapper/impl/TSRGMapper.java
+++ b/src/main/java/ftbsc/lll/mapper/impl/TSRGMapper.java
@@ -3,8 +3,8 @@ package ftbsc.lll.mapper.impl;
import com.google.auto.service.AutoService;
import ftbsc.lll.exceptions.MalformedMappingsException;
import ftbsc.lll.mapper.IMappingFormat;
-import ftbsc.lll.mapper.tools.Mapper;
-import ftbsc.lll.mapper.tools.data.ClassData;
+import ftbsc.lll.mapper.utils.Mapper;
+import ftbsc.lll.mapper.data.ClassData;
import java.util.List;
import java.util.regex.Pattern;
diff --git a/src/main/java/ftbsc/lll/mapper/impl/TinyV2Mapper.java b/src/main/java/ftbsc/lll/mapper/impl/TinyV2Mapper.java
index 1810b84..e60b7ed 100644
--- a/src/main/java/ftbsc/lll/mapper/impl/TinyV2Mapper.java
+++ b/src/main/java/ftbsc/lll/mapper/impl/TinyV2Mapper.java
@@ -3,8 +3,8 @@ package ftbsc.lll.mapper.impl;
import com.google.auto.service.AutoService;
import ftbsc.lll.exceptions.MalformedMappingsException;
import ftbsc.lll.mapper.IMappingFormat;
-import ftbsc.lll.mapper.tools.Mapper;
-import ftbsc.lll.mapper.tools.data.ClassData;
+import ftbsc.lll.mapper.utils.Mapper;
+import ftbsc.lll.mapper.data.ClassData;
import java.util.List;
import java.util.regex.Pattern;
diff --git a/src/main/java/ftbsc/lll/mapper/tools/Mapper.java b/src/main/java/ftbsc/lll/mapper/utils/Mapper.java
index 2b59d17..b6e0722 100644
--- a/src/main/java/ftbsc/lll/mapper/tools/Mapper.java
+++ b/src/main/java/ftbsc/lll/mapper/utils/Mapper.java
@@ -1,9 +1,9 @@
-package ftbsc.lll.mapper.tools;
+package ftbsc.lll.mapper.utils;
import ftbsc.lll.exceptions.MappingNotFoundException;
-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.data.ClassData;
+import ftbsc.lll.mapper.data.FieldData;
+import ftbsc.lll.mapper.data.MethodData;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/ftbsc/lll/mapper/tools/MappingUtils.java b/src/main/java/ftbsc/lll/mapper/utils/MappingUtils.java
index fc121dd..ff7327c 100644
--- a/src/main/java/ftbsc/lll/mapper/tools/MappingUtils.java
+++ b/src/main/java/ftbsc/lll/mapper/utils/MappingUtils.java
@@ -1,7 +1,7 @@
-package ftbsc.lll.mapper.tools;
+package ftbsc.lll.mapper.utils;
import ftbsc.lll.exceptions.MappingNotFoundException;
-import ftbsc.lll.tools.DescriptorBuilder;
+import ftbsc.lll.utils.DescriptorBuilder;
import org.objectweb.asm.Type;
/**