Skip to content

Commit 8f6994a

Browse files
committed
fix compatibility issue with forge
1 parent 816935b commit 8f6994a

3 files changed

Lines changed: 9 additions & 5 deletions

File tree

build.gradle

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,8 @@ shadowJar {
216216
exclude "META-INF/services/kotlin*"
217217
exclude "META-INF/versions/9/**"
218218
exclude "META-INF/com.android.tools/**"
219+
exclude "com/fasterxml/**"
219220
relocate "me.towdium.pinin", "icu.takeneko.appwebterminal.deps.pinin"
220-
relocate "com.fasterxml.jackson", "icu.takeneko.appwebterminal.deps.jackson"
221221
}
222222

223223
reobfJar {
@@ -250,10 +250,13 @@ dependencies {
250250
additionalRuntimeClasspath shadowInclude(implementation("io.ktor:ktor-server-caching-headers:3.1.2"))
251251
additionalRuntimeClasspath shadowInclude(implementation("io.ktor:ktor-server-host-common:3.1.2"))
252252
additionalRuntimeClasspath shadowInclude(implementation("io.ktor:ktor-server-auth:3.1.2"))
253-
additionalRuntimeClasspath shadowInclude(implementation("io.ktor:ktor-server-auth-jwt:3.1.2"))
253+
additionalRuntimeClasspath shadowInclude(implementation("io.ktor:ktor-server-auth-jwt:3.1.2") {
254+
exclude group: 'com.fasterxml.jackson.core'
255+
})
254256
additionalRuntimeClasspath shadowInclude(implementation("io.ktor:ktor-server-cio:3.1.2"))
255257
additionalRuntimeClasspath shadowInclude(implementation("com.github.Towdium:PinIn:1.6.0") { transitive = false })
256-
258+
additionalRuntimeClasspath jarJar(implementation("com.fasterxml.jackson.core:jackson-core:2.14.0"))
259+
additionalRuntimeClasspath jarJar(implementation("com.fasterxml.jackson.core:jackson-databind:2.14.0"))
257260
implementation "thedarkcolour:kfflang:4.11.0"
258261
implementation "thedarkcolour:kfflib:4.11.0"
259262
implementation "thedarkcolour:kffmod:4.11.0"
@@ -288,7 +291,8 @@ mixin {
288291

289292
jar {
290293
manifest.attributes([
291-
"MixinConfigs": "${mod_id}.mixins.json"
294+
"MixinConfigs": "${mod_id}.mixins.json",
295+
"Multi-Release": false
292296
])
293297
}
294298

src/main/kotlin/icu/takeneko/appwebterminal/client/ClientEvents.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ fun onRenderLevelPost(event: RenderLevelStageEvent) {
4848
if (event.stage == RenderLevelStageEvent.Stage.AFTER_LEVEL) {
4949
if (Minecraft.getInstance().screen is WebTerminalScreen) {
5050
val mainRenderTarget = Minecraft.getInstance().mainRenderTarget
51-
BlurPostProcessInstance?.apply(mainRenderTarget.frameBufferId)
51+
BlurPostProcessInstance?.apply(mainRenderTarget.colorTextureId)
5252
mainRenderTarget.bindWrite(true)
5353
}
5454
AEKeyRenderer.instance?.next()

src/main/resources/META-INF/versions/8/DONT_DELETE_ME

Whitespace-only changes.

0 commit comments

Comments
 (0)