frogmc/phytotelma
6
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mistress' into TheKodeToad/run-config-adapter
All checks were successful
Publish to snapshot maven / build (push) Successful in 16s
Details

Browse source
This commit is contained in:
owlsys 2024-05-18 10:48:09 -04:00
parent d52b263280 12d11d478c
commit 048783f9b3
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.forgejo/workflows/publish.yml
View file

@ -15,6 +15,6 @@ jobs:
- name: Build - name: Build
run: | run: |
chmod +x ./gradlew chmod +x ./gradlew
./gradlew publishPluginMavenPublicationToEsnesnonSnapshotsMavenRepository \ ./gradlew publishAllPublicationsToEsnesnonSnapshotsMavenRepository \
-PEsnesnonSnapshotsMavenUsername=${{ secrets.MAVEN_PUSH_USER }} \ -PEsnesnonSnapshotsMavenUsername=${{ secrets.MAVEN_PUSH_USER }} \
-PEsnesnonSnapshotsMavenPassword=${{ secrets.MAVEN_PUSH_TOKEN }} -PEsnesnonSnapshotsMavenPassword=${{ secrets.MAVEN_PUSH_TOKEN }}

5
src/main/kotlin/org/ecorous/esnesnon/gradle/ext/Stuff.kt
View file

@ -29,6 +29,7 @@ fun Project.minecraft(
NonsenseGradlePlugin.remappedGameJarPath = remappedJar NonsenseGradlePlugin.remappedGameJarPath = remappedJar
println("Time to setup Minecraft!") println("Time to setup Minecraft!")
if (remappedJar.notExists()) { if (remappedJar.notExists()) {
println("Remapping the game...")
val mapper = Mapper(ProguardParser.read(MojmapProvider.get(version).orElseThrow()).reverse()) val mapper = Mapper(ProguardParser.read(MojmapProvider.get(version).orElseThrow()).reverse())
val paramMappings = ParchmentProvider.getParchment( val paramMappings = ParchmentProvider.getParchment(
version, parchmentVersion, version, parchmentVersion,
@ -37,16 +38,18 @@ fun Project.minecraft(
) )
NonsenseRemapper.remap(mapper, clientJar, remappedJar, true, paramMappings) NonsenseRemapper.remap(mapper, clientJar, remappedJar, true, paramMappings)
} }
println("Adding dependencies...")
VersionChecker.getDependencies(version) { VersionChecker.getDependencies(version) {
dependencies.add("implementation", it) dependencies.add("implementation", it)
} }
dependencies.add("implementation", "net.minecraft:client:$version:remapped") dependencies.add("implementation", "net.minecraft:client:$version:remapped")
println("Generating run configurations...")
RunConfigGenerator.generate(this) RunConfigGenerator.generate(this)
println("Done!")
} else { } else {
println("Invalid version! $version") println("Invalid version! $version")
error("Invalid minecraft version provided: $version") error("Invalid minecraft version provided: $version")
} }
println("Minecraft!")
return this return this
} }