From 900e8bdd343c0261f2ed69f6141aa5b66ec34628 Mon Sep 17 00:00:00 2001 From: Ethan Stevenson Date: Sun, 12 Dec 2021 02:38:53 -0700 Subject: [PATCH] Janky fix for syncing --- src/main/java/mrnavastar/invsync/InvSync.java | 11 ++++++++--- src/main/java/mrnavastar/invsync/util/Converter.java | 5 ++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/mrnavastar/invsync/InvSync.java b/src/main/java/mrnavastar/invsync/InvSync.java index 4671df3..fe14efa 100644 --- a/src/main/java/mrnavastar/invsync/InvSync.java +++ b/src/main/java/mrnavastar/invsync/InvSync.java @@ -8,16 +8,21 @@ import mrnavastar.sqlib.api.databases.MySQLDatabase; import mrnavastar.sqlib.api.databases.SQLiteDatabase; import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; +import net.minecraft.advancement.AdvancementManager; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; +import java.util.concurrent.TimeUnit; + public class InvSync implements ModInitializer { public static final String MODID = "InvSync"; public static Table playerData; public static Settings settings; - public static Database database; + public static AdvancementManager advancementManager; + private static Database database; @Override public void onInitialize() { @@ -40,14 +45,14 @@ public void onInitialize() { playerData = database.createTable("PlayerData"); ServerPlayConnectionEvents.INIT.register((handler, server) -> { - /*try { + try { TimeUnit.SECONDS.sleep(1); //Maybe we can find a less shit solution in the future playerData.beginTransaction(); Converter.updatePlayerData(handler.getPlayer()); playerData.endTransaction(); } catch (InterruptedException e) { e.printStackTrace(); - }*/ + } playerData.beginTransaction(); Converter.updatePlayerData(handler.getPlayer()); playerData.endTransaction(); diff --git a/src/main/java/mrnavastar/invsync/util/Converter.java b/src/main/java/mrnavastar/invsync/util/Converter.java index 26eb195..0442a86 100644 --- a/src/main/java/mrnavastar/invsync/util/Converter.java +++ b/src/main/java/mrnavastar/invsync/util/Converter.java @@ -1,18 +1,21 @@ package mrnavastar.invsync.util; import mrnavastar.sqlib.api.DataContainer; +import net.minecraft.advancement.Advancement; +import net.minecraft.advancement.AdvancementCriterion; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtElement; import net.minecraft.nbt.NbtList; +import net.minecraft.server.network.ServerPlayerEntity; import static mrnavastar.invsync.InvSync.playerData; import static mrnavastar.invsync.InvSync.settings; public class Converter { - public static void updatePlayerData(PlayerEntity player) { + public static void updatePlayerData(ServerPlayerEntity player) { if (settings.SYNC_CREATIVE_MODE || !player.isCreative()) { DataContainer playerDataContainer = playerData.get(player.getUuid());