render door pushing for players in third person

Author: PssbleTrngle

src/main/java/galena/oreganized/client/OreganizedClient.java

@@ -12,6 +12,7 @@
 import galena.oreganized.world.IDoorProgressHolder;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.geom.ModelPart;
 import net.minecraft.client.renderer.ItemBlockRenderTypes;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.entity.player.PlayerRenderer;
@@ -100,6 +101,10 @@ public static void registerGuiOverlays(RegisterGuiOverlaysEvent event) {
         event.registerAbove(VanillaGuiOverlay.FROSTBITE.id(), "stunning", new StunningOverlay());
     }
 
+    public static void renderThirdPersonArm(ModelPart arm, boolean rightArm) {
+        arm.xRot = -1.7F;
+        arm.yRot = rightArm ? -0.1F : 0.2F;
+    }
 
     @Mod.EventBusSubscriber(modid = Oreganized.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.FORGE)
     public static class ForgeBusEvents {

src/main/java/galena/oreganized/content/block/HeavyDoorBlockEntity.java

@@ -122,7 +122,7 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player
             stopUsing(state, level, pos, player);
         }
 
-        return InteractionResult.sidedSuccess(level.isClientSide);
+        return InteractionResult.FAIL;
     }
 
 }

src/main/java/galena/oreganized/mixin/PlayerMixin.java

@@ -1,8 +1,11 @@
 package galena.oreganized.mixin;
 
+import galena.oreganized.network.OreganizedNetwork;
+import galena.oreganized.network.packet.DoorPushingPacket;
 import galena.oreganized.world.IDoorProgressHolder;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.player.Player;
-import org.checkerframework.checker.units.qual.A;
+import net.minecraftforge.network.PacketDistributor;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -24,30 +27,42 @@ public class PlayerMixin implements IDoorProgressHolder {
         return oreganised$leadDoorOpeningProgress;
     }
 
+    @Unique
+    private void oreganized$syncProgress(boolean pushing) {
+        var self = (Player) (Object) this;
+
+        if (self instanceof ServerPlayer) {
+            var packet = new DoorPushingPacket(self.getUUID(), pushing);
+            OreganizedNetwork.CHANNEL.send(PacketDistributor.DIMENSION.with(self.level()::dimension), packet);
+        }
+    }
+
     @Unique
     @Override
     public int oreganised$incrementOpeningProgress() {
         var self = (Player) (Object) this;
         oreganised$lastPress = self.level().getGameTime();
+        oreganized$syncProgress(true);
         return ++oreganised$leadDoorOpeningProgress;
     }
 
     @Unique
     @Override
     public void oreganised$resetOpeningProgress() {
         oreganised$leadDoorOpeningProgress = 0;
+        oreganized$syncProgress(false);
     }
 
     @Inject(
             method = "tick",
             at = @At("HEAD")
     )
     private void oreganised$onTick(CallbackInfo ci) {
-        if(oreganised$leadDoorOpeningProgress == 0) return;
+        if (oreganised$leadDoorOpeningProgress == 0) return;
         var self = (Player) (Object) this;
-        if(self.level() == null) return;
+        if (self.level() == null || self.level().isClientSide) return;
         var time = self.level().getGameTime();
-        if(time - oreganised$lastPress > 6) oreganised$resetOpeningProgress();
+        if (time - oreganised$lastPress > 6) oreganised$resetOpeningProgress();
     }
 
 }

src/main/java/galena/oreganized/mixin/client/HumanoidModelMixin.java

@@ -0,0 +1,37 @@
+package galena.oreganized.mixin.client;
+
+import galena.oreganized.client.OreganizedClient;
+import galena.oreganized.world.IDoorProgressHolder;
+import net.minecraft.client.model.HumanoidModel;
+import net.minecraft.world.entity.LivingEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(HumanoidModel.class)
+public class HumanoidModelMixin<T extends LivingEntity> {
+
+    @Inject(method = "poseRightArm", at = @At(value = "HEAD"), cancellable = true)
+    public void poseRightArm(T entity, CallbackInfo ci) {
+        if (!(entity instanceof IDoorProgressHolder progressHolder)) return;
+        if (progressHolder.oreganised$getOpeningProgress() == 0) return;
+
+        var model = (HumanoidModel<T>) (Object) this;
+        OreganizedClient.renderThirdPersonArm(model.rightArm, true);
+
+        ci.cancel();
+    }
+
+    @Inject(method = "poseLeftArm", at = @At(value = "HEAD"), cancellable = true)
+    public void poseLeftArm(T entity, CallbackInfo ci) {
+        if (!(entity instanceof IDoorProgressHolder progressHolder)) return;
+        if (progressHolder.oreganised$getOpeningProgress() == 0) return;
+
+        var model = (HumanoidModel<T>) (Object) this;
+        OreganizedClient.renderThirdPersonArm(model.leftArm, false);
+
+        ci.cancel();
+    }
+
+}

src/main/java/galena/oreganized/network/OreganizedNetwork.java

@@ -1,6 +1,7 @@
 package galena.oreganized.network;
 
 import galena.oreganized.Oreganized;
+import galena.oreganized.network.packet.DoorPushingPacket;
 import galena.oreganized.network.packet.GargoyleParticlePacket;
 import net.minecraftforge.network.NetworkRegistry;
 import net.minecraftforge.network.simple.SimpleChannel;
@@ -18,5 +19,6 @@ public static void register() {
         int id = 0;
 
         CHANNEL.registerMessage(id++, GargoyleParticlePacket.class, GargoyleParticlePacket::write, GargoyleParticlePacket::from, GargoyleParticlePacket::handle);
+        CHANNEL.registerMessage(id++, DoorPushingPacket.class, DoorPushingPacket::write, DoorPushingPacket::from, DoorPushingPacket::handle);
     }
 }

src/main/java/galena/oreganized/network/packet/DoorPushingPacket.java

@@ -0,0 +1,40 @@
+package galena.oreganized.network.packet;
+
+import galena.oreganized.world.IDoorProgressHolder;
+import net.minecraft.client.Minecraft;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraftforge.network.NetworkEvent;
+
+import java.util.UUID;
+import java.util.function.Supplier;
+
+public record DoorPushingPacket(UUID player, boolean pushing) {
+
+    public void write(FriendlyByteBuf buffer) {
+        buffer.writeUUID(player);
+        buffer.writeBoolean(pushing);
+    }
+
+    public void handle(Supplier<NetworkEvent.Context> contextSupplier) {
+        var context = contextSupplier.get();
+        context.enqueueWork(() -> {
+            var level = Minecraft.getInstance().level;
+            if (level == null) return;
+
+            var player = level.getPlayerByUUID(player());
+            if (player instanceof IDoorProgressHolder progressHolder) {
+                if (pushing) progressHolder.oreganised$incrementOpeningProgress();
+                else progressHolder.oreganised$resetOpeningProgress();
+            }
+        });
+
+        context.setPacketHandled(true);
+    }
+
+    public static DoorPushingPacket from(FriendlyByteBuf buffer) {
+        var player = buffer.readUUID();
+        var pushing = buffer.readBoolean();
+        return new DoorPushingPacket(player, pushing);
+    }
+
+}

src/main/java/galena/oreganized/network/packet/GargoyleParticlePacket.java

@@ -8,13 +8,7 @@
 
 import java.util.function.Supplier;
 
-public class GargoyleParticlePacket {
-
-    private final BlockPos pos;
-
-    public GargoyleParticlePacket(BlockPos pos) {
-        this.pos = pos;
-    }
+public record GargoyleParticlePacket(BlockPos pos) {
 
     public void write(FriendlyByteBuf buffer) {
         buffer.writeBlockPos(pos);

src/main/resources/oreganized.mixins.json

@@ -8,7 +8,7 @@
     "MobEffectInstanceMixin", "PillagerMixin", "PlayerMixin"
   ],
   "client": [
-    "client.GuiAccessor", "client.GuiMixin", "client.HumanoidArmorLayerAccessor", "client.HumanoidArmorLayerMixin"
+    "client.GuiAccessor", "client.GuiMixin", "client.HumanoidArmorLayerAccessor", "client.HumanoidArmorLayerMixin", "client.HumanoidModelMixin"
   ],
   "server": [],
   "injectors": {