Blocks now disappear client-side when bumped

src/main/java/com/floralquafloral/BlockBumping.java

@@ -2,14 +2,24 @@
 
 import com.floralquafloral.mariodata.MarioData;
 import com.floralquafloral.mariodata.moveable.MarioMainClientData;
+import com.floralquafloral.util.MarioSFX;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.sound.SoundCategory;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.math.random.Random;
+import net.minecraft.world.World;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public abstract class BlockBumping {
 	public static final Map<BlockPos, BumpedBlockData> BUMPED_BLOCKS = new HashMap<>();
+	public static BlockPos SAVED_POSITION = null;
 
 	public static void registerPackets() {
 
@@ -22,8 +32,27 @@ public static void attempt(MarioMainClientData data, Vec3d movement) {
 
 	}
 
-	public static void bumpBlock(MarioData data, BlockPos position, boolean isCeiling, int strength) {
-		MarioQuaMario.LOGGER.info("{} bumped block {}", data.getMario(), position);
+	public static void bumpBlocks(MarioMainClientData data, ClientWorld world, Iterable<BlockPos> blocks, Direction direction, int strength) {
+		int bumpCount = 0;
+		double bumpX = 0, bumpY = 0, bumpZ = 0;
+		for(BlockPos bumpPos : blocks) {
+			bumpPos = new BlockPos(bumpPos);
+			BUMPED_BLOCKS.put(bumpPos, new BumpedBlockData());
+			Vec3d centerPos = bumpPos.toCenterPos();
+			bumpCount++;
+			bumpX += centerPos.x; bumpY += centerPos.y; bumpZ += centerPos.z;
+			BlockState bumpBlockState = world.getBlockState(bumpPos);
+			world.updateListeners(bumpPos, bumpBlockState, bumpBlockState, Block.NOTIFY_ALL);
+		}
+
+		if(bumpCount > 0) {
+			long seed = Random.create().nextLong();
+			data.playSoundEvent(
+					MarioSFX.BUMP, SoundCategory.BLOCKS,
+					bumpX / bumpCount, bumpY / bumpCount, bumpZ / bumpCount,
+					1.0F, 1.0F, seed
+			);
+		}
 	}
 
 	public static class BumpedBlockData {

src/main/java/com/floralquafloral/mixin/BlockMixin.java

@@ -0,0 +1,33 @@
+package com.floralquafloral.mixin;
+
+import com.floralquafloral.BlockBumping;
+import com.floralquafloral.MarioQuaMario;
+import net.minecraft.block.AbstractBlock;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.util.shape.VoxelShapes;
+import net.minecraft.world.BlockView;
+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.CallbackInfoReturnable;
+
+import java.util.Objects;
+
+@Mixin(Block.class)
+public abstract class BlockMixin {
+	/**
+	 * this implementation is YUCKY i would strongly prefer something in the chunk building stuff or something.
+	 * maybe in SectionBuilder? to make it think the block is transparent when building?
+	 * as opposed to this dumb approach. >:(
+	 * but i don't know how to do that. ;-;
+	 */
+	@Inject(method = "shouldDrawSide", at = @At("HEAD"), cancellable = true)
+	private static void uwuuber(BlockState state, BlockView world, BlockPos pos, Direction side, BlockPos otherPos, CallbackInfoReturnable<Boolean> cir) {
+		if(BlockBumping.BUMPED_BLOCKS.containsKey(otherPos)) cir.setReturnValue(true);
+	}
+}

src/main/java/com/floralquafloral/mixin/EntityMixin.java

@@ -13,22 +13,30 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.block.BlockState;
+import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityPose;
 import net.minecraft.entity.MovementType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Box;
+import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.world.BlockCollisionSpliterator;
 import net.minecraft.world.World;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 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;
 
+import java.util.List;
+
 @Mixin(Entity.class)
 public abstract class EntityMixin {
 	@Inject(at = @At("HEAD"), method = "setSwimming(Z)V", cancellable = true)
@@ -74,7 +82,17 @@ private void preventStepSounds(BlockPos pos, BlockState state, CallbackInfo ci)
 
 	@Inject(method = "move", at = @At("HEAD"), cancellable = true)
 	private void executeStompsOnServer(MovementType movementType, Vec3d movement, CallbackInfo ci) {
-		if((Entity) (Object) this instanceof ServerPlayerEntity mario && shouldStompHook) {
+		Entity entity = (Entity) (Object) this;
+//		if(entity instanceof ServerPlayerEntity) {
+////			Iterable<VoxelShape> uwu = entity.getWorld().getBlockCollisions(entity, entity.getBoundingBox());
+//			Iterable<BlockPos> uwu = () -> new BlockCollisionSpliterator<>(entity.getWorld(), entity, entity.getBoundingBox().stretch(movement), false, (pos, voxelShape) -> pos);
+//
+//			for(BlockPos uwuuber : uwu) {
+//				MarioQuaMario.LOGGER.info("POS: " + uwuuber);
+//				entity.getWorld().breakBlock(uwuuber, true, entity);
+//			}
+//		}
+		if(entity instanceof ServerPlayerEntity mario && shouldStompHook) {
 			MarioData data = MarioDataManager.getMarioData(mario);
 			if(data.useMarioPhysics()) {
 				ParsedAction action = data.getAction();
@@ -87,13 +105,51 @@ private void executeStompsOnServer(MovementType movementType, Vec3d movement, Ca
 		}
 	}
 
-	@WrapOperation(method = "checkBlockCollision", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;onEntityCollision(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/Entity;)V"))
-	private void executeBumpsOnClient(BlockState instance, World world, BlockPos blockPos, Entity entity, Operation<Void> original) {
-		if(entity instanceof ServerPlayerEntity mario) {
-//			world.breakBlock(blockPos, true, mario);
+	@Inject(method = "move", at = @At("TAIL"))
+	private void uwuubersaur(MovementType movementType, Vec3d movement, CallbackInfo ci) {
+		if((Entity) (Object) this instanceof ClientPlayerEntity mario) {
+			if(mario.verticalCollision && !mario.groundCollision) {
+				BlockBumping.bumpBlocks(
+						(MarioMainClientData) MarioDataManager.getMarioData(mario),
+						mario.clientWorld,
+						() -> new BlockCollisionSpliterator<>(mario.getWorld(), mario, mario.getBoundingBox().stretch(0, 0.15, 0), false, (pos, voxelShape) -> pos),
+						Direction.UP,
+						2
+				);
+
+
+//				Iterable<BlockPos> uwu = () -> new BlockCollisionSpliterator<>(mario.getWorld(), mario, mario.getBoundingBox().stretch(0, 0.15, 0), false, (pos, voxelShape) -> pos);
+//
+//				boolean affectMario = true;
+
+//				for(BlockPos uwuuber : uwu) {
+////					MarioQuaMario.LOGGER.info("POS: " + uwuuber + "\n" + mario.getWorld().getBlockState(uwuuber));
+//					BlockBumping.bumpBlock(MarioDataManager.getMarioData(mario), uwuuber, Direction.UP, 2);
+//					break;
+////					mario.getWorld().breakBlock(uwuuber, true, mario);
+//				}
+			}
 		}
 	}
 
+
+//	@WrapOperation(method = "checkBlockCollision", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;onEntityCollision(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/Entity;)V"))
+//	private void executeBumpsOnClient(BlockState instance, World world, BlockPos blockPos, Entity entity, Operation<Void> original) {
+//		if(entity instanceof ServerPlayerEntity mario) {
+////			world.breakBlock(blockPos, true, mario);
+//		}
+//	}
+
+//	@Inject(method = "findCollisionsForMovement", at = @At("TAIL"))
+//	private static void testasaur(@Nullable Entity entity, World world, List<VoxelShape> regularCollisions, Box movingEntityBoundingBox, CallbackInfoReturnable<List<VoxelShape>> cir) {
+//		if(entity instanceof ClientPlayerEntity clientPlayer) {
+//			MarioQuaMario.LOGGER.info("findCollisionsForMovement on Mario!");
+//			for(VoxelShape shape : cir.getReturnValue()) {
+//				MarioQuaMario.LOGGER.info("Uwu: " + shape.);
+//			}
+//		}
+//	}
+
 	@Inject(method = "startRiding(Lnet/minecraft/entity/Entity;Z)Z", at = @At("HEAD"))
 	private void setMountedAction(Entity entity, boolean force, CallbackInfoReturnable<Boolean> cir) {
 		if((Entity) (Object) this instanceof PlayerEntity mario) {

src/main/java/com/floralquafloral/mixin/SectionBuilderMixin.java

@@ -0,0 +1,24 @@
+package com.floralquafloral.mixin;
+
+import com.floralquafloral.BlockBumping;
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.block.BlockRenderType;
+import net.minecraft.client.render.chunk.SectionBuilder;
+import net.minecraft.util.math.BlockPos;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(SectionBuilder.class)
+public class SectionBuilderMixin {
+	@ModifyExpressionValue(method = "build", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;getRenderType()Lnet/minecraft/block/BlockRenderType;"))
+	private BlockRenderType preventRender(BlockRenderType original, @Local(ordinal = 2) BlockPos pos) {
+		if(BlockBumping.BUMPED_BLOCKS.containsKey(pos)) return BlockRenderType.INVISIBLE;
+		return original;
+	}
+
+//	@ModifyExpressionValue(method = "build", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/RenderLayers;getBlockLayer(Lnet/minecraft/block/BlockState;)Lnet/minecraft/client/render/RenderLayer;"))
+//	private RenderLayer gooble(RenderLayer original, @Local(ordinal = 2) BlockPos pos) {
+//		return RenderLayer.getSolid();
+//	}
+}

src/main/java/com/floralquafloral/util/MarioSFX.java

@@ -14,6 +14,7 @@ public final class MarioSFX {
 	public static final SoundEvent SKID_SAND = makeMovementSound("skid_sand");
 	public static final SoundEvent SKID_SNOW = makeMovementSound("skid_snow");
 	public static final SoundEvent SKID_WALL = makeMovementSound("skid_wall");
+	public static final SoundEvent BUMP = makeMovementSound("bump");
 
 	public static final SoundEvent NORMAL_POWER = makePowerSound("normal_power");
 	public static final SoundEvent REVERT = makePowerSound("revert");

src/main/java/com/floralquafloral/util/MixedEasing.java

@@ -26,6 +26,7 @@ private interface EasingFunction {
 	}
 
 	public static float mixedEase(float x, MixedEasing first, MixedEasing second) {
-		return (float) (x < 0.5 ? first.FUNCTION.ease(x) : second.FUNCTION.ease(x));
+//		return (float) (x < 0.5 ? first.FUNCTION.ease(x) : second.FUNCTION.ease(x));
+		return x * (float) first.FUNCTION.ease(x) + (1 - x) * (float) second.FUNCTION.ease(x);
 	}
 }

src/main/resources/assets/qua_mario/lang/en_us.json

@@ -33,6 +33,7 @@
 	"subtitles.qua_mario.movement.skid_sand": "Skidding",
 	"subtitles.qua_mario.movement.skid_snow": "Skidding",
 	"subtitles.qua_mario.movement.skid_wall": "Sliding",
+	"subtitles.qua_mario.movement.bump": "Block bumped",
 	"subtitles.qua_mario.power_up.normal_power": "Powering up",
 	"subtitles.qua_mario.power_up.revert": "Powering down",
 	"subtitles.qua_mario.stomp.stomp": "Something gets stomped",

src/main/resources/assets/qua_mario/sounds.json

@@ -41,6 +41,12 @@
       "qua_mario:sfx/movement/skid_wall"
     ]
   },
+  "sfx.movement.bump": {
+    "subtitle": "subtitles.qua_mario.movement.bump",
+    "sounds": [
+      "qua_mario:sfx/movement/bump"
+    ]
+  },
   "sfx.power_up.normal_power": {
     "subtitle": "subtitles.qua_mario.power_up.normal_power",
     "sounds": [

src/main/resources/data/qua_mario/tags/block/breaks_on_hard_bump.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+
+  ]
+}

src/main/resources/data/qua_mario/tags/block/powered_on_hard_bump.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+
+  ]
+}

src/main/resources/qua_mario.mixins.json

@@ -12,10 +12,12 @@
     "defaultRequire": 1
   },
   "client": [
+    "BlockMixin",
     "CameraMixin",
     "ClientPlayerEntityMixin",
     "ClientPlayNetworkHandlerMixin",
     "InGameHudMixin",
-    "LivingEntityRendererMixin"
+    "LivingEntityRendererMixin",
+    "SectionBuilderMixin"
   ]
 }