Skip to content

Commit 7b0c178

Browse files
authored
Merge pull request #36 from dm432/feature/pack-hosting-rework
feat: Resource Pack can now be generated by a gradle task and is provided to the users via github releases
2 parents fea91cb + 0130ee8 commit 7b0c178

901 files changed

Lines changed: 382 additions & 334 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

build.gradle.kts

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,12 @@ tasks {
101101
filteringCharset = Charsets.UTF_8.name()
102102
}
103103

104+
build {
105+
finalizedBy("buildResourcePack")
106+
}
107+
104108
runServer {
109+
dependsOn("runResourcePackServer")
105110
doFirst {
106111
download.run {
107112
src("https://ci.dmulloy2.net/job/ProtocolLib/lastSuccessfulBuild/artifact/target/ProtocolLib.jar")
@@ -113,4 +118,37 @@ tasks {
113118
pluginJars(File(buildDir, "ProtocolLib.jar"))
114119
minecraftVersion(minecraftVersion)
115120
}
121+
122+
// region group often used tasks for convenience
123+
clean {
124+
group = "mpp"
125+
}
126+
build {
127+
group = "mpp"
128+
}
129+
ktlintCheck {
130+
group = "mpp"
131+
}
132+
runServer {
133+
group = "mpp"
134+
}
135+
// endregion
136+
}
137+
138+
abstract class RunResourcePackServer : DefaultTask() {
139+
140+
@TaskAction
141+
fun runResourcePackServer() {
142+
println("hello world")
143+
}
144+
}
145+
146+
tasks.register<JavaExec>("buildResourcePack") {
147+
mainClass.set("de.danielmaile.resourcepack.PackBuilderKt")
148+
classpath(sourceSets["main"].runtimeClasspath, configurations.compileClasspath)
149+
group = "mpp"
150+
args = listOf(getPluginVersion(), project.projectDir.absolutePath)
151+
}
152+
tasks.register<RunResourcePackServer>("runResourcePackServer") {
153+
group = "mpp"
116154
}

src/main/kotlin/de/danielmaile/mpp/MPP.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import de.danielmaile.mpp.block.ListenerBlock
2222
import de.danielmaile.mpp.block.function.CloudEffects
2323
import de.danielmaile.mpp.command.CommandMPP
2424
import de.danielmaile.mpp.data.DataPackManager
25-
import de.danielmaile.mpp.data.ResourcePackBuilder
25+
import de.danielmaile.mpp.data.ResourcePackManager
2626
import de.danielmaile.mpp.data.config.ConfigManager
2727
import de.danielmaile.mpp.data.config.LanguageManager
2828
import de.danielmaile.mpp.item.ListenerConverter
@@ -84,7 +84,6 @@ class MPP : JavaPlugin() {
8484
}
8585

8686
DataPackManager.saveOrUpdateDataPack()
87-
ResourcePackBuilder.generateResourcePack()
8887

8988
// register commands, events and recipes
9089
Bukkit.getPluginCommand("mpp")?.setExecutor(CommandMPP())
@@ -170,6 +169,7 @@ class MPP : JavaPlugin() {
170169
server.pluginManager.registerEvents(ListenerRift(), this)
171170
server.pluginManager.registerEvents(ListenerHealer(), this)
172171
server.pluginManager.registerEvents(ListenerHitman(), this)
172+
server.pluginManager.registerEvents(ResourcePackManager(), this)
173173
}
174174

175175
private fun registerRecipes() {

src/main/kotlin/de/danielmaile/mpp/data/ResourcePackBuilder.kt

Lines changed: 0 additions & 317 deletions
This file was deleted.

0 commit comments

Comments
 (0)