diff --git a/build.gradle b/build.gradle index f92bf79..e25656b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'babric-loom' version '1.1.+' - id 'scala' + id 'java' } group = project.mod_group @@ -15,7 +15,7 @@ loom { repositories { mavenCentral() - maven { url 'https://jitpack.io' } + maven { url = "https://jitpack.io" } maven { name = 'Babric' url = 'https://maven.glass-launcher.net/babric' @@ -35,7 +35,7 @@ repositories { ivy { url = "https://github.com/Turnip-Labs" patternLayout { - artifact "[organisation]/releases/download/[revision]/[module]-bta-[revision].jar" + artifact "[organisation]/releases/download/v[revision]/[module]-[revision].jar" m2compatible = true } metadataSources { artifact() } @@ -43,7 +43,7 @@ repositories { ivy { url = "https://github.com/Turnip-Labs" patternLayout { - artifact "[organisation]/releases/download/v[revision]/[module]-[revision].jar" + artifact "[organisation]/releases/download/[revision]/[module]-[revision].jar" m2compatible = true } metadataSources { artifact() } @@ -51,7 +51,7 @@ repositories { ivy { url = "https://github.com/Turnip-Labs" patternLayout { - artifact "[organisation]/releases/download/[revision]/[module]-[revision].jar" + artifact "[organisation]/releases/download/[revision]/[module]-bta-[revision].jar" m2compatible = true } metadataSources { artifact() } @@ -72,11 +72,6 @@ repositories { } metadataSources { artifact() } } - maven { - name = "Azure Kotori316" - // See https://dev.azure.com/Kotori316/minecraft/_artifacts/feed/mods for versions - url = "https://pkgs.dev.azure.com/Kotori316/minecraft/_packaging/mods/maven/v1" - } } dependencies { @@ -90,25 +85,17 @@ dependencies { // If you do not need Halplibe you can comment this line out or delete this line modImplementation "com.github.Turnip-Labs:bta-halplibe:${project.halplibe_version}" - modImplementation "com.github.Turnip-Labs:ModMenu:2.0.2" + modImplementation "ModMenu:ModMenu:2.0.3" implementation "org.slf4j:slf4j-api:1.8.0-beta4" implementation "org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0" implementation 'com.google.guava:guava:30.0-jre' - implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.9' - + implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1' var log4jVersion = "2.20.0" implementation("org.apache.logging.log4j:log4j-core:${log4jVersion}") implementation("org.apache.logging.log4j:log4j-api:${log4jVersion}") implementation("org.apache.logging.log4j:log4j-1.2-api:${log4jVersion}") - include(implementation("org.apache.commons:commons-lang3:3.12.0")) - - modImplementation("com.kotori316:scalable-cats-force-fabric:${project.scf_version}") - - implementation(group: 'org.scala-lang', name: 'scala3-library_3', version: project.scala_version) - implementation(group: "org.typelevel", name: "cats-core_3", version: project.cats_version) - implementation(group: "org.typelevel", name: "cats-kernel_3", version: project.cats_version) } java { @@ -117,7 +104,7 @@ java { withSourcesJar() } -tasks.withType(JavaCompile).configureEach { +tasks.withType(JavaCompile) { options.release.set 8 } diff --git a/gradle.properties b/gradle.properties index 63e20aa..6f0d8fd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,13 @@ org.gradle.jvmargs=-Xmx2G # BTA -bta_version=1.7.7.0_02 +bta_version=7.1-pre1a # Loader -loader_version=0.14.19-babric.1-bta +loader_version=0.14.19-babric.3-bta # HalpLibe -halplibe_version=2.4.0 - -# Scalable Cat's Force Fabric -scf_version=2.1.0 -scala_version=3.3.0 -cats_version=2.9.2-kotori +halplibe_version=3.1.0 # Mod mod_version=1.0.0