R3944Realms/PlayerSync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix error symbol

Browse Source
This commit is contained in:
mlus 2025-05-02 00:35:47 +08:00
parent e5ba5cadac
commit c1778a956c
2 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/vip/fubuki/playersync/sync/ModsSupport.java
View File

@ -49,15 +49,13 @@ public class ModsSupport {
Map<String, String> storedMap = LocalJsonUtil.StringToMap(curiosData); Map<String, String> storedMap = LocalJsonUtil.StringToMap(curiosData);
// Clear current Curios slots to avoid conflicts. // Clear current Curios slots to avoid conflicts.
handlerOpt.ifPresent(handler -> { handlerOpt.ifPresent(handler -> handler.getCurios().forEach((slotType, stacksHandler) -> {
handler.getCurios().forEach((slotType, stacksHandler) -> { // Use the dynamic stack handler to clear slots.
// Use the dynamic stack handler to clear slots. IDynamicStackHandler dynStacks = stacksHandler.getStacks();
IDynamicStackHandler dynStacks = stacksHandler.getStacks(); for (int i = 0; i < dynStacks.getSlots(); i++) {
for (int i = 0; i < dynStacks.getSlots(); i++) { dynStacks.setStackInSlot(i, ItemStack.EMPTY);
dynStacks.setStackInSlot(i, ItemStack.EMPTY); }
} }));
});
});
// Restore each saved item. // Restore each saved item.
handlerOpt.ifPresent(handler -> { handlerOpt.ifPresent(handler -> {
@ -109,7 +107,7 @@ public class ModsSupport {
if (uuidOpt.isPresent()) { if (uuidOpt.isPresent()) {
UUID contentsUuid = uuidOpt.get(); UUID contentsUuid = uuidOpt.get();
try { try {
JDBCsetUp.QueryResult qrBackpack = JDBCsetUp.executeQuery("SELECT backpack_nbt FROM backpack_data WHERE uuid='" + contentsUuid.toString() + "'"); JDBCsetUp.QueryResult qrBackpack = JDBCsetUp.executeQuery("SELECT backpack_nbt FROM backpack_data WHERE uuid='" + contentsUuid + "'");
ResultSet rsBackpack = qrBackpack.resultSet(); ResultSet rsBackpack = qrBackpack.resultSet();
if (rsBackpack.next()) { if (rsBackpack.next()) {
String serialized = rsBackpack.getString("backpack_nbt"); String serialized = rsBackpack.getString("backpack_nbt");
@ -186,7 +184,7 @@ public class ModsSupport {
String serialized = VanillaSync.serialize(backpackNbt.toString()); String serialized = VanillaSync.serialize(backpackNbt.toString());
try { try {
// Use REPLACE INTO so existing records are updated // Use REPLACE INTO so existing records are updated
JDBCsetUp.executeUpdate("REPLACE INTO backpack_data (uuid, backpack_nbt) VALUES ('" + contentsUuid.toString() + "', '" + serialized + "')"); JDBCsetUp.executeUpdate("REPLACE INTO backpack_data (uuid, backpack_nbt) VALUES ('" + contentsUuid + "', '" + serialized + "')");
PlayerSync.LOGGER.info("Saved backpack data for UUID " + contentsUuid); PlayerSync.LOGGER.info("Saved backpack data for UUID " + contentsUuid);
} catch (SQLException e) { } catch (SQLException e) {
PlayerSync.LOGGER.error("Error saving backpack data for UUID " + contentsUuid, e); PlayerSync.LOGGER.error("Error saving backpack data for UUID " + contentsUuid, e);

27
src/main/java/vip/fubuki/playersync/sync/VanillaSync.java
View File

@ -1,20 +1,6 @@
package vip.fubuki.playersync.sync; package vip.fubuki.playersync.sync;
import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.CommandSyntaxException;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Base64;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.NbtUtils; import net.minecraft.nbt.NbtUtils;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
@ -36,11 +22,20 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.server.ServerLifecycleHooks; import net.minecraftforge.server.ServerLifecycleHooks;
import vip.fubuki.playersync.PlayerSync; import vip.fubuki.playersync.PlayerSync;
import vip.fubuki.playersync.config.JdbcConfig; import vip.fubuki.playersync.config.JdbcConfig;
import vip.fubuki.playersync.sync.ModsSupport;
import vip.fubuki.playersync.util.JDBCsetUp; import vip.fubuki.playersync.util.JDBCsetUp;
import vip.fubuki.playersync.util.LocalJsonUtil; import vip.fubuki.playersync.util.LocalJsonUtil;
import vip.fubuki.playersync.util.PSThreadPoolFactory; import vip.fubuki.playersync.util.PSThreadPoolFactory;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@Mod.EventBusSubscriber @Mod.EventBusSubscriber
public class VanillaSync { public class VanillaSync {
@ -223,7 +218,7 @@ public class VanillaSync {
// Check the config option for backwards compatibility during writing // Check the config option for backwards compatibility during writing
if (JdbcConfig.USE_LEGACY_SERIALIZATION.get()) { if (JdbcConfig.USE_LEGACY_SERIALIZATION.get()) {
// Use old custom replacement logic // Use old custom replacement logic
return objeåct.replace(",", "|") return object.replace(",", "|")
.replace("\"", "^") .replace("\"", "^")
.replace("{", "<") .replace("{", "<")
.replace("}", ">") .replace("}", ">")