kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

修复泰瑟枪导致的崩溃bug

Browse source
This commit is contained in:
Atsuihsio 2024-12-02 01:13:36 +08:00
parent fcc78698f5
commit 786267a1d5
1 changed files with 0 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/main/java/com/atsuishio/superbwarfare/client/model/item/TaserItemModel.java
View file

@ -3,22 +3,17 @@ package com.atsuishio.superbwarfare.client.model.item;
import com.atsuishio.superbwarfare.ModUtils; import com.atsuishio.superbwarfare.ModUtils;
import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.AnimationHelper;
import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.event.ClientEventHandler;
import com.atsuishio.superbwarfare.init.ModPerks;
import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.init.ModTags;
import com.atsuishio.superbwarfare.item.gun.special.TaserItem; import com.atsuishio.superbwarfare.item.gun.special.TaserItem;
import com.atsuishio.superbwarfare.perk.PerkHelper;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraftforge.common.capabilities.ForgeCapabilities;
import software.bernie.geckolib.core.animatable.model.CoreGeoBone; import software.bernie.geckolib.core.animatable.model.CoreGeoBone;
import software.bernie.geckolib.core.animation.AnimationState; import software.bernie.geckolib.core.animation.AnimationState;
import software.bernie.geckolib.model.GeoModel; import software.bernie.geckolib.model.GeoModel;
import java.util.concurrent.atomic.AtomicInteger;
public class TaserItemModel extends GeoModel<TaserItem> { public class TaserItemModel extends GeoModel<TaserItem> {
@Override @Override
@ -40,9 +35,6 @@ public class TaserItemModel extends GeoModel<TaserItem> {
public void setCustomAnimations(TaserItem animatable, long instanceId, AnimationState animationState) { public void setCustomAnimations(TaserItem animatable, long instanceId, AnimationState animationState) {
CoreGeoBone gun = getAnimationProcessor().getBone("bone"); CoreGeoBone gun = getAnimationProcessor().getBone("bone");
CoreGeoBone shen = getAnimationProcessor().getBone("shen"); CoreGeoBone shen = getAnimationProcessor().getBone("shen");
CoreGeoBone bar = getAnimationProcessor().getBone("bar");
CoreGeoBone bluecover = getAnimationProcessor().getBone("bluecover");
CoreGeoBone redcover = getAnimationProcessor().getBone("redcover");
Player player = Minecraft.getInstance().player; Player player = Minecraft.getInstance().player;
if (player == null) return; if (player == null) return;
@ -67,31 +59,6 @@ public class TaserItemModel extends GeoModel<TaserItem> {
double fp = ClientEventHandler.firePos; double fp = ClientEventHandler.firePos;
double fr = ClientEventHandler.fireRot; double fr = ClientEventHandler.fireRot;
AtomicInteger energy = new AtomicInteger(0);
stack.getCapability(ForgeCapabilities.ENERGY).ifPresent(
e -> energy.set(e.getEnergyStored())
);
int perkLevel = PerkHelper.getItemPerkLevel(ModPerks.VOLT_OVERLOAD.get(), stack);
bar.setScaleX((float) energy.get() / 12000);
if (energy.get() >= 2000 + 200 * perkLevel) {
bluecover.setScaleX(1);
bluecover.setScaleY(1);
bluecover.setScaleZ(1);
redcover.setScaleX(0);
redcover.setScaleY(0);
redcover.setScaleZ(0);
} else {
bluecover.setScaleX(0);
bluecover.setScaleY(0);
bluecover.setScaleZ(0);
redcover.setScaleX(1);
redcover.setScaleY(1);
redcover.setScaleZ(1);
}
shen.setPosX((float) (0.75f * ClientEventHandler.recoilHorizon * fpz * fp)); shen.setPosX((float) (0.75f * ClientEventHandler.recoilHorizon * fpz * fp));
shen.setPosY((float) (-0.03f * fp - 0.06f * fr)); shen.setPosY((float) (-0.03f * fp - 0.06f * fr));
shen.setPosZ((float) (0.725 * fp + 0.34f * fr + 0.45 * fpz)); shen.setPosZ((float) (0.725 * fp + 0.34f * fr + 0.45 * fpz));