继续修改部分AR的渲染

src/main/java/com/atsuishio/superbwarfare/client/model/item/AK12ItemModel.java

@@ -6,7 +6,6 @@ import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay;
 import com.atsuishio.superbwarfare.data.gun.GunData;
 import com.atsuishio.superbwarfare.data.gun.value.AttachmentType;
 import com.atsuishio.superbwarfare.event.ClientEventHandler;
-import com.atsuishio.superbwarfare.item.gun.GunItem;
 import com.atsuishio.superbwarfare.item.gun.rifle.AK12Item;
 import net.minecraft.client.Minecraft;
 import net.minecraft.resources.ResourceLocation;
@@ -15,11 +14,10 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import software.bernie.geckolib.animation.AnimationState;
 import software.bernie.geckolib.cache.object.GeoBone;
-import software.bernie.geckolib.model.GeoModel;
 
 import static com.atsuishio.superbwarfare.event.ClientEventHandler.isProne;
 
-public class AK12ItemModel extends GeoModel<AK12Item> {
+public class AK12ItemModel extends CustomGunModel<AK12Item> {
 
     public static float fireRotY = 0f;
     public static float fireRotZ = 0f;
@@ -41,7 +39,12 @@ public class AK12ItemModel extends GeoModel<AK12Item> {
     }
 
     @Override
-    public void setCustomAnimations(AK12Item animatable, long instanceId, AnimationState animationState) {
+    public void setCustomAnimations(AK12Item animatable, long instanceId, AnimationState<AK12Item> animationState) {
+        Player player = Minecraft.getInstance().player;
+        if (player == null) return;
+        ItemStack stack = player.getMainHandItem();
+        if (shouldCancelRender(stack, animationState)) return;
+
         GeoBone gun = getAnimationProcessor().getBone("bone");
         GeoBone scope1 = getAnimationProcessor().getBone("Scope1");
         GeoBone scope2 = getAnimationProcessor().getBone("Scope2");
@@ -49,11 +52,6 @@ public class AK12ItemModel extends GeoModel<AK12Item> {
         GeoBone frontSight = getAnimationProcessor().getBone("qianjimiao");
         GeoBone shuan = getAnimationProcessor().getBone("shuan");
 
-        Player player = Minecraft.getInstance().player;
-        if (player == null) return;
-        ItemStack stack = player.getMainHandItem();
-        if (!(stack.getItem() instanceof GunItem)) return;
-
         float times = 0.6f * (float) Math.min(Minecraft.getInstance().getTimer().getRealtimeDeltaTicks(), 0.8);
         double zt = ClientEventHandler.zoomTime;
         double zp = ClientEventHandler.zoomPos;

src/main/java/com/atsuishio/superbwarfare/client/model/item/CustomGunModel.java

@@ -76,8 +76,6 @@ public abstract class CustomGunModel<T extends GunItem & GeoAnimatable> extends
             set(MolangQueries.TIME_OF_DAY, () -> mc.level.getDayTime() / 24000f);
             set(MolangQueries.MOON_PHASE, mc.level::getMoonPhase);
         }
-
-        set(MolangVariable.SBW_SYSTEM_TIME, System::currentTimeMillis);
     }
 
     public void applyCustomMolangQueries(AnimationState<T> animationState, double animTime) {
@@ -111,9 +109,8 @@ public abstract class CustomGunModel<T extends GunItem & GeoAnimatable> extends
         }
 
         var data = GunData.from(stack);
-
-        // TODO 实现正确的空判断，需要分离stack
         set(MolangVariable.SBW_IS_EMPTY, () -> data.isEmpty.get() ? 1 : 0);
+        set(MolangVariable.SBW_IS_EMPTY, System::currentTimeMillis);
     }
 
     private static void set(String key, DoubleSupplier value) {
@@ -121,7 +118,8 @@ public abstract class CustomGunModel<T extends GunItem & GeoAnimatable> extends
     }
 
     private void resetQueryValue() {
-        MathParser.setVariable(MolangVariable.SBW_IS_EMPTY, () -> 0);
+        set(MolangVariable.SBW_IS_EMPTY, () -> 0);
+        set(MolangVariable.SBW_IS_EMPTY, () -> 0);
     }
 
     public boolean shouldCancelRender(ItemStack stack, AnimationState<T> animationState) {

src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/AK12ItemRenderer.java

@@ -14,7 +14,9 @@ import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
+import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
+import software.bernie.geckolib.animatable.GeoItem;
 import software.bernie.geckolib.cache.object.GeoBone;
 
 public class AK12ItemRenderer extends CustomGunRenderer<AK12Item> {
@@ -36,19 +38,20 @@ public class AK12ItemRenderer extends CustomGunRenderer<AK12Item> {
         }
 
         var player = mc.player;
-        if (player != null) {
+        if (player == null) return;
+        ItemStack itemStack = player.getMainHandItem();
 
-            ItemStack itemStack = player.getMainHandItem();
+        if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) {
-            if (!(itemStack.getItem() instanceof GunItem)) return;
+            if (this.renderPerspective == ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) {
+                if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 2
+                        && (name.equals("hidden2"))) {
+                    bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom);
+                }
 
-            if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 2
+                if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 3
-                    && (name.equals("hidden2"))) {
+                        && (name.equals("jing") || name.equals("Barrel") || name.equals("humu") || name.equals("qiangguan") || name.equals("houzhunxing"))) {
-                bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom);
+                    bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom);
-            }
+                }
-
-            if (GunData.from(itemStack).attachment.get(AttachmentType.SCOPE) == 3
-                    && (name.equals("jing") || name.equals("Barrel") || name.equals("humu") || name.equals("qiangguan") || name.equals("houzhunxing"))) {
-                bone.setHidden(ClientEventHandler.zoomPos > 0.7 && ClientEventHandler.zoom);
             }
 
             int scopeType = GunData.from(itemStack).attachment.get(AttachmentType.SCOPE);
@@ -63,8 +66,9 @@ public class AK12ItemRenderer extends CustomGunRenderer<AK12Item> {
             }
 
             AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, -0.012, 0.02, 1.25229375, 0.3);
-
             ItemModelHelper.handleGunAttachments(bone, itemStack, name);
+        } else {
+            ItemModelHelper.hideAllAttachments(bone, name);
         }
 
         if (renderingArms) {

src/main/java/com/atsuishio/superbwarfare/client/renderer/gun/SksItemRenderer.java

@@ -10,6 +10,7 @@ import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
+import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
 import software.bernie.geckolib.animatable.GeoItem;
 import software.bernie.geckolib.cache.object.GeoBone;
@@ -36,8 +37,16 @@ public class SksItemRenderer extends CustomGunRenderer<SksItem> {
         if (player == null) return;
         ItemStack itemStack = player.getMainHandItem();
         if (itemStack.getItem() instanceof GunItem && GeoItem.getId(itemStack) == this.getInstanceId(animatable)) {
+            if (this.renderPerspective != ItemDisplayContext.FIRST_PERSON_RIGHT_HAND) {
+                if (bone.getName().equals("magazine2")) {
+                    bone.setHidden(true);
+                }
+            }
+
             AnimationHelper.handleZoomCrossHair(currentBuffer, renderType, name, stack, bone, buffer, 0, 0.25654375, 20, 2f, 0, 255, 0, 255, "okp_7", false);
             AnimationHelper.handleShootFlare(name, stack, itemStack, bone, buffer, packedLightIn, 0, 0, 1.4375, 0.35);
+        } else if (bone.getName().equals("magazine2")) {
+            bone.setHidden(true);
         }
 
         if (renderingArms) {

src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/AK12Item.java

@@ -15,9 +15,11 @@ import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Rarity;
 import software.bernie.geckolib.animation.*;
+import software.bernie.geckolib.constant.DataTickets;
 import software.bernie.geckolib.renderer.GeoItemRenderer;
 
 import java.util.Set;
@@ -44,8 +46,10 @@ public class AK12Item extends GunItem {
         if (player == null) return PlayState.STOP;
         ItemStack stack = player.getMainHandItem();
         if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP;
-        var data = GunData.from(stack);
+        if (event.getData(DataTickets.ITEM_RENDER_PERSPECTIVE) != ItemDisplayContext.FIRST_PERSON_RIGHT_HAND)
+            return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak_12.idle"));
 
+        var data = GunData.from(stack);
         boolean drum = data.attachment.get(AttachmentType.MAGAZINE) == 2;
         boolean grip = data.attachment.get(AttachmentType.GRIP) == 1 || data.attachment.get(AttachmentType.GRIP) == 2;
 
@@ -97,6 +101,8 @@ public class AK12Item extends GunItem {
         if (player == null) return PlayState.STOP;
         ItemStack stack = player.getMainHandItem();
         if (!(stack.getItem() instanceof GunItem)) return PlayState.STOP;
+        if (event.getData(DataTickets.ITEM_RENDER_PERSPECTIVE) != ItemDisplayContext.FIRST_PERSON_RIGHT_HAND)
+            return event.setAndContinue(RawAnimation.begin().thenLoop("animation.ak_12.idle"));
 
         if (ClickHandler.isEditing) {
             return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak_12.edit"));