edit SeatBlockMixin round 2

aesefficio · Nov 14, 2023 · 0a4e48b · 0a4e48b
1 parent 6405e8a
commit 0a4e48b
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/main/java/com/sudolev/interiors/foundation/mixin/SeatBlockMixin.java b/src/main/java/com/sudolev/interiors/foundation/mixin/SeatBlockMixin.java
@@ -3,12 +3,14 @@
 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.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 import com.simibubi.create.content.contraptions.components.actors.SeatBlock;
 import com.simibubi.create.content.contraptions.components.actors.SeatEntity;
+import com.sudolev.interiors.content.block.seat.BigChairBlock;
 import com.sudolev.interiors.content.entity.BigSeatEntity;
 
 import net.minecraft.core.BlockPos;
@@ -25,12 +27,12 @@ private static void sitDown(Level world, BlockPos pos, CallbackInfoReturnable<Bo
 			cir.setReturnValue(true);
 	}
 
-	// @Redirect(method = "sitDown", at = @At(value = "NEW", target = "(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Lcom/simibubi/create/content/contraptions/actors/seat/SeatEntity;"), remap = false)
-	// private static SeatEntity createSeatEntity(Level world, BlockPos pos) {
-	// 	return world.getBlockState(pos).getBlock() instanceof BigChairBlock
-	//		   ? new BigSeatEntity(world, pos)
-	// 		   : new SeatEntity(world, pos);
-	// }
+	@Redirect(method = "sitDown", at = @At(value = "NEW", target = "(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Lcom/simibubi/create/content/contraptions/components/actors/SeatEntity;"), remap = false)
+	private static SeatEntity createSeatEntity(Level world, BlockPos pos) {
+		return world.getBlockState(pos).getBlock() instanceof BigChairBlock
+				? new BigSeatEntity(world, pos)
+				: new SeatEntity(world, pos);
+	}
 
 	@Inject(method = "sitDown", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;addFreshEntity(Lnet/minecraft/world/entity/Entity;)Z"), locals = LocalCapture.CAPTURE_FAILHARD)
 	private static void getY(Level world, BlockPos pos, Entity entity, CallbackInfo ci, SeatEntity seat) {