From 4bac8fcc852b5928ac2362a8b7ea0aaf660fa591 Mon Sep 17 00:00:00 2001 From: Kli Kli Date: Sat, 13 Jan 2024 15:04:23 +0100 Subject: [PATCH] chore: cleanup for devil familiar --- .../client/model/entity/DevilFamiliarModel.java | 11 ----------- .../client/render/entity/DevilFamiliarRenderer.java | 3 --- .../common/entity/familiar/DevilFamiliarEntity.java | 2 +- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/main/java/com/klikli_dev/occultism/client/model/entity/DevilFamiliarModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/DevilFamiliarModel.java index a30902b34..6f8de70d8 100644 --- a/src/main/java/com/klikli_dev/occultism/client/model/entity/DevilFamiliarModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/DevilFamiliarModel.java @@ -41,17 +41,6 @@ public class DevilFamiliarModel extends DefaultedGeoModel { - /** - * Create a new instance of this model class.
- * The asset path should be the truncated relative path from the base folder.
- * E.G. - *
-     *     {@code
-     * 		new ResourceLocation("myMod", "animals/red_fish")
-     *                }
- * - * @param assetSubpath - */ public DevilFamiliarModel() { super(new ResourceLocation(Occultism.MODID, "familiar_devil")); } diff --git a/src/main/java/com/klikli_dev/occultism/client/render/entity/DevilFamiliarRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/DevilFamiliarRenderer.java index 5b359ef4b..5f98b4a7d 100644 --- a/src/main/java/com/klikli_dev/occultism/client/render/entity/DevilFamiliarRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/DevilFamiliarRenderer.java @@ -2,10 +2,7 @@ import com.klikli_dev.occultism.client.model.entity.DevilFamiliarModel; import com.klikli_dev.occultism.common.entity.familiar.DevilFamiliarEntity; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.EntityRendererProvider; -import net.minecraft.resources.ResourceLocation; import software.bernie.geckolib.renderer.GeoEntityRenderer; public class DevilFamiliarRenderer extends GeoEntityRenderer { diff --git a/src/main/java/com/klikli_dev/occultism/common/entity/familiar/DevilFamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/DevilFamiliarEntity.java index ea8990af9..3294f2eb9 100644 --- a/src/main/java/com/klikli_dev/occultism/common/entity/familiar/DevilFamiliarEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/DevilFamiliarEntity.java @@ -118,7 +118,7 @@ public void registerControllers(AnimatableManager.ControllerRegistrar controller @Override public int getCurrentSwingDuration() { - return 10; //to match our attack animation speed + return 11; //to match our attack animation speed + 1 tick } private PlayState animPredicate(AnimationState tAnimationState) {