Compare commits
No commits in common. "a66e6e73844bce4a8d4de5b5311afeda43e25269" and "f62c90de6691769dd6459e7c7c3f2b4b75e88802" have entirely different histories.
a66e6e7384
...
f62c90de66
Binary file not shown.
|
@ -1,5 +1,6 @@
|
|||
#Mon Sep 14 12:28:28 PDT 2015
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
|
||||
|
|
|
@ -169,4 +169,4 @@ if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
|
|||
cd "$(dirname "$0")"
|
||||
fi
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
exec "$JAVACMD" "$@"
|
|
@ -14,10 +14,7 @@ import net.minecraft.world.*;
|
|||
import net.minecraftforge.fml.relauncher.*;
|
||||
|
||||
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;
|
||||
|
||||
public BlockTurbineRotorBlade(TurbineRotorBladeType bladeType) {
|
||||
|
@ -54,12 +51,7 @@ public class BlockTurbineRotorBlade extends BlockTurbinePart implements IBlockRo
|
|||
public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) {
|
||||
return NULL_AABB;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World worldIn, BlockPos pos) {
|
||||
return bbox;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
|
||||
if (player == null) {
|
||||
|
|
|
@ -14,9 +14,6 @@ import net.minecraft.world.*;
|
|||
import net.minecraftforge.fml.relauncher.*;
|
||||
|
||||
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() {
|
||||
super();
|
||||
|
@ -42,12 +39,7 @@ public class BlockTurbineRotorStator extends BlockTurbinePart implements IBlockR
|
|||
public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) {
|
||||
return NULL_AABB;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World worldIn, BlockPos pos) {
|
||||
return bbox;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
|
||||
if (player == null) {
|
||||
|
|
|
@ -66,7 +66,7 @@
|
|||
"anchor": "electrolyzer",
|
||||
"type": "machines/single_machine",
|
||||
"block": "nuclearcraft:electrolyzer",
|
||||
"text": "使用电能分解分子。"
|
||||
"text": "使用电能分解电子。"
|
||||
},
|
||||
{
|
||||
"anchor": "assembler",
|
||||
|
|
Loading…
Reference in New Issue