Skip to content

Fix migration crash #131

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
RecursivePineapple merged 1 commit into from
Dec 16, 2025
Merged

Fix migration crash #131

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: 12 additions & 7 deletions ...ain/java/com/recursive_pineapple/matter_manipulator/common/items/manipulator/MMState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ public class MMState {
.create();

@SerializedName("jv")
private int jsonVersion = 0;
private int jsonVersion = LASTEST_JSON_VERSION;
@SerializedName("dv")
private int dataVersion = 0;
private int dataVersion = LASTEST_DATA_VERSION;

public MMConfig config = new MMConfig();

Expand Down Expand Up @@ -138,8 +138,11 @@ public MMState clone() {
return copy;
}

private static final int LASTEST_JSON_VERSION = 2;
private static final int LASTEST_DATA_VERSION = 0;

private static void migrateJson(JsonObject obj) {
int version = obj.has("jv") ? obj.get("jv").getAsInt() : 2;
int version = obj.has("jv") ? obj.get("jv").getAsInt() : LASTEST_JSON_VERSION;

if (version == 0) {
if (obj.get("config") instanceof JsonObject config) {
Expand All @@ -157,11 +160,13 @@ private static void migrateJson(JsonObject obj) {

if (version == 1) {
try {
// Load with the default encoder
BitSet bitSet = new Gson().fromJson(obj.get("installedUpgrades"), BitSet.class);
if (obj.get("installedUpgrades") != null && obj.get("installedUpgrades").isJsonArray()) {
// Load with the default encoder
BitSet bitSet = new Gson().fromJson(obj.get("installedUpgrades"), BitSet.class);

// Save with the new encoder
obj.add("installedUpgrades", GSON.toJsonTree(bitSet));
// Save with the new encoder
obj.add("installedUpgrades", GSON.toJsonTree(bitSet));
}
} catch (Throwable t) {
MMMod.LOG.error("Could not migrate installedUpgrades: your MM upgrades may have been deleted.", t);
}
Expand Down