Skip to content

Commit

Permalink
removed OpenGAL
Browse files Browse the repository at this point in the history
  • Loading branch information
liplum committed Dec 11, 2023
1 parent 37324ef commit b20273d
Show file tree
Hide file tree
Showing 15 changed files with 9 additions and 375 deletions.
6 changes: 1 addition & 5 deletions annotations/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ plugins {
kotlin("jvm")
id("io.github.liplum.mgpp")
}
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
sourceSets {
main {
java.srcDir("src")
Expand All @@ -18,4 +14,4 @@ sourceSets {
}
dependencies {
importMindustry()
}
}
8 changes: 8 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import io.github.liplum.mindustry.minGameVersion
import net.liplum.gradle.settings.Settings.localConfig
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") apply false
Expand Down Expand Up @@ -42,6 +43,13 @@ allprojects {
}
}
}
tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
}
tasks.withType<JavaCompile> {
sourceCompatibility = JavaVersion.VERSION_1_8.toString()
targetCompatibility = JavaVersion.VERSION_1_8.toString()
}
}
mindustry {
dependency {
Expand Down
2 changes: 0 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# suppress inspection "SpellCheckingInspection" for whole file
kotlin.code.style=official
OpenGalPlumyVersion=v0.1.4
PlumyVersion=7597fd8bb8
mktxVersion=7a1dc3ff54
OpenGalVersion=v0.4.3
mgpp.deploy.enableFatJar=false
10 changes: 0 additions & 10 deletions main/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ plugins {
id("io.github.liplum.mgpp")
}
val PlumyVersion: String by project
val OpenGalVersion: String by project

sourceSets {
main {
Expand Down Expand Up @@ -85,7 +84,6 @@ dependencies {
ksp(project(":processor"))
importMindustry("ksp")
importMindustry()
implementation("com.github.liplum:OpenGAL:$OpenGalVersion")
implementation("com.github.liplum.plumyjava:path-kt:$PlumyVersion")
mktxImplmenetation(
mktxVersion,
Expand All @@ -106,14 +104,6 @@ tasks.jar {
includeEmptyDirs = false
exclude("**/**/*.java")
}
tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
}
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
withSourcesJar()
}

publishing {
publications {
Expand Down
2 changes: 0 additions & 2 deletions main/src/net/liplum/CioMod.kt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import net.liplum.registry.ServerCommand.registerCioCommands
import net.liplum.registry.SpecificLoader
import net.liplum.render.GlobalAnimation
import net.liplum.render.TestShader
import net.liplum.script.NpcSystem
import net.liplum.update.Updater
import net.liplum.welcome.FirstLoaded
import net.liplum.welcome.Welcome
Expand Down Expand Up @@ -156,7 +155,6 @@ class CioMod : Mod() {
DebugOnly {
PlanetDialog.debugSelect = true
ClientOnly {
NpcSystem.register()
Core.input.addProcessor(UnitTap)
}
}
Expand Down
4 changes: 0 additions & 4 deletions main/src/net/liplum/Settings.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import arc.math.Interp
import mindustry.Vars
import plumy.dsl.Setting
import plumy.core.ClientOnly
import net.liplum.script.KeyNotFoundException
import net.liplum.update.Version2
import plumy.core.math.invoke

Expand Down Expand Up @@ -65,9 +64,6 @@ object Settings {
var ContentSpecific: String by Setting(R.Setting.ContentSpecific, ContentSpec.Vanilla.id)
/** Last skipped update. If it equals to current new version detected, it will skip the update dialog. */
var LastSkippedUpdate: String by Setting(R.Setting.LastSkippedUpdate, Version2.Zero.toString())
@Suppress("UNCHECKED_CAST")
operator fun <T> get(key: String): T =
settingsMap[key]?.let { it[key] as T } ?: throw KeyNotFoundException("Can't find $key in Cyber IO settings.")

internal inline fun <reified T> Setting(key: String, default: T): Setting<Settings, T> =
Setting(key, default) { settingsMap[it] = this }
Expand Down
41 changes: 0 additions & 41 deletions main/src/net/liplum/script/Entity.kt

This file was deleted.

8 changes: 0 additions & 8 deletions main/src/net/liplum/script/INpc.kt

This file was deleted.

6 changes: 0 additions & 6 deletions main/src/net/liplum/script/Npc.kt

This file was deleted.

57 changes: 0 additions & 57 deletions main/src/net/liplum/script/NpcDialogFrag.kt

This file was deleted.

39 changes: 0 additions & 39 deletions main/src/net/liplum/script/NpcSystem.kt

This file was deleted.

26 changes: 0 additions & 26 deletions main/src/net/liplum/script/NpcUnit.kt

This file was deleted.

10 changes: 0 additions & 10 deletions main/src/net/liplum/script/NpcUnitType.kt

This file was deleted.

Loading

0 comments on commit b20273d

Please sign in to comment.