Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

BioReactor, BlockBreaker porting

Browse source
This commit is contained in:
Michael 2020-09-09 16:47:51 +01:00
parent b51722e181
commit 9dbbb7b913
No known key found for this signature in database
GPG key ID: 971C5B254742488F
4 changed files with 49 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBioReactor.java
View file

@ -3,10 +3,7 @@ package de.ellpeck.actuallyadditions.common.blocks;
import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase;
import de.ellpeck.actuallyadditions.common.tile.TileEntityBioReactor; import de.ellpeck.actuallyadditions.common.tile.TileEntityBioReactor;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Rarity;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ActionResultType; import net.minecraft.util.ActionResultType;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;
@ -14,15 +11,11 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.world.IBlockReader; import net.minecraft.world.IBlockReader;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.ToolType;
public class BlockBioReactor extends BlockContainerBase { public class BlockBioReactor extends BlockContainerBase {
public BlockBioReactor() { public BlockBioReactor() {
super(Properties.create(Material.ROCK) super(STONE_PROPS.hardnessAndResistance(2f, 10.0f));
.hardnessAndResistance(2f, 10.0f)
.harvestTool(ToolType.PICKAXE)
.sound(SoundType.STONE));
} }
@Override @Override
@ -39,9 +32,4 @@ public class BlockBioReactor extends BlockContainerBase {
} }
return ActionResultType.SUCCESS; return ActionResultType.SUCCESS;
} }
@Override
public Rarity getRarity() {
return Rarity.EPIC;
}
} }

99
src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockBreaker.java
View file

@ -1,95 +1,76 @@
package de.ellpeck.actuallyadditions.common.blocks; package de.ellpeck.actuallyadditions.common.blocks;
import de.ellpeck.actuallyadditions.common.ActuallyAdditions;
import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase; import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase;
import de.ellpeck.actuallyadditions.common.inventory.GuiHandler;
import de.ellpeck.actuallyadditions.common.tile.TileEntityBreaker; import de.ellpeck.actuallyadditions.common.tile.TileEntityBreaker;
import de.ellpeck.actuallyadditions.common.tile.TileEntityPlacer; import de.ellpeck.actuallyadditions.common.tile.TileEntityPlacer;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockDirectional; import net.minecraft.block.BlockState;
import net.minecraft.block.SoundType; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.block.material.Material; import net.minecraft.item.BlockItemUseContext;
import net.minecraft.block.state.BlockStateContainer; import net.minecraft.state.DirectionProperty;
import net.minecraft.block.state.IBlockState; import net.minecraft.state.StateContainer;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.state.properties.BlockStateProperties;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing; import net.minecraft.util.*;
import net.minecraft.util.EnumHand;
import net.minecraft.util.Mirror;
import net.minecraft.util.Rotation;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.ToolType;
import javax.annotation.Nullable;
public class BlockBreaker extends BlockContainerBase { public class BlockBreaker extends BlockContainerBase {
public static final DirectionProperty FACING = BlockStateProperties.FACING;
private final boolean isPlacer; private final boolean isPlacer;
public BlockBreaker(boolean isPlacer) { public BlockBreaker(boolean isPlacer) {
super(Block.Properties.create(Material.ROCK) super(STONE_PROPS);
.hardnessAndResistance(1.5f, 10.0f)
.harvestTool(ToolType.PICKAXE)
.sound(SoundType.STONE));
this.isPlacer = isPlacer; this.isPlacer = isPlacer;
setDefaultState(getStateContainer().getBaseState().with(FACING, Direction.SOUTH));
} }
@Nullable
@Override @Override
public TileEntity createNewTileEntity(World world, int par2) { public TileEntity createTileEntity(BlockState state, IBlockReader world) {
return this.isPlacer ? new TileEntityPlacer() : new TileEntityBreaker(); return this.isPlacer ? new TileEntityPlacer() : new TileEntityBreaker();
} }
@Override @Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9) { public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) {
if (this.tryToggleRedstone(world, pos, player)) { return true; } if (this.tryToggleRedstone(world, pos, player)) { return ActionResultType.SUCCESS; }
if (!world.isRemote) { if (!world.isRemote) {
TileEntityBreaker breaker = (TileEntityBreaker) world.getTileEntity(pos); TileEntityBreaker breaker = (TileEntityBreaker) world.getTileEntity(pos);
if (breaker != null) { if (breaker != null) {
player.openGui(ActuallyAdditions.INSTANCE, GuiHandler.GuiTypes.BREAKER.ordinal(), world, pos.getX(), pos.getY(), pos.getZ()); // todo: come back to this once we have guis
// NetworkHooks.openGui(player, new SimpleNamedContainerProvider(());
// player.openGui(ActuallyAdditions.INSTANCE, GuiHandler.GuiTypes.BREAKER.ordinal(), world, pos.getX(), pos.getY(), pos.getZ());
} }
return true; return ActionResultType.SUCCESS;
} }
return true; return ActionResultType.SUCCESS;
} }
@Override @Override
public EnumRarity getRarity(ItemStack stack) { protected void fillStateContainer(StateContainer.Builder<Block, BlockState> builder) {
return EnumRarity.UNCOMMON; super.fillStateContainer(builder);
builder.add(FACING);
} }
@Nullable
@Override @Override
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack) { public BlockState getStateForPlacement(BlockItemUseContext context) {
int rotation = EnumFacing.getDirectionFromEntityLiving(pos, player).ordinal(); // @todo: might be wrong
world.setBlockState(pos, this.getStateFromMeta(rotation), 2); return getDefaultState().with(FACING, context.getFace().getOpposite());
super.onBlockPlacedBy(world, pos, state, player, stack);
} }
@Override // @Override
public IBlockState getStateFromMeta(int meta) { // public IBlockState withRotation(IBlockState state, Rotation rot) {
return this.getDefaultState().withProperty(BlockDirectional.FACING, EnumFacing.byIndex(meta)); // return state.withProperty(BlockDirectional.FACING, rot.rotate(state.getValue(BlockDirectional.FACING)));
} // }
//
@Override // @Override
public int getMetaFromState(IBlockState state) { // public IBlockState withMirror(IBlockState state, Mirror mirror) {
return state.getValue(BlockDirectional.FACING).getIndex(); // return this.withRotation(state, mirror.toRotation(state.getValue(BlockDirectional.FACING)));
} // }
@Override
protected BlockStateContainer createBlockState() {
return new BlockStateContainer(this, BlockDirectional.FACING);
}
@Override
public IBlockState withRotation(IBlockState state, Rotation rot) {
return state.withProperty(BlockDirectional.FACING, rot.rotate(state.getValue(BlockDirectional.FACING)));
}
@Override
public IBlockState withMirror(IBlockState state, Mirror mirror) {
return this.withRotation(state, mirror.toRotation(state.getValue(BlockDirectional.FACING)));
}
} }

5
src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCanolaPress.java
View file

@ -19,10 +19,7 @@ import net.minecraftforge.common.ToolType;
public class BlockCanolaPress extends BlockContainerBase { public class BlockCanolaPress extends BlockContainerBase {
public BlockCanolaPress() { public BlockCanolaPress() {
super(Block.Properties.create(Material.ROCK) super(STONE_PROPS);
.hardnessAndResistance(1.5f, 10.0f)
.harvestTool(ToolType.PICKAXE)
.sound(SoundType.STONE));
} }
@Override @Override

7
src/main/java/de/ellpeck/actuallyadditions/common/blocks/package-info.java Normal file
View file

@ -0,0 +1,7 @@
@MethodsReturnNonnullByDefault
@ParametersAreNonnullByDefault
package de.ellpeck.actuallyadditions.common.blocks;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;