From 63b5693ccbc85e982ffd446c885af1209e38122e Mon Sep 17 00:00:00 2001
From: famous1622 <8428080+famous1622@users.noreply.github.com>
Date: Thu, 23 Jul 2020 15:19:17 -0400
Subject: [PATCH] Don't crash when a mods Block has a BlockEntity but doesn't
 extend BlockEntityProvider

---
 .../block/blockentity/MixinWorldChunk.java    | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/patchwork-extensions-block/src/main/java/net/patchworkmc/mixin/extensions/block/blockentity/MixinWorldChunk.java b/patchwork-extensions-block/src/main/java/net/patchworkmc/mixin/extensions/block/blockentity/MixinWorldChunk.java
index 9c6b4246..875646e0 100644
--- a/patchwork-extensions-block/src/main/java/net/patchworkmc/mixin/extensions/block/blockentity/MixinWorldChunk.java
+++ b/patchwork-extensions-block/src/main/java/net/patchworkmc/mixin/extensions/block/blockentity/MixinWorldChunk.java
@@ -19,7 +19,11 @@
 
 package net.patchworkmc.mixin.extensions.block.blockentity;
 
+import javax.annotation.Nullable;
+
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Constant;
@@ -36,6 +40,7 @@
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
 import net.minecraft.world.chunk.ChunkSection;
 import net.minecraft.world.chunk.WorldChunk;
 
@@ -44,6 +49,17 @@
 
 @Mixin(WorldChunk.class)
 public abstract class MixinWorldChunk {
+	@Shadow
+	@Nullable
+	public abstract BlockEntity getBlockEntity(BlockPos pos, WorldChunk.CreationType creationType);
+
+	@Shadow
+	@Final
+	private World world;
+
+	@Shadow
+	private volatile boolean shouldSave;
+
 	/**
 	 * @param blockState
 	 * @return the blockEntity created by IForgeBlock.createTileEntity(BlockState, World)
@@ -155,4 +171,21 @@ private BlockEntity patchwork_setBlockState_createBlockEntity(BlockEntityProvide
 	private Block patchwork_setBlockEntity_getBlock(BlockState blockState) {
 		return BlockContext.hasBlockEntityBlockMarker(blockState);
 	}
+
+	// Workaround in setBlockState for Forge Blocks with BEs that don't extend BlockEntityProvider
+	@Inject(method = "setBlockState", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/chunk/WorldChunk;getBlockEntity(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/chunk/WorldChunk$CreationType;)Lnet/minecraft/block/entity/BlockEntity;", ordinal = 1, shift = At.Shift.AFTER), cancellable = true)
+	private void postGetBlockEntity(BlockPos pos, BlockState state, boolean bl, CallbackInfoReturnable<BlockState> cir) {
+		if (!(state.getBlock() instanceof BlockEntityProvider)) {
+			BlockEntity blockEntity = getBlockEntity(pos, WorldChunk.CreationType.CHECK);
+
+			if (blockEntity == null) {
+				IForgeBlockState forgeBlockState = (IForgeBlockState) state;
+				BlockEntity tileEntity = forgeBlockState.createTileEntity(world);
+				world.setBlockEntity(pos, tileEntity);
+
+				this.shouldSave = true;
+				cir.setReturnValue(state);
+			}
+		}
+	}
 }