Polish the Polish

enjarai · Mar 1, 2025 · b39c801 · b39c801
1 parent 8198e9f
commit b39c801
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/src/client/java/dev/enjarai/trickster/render/entity/LevitatingBlockEntityRenderer.java b/src/client/java/dev/enjarai/trickster/render/entity/LevitatingBlockEntityRenderer.java
@@ -4,14 +4,12 @@
 import net.minecraft.block.BlockRenderType;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
-import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.RenderLayers;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.client.render.block.BlockRenderManager;
-import net.minecraft.client.render.block.entity.BlockEntityRenderer;
 import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.EntityRendererFactory;
 import net.minecraft.client.texture.SpriteAtlasTexture;
@@ -47,7 +45,7 @@ public void render(LevitatingBlockEntity fallingBlockEntity, float f, float tick
         matrixStack.push();
         matrixStack.translate(0, 0.5, 0);
 
-        if (!fallingBlockEntity.isOnGround()) {
+        if (!fallingBlockEntity.isOnGround() || fallingBlockEntity.onGroundTicks < 2) {
             matrixStack.multiply(new Quaternionf().rotateAxis((float) (totalAge / 10 % (Math.PI * 2)), rotationAxis));
         }
 

diff --git a/src/main/java/dev/enjarai/trickster/entity/LevitatingBlockEntity.java b/src/main/java/dev/enjarai/trickster/entity/LevitatingBlockEntity.java
@@ -9,8 +9,6 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.MovementType;
-import net.minecraft.entity.damage.DamageSource;
-import net.minecraft.entity.damage.DamageSources;
 import net.minecraft.entity.data.DataTracker;
 import net.minecraft.entity.data.TrackedData;
 import net.minecraft.entity.data.TrackedDataHandlerRegistry;
@@ -23,7 +21,6 @@
 import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket;
 import net.minecraft.registry.RegistryKeys;
-import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.server.network.EntityTrackerEntry;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.BlockSoundGroup;
@@ -46,6 +43,8 @@ public class LevitatingBlockEntity extends Entity {
     public BlockEntity cachedBlockEntity;
     public boolean shouldRevertNow = false;
 
+    public int onGroundTicks = 0;
+
     public LevitatingBlockEntity(EntityType<?> type, World world) {
         super(type, world);
     }
@@ -125,6 +124,12 @@ public void tick() {
                             blockSoundGroup.getVolume(), blockSoundGroup.getPitch(), true //  * 0.15F
                     );
                 }
+
+                if (this.isOnGround()) {
+                    this.onGroundTicks++;
+                } else {
+                    this.onGroundTicks = 0;
+                }
             }
 
             if (getWeight() != 1.0f && !ModEntityComponents.GRACE.get(this).isInGrace("weight")) {
@@ -140,7 +145,8 @@ public void tick() {
             if (!this.getWorld().isClient()) {
                 BlockPos blockPos = BlockPos.ofFloored(this.getPos().add(0, 0.49, 0));
 
-                if (this.getWeight() >= 1 && (isOnGround() || shouldRevertNow) && getWorld().getBlockState(blockPos).isReplaceable()) {
+                if (this.getWeight() >= 1 && (isOnGround() || shouldRevertNow) &&
+                        this.getVelocity().lengthSquared() < 0.2 * 0.2 && getWorld().getBlockState(blockPos).isReplaceable()) {
                     var isWater = getWorld().getFluidState(blockPos).isOf(Fluids.WATER);
                     var isWaterLoggable = this.blockState.contains(Properties.WATERLOGGED);
 

diff --git a/src/main/java/dev/enjarai/trickster/mixin/EntityMixin.java b/src/main/java/dev/enjarai/trickster/mixin/EntityMixin.java
@@ -1,11 +1,14 @@
 package dev.enjarai.trickster.mixin;
 
 import dev.enjarai.trickster.cca.ModEntityComponents;
+import net.minecraft.block.BlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.util.math.BlockPos;
 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;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(Entity.class)
@@ -21,4 +24,12 @@ private void applyGravityGrace(CallbackInfoReturnable<Double> cir) {
             cir.setReturnValue(0.0);
         }
     }
+
+    @Inject(
+            method = "playStepSounds(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V",
+            at = @At("TAIL")
+    )
+    private void playCollarJingle(BlockPos pos, BlockState state, CallbackInfo ci) {
+
+    }
 }