chore: version bump + internal reorganisation

build.gradle

@@ -24,7 +24,7 @@ repositories {
 }
 
 dependencies {
-	implementation 'ftbsc:lll:0.4.2'
+	implementation 'ftbsc:lll:0.5.0'
 	implementation 'com.google.auto.service:auto-service-annotations:1.1.0'
 	annotationProcessor 'com.google.auto.service:auto-service:1.1.0'
 }

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;
 

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.utils.Mapper;
-import ftbsc.lll.mapper.tools.MappingUtils;
+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;
 	}
-}
+}

src/main/java/ftbsc/lll/mapper/data/FieldData.java

@@ -1,5 +1,4 @@
-
+package ftbsc.lll.mapper.data;
-package ftbsc.lll.mapper.tools.data;
 
 /**
  * Container class for method data.

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.

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;
 

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.utils.Mapper;
-import ftbsc.lll.mapper.tools.MappingUtils;
+import ftbsc.lll.mapper.utils.MappingUtils;
-import ftbsc.lll.mapper.tools.data.ClassData;
+import ftbsc.lll.mapper.data.ClassData;
 
 import java.util.ArrayList;
 import java.util.List;

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.utils.Mapper;
-import ftbsc.lll.mapper.tools.data.ClassData;
+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);
 	}
-}
+}

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.utils.Mapper;
-import ftbsc.lll.mapper.tools.data.ClassData;
+import ftbsc.lll.mapper.data.ClassData;
 
 import java.util.List;
 import java.util.regex.Pattern;

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.utils.Mapper;
-import ftbsc.lll.mapper.tools.data.ClassData;
+import ftbsc.lll.mapper.data.ClassData;
 
 import java.util.List;
 import java.util.regex.Pattern;

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.data.ClassData;
-import ftbsc.lll.mapper.tools.data.FieldData;
+import ftbsc.lll.mapper.data.FieldData;
-import ftbsc.lll.mapper.tools.data.MethodData;
+import ftbsc.lll.mapper.data.MethodData;
 
 import java.util.HashMap;
 import java.util.Map;

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;
 
 /**