Bouncy Seats

- Fix seats not being bouncy

Author: IThundxr

src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatBlock.java

@@ -2,9 +2,10 @@
 
 import java.util.List;
 
-import org.jetbrains.annotations.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 
+import org.jetbrains.annotations.Nullable;
+
 import com.google.common.base.Optional;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllShapes;
@@ -122,7 +123,7 @@ public VoxelShape getShape(BlockState p_220053_1_, BlockGetter p_220053_2_, Bloc
 	@Override
 	public VoxelShape getCollisionShape(BlockState p_220071_1_, BlockGetter p_220071_2_, BlockPos p_220071_3_,
 										CollisionContext ctx) {
-		if (ctx instanceof EntityCollisionContext ecc && ecc.getEntity() instanceof Player)
+		if (ctx instanceof EntityCollisionContext ecc && ecc.getEntity() instanceof Player player)
 			return AllShapes.SEAT_COLLISION_PLAYERS;
 		return AllShapes.SEAT_COLLISION;
 	}

src/main/java/com/simibubi/create/foundation/mixin/EntityMixin.java

@@ -1,17 +1,37 @@
 package com.simibubi.create.foundation.mixin;
 
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import com.simibubi.create.content.contraptions.actors.seat.SeatBlock;
 import com.simibubi.create.content.equipment.armor.NetheriteDivingHandler;
 
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockState;
 
 @Mixin(value = Entity.class, priority = 1500)
-public class EntityMixin {
+public abstract class EntityMixin {
+	@Shadow
+	public abstract BlockPos getOnPos();
+
+	@Shadow
+	private Level level;
+
+	@Shadow
+	public abstract BlockState getBlockStateOn();
+
 	@ModifyReturnValue(method = "fireImmune()Z", at = @At("RETURN"))
-	public boolean create$onFireImmune(boolean original) {
+	private boolean create$onFireImmune(boolean original) {
 		return ((Entity) (Object) this).getPersistentData().getBoolean(NetheriteDivingHandler.FIRE_IMMUNE_KEY) || original;
 	}
+
+	@ModifyExpressionValue(method = "move", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;getOnPosLegacy()Lnet/minecraft/core/BlockPos;"))
+	private BlockPos create$fixSeatBouncing(BlockPos original) {
+		return getBlockStateOn().getBlock() instanceof SeatBlock ? getOnPos() : original;
+	}
 }

src/main/java/com/simibubi/create/foundation/mixin/MapItemSavedDataMixin.java

@@ -76,7 +76,7 @@ public class MapItemSavedDataMixin implements StationMapData {
 			method = "save",
 			at = @At("RETURN")
 	)
-	public void create$onSave(CompoundTag tag, HolderLookup.Provider registries, CallbackInfoReturnable<CompoundTag> cir) {
+	private void create$onSave(CompoundTag tag, HolderLookup.Provider registries, CallbackInfoReturnable<CompoundTag> cir) {
 		ListTag listTag = new ListTag();
 		for (StationMarker stationMarker : create$stationMarkers.values()) {
 			listTag.add(stationMarker.save(registries));

src/main/java/com/simibubi/create/foundation/mixin/PlayerMixin.java

@@ -22,7 +22,7 @@ protected PlayerMixin(EntityType<? extends LivingEntity> entityType, Level level
 	}
 
 	@ModifyExpressionValue(method = "canPlayerFitWithinBlocksAndEntitiesWhen", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;noCollision(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/AABB;)Z"))
-	public boolean create$playerHidingAsBoxIsCrouchingNotSwimming(boolean original, @Local(argsOnly = true) Pose pose) {
+	private boolean create$playerHidingAsBoxIsCrouchingNotSwimming(boolean original, @Local(argsOnly = true) Pose pose) {
 		return original || (pose == Pose.CROUCHING && CardboardArmorHandler.testForStealth(this));
 	}
 

src/main/java/com/simibubi/create/foundation/mixin/client/CameraMixin.java

@@ -15,7 +15,7 @@ public abstract class CameraMixin {
 			at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Camera;getMaxZoom(F)F"),
 			index = 0
 	)
-	public float create$modifyCameraOffset(float originalValue) {
+	private float create$modifyCameraOffset(float originalValue) {
 		return originalValue * CameraDistanceModifier.getMultiplier();
 	}
 }

src/main/java/com/simibubi/create/foundation/mixin/compat/xaeros/XaeroFullscreenMapMixin.java

@@ -19,7 +19,7 @@ public abstract class XaeroFullscreenMapMixin {
 
 	@Inject(method = "render(Lnet/minecraft/client/gui/GuiGraphics;IIF)V", at = @At(value = "INVOKE",
 		target = "Lnet/minecraft/client/gui/GuiGraphics;blit(Lnet/minecraft/resources/ResourceLocation;IIIIII)V"), require = 0)
-	public void create$xaeroMapFullscreenRender(GuiGraphics graphics, int mouseX, int mouseY, float pt, CallbackInfo ci) {
+	private void create$xaeroMapFullscreenRender(GuiGraphics graphics, int mouseX, int mouseY, float pt, CallbackInfo ci) {
 		try {
 			if (!create$failedToRenderTrainMap)
 				XaeroTrainMap.onRender(graphics, (GuiMap) (Object) this, mouseX, mouseY, pt);

src/main/java/com/simibubi/create/foundation/mixin/compat/xaeros/XaeroPauseScreenOverrideMixin.java

@@ -14,7 +14,7 @@
 public class XaeroPauseScreenOverrideMixin {
 
 	@Inject(method = "isPauseScreen", at = @At("HEAD"), cancellable = true)
-	public void create$xaeroPauseScreenOverride(CallbackInfoReturnable<Boolean> cir) {
+	private void create$xaeroPauseScreenOverride(CallbackInfoReturnable<Boolean> cir) {
 		if (Mods.XAEROWORLDMAP.isLoaded()) {
 			if (XaeroTrainMap.isMapOpen((Screen) (Object) this))
 				cir.setReturnValue(false);

src/main/java/com/simibubi/create/foundation/mixin/datafixer/BlockPosFormatAndRenamesFixMixin.java

@@ -21,7 +21,7 @@
 
 @Mixin(BlockPosFormatAndRenamesFix.class)
 public abstract class BlockPosFormatAndRenamesFixMixin extends DataFix {
-	public BlockPosFormatAndRenamesFixMixin(Schema outputSchema, boolean changesType) {
+	private BlockPosFormatAndRenamesFixMixin(Schema outputSchema, boolean changesType) {
 		super(outputSchema, changesType);
 	}