maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed missing nuke textures

Browse source
This commit is contained in:
drcrazy 2017-09-07 00:13:37 +03:00
parent 7a55995546
commit bc390fa0e0
2 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/techreborn/blocks/BlockNuke.java
View file

@ -38,9 +38,12 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.Explosion;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.BaseBlock;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.entities.EntityNukePrimed;
import techreborn.lib.ModInfo;
/**
* Created by Mark on 13/03/2016.
@ -53,6 +56,7 @@ public class BlockNuke extends BaseBlock {
setUnlocalizedName("techreborn.nuke");
setCreativeTab(TechRebornCreativeTabMisc.instance);
this.setDefaultState(this.blockState.getBaseState().withProperty(OVERLAY, false));
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this));
}
public void explode(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase igniter) {
@ -75,6 +79,7 @@ public class BlockNuke extends BaseBlock {
}
}
@Override
public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn) {
if (!worldIn.isRemote && entityIn instanceof EntityArrow) {
EntityArrow entityarrow = (EntityArrow) entityIn;
@ -87,6 +92,7 @@ public class BlockNuke extends BaseBlock {
}
}
@Override
public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) {
super.onBlockAdded(worldIn, pos, state);
if (worldIn.isBlockPowered(pos)) {
@ -112,14 +118,17 @@ public class BlockNuke extends BaseBlock {
return false;
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(OVERLAY) ? 1 : 0;
}
@Override
public IBlockState getStateFromMeta(int meta) {
return this.getDefaultState().withProperty(OVERLAY, (meta & 1) > 0);
}
@Override
protected BlockStateContainer createBlockState() {
return new BlockStateContainer(this, OVERLAY);
}

22
src/main/resources/assets/techreborn/blockstates/nuke.json
View file

@ -5,10 +5,30 @@
"model": "orientable",
"textures": {
"particle": "techreborn:blocks/nuke_side",
"bottom": "techreborn:blocks/nuke_bottom",
"bottom": "techreborn:blocks/nuke_top",
"top": "techreborn:blocks/nuke_top",
"front": "techreborn:blocks/nuke_front",
"side": "techreborn:blocks/nuke_side"
}
},
"variants": {
"inventory": {
"transform": "forge:default-block",
"textures": {
}
},
"normal": [
{}
],
"overlay": {
"true": {
"textures": {
}
},
"false": {
"textures": {
}
}
}
}
}