diff --git a/.gitignore b/.gitignore index ce59107..3b357db 100644 --- a/.gitignore +++ b/.gitignore @@ -135,6 +135,8 @@ run-data run-data/* runs/ .cache/ +server/ +server/* ### Gradle ### build/ diff --git a/build.gradle b/build.gradle index 38ad142..344e301 100644 --- a/build.gradle +++ b/build.gradle @@ -120,17 +120,18 @@ sourceSets.main.resources { srcDir 'src/generated/resources' } repositories { // Cloth Config API maven { - url "https://maven.shedaniel.me/" + url = "https://maven.shedaniel.me/" } // Player Animation maven { - name "KosmX's maven" - url 'https://maven.kosmx.dev/' + name = "KosmX's maven" + url = 'https://maven.kosmx.dev/' } // BetterCombat maven { - url 'https://api.modrinth.com/maven' + url = 'https://api.modrinth.com/maven' } + // Curios API maven { name = "Illusive Soulworks maven" @@ -138,12 +139,17 @@ repositories { } // YetAnotherConfigLib maven { - name 'Xander Maven' - url 'https://maven.isxander.dev/releases' + name = 'Kotlin for Forge' + url = 'https://thedarkcolour.github.io/KotlinForForge/' + } + maven { + name = 'Xander Maven' + url = 'https://maven.isxander.dev/releases' } + // Tetra, PointBlank, Tac:Zero, MrCrayfish's Gun Mod, ScorchedGuns 2 & JEI maven { - url "https://cursemaven.com" + url = "https://cursemaven.com" content { includeGroup "curse.maven" } @@ -172,7 +178,7 @@ repositories { } dependencies { - minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" + minecraft 'net.minecraftforge:forge:' + minecraft_version + '-' + forge_version annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' @@ -200,14 +206,12 @@ dependencies { // BetterCombat implementation implementation fg.deobf('maven.modrinth:better-combat:1.8.5+1.20.1-forge') - // Compile against only the API artifact + runtimeOnly(implementation fg.deobf("top.theillusivec4.curios:curios-forge:5.9.1+1.20.1")) compileOnly(fg.deobf("top.theillusivec4.curios:curios-forge:5.9.1+1.20.1:api")) - // Use the full Curios API jar at runtime - runtimeOnly(fg.deobf("top.theillusivec4.curios:curios-forge:5.9.1+1.20.1")) // YetAnotherConfigLib implementation - implementation fg.deobf("dev.isxander:yet-another-config-lib:3.4.2+1.20.1-forge") - compileOnly(fg.deobf("dev.isxander:yet-another-config-lib:3.4.2+1.20.1-forge")) + runtimeOnly(implementation fg.deobf("dev.isxander:yet-another-config-lib:${yacl_version}")) + compileOnly(fg.deobf("dev.isxander:yet-another-config-lib:${yacl_version}")) // Tetra compatibility compileOnly fg.deobf("curse.maven:tetra-289712:${tetra_version}") diff --git a/gradle.properties b/gradle.properties index 664b5f3..f657585 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,6 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false - # The Minecraft version must agree with the Forge version to get a valid artifact minecraft_version=1.20.1 # The Minecraft version range can use any release version of Minecraft as bounds. @@ -42,6 +41,9 @@ architectury_version=9.1.12 # JEI jei_version=15.19.0.89 +# YACL +yacl_version=3.5.0+1.20.1-forge + # The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} # Must match the String constant located in the main mod class annotated with @Mod. mod_id=justlevelingfork diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3fa8f86..9355b41 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME