Compare commits

..

No commits in common. "a66e6e73844bce4a8d4de5b5311afeda43e25269" and "f62c90de6691769dd6459e7c7c3f2b4b75e88802" have entirely different histories.

6 changed files with 7 additions and 22 deletions

Binary file not shown.

View File

@ -1,5 +1,6 @@
#Mon Sep 14 12:28:28 PDT 2015
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip

2
gradlew vendored
View File

@ -169,4 +169,4 @@ if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")" cd "$(dirname "$0")"
fi fi
exec "$JAVACMD" "$@" exec "$JAVACMD" "$@"

View File

@ -14,10 +14,7 @@ import net.minecraft.world.*;
import net.minecraftforge.fml.relauncher.*; import net.minecraftforge.fml.relauncher.*;
public class BlockTurbineRotorBlade extends BlockTurbinePart implements IBlockRotorBlade { public class BlockTurbineRotorBlade extends BlockTurbinePart implements IBlockRotorBlade {
// Bounding box pulled from the rotor blade model
private final AxisAlignedBB bbox = new AxisAlignedBB(2D, 0D, 7D, 14D, 16D, 9D);
private final TurbineRotorBladeType bladeType; private final TurbineRotorBladeType bladeType;
public BlockTurbineRotorBlade(TurbineRotorBladeType bladeType) { public BlockTurbineRotorBlade(TurbineRotorBladeType bladeType) {
@ -54,12 +51,7 @@ public class BlockTurbineRotorBlade extends BlockTurbinePart implements IBlockRo
public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) { public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) {
return NULL_AABB; return NULL_AABB;
} }
@Override
public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World worldIn, BlockPos pos) {
return bbox;
}
@Override @Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
if (player == null) { if (player == null) {

View File

@ -14,9 +14,6 @@ import net.minecraft.world.*;
import net.minecraftforge.fml.relauncher.*; import net.minecraftforge.fml.relauncher.*;
public class BlockTurbineRotorStator extends BlockTurbinePart implements IBlockRotorBlade { public class BlockTurbineRotorStator extends BlockTurbinePart implements IBlockRotorBlade {
// Bounding box pulled from the rotor stator model
private final AxisAlignedBB bbox = new AxisAlignedBB(7D, 0D, 2D, 9D, 16D, 14D);
public BlockTurbineRotorStator() { public BlockTurbineRotorStator() {
super(); super();
@ -42,12 +39,7 @@ public class BlockTurbineRotorStator extends BlockTurbinePart implements IBlockR
public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) { public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) {
return NULL_AABB; return NULL_AABB;
} }
@Override
public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World worldIn, BlockPos pos) {
return bbox;
}
@Override @Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
if (player == null) { if (player == null) {

View File

@ -66,7 +66,7 @@
"anchor": "electrolyzer", "anchor": "electrolyzer",
"type": "machines/single_machine", "type": "machines/single_machine",
"block": "nuclearcraft:electrolyzer", "block": "nuclearcraft:electrolyzer",
"text": "使用电能分解子。" "text": "使用电能分解子。"
}, },
{ {
"anchor": "assembler", "anchor": "assembler",