Shift ClientHooks to common, deprecate LootrAPI::getPlayer.

Author: noobanidus

common/src/main/java/noobanidus/mods/lootr/common/api/IClientOpeners.java

@@ -28,15 +28,6 @@ default boolean clearOpeners () {
     return result;
   }
 
-  default boolean hasClientOpened () {
-    Player player = LootrAPI.getPlayer();
-    if (player == null) {
-      return false;
-    }
-
-    return hasClientOpened(player.getUUID());
-  }
-
   default boolean hasClientOpened (UUID uuid) {
     Set<UUID> clientOpeners = getClientOpeners();
     if (clientOpeners != null && !clientOpeners.isEmpty() && clientOpeners.contains(uuid)) {

fabric/src/main/java/noobanidus/mods/lootr/fabric/ClientHooks.java renamed to common/src/main/java/noobanidus/mods/lootr/common/client/ClientHooks.java

@@ -1,4 +1,4 @@
-package noobanidus.mods.lootr.fabric;
+package noobanidus.mods.lootr.common.client;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;

fabric/src/main/java/noobanidus/mods/lootr/fabric/block/entity/LootrFabricBarrelBlockEntity.java

@@ -5,7 +5,7 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.block.state.BlockState;
 import noobanidus.mods.lootr.common.block.entity.LootrBarrelBlockEntity;
-import noobanidus.mods.lootr.fabric.ClientHooks;
+import noobanidus.mods.lootr.common.client.ClientHooks;
 import org.jetbrains.annotations.Nullable;
 
 public class LootrFabricBarrelBlockEntity extends LootrBarrelBlockEntity implements RenderDataBlockEntity {

fabric/src/main/java/noobanidus/mods/lootr/fabric/mixins/client/MixinClientPacketListener.java

@@ -5,7 +5,7 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import noobanidus.mods.lootr.common.api.LootrAPI;
 import noobanidus.mods.lootr.common.api.data.blockentity.ILootrBlockEntity;
-import noobanidus.mods.lootr.fabric.ClientHooks;
+import noobanidus.mods.lootr.common.client.ClientHooks;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

fabric/src/main/java/noobanidus/mods/lootr/fabric/network/LootrNetworkingInit.java

@@ -7,7 +7,7 @@
 import noobanidus.mods.lootr.common.api.LootrAPI;
 import noobanidus.mods.lootr.common.api.data.blockentity.ILootrBlockEntity;
 import noobanidus.mods.lootr.common.api.data.entity.ILootrCart;
-import noobanidus.mods.lootr.fabric.ClientHooks;
+import noobanidus.mods.lootr.common.client.ClientHooks;
 import noobanidus.mods.lootr.fabric.network.to_client.PacketCloseCart;
 import noobanidus.mods.lootr.fabric.network.to_client.PacketCloseContainer;
 import noobanidus.mods.lootr.fabric.network.to_client.PacketOpenCart;

neoforge/src/main/java/noobanidus/mods/lootr/neoforge/block/entity/LootrNeoForgeBarrelBlockEntity.java

@@ -1,9 +1,11 @@
 package noobanidus.mods.lootr.neoforge.block.entity;
 
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.block.state.BlockState;
 import net.neoforged.neoforge.client.model.data.ModelData;
 import noobanidus.mods.lootr.common.block.entity.LootrBarrelBlockEntity;
+import noobanidus.mods.lootr.common.client.ClientHooks;
 import noobanidus.mods.lootr.neoforge.init.ModBlockProperties;
 import org.jetbrains.annotations.NotNull;
 
@@ -20,10 +22,11 @@ public ModelData getModelData() {
     if (modelData == null) {
       modelData = ModelData.builder().with(ModBlockProperties.OPENED, false).build();
     }
-    if (hasClientOpened()) {
-      return modelData.derive().with(ModBlockProperties.OPENED, true).build();
-    } else {
+    Player player = ClientHooks.getPlayer();
+    if (player == null || !hasClientOpened(player.getUUID())) {
       return modelData.derive().with(ModBlockProperties.OPENED, false).build();
+    } else {
+      return modelData.derive().with(ModBlockProperties.OPENED, true).build();
     }
   }
 }