Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kotlin support fixes

Browse Source
This commit is contained in:
Anuken
2021-04-03 00:59:57 -04:00
parent d538e63c4c
commit 28a2e7c697
5 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
annotations/src/main/java/mindustry/annotations/BaseProcessor.java
View File

@@ -219,7 +219,7 @@ public abstract class BaseProcessor extends AbstractProcessor{
String path = Fi.get(filer.getResource(StandardLocation.CLASS_OUTPUT, "no", "no") String path = Fi.get(filer.getResource(StandardLocation.CLASS_OUTPUT, "no", "no")
.toUri().toURL().toString().substring(OS.isWindows ? 6 : "file:".length())) .toUri().toURL().toString().substring(OS.isWindows ? 6 : "file:".length()))
.parent().parent().parent().parent().parent().parent().parent().toString().replace("%20", " "); .parent().parent().parent().parent().parent().parent().parent().toString().replace("%20", " ");
rootDirectory = Fi.get(path); rootDirectory = Fi.get(path).parent();
}catch(IOException e){ }catch(IOException e){
throw new RuntimeException(e); throw new RuntimeException(e);
} }

7
annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java
View File

@@ -749,6 +749,7 @@ public class EntityProcess extends BaseProcessor{
//store nulls //store nulls
TypeSpec.Builder nullsBuilder = TypeSpec.classBuilder("Nulls").addModifiers(Modifier.PUBLIC).addModifiers(Modifier.FINAL); TypeSpec.Builder nullsBuilder = TypeSpec.classBuilder("Nulls").addModifiers(Modifier.PUBLIC).addModifiers(Modifier.FINAL);
ObjectSet<String> nullList = ObjectSet.with("unit", "blockUnit");
//create mock types of all components //create mock types of all components
for(Stype interf : allInterfaces){ for(Stype interf : allInterfaces){
@@ -767,6 +768,12 @@ public class EntityProcess extends BaseProcessor{
//create null builder //create null builder
String baseName = interf.name().substring(0, interf.name().length() - 1); String baseName = interf.name().substring(0, interf.name().length() - 1);
//prevent Nulls bloat
if(!nullList.contains(Strings.camelize(baseName))){
continue;
}
String className = "Null" + baseName; String className = "Null" + baseName;
TypeSpec.Builder nullBuilder = TypeSpec.classBuilder(className) TypeSpec.Builder nullBuilder = TypeSpec.classBuilder(className)
.addModifiers(Modifier.FINAL); .addModifiers(Modifier.FINAL);

10
annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java
View File

@@ -20,8 +20,8 @@ public class AssetsProcess extends BaseProcessor{
@Override @Override
public void process(RoundEnvironment env) throws Exception{ public void process(RoundEnvironment env) throws Exception{
processSounds("Sounds", rootDirectory + "/assets/sounds", "arc.audio.Sound"); processSounds("Sounds", rootDirectory + "/core/assets/sounds", "arc.audio.Sound");
processSounds("Musics", rootDirectory + "/assets/music", "arc.audio.Music"); processSounds("Musics", rootDirectory + "/core/assets/music", "arc.audio.Music");
processUI(env.getElementsAnnotatedWith(StyleDefaults.class)); processUI(env.getElementsAnnotatedWith(StyleDefaults.class));
} }
@@ -33,11 +33,11 @@ public class AssetsProcess extends BaseProcessor{
MethodSpec.Builder loadStyles = MethodSpec.methodBuilder("loadStyles").addModifiers(Modifier.PUBLIC, Modifier.STATIC); MethodSpec.Builder loadStyles = MethodSpec.methodBuilder("loadStyles").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
MethodSpec.Builder icload = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC); MethodSpec.Builder icload = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
CodeBlock.Builder ichinit = CodeBlock.builder(); CodeBlock.Builder ichinit = CodeBlock.builder();
String resources = rootDirectory + "/assets-raw/sprites/ui"; String resources = rootDirectory + "/core/assets-raw/sprites/ui";
Jval icons = Jval.read(Fi.get(rootDirectory + "/assets-raw/fontgen/config.json").readString()); Jval icons = Jval.read(Fi.get(rootDirectory + "/core/assets-raw/fontgen/config.json").readString());
ObjectMap<String, String> texIcons = new OrderedMap<>(); ObjectMap<String, String> texIcons = new OrderedMap<>();
PropertiesUtils.load(texIcons, Fi.get(rootDirectory + "/assets/icons/icons.properties").reader()); PropertiesUtils.load(texIcons, Fi.get(rootDirectory + "/core/assets/icons/icons.properties").reader());
StringBuilder iconcAll = new StringBuilder(); StringBuilder iconcAll = new StringBuilder();

6
build.gradle
View File

@@ -23,7 +23,7 @@ buildscript{
} }
} }
plugins { plugins{
id 'org.jetbrains.kotlin.jvm' version '1.4.32' id 'org.jetbrains.kotlin.jvm' version '1.4.32'
id "org.jetbrains.kotlin.kapt" version "1.4.32" id "org.jetbrains.kotlin.kapt" version "1.4.32"
} }
@@ -295,8 +295,8 @@ project(":core"){
apply plugin: "kotlin" apply plugin: "kotlin"
apply plugin: "kotlin-kapt" apply plugin: "kotlin-kapt"
kapt { kapt{
javacOptions { javacOptions{
option("-source", "14") option("-source", "14")
option("-target", "1.8") option("-target", "1.8")
option("--enable-preview") option("--enable-preview")

2
gradle.properties
View File

@@ -1,9 +1,9 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=0e99b0291f81d74d335dca8b0cf3bf26931f1197
# Don't recompute annotations if sources haven't been changed # Don't recompute annotations if sources haven't been changed
kapt.incremantal.apt = true kapt.incremantal.apt = true
# Multithreaded # Multithreaded
kapt.use.worker.api=true kapt.use.worker.api=true
# Compilation avoidance (see https://kotlinlang.org/docs/kapt.html#compile-avoidance-for-kapt-since-1-3-20) # Compilation avoidance (see https://kotlinlang.org/docs/kapt.html#compile-avoidance-for-kapt-since-1-3-20)
kapt.include.compile.classpath=false kapt.include.compile.classpath=false
archash=0e99b0291f81d74d335dca8b0cf3bf26931f1197