diff --git a/VoxelSniperForge/build.gradle b/VoxelSniperForge/build.gradle index 982db5f4..113f776a 100644 --- a/VoxelSniperForge/build.gradle +++ b/VoxelSniperForge/build.gradle @@ -4,10 +4,10 @@ plugins { id 'org.spongepowered.mixin' } - +def forge_mc_version = findProperty("voxelsniper.forge.mc-version") ?: "unspecified" description='VoxelSniperForge' ext { - platform = "forge-beta" + platform = "forge-" + forge_mc_version } java { @@ -20,7 +20,7 @@ compileJava { } minecraft { - mappings channel: 'official', version: '1.20.1' + mappings channel: 'official', version: forge_mc_version.toString() runs { client { workingDirectory project.file('run') @@ -100,7 +100,9 @@ dependencies { // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft' it is assumed // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied. // The userdev artifact is a special name and will get all sorts of transformations applied to it. - minecraft 'net.minecraftforge:forge:1.20.1-47.1.0' + minecraft ('net.minecraftforge:forge:1.20.1-47.1.0') { + exclude group: 'org.slf4j' + } shadow "net.kyori:adventure-text-serializer-gson:4.11.0" annotationProcessor "org.spongepowered:mixin:0.8.5:processor" diff --git a/buildSrc/src/main/kotlin/voxel-core.gradle.kts b/buildSrc/src/main/kotlin/voxel-core.gradle.kts index 5d08798b..2d69c3b6 100644 --- a/buildSrc/src/main/kotlin/voxel-core.gradle.kts +++ b/buildSrc/src/main/kotlin/voxel-core.gradle.kts @@ -42,7 +42,9 @@ dependencies { shadow("net.kyori:adventure-text-serializer-legacy:4.13.1") implementation(kotlin("stdlib-jdk8")) - implementation("com.github.SandroHc:schematic4j:0.1.0-SNAPSHOT") + implementation("com.github.SandroHc:schematic4j:0.1.0-SNAPSHOT") { + exclude("org.slf4j", "") + } shadowNoRuntime("com.google.code.gson:gson:2.10.1") shadow("org.yaml:snakeyaml:1.33") @@ -90,6 +92,7 @@ tasks { relocate("net.kyori", "com.github.kevindagame.voxelsniper.libs.net.kyori") relocate("org.yaml.snakeyaml", "com.github.kevindagame.voxelsniper.libs.org.yaml.snakeyaml") relocate("kotlin", "com.github.kevindagame.voxelsniper.libs.kotlin") + exclude("org.apache.logging.log4j:log4j-core:2.11.1") } build { diff --git a/gradle.properties b/gradle.properties index 07f583b5..73b33c33 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,5 @@ -voxelsniper.version=8.12.1 +voxelsniper.version=8.12.2 +voxelsniper.forge.mc-version=1.20.1 org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false