mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-20 20:12:19 +00:00
Fix 1444 Apiarist's Chest collision box is acting weird., Fix # 1422 Cacoons cause suffocation if you walk into them
This commit is contained in:
1 parent
2df6cfb7f7
commit
2d25754731
5 files changed
+26
No files matched your search
@@ -139,6 +139,7 @@ public class BlockBase<P extends Enum<P> & IBlockType & IStringSerializable> ext
|
||||
return definition.collisionRayTrace(worldIn, pos, start, end);
|
||||
}
|
||||
|
||||
|
||||
/* TILE ENTITY CREATION */
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int meta) {
|
||||
@@ -230,6 +231,12 @@ public class BlockBase<P extends Enum<P> & IBlockType & IStringSerializable> ext
|
||||
public void registerStateMapper() {
|
||||
Proxies.render.registerStateMapper(this, new MachineStateMapper<>(blockType));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isFullCube(IBlockState state){
|
||||
IMachineProperties definition = getDefinition();
|
||||
return definition.isFullCube(state);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected BlockStateContainer createBlockState() {
|
||||
|
||||
@@ -46,6 +46,8 @@ public interface IMachineProperties<T extends TileForestry> extends IStringSeria
|
||||
void setBlock(@Nonnull Block block);
|
||||
|
||||
Block getBlock();
|
||||
|
||||
boolean isFullCube(IBlockState state);
|
||||
|
||||
@Nonnull
|
||||
AxisAlignedBB getBoundingBox(@Nonnull BlockPos pos, @Nonnull IBlockState state);
|
||||
|
||||
@@ -108,4 +108,9 @@ public class MachineProperties<T extends TileForestry> implements IMachineProper
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isFullCube(IBlockState state) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@ package forestry.core.blocks;
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
@@ -55,4 +56,9 @@ public class MachinePropertiesTesr<T extends TileForestry> extends MachineProper
|
||||
public String getParticleTextureLocation() {
|
||||
return particleTextureLocation;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isFullCube(IBlockState state) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -39,6 +39,7 @@ import forestry.api.core.IStateMapperRegister;
|
||||
import forestry.api.lepidopterology.ButterflyManager;
|
||||
import forestry.api.lepidopterology.EnumFlutterType;
|
||||
import forestry.api.lepidopterology.IButterfly;
|
||||
import forestry.core.blocks.IMachineProperties;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.tiles.TileUtil;
|
||||
import forestry.lepidopterology.blocks.property.PropertyCocoon;
|
||||
@@ -155,6 +156,11 @@ public class BlockCocoon extends Block implements ITileEntityProvider, IStateMap
|
||||
|
||||
return stack;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isFullCube(IBlockState state){
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World worldIn, BlockPos pos) {
|
||||
|
||||
Reference in new issue
Block a user