Skip to content

Commit

Permalink
Merge pull request #209 from KevinDaGame/fix/forge-loading
Browse files Browse the repository at this point in the history
Fix/forge loading
  • Loading branch information
KevinDaGame authored Jul 24, 2023
2 parents 699ce6f + 8e3c43c commit 7570ba8
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
10 changes: 6 additions & 4 deletions VoxelSniperForge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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')
Expand Down Expand Up @@ -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"

Expand Down
5 changes: 4 additions & 1 deletion buildSrc/src/main/kotlin/voxel-core.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 7570ba8

Please sign in to comment.