Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Visual fixes, durability fix.

Browse source
This commit is contained in:
Dragon2488 2016-12-19 15:02:33 +07:00
parent 27f8bb4193
commit 3b5ae6198a
5 changed files with 21 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/main/java/gregtech/api/items/GT_Generic_Block.java
View file

@ -1,6 +1,8 @@
package gregtech.api.items;
import codechicken.lib.render.DigIconParticle;
import codechicken.lib.render.particle.CustomParticleHandler;
import codechicken.lib.vec.Cuboid6;
import gregtech.api.enums.Textures;
import gregtech.api.util.GT_LanguageManager;
import gregtech.common.render.RenderBlocks;
import net.minecraft.block.Block;
@ -9,7 +11,6 @@ import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.particle.ParticleDigging;
import net.minecraft.client.particle.ParticleManager;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
@ -19,7 +20,6 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumBlockRenderType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.IBlockAccess;
@ -29,7 +29,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.Random;
import java.util.Arrays;
import static gregtech.api.enums.GT_Values.W;
@ -56,70 +56,24 @@ public abstract class GT_Generic_Block extends Block {
@Override
@SideOnly(Side.CLIENT)
public boolean addHitEffects(IBlockState state, World worldObj, RayTraceResult target, ParticleManager manager) {
addBlockHitEffects(worldObj, target.getBlockPos() != null ? target.getBlockPos() : BlockPos.ORIGIN,
target.sideHit != null ? target.sideHit : EnumFacing.UP, worldObj.rand, manager);
CustomParticleHandler.addBlockHitEffects(worldObj, getBlockBounds(target.getBlockPos()), target.sideHit, getParticleSprite(worldObj, target.getBlockPos(), target.sideHit), manager);
return true;
}
@Override
@SideOnly(Side.CLIENT)
public boolean addDestroyEffects(World world, BlockPos pos, ParticleManager manager) {
int count = 14 + world.rand.nextInt(10);
for(int i = 0; i < count; i++) {
addBlockHitEffects(world, pos, EnumFacing.UP, world.rand, manager);
TextureAtlasSprite[] textures = new TextureAtlasSprite[6];
for(EnumFacing facing : EnumFacing.VALUES) {
textures[facing.getIndex()] = getParticleSprite(world, pos, facing);
}
CustomParticleHandler.addBlockDestroyEffects(world, getBlockBounds(pos), textures, manager);
return true;
}
@SideOnly(Side.CLIENT)
public void addBlockHitEffects(World worldObj, BlockPos pos, EnumFacing side, Random rand, ParticleManager manager)
{
IBlockState iblockstate = worldObj.getBlockState(pos);
if (iblockstate.getRenderType() != EnumBlockRenderType.INVISIBLE) {
int i = pos.getX();
int j = pos.getY();
int k = pos.getZ();
float f = 0.1F;
AxisAlignedBB axisalignedbb = iblockstate.getBoundingBox(worldObj, pos);
double d0 = (double) i + rand.nextDouble() * (axisalignedbb.maxX - axisalignedbb.minX - 0.20000000298023224D) + 0.10000000149011612D + axisalignedbb.minX;
double d1 = (double) j + rand.nextDouble() * (axisalignedbb.maxY - axisalignedbb.minY - 0.20000000298023224D) + 0.10000000149011612D + axisalignedbb.minY;
double d2 = (double) k + rand.nextDouble() * (axisalignedbb.maxZ - axisalignedbb.minZ - 0.20000000298023224D) + 0.10000000149011612D + axisalignedbb.minZ;
if (side == EnumFacing.DOWN) {
d1 = (double) j + axisalignedbb.minY - 0.10000000149011612D;
}
if (side == EnumFacing.UP) {
d1 = (double) j + axisalignedbb.maxY + 0.10000000149011612D;
}
if (side == EnumFacing.NORTH) {
d2 = (double) k + axisalignedbb.minZ - 0.10000000149011612D;
}
if (side == EnumFacing.SOUTH) {
d2 = (double) k + axisalignedbb.maxZ + 0.10000000149011612D;
}
if (side == EnumFacing.WEST) {
d0 = (double) i + axisalignedbb.minX - 0.10000000149011612D;
}
if (side == EnumFacing.EAST) {
d0 = (double) i + axisalignedbb.maxX + 0.10000000149011612D;
}
TextureAtlasSprite sprite = getParticleSprite(worldObj, pos, side);
if (sprite != null) {
manager.addEffect((new DigIconParticle(worldObj, d0, d1, d2, 0.0D, 0.0D, 0.0D, sprite)).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F));
}
}
}
@SideOnly(Side.CLIENT)
public TextureAtlasSprite getParticleSprite(World worldObj, BlockPos aPos, EnumFacing side) {
public TextureAtlasSprite getParticleSprite(IBlockAccess worldObj, BlockPos aPos, EnumFacing side) {
return getWorldIcon(worldObj, aPos, worldObj.getBlockState(aPos), side);
}
@ -157,6 +111,10 @@ public abstract class GT_Generic_Block extends Block {
public void setBlockBoundsForItemRender() {}
public void setBlockBoundsBasedOnState(IBlockAccess world, BlockPos pos, IBlockState state) {}
public Cuboid6 getBlockBounds(BlockPos pos) {
return new Cuboid6(pos.getX() + minX, pos.getY() + minY, pos.getZ() + minZ, pos.getX() + maxX, pos.getY() + maxY, pos.getZ() + maxX);
}
@Override
protected BlockStateContainer createBlockState() {
return new BlockStateContainer(this, METADATA);

6
src/main/java/gregtech/common/blocks/GT_Block_GeneratedOres.java
View file

@ -182,12 +182,12 @@ public class GT_Block_GeneratedOres extends GT_Generic_Block {
@Override
public float getBlockHardness(IBlockState blockState, World worldIn, BlockPos pos) {
return 1.0F * Math.max(1, getHarvestLevel(blockState));
return 2.0F * (getHarvestLevel(blockState) + 1);
}
@Override
public float getExplosionResistance(World world, BlockPos pos, Entity exploder, Explosion explosion) {
return 1.0F * Math.max(1, getHarvestLevel(world.getBlockState(pos)));
return 3.5F * (getHarvestLevel(world.getBlockState(pos)) + 1);
}
@Override
@ -197,7 +197,7 @@ public class GT_Block_GeneratedOres extends GT_Generic_Block {
@Override
@SideOnly(Side.CLIENT)
public TextureAtlasSprite getParticleSprite(World worldObj, BlockPos aPos, EnumFacing side) {
public TextureAtlasSprite getParticleSprite(IBlockAccess worldObj, BlockPos aPos, EnumFacing side) {
return getStoneTypeSafe(worldObj.getBlockState(aPos)).mIconContainer.getIcon();
}

2
src/main/java/gregtech/common/blocks/GT_Block_Machines.java
View file

@ -290,7 +290,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
@Override
@SideOnly(Side.CLIENT)
public TextureAtlasSprite getParticleSprite(World worldObj, BlockPos aPos, EnumFacing side) {
public TextureAtlasSprite getParticleSprite(IBlockAccess worldObj, BlockPos aPos, EnumFacing side) {
TileEntity tileEntity = worldObj.getTileEntity(aPos);
if(tileEntity instanceof ITexturedTileEntity) {
ITexture[] textures = ((ITexturedTileEntity) tileEntity).getTexture(this, (byte) 1);

2
src/main/java/gregtech/common/render/ItemRenderer.java
View file

@ -319,7 +319,7 @@ public class ItemRenderer implements IItemRenderer, IStackPerspectiveAwareModel
@Override
public ItemCameraTransforms getItemCameraTransforms() {
return ModelUtil.DEFAULT_TRANSFORMS;
return ModelUtil.BLOCK_TRANSFORMS; //RenderEntityItem calls it directly
}
@Override

2
src/main/java/gregtech/common/render/RenderGeneratedOres.java
View file

@ -2,6 +2,7 @@ package gregtech.common.render;
import codechicken.lib.render.block.BlockRenderingRegistry;
import codechicken.lib.render.block.ICCBlockRenderer;
import ic2.core.block.RenderBlock;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.VertexBuffer;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@ -24,6 +25,7 @@ public class RenderGeneratedOres implements ICCBlockRenderer {
@Override
public void handleRenderBlockDamage(IBlockAccess world, BlockPos pos, IBlockState state, TextureAtlasSprite sprite, VertexBuffer buffer) {
RenderBlocks.INSTANCE.handleRenderBlockDamage(world, pos, state, sprite, buffer);
}
@Override