diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..7dc276b --- /dev/null +++ b/build.gradle @@ -0,0 +1,22 @@ +wrapper { + gradleVersion = "8.8" + distributionType = Wrapper.DistributionType.BIN +} + +subprojects { prj -> + apply plugin: "java" + + group = "minecraft" + version = "1.2.5" + + compileJava { + sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8 + options.encoding = "UTF-8" + } + + repositories { + mavenLocal() + mavenCentral() + flatDir { dirs rootDir.toPath().resolve("libs").toFile() } + } +} \ No newline at end of file diff --git a/client/build.gradle b/client/build.gradle index 290f090..26278de 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -1,67 +1,56 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform -apply plugin: 'java' -apply plugin: 'application' - -group = 'minecraft' -version = '1.2.5' -OperatingSystem os = DefaultNativePlatform.currentOperatingSystem - -compileJava { - sourceCompatibility = targetCompatibility = 1.8 - options.encoding = 'UTF-8' +plugins { + id "application" } application { - mainClassName = 'Start' + mainClassName = "Start" } run { - workingDir = new File(buildDir, 'run') + workingDir = new File(buildDir, "run") if (!workingDir.exists()) { workingDir.mkdir() } + systemProperty "java.library.path", file("$buildDir/natives") - systemProperty 'java.library.path', file("$buildDir/natives") -} - -repositories { - flatDir { dirs '../libs' } + dependsOn ":client:copyNatives" } dependencies { - compile name: 'jinput' // предположительно это "jinput-1.0.jar" - compile name: 'org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0' - compile name: 'org/lwjgl/lwjgl/lwjgl_util/2.9.0/lwjgl_util-2.9.0' - compile name: 'paulscode' + implementation name: "jinput" // предположительно это "jinput-1.0.jar" + implementation name: "org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0" + implementation name: "org/lwjgl/lwjgl/lwjgl_util/2.9.0/lwjgl_util-2.9.0" + implementation name: "paulscode" - if (os.isWindows()) { - compile name: 'org/lwjgl/lwjgl/lwjgl-platform/2.9.0/lwjgl-platform-2.9.0-natives-windows' + if (DefaultNativePlatform.currentOperatingSystem.isWindows()) { + implementation name: "org/lwjgl/lwjgl/lwjgl-platform/2.9.0/lwjgl-platform-2.9.0-natives-windows" // вроде подходит и слава богу - compile name: 'net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows' + implementation name: "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-windows" } else { - compile name: 'org/lwjgl/lwjgl/lwjgl-platform/2.9.0/lwjgl-platform-2.9.0-natives-linux' + implementation name: "org/lwjgl/lwjgl/lwjgl-platform/2.9.0/lwjgl-platform-2.9.0-natives-linux" // вроде подходит и слава богу - compile name: 'net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux' + implementation name: "net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux" } } -tasks.register('copyNatives').configure { +tasks.register("copyNatives").configure { doLast { def classifier def suffix - if (os.isWindows()) { - classifier = 'natives-windows' - suffix = '-natives-windows' + if (DefaultNativePlatform.currentOperatingSystem.isWindows()) { + classifier = "natives-windows" + suffix = "-natives-windows" } else { - classifier = 'natives-linux' - suffix = '-natives-linux' + classifier = "natives-linux" + suffix = "-natives-linux" } copy { - def resolvedArtifacts = configurations.compile.resolvedConfiguration.resolvedArtifacts + def resolvedArtifacts = configurations.runtimeClasspath.resolvedConfiguration.resolvedArtifacts def matches = resolvedArtifacts.findAll {it.classifier == classifier || it.name.endsWith(suffix)} - from matches.collect { it.file }.collect { zipTree(it).matching { exclude 'META-INF/**' } } + from matches.collect { it.file }.collect { zipTree(it).matching { exclude "META-INF/**" } } into "$buildDir/natives" } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c9d55ea..e708b1c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index da9702f..0d18421 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-8.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/server/build.gradle b/server/build.gradle index 337327d..95872e4 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -1,23 +1,15 @@ -apply plugin: 'java' -apply plugin: 'application' - -group = 'minecraft' -version = '1.2.5' - -compileJava { - sourceCompatibility = targetCompatibility = 1.8 - options.encoding = 'UTF-8' +plugins { + id "application" } application { - mainClassName = 'net.minecraft.server.MinecraftServer' + mainClassName = "net.minecraft.server.MinecraftServer" } run { - workingDir = new File(buildDir, 'run') + workingDir = new File(buildDir, "run") if (!workingDir.exists()) { workingDir.mkdir() } - - args 'nogui' + args "nogui" } diff --git a/settings.gradle b/settings.gradle index 3c55db6..265ce6b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -rootProject.name = 'mc-1.2.5' +rootProject.name = "mc-1.2.5" -include('client') -include('server') +include("client") +include("server")