update gradle
This commit is contained in:
parent
be68ca40f0
commit
76a2a704dd
20
build.gradle
20
build.gradle
|
|
@ -1,7 +1,7 @@
|
||||||
plugins {
|
plugins {
|
||||||
id 'eclipse'
|
id 'eclipse'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
id 'net.minecraftforge.gradle' version '5.1.+'
|
id 'net.neoforged.gradle' version '[6.0.18,6.2)'
|
||||||
id 'org.spongepowered.mixin' version '0.7.+'
|
id 'org.spongepowered.mixin' version '0.7.+'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -12,10 +12,11 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17)
|
||||||
|
|
||||||
println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
|
println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
|
||||||
minecraft {
|
minecraft {
|
||||||
mappings channel: 'official', version: '1.19.2'
|
mappings channel: 'official', version: '1.20.1'
|
||||||
|
|
||||||
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
|
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
|
||||||
|
|
||||||
|
copyIdeResources = true
|
||||||
runs {
|
runs {
|
||||||
client {
|
client {
|
||||||
properties 'mixin.env.remapRefMap': 'true'
|
properties 'mixin.env.remapRefMap': 'true'
|
||||||
|
|
@ -73,17 +74,17 @@ repositories{
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
minecraft 'net.minecraftforge:forge:1.19.2-43.2.10'
|
minecraft 'net.neoforged:forge:1.20.1-47.1.65'
|
||||||
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
|
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
|
||||||
|
|
||||||
implementation fg.deobf("com.github.Mysticpasta1:mcef-forge:2ec6581622")
|
// implementation fg.deobf("com.github.Mysticpasta1:mcef-forge:2ec6581622")
|
||||||
implementation fg.deobf("curse.maven:SU-370704:4485052")
|
// implementation fg.deobf("curse.maven:SU-370704:4485052")
|
||||||
implementation fg.deobf("curse.maven:spark-361579:4381167")
|
// implementation fg.deobf("curse.maven:spark-361579:4381167")
|
||||||
|
|
||||||
// implementation fg.deobf("flatdir.lib:mcef:1.2.4")
|
// implementation fg.deobf("flatdir.lib:mcef:1.2.4")
|
||||||
// implementation fg.deobf("flatdir.lib:smallerunits:2.1.3")
|
// implementation fg.deobf("flatdir.lib:smallerunits:2.1.3")
|
||||||
|
|
||||||
compileOnly fg.deobf("curse.maven:vivecraft-667903:4409427")
|
// compileOnly fg.deobf("curse.maven:vivecraft-667903:4409427")
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|
@ -133,8 +134,3 @@ apply plugin: 'org.spongepowered.mixin'
|
||||||
mixin {
|
mixin {
|
||||||
add sourceSets.main, "webdisplays.refmap.json"
|
add sourceSets.main, "webdisplays.refmap.json"
|
||||||
}
|
}
|
||||||
|
|
||||||
task deobfJar(type: Jar) {
|
|
||||||
from sourceSets.main.output
|
|
||||||
classifier = 'deobf'
|
|
||||||
}
|
|
||||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
|
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
|
||||||
|
|
|
||||||
|
|
@ -1,20 +1,27 @@
|
||||||
pluginManagement {
|
pluginManagement {
|
||||||
repositories {
|
repositories {
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
maven { url = 'https://maven.minecraftforge.net/' }
|
maven {
|
||||||
}
|
name = 'NeoForged'
|
||||||
resolutionStrategy {
|
url = 'https://maven.neoforged.net/releases'
|
||||||
eachPlugin {
|
|
||||||
switch (requested.id.toString()) {
|
|
||||||
case "net.minecraftforge.gradle": {
|
|
||||||
useModule("${requested.id}:ForgeGradle:${requested.version}")
|
|
||||||
break
|
|
||||||
}
|
|
||||||
case "org.spongepowered.mixin": {
|
|
||||||
useModule("org.spongepowered:mixingradle:${requested.version}")
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// resolutionStrategy {
|
||||||
|
// eachPlugin {
|
||||||
|
// switch (requested.id.toString()) {
|
||||||
|
// case "net.minecraftforge.gradle": {
|
||||||
|
// useModule("${requested.id}:ForgeGradle:${requested.version}")
|
||||||
|
// break
|
||||||
|
// }
|
||||||
|
// case "org.spongepowered.mixin": {
|
||||||
|
// useModule("org.spongepowered:mixingradle:${requested.version}")
|
||||||
|
// break;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
|
plugins {
|
||||||
|
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user