ObsidianMC/nugget
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update DiffPatch (#225)

Browse source
This commit is contained in:
Jason Penilla 2023-11-20 16:39:14 -07:00 committed by GitHub
parent 3be0f6cff7
commit 47ec175e27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
buildSrc/src/main/kotlin/config-kotlin.gradle.kts
View file

@ -24,7 +24,7 @@ repositories {
}
maven("https://repo.papermc.io/repository/maven-public/") {
mavenContent {
includeGroup("net.minecraftforge")
includeGroup("codechicken")
includeGroup("net.fabricmc")
}
}

2
gradle/libs.versions.toml
View file

@ -29,7 +29,7 @@ slf4j-jdk14 = "org.slf4j:slf4j-jdk14:1.7.32"
lorenzTiny = "net.fabricmc:lorenz-tiny:3.0.0"
jbsdiff = "io.sigpipe:jbsdiff:1.0"
diffpatch = "net.minecraftforge:DiffPatch:2.0.7"
diffpatch = "codechicken:DiffPatch:1.5.0.29"
# Gradle
gradle-licenser = "net.kyori:indra-licenser-spotless:3.1.3"

3
paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/step/ApplyDevBundlePatches.kt
View file

@ -23,6 +23,7 @@
package io.papermc.paperweight.userdev.internal.setup.step
import codechicken.diffpatch.cli.PatchOperation
import codechicken.diffpatch.util.LogLevel
import codechicken.diffpatch.util.archiver.ArchiveFormat
import io.papermc.paperweight.PaperweightException
import io.papermc.paperweight.userdev.internal.setup.SetupHandler
@ -65,7 +66,7 @@ class ApplyDevBundlePatches(
PrintStream(log.toFile(), Charsets.UTF_8).use { logOut ->
val op = PatchOperation.builder()
.logTo(logOut)
.verbose(true)
.level(LogLevel.ALL)
.summary(true)
.basePath(decompiledJar, ArchiveFormat.ZIP)
.patchesPath(tempPatchDir)