From 5496b746ea99b2832e94fdf71aa9c2e37ea151d5 Mon Sep 17 00:00:00 2001 From: fscan Date: Fri, 20 Oct 2017 23:52:55 +0200 Subject: [PATCH] Fix Tiny TNT (#3162) --- .../java/appeng/block/misc/BlockTinyTNT.java | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/main/java/appeng/block/misc/BlockTinyTNT.java b/src/main/java/appeng/block/misc/BlockTinyTNT.java index 8130cb50d..683e15824 100644 --- a/src/main/java/appeng/block/misc/BlockTinyTNT.java +++ b/src/main/java/appeng/block/misc/BlockTinyTNT.java @@ -37,13 +37,17 @@ import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.EntityRegistry; import appeng.block.AEBaseBlock; +import appeng.core.AppEng; +import appeng.entity.EntityIds; import appeng.entity.EntityTinyTNTPrimed; import appeng.helpers.ICustomCollision; @@ -54,15 +58,24 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision public BlockTinyTNT() { super( Material.TNT ); - this.setLightOpacity( 1 ); + this.boundingBox = new AxisAlignedBB( 0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f ); - this.setFullSize( this.setOpaque( false ) ); + + this.setLightOpacity( 2 ); + this.setFullSize( false ); + this.setOpaque( false ); + this.setSoundType( SoundType.GROUND ); this.setHardness( 0F ); - // TODO: 1.11 - // EntityRegistry.registerModEntity( EntityTinyTNTPrimed.class, "EntityTinyTNTPrimed", EntityIds.get( - // EntityTinyTNTPrimed.class ), AppEng.instance(), 16, 4, true ); + EntityRegistry.registerModEntity( new ResourceLocation( AppEng.MOD_ID, EntityTinyTNTPrimed.class.getName() ), EntityTinyTNTPrimed.class, + "EntityTinyTNTPrimed", EntityIds.get( EntityTinyTNTPrimed.class ), AppEng.instance(), 16, 4, true ); + } + + @Override + public boolean isFullCube( IBlockState state ) + { + return false; } @Override