Skip to content

Bug Fixes #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Exterminate5573 merged 1 commit into from
Sep 6, 2025
Merged

Bug Fixes #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ configure(
dependencies {
library 'com.github.JnCrMx:discord-game-sdk4j:v0.5.5'

library 'com.fasterxml.jackson.core:jackson-core:2.8.8'
library 'com.fasterxml.jackson.core:jackson-annotations:2.8.8'
library 'com.fasterxml.jackson.core:jackson-databind:2.8.8'
library 'com.fasterxml.jackson.core:jackson-core:2.20.0'
library 'com.fasterxml.jackson.core:jackson-annotations:2.20'
library 'com.fasterxml.jackson.core:jackson-databind:2.20'

testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
Expand Down Expand Up @@ -59,7 +59,7 @@ configure(
])
}

if (project.name != "common" && project.name != "network-api") {
if (project.name != "common") {
//destinationDirectory = rootProject.buildDir
doFirst {
archiveClassifier = project.name
Expand All @@ -86,6 +86,12 @@ configure(
}


tasks.withType(JavaExec).configureEach {
if (project.name != "common") {
javaLauncher.set(javaToolchains.launcherFor(java.toolchain))
}
}

tasks.withType(JavaCompile).configureEach {
int jdkVersion = project.properties.getOrDefault("jdkVersion", 17) as int

Expand All @@ -98,11 +104,8 @@ configure(
options.encoding = 'UTF-8'
}

if (project.name != "common" && project.name != "network-api") {
if (project.name != "common") {
project.afterEvaluate {
tasks.withType(JavaExec).configureEach {
javaLauncher.set(javaToolchains.launcherFor(java.toolchain))
}

remapJar {
inputFile.set project.jar.archiveFile
Expand Down
6 changes: 5 additions & 1 deletion common/src/main/java/io/github/kurrycat/mpkmod/save/Serializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ public static void registerSerializer() {
module.addDeserializer(Color.class, new ColorDeserializer());

mapper.registerModule(module);
mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.OBJECT_AND_NON_CONCRETE, JsonTypeInfo.As.PROPERTY);
mapper.activateDefaultTyping(
mapper.getPolymorphicTypeValidator(),
ObjectMapper.DefaultTyping.OBJECT_AND_NON_CONCRETE,
JsonTypeInfo.As.PROPERTY
);
mapper.enable(SerializationFeature.INDENT_OUTPUT);

mapper.setVisibility(mapper.getSerializationConfig().getDefaultVisibilityChecker()
Expand Down
4 changes: 3 additions & 1 deletion fabric-1.21.6/src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
"authors": [
"kurrycat",
"CodeKid0 (Fabric port)",
"Exterminate",
"Zpiboo",
"Contributors"
],
"contact": {
Expand All @@ -19,7 +21,7 @@
"environment": "client",
"entrypoints": {
"main": [
"io.github.kurrycat.mpkmod.compatibility.fabric_1_21_5.MPKMod"
"io.github.kurrycat.mpkmod.compatibility.fabric_1_21_6.MPKMod"
]
},
"mixins": [
Expand Down
2 changes: 1 addition & 1 deletion forge-1.8.9/src/main/resources/mcmod.info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"mcversion": "",
"url": "https://github.com/kurrycat2004/MpkMod_2",
"updateUrl": "",
"authorList": ["kurrycat"],
"authorList": ["kurrycat", "Exterminate", "Zpiboo", "Contributors"],
"credits": "",
"logoFile": "mpkmod_logo.png",
"screenshots": [],
Expand Down