Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix Coffee Machine and Smiley Cloud bounding box

Browse source
This commit is contained in:
Ellpeck 2016-01-22 19:02:04 +01:00
parent 0b3201bcf9
commit c9f3b926cc
2 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java
View file

@ -39,9 +39,8 @@ public class BlockCoffeeMachine extends BlockContainerBase{
this.setResistance(10.0F); this.setResistance(10.0F);
this.setStepSound(soundTypeStone); this.setStepSound(soundTypeStone);
//TODO Fix bounding box float f = 1/16F;
//float f = 1/16F; this.setBlockBounds(f, 0F, f, 1F-f, 1F-2*f, 1F-f);
//this.setBlockBounds(f, 0F, f, 1F-f, 1F-2*f, 1F-f);
} }
@Override @Override

28
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSmileyCloud.java
View file

@ -21,19 +21,19 @@ import de.ellpeck.actuallyadditions.mod.util.Util;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity; import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos; import net.minecraft.util.*;
import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
import java.util.Random; import java.util.Random;
public class BlockSmileyCloud extends BlockContainerBase{ public class BlockSmileyCloud extends BlockContainerBase{
@ -88,8 +88,7 @@ public class BlockSmileyCloud extends BlockContainerBase{
return true; return true;
} }
//TODO Fix bounding box @Override
/*@Override
public void addCollisionBoxesToList(World world, BlockPos pos, IBlockState state, AxisAlignedBB axis, List list, Entity entity){ public void addCollisionBoxesToList(World world, BlockPos pos, IBlockState state, AxisAlignedBB axis, List list, Entity entity){
this.setBlockBoundsBasedOnState(world, pos); this.setBlockBoundsBasedOnState(world, pos);
super.addCollisionBoxesToList(world, pos, state, axis, list, entity); super.addCollisionBoxesToList(world, pos, state, axis, list, entity);
@ -100,20 +99,19 @@ public class BlockSmileyCloud extends BlockContainerBase{
int meta = PosUtil.getMetadata(pos, world); int meta = PosUtil.getMetadata(pos, world);
float f = 0.0625F; float f = 0.0625F;
if(meta == 0){
this.setBlockBounds(0F, 0F, 0F, 1F, 1F, 1F-f*3F);
}
if(meta == 1){ if(meta == 1){
this.setBlockBounds(0F, 0F, 0F, 1F-f*3F, 1F, 1F); this.setBlockBounds(0F, 0F, 0F, 1F, 1F-f*3F, 1F-f*2F);
}
if(meta == 2){
this.setBlockBounds(0F, 0F, f*3F, 1F, 1F, 1F);
} }
if(meta == 3){ if(meta == 3){
this.setBlockBounds(f*3F, 0F, 0F, 1F, 1F, 1F); this.setBlockBounds(0F, 0F, 0F, 1F-f*2F, 1F-f*3F, 1F);
}
if(meta == 0){
this.setBlockBounds(0F, 0F, f*2F, 1F, 1F-f*3F, 1F);
}
if(meta == 2){
this.setBlockBounds(f*2F, 0F, 0F, 1F, 1F-f*3F, 1F);
} }
} }
*/
@Override @Override
public TileEntity createNewTileEntity(World world, int meta){ public TileEntity createNewTileEntity(World world, int meta){