diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 470f0f640..3ff3e3228 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -39,7 +39,6 @@ - diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 533b575ba..4f2a7b340 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -13,7 +13,6 @@ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1db3eca17..9ae50fcc9 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -15,166 +15,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/build.gradle.kts b/build.gradle.kts index 47d87fa11..a14c2ca56 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,6 @@ plugins { id("io.github.pulverizer.movecraft.common_build") + id("org.spongepowered.gradle.vanilla") } tasks.shadowJar { @@ -22,4 +23,9 @@ dependencies { "provided"(project(path = ":", configuration = "provided")) "shade"(project(path = ":")) { isTransitive = false } "shade"(project(path = ":", configuration = "shade")) +} + +minecraft { + version("1.16.5") + //accessWideners(file("../src/main/resources/movecraft.accesswidener")) } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/io.github.pulverizer.movecraft.common_build.gradle.kts b/buildSrc/src/main/kotlin/io.github.pulverizer.movecraft.common_build.gradle.kts index 1eced09a6..c2afb374d 100644 --- a/buildSrc/src/main/kotlin/io.github.pulverizer.movecraft.common_build.gradle.kts +++ b/buildSrc/src/main/kotlin/io.github.pulverizer.movecraft.common_build.gradle.kts @@ -9,7 +9,6 @@ plugins { id("org.spongepowered.gradle.ore") // for Ore publishing // my plugins - id("org.spongepowered.gradle.vanilla") `maven-publish` } @@ -49,11 +48,6 @@ sponge { } } -minecraft { - version("1.16.5") - //accessWideners(file("../src/main/resources/movecraft.accesswidener")) -} - val javaTarget = 16 java { sourceCompatibility = JavaVersion.toVersion(javaTarget) diff --git a/gradle/forge/build.gradle.kts b/gradle/forge/build.gradle.kts index 2048bfc7f..61ab8304e 100644 --- a/gradle/forge/build.gradle.kts +++ b/gradle/forge/build.gradle.kts @@ -22,7 +22,7 @@ plugins { id("io.github.pulverizer.movecraft.common_build") - //id("net.smoofyuniverse.loom") version "0.12.0-SNAPSHOT" + id("net.smoofyuniverse.loom") version "0.12.0-SNAPSHOT" } tasks.jar { diff --git a/gradle/vanilla/build.gradle.kts b/gradle/vanilla/build.gradle.kts index 291e2bf87..55a215e4b 100644 --- a/gradle/vanilla/build.gradle.kts +++ b/gradle/vanilla/build.gradle.kts @@ -22,6 +22,7 @@ plugins { id("io.github.pulverizer.movecraft.common_build") + id("org.spongepowered.gradle.vanilla") } tasks.jar { @@ -55,4 +56,9 @@ tasks.create("setupServer") { into("mods") { from(tasks.shadowJar) } +} + +minecraft { + version("1.16.5") + //accessWideners(file("../src/main/resources/movecraft.accesswidener")) } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index bef3c7d13..52c8df5e7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -32,4 +32,4 @@ pluginManagement { rootProject.name = 'movecraft' include ':gradle:vanilla' -include ':gradle:forge' \ No newline at end of file +//include ':gradle:forge' \ No newline at end of file