Clean

annotation/build.gradle

@@ -0,0 +1,21 @@
+project(":annotation"){
+    apply plugin: "java-library"
+
+    java{
+        targetCompatibility = 21
+        sourceCompatibility = 21
+    }
+
+    repositories{
+        mavenCentral()
+        maven{ url "https://raw.githubusercontent.com/Zelaux/MindustryRepo/master/repository" }
+        maven{ url 'https://www.jitpack.io' }
+    }
+
+    dependencies{
+        compileOnly "com.github.Anuken.Arc:arc-core:$mindustryVersion"
+        compileOnly 'com.google.auto.service:auto-service:1.0-rc2'
+
+        annotationProcessor 'com.google.auto.service:auto-service:1.0-rc2'
+    }
+}

build.gradle

@@ -1,26 +1,27 @@
 apply plugin: "java"
 
-version '1.0'
+group = 'com.github.MinRi2'
+version = '1.0'
 
 sourceSets.main.java.srcDirs = ["src"]
 
 java{
-    targetCompatibility = 8
-    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = 17
+    sourceCompatibility = 17
 }
 
 ext{
     //the build number that this mod is made for
     mindustryVersion = 'v146'
-    jabelVersion = "93fde537c7"
+    minModCoreVersion = "544f5fde08"
+
     //windows sucks
     isWindows = System.getProperty("os.name").toLowerCase().contains("windows")
     sdkRoot = System.getenv("ANDROID_HOME") ?: System.getenv("ANDROID_SDK_ROOT") ?: "D:/Sdk"
 
     modDir = "${System.getenv("APPDATA")}\\Mindustry\\mods"
 }
 
-//java 8 backwards compatibility flag
 allprojects{
     tasks.withType(JavaCompile){
         options.compilerArgs.addAll(['--release', '17'])
@@ -40,38 +41,7 @@ dependencies{
     compileOnly project(":annotation")
     compileOnly "com.github.Anuken.Arc:arc-core:$mindustryVersion"
     compileOnly "com.github.Anuken.Mindustry:core:$mindustryVersion"
-
-//    annotationProcessor "com.github.Anuken:jabel:$jabelVersion"
-}
-
-project(":annotation"){
-    apply plugin: "java-library"
-
-    repositories{
-        mavenCentral()
-        maven{ url "https://raw.githubusercontent.com/Zelaux/MindustryRepo/master/repository" }
-        maven{ url 'https://www.jitpack.io' }
-    }
-
-    dependencies{
-        compileOnly "com.github.Anuken.Arc:arc-core:$mindustryVersion"
-        compileOnly 'com.google.auto.service:auto-service:1.0-rc2'
-        annotationProcessor 'com.google.auto.service:auto-service:1.0-rc2'
-    }
-}
-
-project(":tools"){
-    apply plugin: "java"
-
-    repositories{
-        mavenCentral()
-        maven{ url "https://raw.githubusercontent.com/Zelaux/MindustryRepo/master/repository" }
-        maven{ url 'https://www.jitpack.io' }
-    }
-
-    dependencies{
-        implementation "com.github.Anuken.Arc:arc-core:$mindustryVersion"
-    }
+    compileOnly "com.github.MinRi2:MinMocCore:$minModCoreVersion"
 }
 
 //force arc version

gradle.properties

@@ -1,5 +1,4 @@
-org.gradle.jvmargs = --illegal-access=permit \
---add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+org.gradle.jvmargs = --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
 --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
 --add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED \
 --add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \

settings.gradle

@@ -3,5 +3,4 @@ if(JavaVersion.current().ordinal() < JavaVersion.VERSION_17.ordinal())
 
 rootProject.name = "MinerTools"
 include 'annotation'
-include 'tools'
-
+include 'tools'

tools/build.gradle

@@ -1,6 +1,20 @@
-task syncBundle(dependsOn: classes, type: JavaExec){
-    mainClass = "bundle.SyncBundle"
-    classpath = sourceSets.main.runtimeClasspath
-    standardInput = System.in
-    workingDir = "../assets/bundles"
+project(":tools"){
+    apply plugin: "java"
+
+    repositories{
+        mavenCentral()
+        maven{ url "https://raw.githubusercontent.com/Zelaux/MindustryRepo/master/repository" }
+        maven{ url 'https://www.jitpack.io' }
+    }
+
+    dependencies{
+        implementation "com.github.Anuken.Arc:arc-core:$mindustryVersion"
+    }
+
+    task syncBundle(dependsOn: classes, type: JavaExec){
+        mainClass = "bundle.SyncBundle"
+        classpath = sourceSets.main.runtimeClasspath
+        standardInput = System.in
+        workingDir = "../assets/bundles"
+    }
 }