@@ -6,12 +6,13 @@ buildscript {
6
6
gradlePluginPortal()
7
7
}
8
8
dependencies {
9
- classpath ' net.minecraftforge.gradle:ForgeGradle:5 +'
9
+ classpath ' net.minecraftforge.gradle:ForgeGradle:6 +'
10
10
classpath " gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.1.3"
11
11
}
12
12
}
13
13
14
- import net.minecraftforge.forge.tasks.*
14
+ import net.minecraftforge.gradle.common.util.Utils
15
+ import net.minecraftforge.gradle.common.util.VersionJson
15
16
import org.jetbrains.gradle.ext.*
16
17
17
18
apply plugin : ' eclipse'
@@ -78,47 +79,52 @@ jar {
78
79
}
79
80
}
80
81
81
- task runclient (type : JavaExec ) {
82
+ var assetsFolder = file(' run/assets' )
83
+
84
+ tasks. register(' runclient' , JavaExec ) {
82
85
group = " MCP"
83
86
description = " Runs the client"
84
87
classpath sourceSets. main. runtimeClasspath
85
88
if (System . getProperty(" os.name" ). toLowerCase(). contains(" mac" )) {
86
89
jvmArgs ' -XstartOnFirstThread'
87
90
}
91
+
92
+ var runFolder = file(' run' )
93
+ var versionJson = Utils . loadJson(downloadAssets. getMeta(). get(). getAsFile(), VersionJson . class)
94
+
95
+ workingDir runFolder
88
96
args ' --gameDir' , ' .'
89
97
args ' --version' , minecraft_version
90
- args ' --assetsDir' , downloadAssets . output
91
- args ' --assetIndex' , " 1.20 "
98
+ args ' --assetsDir' , runFolder . relativePath(assetsFolder)
99
+ args ' --assetIndex' , versionJson . assetIndex . id
92
100
args ' --accessToken' , ' 0'
93
101
main ' net.minecraft.client.main.Main'
94
- workingDir ' run'
95
102
}
96
103
97
104
98
-
99
- task setup () {
105
+ tasks. register(' setup' ) {
100
106
group = " MCP"
101
107
description = " Setups the dev workspace"
102
108
dependsOn ' :extractMapped'
103
- mkdir ' run/assets '
109
+ mkdir assetsFolder
104
110
copy {
105
111
from downloadAssets. output. path
106
- into ' run/assets '
112
+ into assetsFolder
107
113
}
108
114
}
109
115
110
- task copyAssets {
116
+ tasks . register( ' copyAssets' ) {
111
117
group = " MCP"
112
118
description = " Download and place the assets into the run folder"
113
119
dependsOn ' :downloadAssets'
114
120
mkdir ' run/assets'
115
121
copy {
116
122
from downloadAssets. output. path
117
- into ' run/assets '
123
+ into assetsFolder
118
124
}
119
125
}
120
126
121
- task runserver ( type : JavaExec ) {
127
+ tasks . register( ' runserver ' , JavaExec ) {
122
128
mkdir ' runserver'
123
129
group = " MCP"
124
130
description = " Runs the server"
@@ -136,4 +142,4 @@ idea.project.settings {
136
142
moduleName = idea. module. name + ' .main'
137
143
}
138
144
}
139
- }
145
+ }
0 commit comments