优化部分代码

This commit is contained in:
17146 2024-08-16 02:40:31 +08:00
parent 8619c0cdcc
commit 3f114d69eb
4 changed files with 12 additions and 5 deletions

View file

@ -30,6 +30,7 @@ import net.minecraft.world.phys.shapes.VoxelShape;
import java.util.List; import java.util.List;
@SuppressWarnings("deprecation")
public class BarbedWireBlock extends Block { public class BarbedWireBlock extends Block {
public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
public static final DirectionProperty FACING = HorizontalDirectionalBlock.FACING; public static final DirectionProperty FACING = HorizontalDirectionalBlock.FACING;

View file

@ -22,6 +22,7 @@ import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraft.world.phys.shapes.VoxelShape;
@SuppressWarnings("deprecation")
public class DragonTeethBlock extends Block { public class DragonTeethBlock extends Block {
public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
public DragonTeethBlock() { public DragonTeethBlock() {

View file

@ -79,11 +79,11 @@ public class M4ItemRenderer extends GeoItemRenderer<M4Item> {
if (name.equals("flare")) { if (name.equals("flare")) {
Player player = Minecraft.getInstance().player; Player player = Minecraft.getInstance().player;
ItemStack pstack = null; ItemStack itemStack = null;
if (player != null) { if (player != null) {
pstack = player.getMainHandItem(); itemStack = player.getMainHandItem();
} }
if (pstack != null && pstack.getOrCreateTag().getDouble("flash_time") > 0) { if (itemStack != null && itemStack.getOrCreateTag().getDouble("flash_time") > 0) {
bone.setHidden(false); bone.setHidden(false);
bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5))); bone.setScaleX((float) (0.55 + 0.5 * (Math.random() - 0.5)));
bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5)));
@ -95,6 +95,11 @@ public class M4ItemRenderer extends GeoItemRenderer<M4Item> {
if (this.transformType.firstPerson() && renderingArms) { if (this.transformType.firstPerson() && renderingArms) {
AbstractClientPlayer player = mc.player; AbstractClientPlayer player = mc.player;
if (player == null) {
return;
}
PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player);
PlayerModel<AbstractClientPlayer> model = playerRenderer.getModel(); PlayerModel<AbstractClientPlayer> model = playerRenderer.getModel();
stack.pushPose(); stack.pushPose();

View file

@ -388,7 +388,7 @@ public class Mle1934Entity extends PathfinderMob implements GeoEntity, ICannonEn
.add(Attributes.KNOCKBACK_RESISTANCE, 1); .add(Attributes.KNOCKBACK_RESISTANCE, 1);
} }
private PlayState movementPredicate(AnimationState event) { private PlayState movementPredicate(AnimationState<Mle1934Entity> event) {
if (this.animationprocedure.equals("empty")) { if (this.animationprocedure.equals("empty")) {
if (this.getFirstPassenger() != null) { if (this.getFirstPassenger() != null) {
@ -408,7 +408,7 @@ public class Mle1934Entity extends PathfinderMob implements GeoEntity, ICannonEn
return PlayState.STOP; return PlayState.STOP;
} }
private PlayState procedurePredicate(AnimationState event) { private PlayState procedurePredicate(AnimationState<Mle1934Entity> event) {
if (!animationprocedure.equals("empty") && event.getController().getAnimationState() == AnimationController.State.STOPPED) { if (!animationprocedure.equals("empty") && event.getController().getAnimationState() == AnimationController.State.STOPPED) {
event.getController().setAnimation(RawAnimation.begin().thenPlay(this.animationprocedure)); event.getController().setAnimation(RawAnimation.begin().thenPlay(this.animationprocedure));
if (event.getController().getAnimationState() == AnimationController.State.STOPPED) { if (event.getController().getAnimationState() == AnimationController.State.STOPPED) {