Fixes #496 and update Json-Destoyer
This commit is contained in:
parent
0ac27fd90e
commit
c20c6d4722
4 changed files with 5 additions and 12 deletions
|
@ -36,12 +36,11 @@ public class BlockPlayerDetector extends BlockMachineBase implements ITexturedBl
|
||||||
|
|
||||||
public BlockPlayerDetector()
|
public BlockPlayerDetector()
|
||||||
{
|
{
|
||||||
super();
|
super(true);
|
||||||
setUnlocalizedName("techreborn.playerDetector");
|
setUnlocalizedName("techreborn.playerDetector");
|
||||||
setCreativeTab(TechRebornCreativeTab.instance);
|
setCreativeTab(TechRebornCreativeTab.instance);
|
||||||
setHardness(2f);
|
setHardness(2f);
|
||||||
this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0).withProperty(FACING, EnumFacing.NORTH)
|
this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0));
|
||||||
.withProperty(ACTIVE, false));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -158,10 +157,8 @@ public class BlockPlayerDetector extends BlockMachineBase implements ITexturedBl
|
||||||
|
|
||||||
protected BlockStateContainer createBlockState()
|
protected BlockStateContainer createBlockState()
|
||||||
{
|
{
|
||||||
FACING = PropertyDirection.create("facing", EnumFacing.Plane.HORIZONTAL);
|
|
||||||
ACTIVE = PropertyBool.create("active");
|
|
||||||
METADATA = PropertyInteger.create("type", 0, types.length - 1);
|
METADATA = PropertyInteger.create("type", 0, types.length - 1);
|
||||||
return new BlockStateContainer(this, METADATA, FACING, ACTIVE);
|
return new BlockStateContainer(this, METADATA);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package techreborn.blocks.fluid;
|
package techreborn.blocks.fluid;
|
||||||
|
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
|
import net.minecraft.util.BlockRenderLayer;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.world.IBlockAccess;
|
import net.minecraft.world.IBlockAccess;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
@ -32,5 +33,4 @@ public class BlockFluidBase extends BlockFluidClassic
|
||||||
return false;
|
return false;
|
||||||
return super.displaceIfPossible(world, pos);
|
return super.displaceIfPossible(world, pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,9 +16,4 @@ public class BlockFluidTechReborn extends BlockFluidBase implements ITexturedFlu
|
||||||
this.name = name;
|
this.name = name;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getTextureName()
|
|
||||||
{
|
|
||||||
return "techreborn:blocks/fluids/" + name.replaceAll("techreborn.", "") + "_flowing";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@ package techreborn.blocks.fluid;
|
||||||
|
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraftforge.fluids.Fluid;
|
import net.minecraftforge.fluids.Fluid;
|
||||||
|
import reborncore.common.util.Color;
|
||||||
|
|
||||||
public class TechRebornFluid extends Fluid
|
public class TechRebornFluid extends Fluid
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue