From a98cd619b6e54f31f3524842020e9aaf3b04aa56 Mon Sep 17 00:00:00 2001 From: Ethan Stevenson Date: Sat, 18 Dec 2021 13:27:39 -1000 Subject: [PATCH] Clean up + new sqlib --- build.gradle | 4 -- gradle.properties | 6 +-- src/main/java/mrnavastar/invsync/InvSync.java | 6 --- .../mrnavastar/invsync/util/Converter.java | 46 +++++++++---------- src/main/resources/fabric.mod.json | 2 +- 5 files changed, 26 insertions(+), 38 deletions(-) diff --git a/build.gradle b/build.gradle index 18732fc..dab9a34 100644 --- a/build.gradle +++ b/build.gradle @@ -20,10 +20,6 @@ dependencies { include(modImplementation("com.github.MrNavaStar:SQLib:${project.sqlib_version}")) include(modImplementation('com.github.P03W:Microconfig:2.0.4')) - - /*modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_version}") { - exclude(group: "net.fabricmc.fabric-api") - }*/ } processResources { diff --git a/gradle.properties b/gradle.properties index b5cf777..5bda542 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,13 +4,13 @@ org.gradle.jvmargs=-Xmx1G # check these on https://modmuss50.me/fabric.html minecraft_version=1.18.1 yarn_mappings=1.18.1+build.2 -loader_version=0.12.11 +loader_version=0.12.12 # Mod Properties -mod_version=v2.1.1 +mod_version=v2.1.2 maven_group=mrnavastar archives_base_name=invsync # Dependencies # check this on https://modmuss50.me/fabric.html fabric_version=0.43.1+1.18 -sqlib_version=b1bb634a77 +sqlib_version=v1.2.1 cloth_version=6.0.42 \ No newline at end of file diff --git a/src/main/java/mrnavastar/invsync/InvSync.java b/src/main/java/mrnavastar/invsync/InvSync.java index 1c6c24e..c395077 100644 --- a/src/main/java/mrnavastar/invsync/InvSync.java +++ b/src/main/java/mrnavastar/invsync/InvSync.java @@ -8,12 +8,7 @@ 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.ServerLoginConnectionEvents; -import net.fabricmc.fabric.api.networking.v1.ServerLoginNetworking; import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; -import net.minecraft.advancement.AdvancementManager; -import net.minecraft.server.network.ServerLoginNetworkHandler; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; @@ -24,7 +19,6 @@ public class InvSync implements ModInitializer { public static final String MODID = "InvSync"; public static Table playerData; public static Settings settings; - public static AdvancementManager advancementManager; private static Database database; @Override diff --git a/src/main/java/mrnavastar/invsync/util/Converter.java b/src/main/java/mrnavastar/invsync/util/Converter.java index 0442a86..43ca50e 100644 --- a/src/main/java/mrnavastar/invsync/util/Converter.java +++ b/src/main/java/mrnavastar/invsync/util/Converter.java @@ -1,8 +1,6 @@ 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; @@ -20,30 +18,30 @@ public static void updatePlayerData(ServerPlayerEntity player) { DataContainer playerDataContainer = playerData.get(player.getUuid()); if (playerDataContainer != null) { - if (settings.SYNC_INVENTORY) { - player.getInventory().readNbt((NbtList) playerDataContainer.getNbt("INVENTORY")); - player.getInventory().selectedSlot = playerDataContainer.getInt("SELECTED_SLOT"); - } - - if (settings.SYNC_ENDER_CHEST) player.getEnderChestInventory().readNbtList((NbtList) playerDataContainer.getNbt("ECHEST")); - if (settings.SYNC_FOOD_LEVEL) player.getHungerManager().readNbt((NbtCompound) playerDataContainer.getNbt("HUNGER")); - if (settings.SYNC_HEALTH) player.setHealth(playerDataContainer.getFloat("HEALTH")); - if (settings.SYNC_SCORE) player.setScore(playerDataContainer.getInt("SCORE")); - - if (settings.SYNC_XP_LEVEL) { - player.experienceLevel = playerDataContainer.getInt("XP"); - player.experienceProgress = playerDataContainer.getFloat("XP_PROGRESS"); - } - - if (settings.SYNC_STATUS_EFFECTS) { - NbtList effects = (NbtList) playerDataContainer.getNbt("EFFECTS"); - if (effects != null) { - player.clearStatusEffects(); - for (NbtElement effect : effects) { - player.addStatusEffect(StatusEffectInstance.fromNbt((NbtCompound) effect)); - } + if (settings.SYNC_INVENTORY) { + player.getInventory().readNbt((NbtList) playerDataContainer.getNbt("INVENTORY")); + player.getInventory().selectedSlot = playerDataContainer.getInt("SELECTED_SLOT"); + } + + if (settings.SYNC_ENDER_CHEST) player.getEnderChestInventory().readNbtList((NbtList) playerDataContainer.getNbt("ECHEST")); + if (settings.SYNC_FOOD_LEVEL) player.getHungerManager().readNbt((NbtCompound) playerDataContainer.getNbt("HUNGER")); + if (settings.SYNC_HEALTH) player.setHealth(playerDataContainer.getFloat("HEALTH")); + if (settings.SYNC_SCORE) player.setScore(playerDataContainer.getInt("SCORE")); + + if (settings.SYNC_XP_LEVEL) { + player.experienceLevel = playerDataContainer.getInt("XP"); + player.experienceProgress = playerDataContainer.getFloat("XP_PROGRESS"); + } + + if (settings.SYNC_STATUS_EFFECTS) { + NbtList effects = (NbtList) playerDataContainer.getNbt("EFFECTS"); + if (effects != null) { + player.clearStatusEffects(); + for (NbtElement effect : effects) { + player.addStatusEffect(StatusEffectInstance.fromNbt((NbtCompound) effect)); } } + } } } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index fb21e7b..9d83562 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -14,7 +14,7 @@ ] }, "depends": { - "fabricloader": ">=0.12.6", + "fabricloader": ">=0.12.12", "fabric": "*", "minecraft": "1.18.x" }