Skip to content
This repository was archived by the owner on Jun 3, 2024. It is now read-only.

Don't crash when a mod's Block has a BlockEntity but doesn't extend BlockEntityProvider #145

Merged
TheGlitch76 merged 1 commit into from
Jul 23, 2020
Merged

Don't crash when a mod's Block has a BlockEntity but doesn't extend BlockEntityProvider #145

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions ...ock/src/main/java/net/patchworkmc/mixin/extensions/block/blockentity/MixinWorldChunk.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand All @@ -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)
Expand Down Expand Up @@ -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);
}
}
}
}