From 266fcf04731cbf67a7b6000906ef63b7583b1876 Mon Sep 17 00:00:00 2001 From: mlus <1319237806@qq.com> Date: Sun, 11 Feb 2024 16:17:26 +0800 Subject: [PATCH] Code Clean --- .../vip/fubuki/playersync/PlayerSync.java | 7 +- .../mixin/MixinServerQuestFile.java | 95 ------------------- .../mixin/accessor/QuestFileAccessor.java | 21 ---- src/main/resources/playersync.mixin.json | 4 +- 4 files changed, 4 insertions(+), 123 deletions(-) delete mode 100644 src/main/java/vip/fubuki/playersync/mixin/MixinServerQuestFile.java delete mode 100644 src/main/java/vip/fubuki/playersync/mixin/accessor/QuestFileAccessor.java diff --git a/src/main/java/vip/fubuki/playersync/PlayerSync.java b/src/main/java/vip/fubuki/playersync/PlayerSync.java index 5213884..26ad134 100644 --- a/src/main/java/vip/fubuki/playersync/PlayerSync.java +++ b/src/main/java/vip/fubuki/playersync/PlayerSync.java @@ -35,10 +35,9 @@ public class PlayerSync if(!resultSet.next()){ JDBCsetUp.executeUpdate("INSERT INTO AstralSorcery(player,tag) VALUES('"+player_uuid+"','{}');"); } - - queryResult=JDBCsetUp.executeQuery("SELECT * FROM FTB WHERE player='" + player_uuid + "';"); - resultSet=queryResult.getResultSet(); - if(!resultSet.next()){ + JDBCsetUp.QueryResult queryResult1=JDBCsetUp.executeQuery("SELECT * FROM FTB WHERE player='" + player_uuid + "';"); + ResultSet resultSet1=queryResult1.getResultSet(); + if(!resultSet1.next()){ JDBCsetUp.executeUpdate("INSERT INTO FTB(player,tag) VALUES('"+player_uuid+"','{}');"); } } diff --git a/src/main/java/vip/fubuki/playersync/mixin/MixinServerQuestFile.java b/src/main/java/vip/fubuki/playersync/mixin/MixinServerQuestFile.java deleted file mode 100644 index 5c8a325..0000000 --- a/src/main/java/vip/fubuki/playersync/mixin/MixinServerQuestFile.java +++ /dev/null @@ -1,95 +0,0 @@ -package vip.fubuki.playersync.mixin; - - -import dev.ftb.mods.ftbquests.quest.ServerQuestFile; -import net.minecraft.server.MinecraftServer; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import java.nio.file.Path; - -@Mixin(ServerQuestFile.class) -public abstract class MixinServerQuestFile { - - @Shadow @Final public MinecraftServer server; - - @Shadow - private boolean shouldSave; - - @Shadow private Path folder; - @Shadow private boolean isLoading; - - @Shadow public abstract Path getFolder(); - - @Inject(method ="saveNow",at = @At("RETURN"), cancellable = true) - private void saveNow(CallbackInfo ci){ -// if (shouldSave) { -// ((QuestFileAccessor) this).invokeWriteDataFull(this.getFolder()); -// shouldSave = false; -// } -// -// Path path = server.getWorldPath(FTBQUESTS_DATA); -// -// for (TeamData data : ((QuestFileAccessor) this).invokeGetAllData()) { -// if (data.shouldSave) { -// SNBT.write(path.resolve(data.uuid + ".snbt"), data.serializeNBT()); -// -// String nbt = data.serializeNBT().toString(); -// nbt.replace(",", "|").replace("\"", "^").replace("{", "<").replace("}", ">").replace("'", "~"); -// try { -// PreparedStatement preparedStatement = JDBCsetUp.getConnection().prepareStatement("UPDATE FTB SET tag=? WHERE player=?"); -// preparedStatement.setString(2, data.uuid.toString()); -// preparedStatement.setString(1, nbt); -// preparedStatement.executeUpdate(); -// } catch (SQLException throwable) { -// throwable.printStackTrace(); -// } -// -// data.shouldSave = false; -// } -// } -// -// ci.cancel(); - } - - @Inject(method="load",at = @At("HEAD")) - private void load(CallbackInfo ci){ -// folder = Platform.getConfigFolder().resolve("ftbquests/quests"); -// -// if (Files.exists(folder)) { -// FTBQuests.LOGGER.info("Loading quests from " + folder); -// isLoading = true; -// ((QuestFileAccessor)this).invokeReadDataFull(folder); -// isLoading = false; -// } -// -// Path path = server.getWorldPath(FTBQUESTS_DATA); -// -// if (Files.exists(path)) { -// try { -// Files.list(path).filter(p -> p.getFileName().toString().contains("-")).forEach(path1 -> { -// SNBTCompoundTag nbt = SNBT.read(path1); -// -// if (nbt != null) { -// try { -// UUID uuid = UUIDTypeAdapter.fromString(nbt.getString("uuid")); -// TeamData data = new TeamData(uuid); -// data.file = (ServerQuestFile)((Object)this); -// this.addData(data, true); -// data.deserializeNBT(nbt); -// } catch (Exception ex) { -// ex.printStackTrace(); -// } -// } -// }); -// } catch (Exception ex) { -// ex.printStackTrace(); -// } -// } - - } -} diff --git a/src/main/java/vip/fubuki/playersync/mixin/accessor/QuestFileAccessor.java b/src/main/java/vip/fubuki/playersync/mixin/accessor/QuestFileAccessor.java deleted file mode 100644 index d91bf62..0000000 --- a/src/main/java/vip/fubuki/playersync/mixin/accessor/QuestFileAccessor.java +++ /dev/null @@ -1,21 +0,0 @@ -package vip.fubuki.playersync.mixin.accessor; - -import dev.ftb.mods.ftbquests.quest.QuestFile; -import dev.ftb.mods.ftbquests.quest.TeamData; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -import java.nio.file.Path; -import java.util.Collection; - -@Mixin(value = QuestFile.class,remap = false) -public interface QuestFileAccessor { - @Invoker - void invokeWriteDataFull(Path folder); - @Invoker - Collection invokeGetAllData(); - - @Invoker - void invokeReadDataFull(Path folder); - void invokeAddData(TeamData data, boolean override); -} diff --git a/src/main/resources/playersync.mixin.json b/src/main/resources/playersync.mixin.json index 727c479..c9f308d 100644 --- a/src/main/resources/playersync.mixin.json +++ b/src/main/resources/playersync.mixin.json @@ -4,9 +4,7 @@ "compatibilityLevel": "JAVA_8", "refmap": "thirst.refmap.json", "mixins": [ - "MixinPlayerProgress", - "MixinServerQuestFile", - "accessor.QuestFileAccessor" + "MixinPlayerProgress" ], "client": [ ],