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

Fixes #496 and update Json-Destoyer

Browse source
This commit is contained in:
modmuss50 2016-05-17 11:41:37 +01:00
parent 0ac27fd90e
commit c20c6d4722
4 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,12 +36,11 @@ public class BlockPlayerDetector extends BlockMachineBase implements ITexturedBl
public BlockPlayerDetector()
{
super();
super(true);
setUnlocalizedName("techreborn.playerDetector");
setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2f);
this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0).withProperty(FACING, EnumFacing.NORTH)
.withProperty(ACTIVE, false));
this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0));
}
@Override
@ -158,10 +157,8 @@ public class BlockPlayerDetector extends BlockMachineBase implements ITexturedBl
protected BlockStateContainer createBlockState()
{
FACING = PropertyDirection.create("facing", EnumFacing.Plane.HORIZONTAL);
ACTIVE = PropertyBool.create("active");
METADATA = PropertyInteger.create("type", 0, types.length - 1);
return new BlockStateContainer(this, METADATA, FACING, ACTIVE);
return new BlockStateContainer(this, METADATA);
}
@Override

2
src/main/java/techreborn/blocks/fluid/BlockFluidBase.java
View file

@ -1,6 +1,7 @@
package techreborn.blocks.fluid;
import net.minecraft.block.material.Material;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
@ -32,5 +33,4 @@ public class BlockFluidBase extends BlockFluidClassic
return false;
return super.displaceIfPossible(world, pos);
}
}

5
src/main/java/techreborn/blocks/fluid/BlockFluidTechReborn.java
View file

@ -16,9 +16,4 @@ public class BlockFluidTechReborn extends BlockFluidBase implements ITexturedFlu
this.name = name;
}
@Override
public String getTextureName()
{
return "techreborn:blocks/fluids/" + name.replaceAll("techreborn.", "") + "_flowing";
}
}

1
src/main/java/techreborn/blocks/fluid/TechRebornFluid.java
View file

@ -2,6 +2,7 @@ package techreborn.blocks.fluid;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.Fluid;
import reborncore.common.util.Color;
public class TechRebornFluid extends Fluid
{