diff --git a/README.MD b/README.MD index ee7c78d..7450e2e 100644 --- a/README.MD +++ b/README.MD @@ -1,8 +1,8 @@ # Minecraft 1.12.2 - MCP decompile -- port to Gradle -- use Java 8 +- Gradle 7.5 +- Java 8 ## Run Client diff --git a/client/build.gradle b/client/build.gradle index 341b45d..9ab80f5 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -1,11 +1,13 @@ -apply plugin: 'java' -apply plugin: 'application' +plugins { + id 'java' + id 'application' +} group = 'minecraft' version = '1.12.2' compileJava { - sourceCompatibility = targetCompatibility = 1.8 + sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8 options.encoding = 'UTF-8' } @@ -30,35 +32,35 @@ repositories { } dependencies { - compile name: 'com/mojang/authlib/1.5.25/authlib-1.5.25' - compile name: 'com/mojang/text2speech/1.10.3/text2speech-1.10.3' - compile name: 'com/mojang/realms/1.10.21/realms-1.10.21' - compile name: 'com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-windows' - compile name: 'com/paulscode/codecjorbis/20101023/codecjorbis-20101023' - compile name: 'com/paulscode/codecwav/20101023/codecwav-20101023' - compile name: 'com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123' - compile name: 'com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824' - compile name: 'com/paulscode/soundsystem/20120107/soundsystem-20120107' - compile name: 'oshi-project/oshi-core/1.1/oshi-core-1.1' - compile name: 'org/lwjgl/lwjgl/lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209' - compile name: 'org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/lwjgl_util-2.9.4-nightly-20150209' - compile name: 'org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows' - compile name: 'com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2' + implementation name: 'com/mojang/authlib/1.5.25/authlib-1.5.25' + implementation name: 'com/mojang/text2speech/1.10.3/text2speech-1.10.3' + implementation name: 'com/mojang/realms/1.10.21/realms-1.10.21' + implementation name: 'com/mojang/text2speech/1.10.3/text2speech-1.10.3-natives-windows' + implementation name: 'com/paulscode/codecjorbis/20101023/codecjorbis-20101023' + implementation name: 'com/paulscode/codecwav/20101023/codecwav-20101023' + implementation name: 'com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123' + implementation name: 'com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824' + implementation name: 'com/paulscode/soundsystem/20120107/soundsystem-20120107' + implementation name: 'oshi-project/oshi-core/1.1/oshi-core-1.1' + implementation name: 'org/lwjgl/lwjgl/lwjgl/2.9.4-nightly-20150209/lwjgl-2.9.4-nightly-20150209' + implementation name: 'org/lwjgl/lwjgl/lwjgl_util/2.9.4-nightly-20150209/lwjgl_util-2.9.4-nightly-20150209' + implementation name: 'org/lwjgl/lwjgl/lwjgl-platform/2.9.4-nightly-20150209/lwjgl-platform-2.9.4-nightly-20150209-natives-windows' + implementation name: 'com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2' - compile 'net.java.dev.jna:jna:4.4.0' - compile 'net.java.jinput:jinput:2.0.5' - compile 'net.java.jinput:jinput-platform:2.0.5' - compile 'net.java.jutils:jutils:1.0.0' - compile 'net.sf.jopt-simple:jopt-simple:5.0.3' - compile 'org.apache.commons:commons-lang3:3.5' - compile 'com.google.guava:guava:21.0' - compile 'org.apache.logging.log4j:log4j-core:2.8.1' - compile 'io.netty:netty-all:4.1.9.Final' - compile 'com.google.code.gson:gson:2.8.0' - compile 'commons-io:commons-io:2.5' - compile 'com.google.code.findbugs:jsr305:3.0.1' - compile 'it.unimi.dsi:fastutil:7.1.0' - compile 'commons-codec:commons-codec:1.10' + implementation 'net.java.dev.jna:jna:4.4.0' + implementation 'net.java.jinput:jinput:2.0.5' + implementation 'net.java.jinput:jinput-platform:2.0.5' + implementation 'net.java.jutils:jutils:1.0.0' + implementation 'net.sf.jopt-simple:jopt-simple:5.0.3' + implementation 'org.apache.commons:commons-lang3:3.5' + implementation 'com.google.guava:guava:21.0' + implementation 'org.apache.logging.log4j:log4j-core:2.8.1' + implementation 'io.netty:netty-all:4.1.9.Final' + implementation 'com.google.code.gson:gson:2.8.0' + implementation 'commons-io:commons-io:2.5' + implementation 'com.google.code.findbugs:jsr305:3.0.1' + implementation 'it.unimi.dsi:fastutil:7.1.0' + implementation 'commons-codec:commons-codec:1.10' } task copyNativesWindows { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index da9702f..2ec77e5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/server/build.gradle b/server/build.gradle index f14bd5b..6238185 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -1,11 +1,13 @@ -apply plugin: 'java' -apply plugin: 'application' +plugins { + id 'java' + id 'application' +} group = 'minecraft' version = '1.12.2' compileJava { - sourceCompatibility = targetCompatibility = 1.8 + sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8 options.encoding = 'UTF-8' } @@ -29,14 +31,14 @@ repositories { } dependencies { - compile name: 'com/mojang/authlib/1.5.25/authlib-1.5.25' + implementation name: 'com/mojang/authlib/1.5.25/authlib-1.5.25' - compile 'org.apache.commons:commons-lang3:3.5' - compile 'com.google.guava:guava:21.0' - compile 'org.apache.logging.log4j:log4j-core:2.8.1' - compile 'io.netty:netty-all:4.1.9.Final' - compile 'com.google.code.gson:gson:2.8.0' - compile 'commons-io:commons-io:2.5' - compile 'com.google.code.findbugs:jsr305:3.0.1' - compile 'it.unimi.dsi:fastutil:7.1.0' + implementation 'org.apache.commons:commons-lang3:3.5' + implementation 'com.google.guava:guava:21.0' + implementation 'org.apache.logging.log4j:log4j-core:2.8.1' + implementation 'io.netty:netty-all:4.1.9.Final' + implementation 'com.google.code.gson:gson:2.8.0' + implementation 'commons-io:commons-io:2.5' + implementation 'com.google.code.findbugs:jsr305:3.0.1' + implementation 'it.unimi.dsi:fastutil:7.1.0' }