lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement BlockStack in Teleposer related areas

Browse source
This commit is contained in:
Nick 2016-01-05 15:26:24 -08:00
parent 31d41d06ab
commit c3beb48499
5 changed files with 34 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/WayofTime/bloodmagic/api/BlockStack.java
View file

@ -3,6 +3,9 @@ package WayofTime.bloodmagic.api;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.registry.GameData;
@Getter
@ -23,6 +26,12 @@ public class BlockStack
this(block, 0);
}
public static BlockStack getStackFromPos(World world, BlockPos pos)
{
IBlockState state = world.getBlockState(pos);
return new BlockStack(state.getBlock(), state.getBlock().getMetaFromState(state));
}
@Override
public String toString()
{

5
src/main/java/WayofTime/bloodmagic/api/ItemStackWrapper.java
View file

@ -43,6 +43,11 @@ public class ItemStackWrapper
this(block, 1, 0);
}
public ItemStackWrapper(BlockStack blockStack)
{
this(blockStack.getBlock(), 1, blockStack.getMeta());
}
public static ItemStackWrapper getHolder(ItemStack stack)
{
return new ItemStackWrapper(stack.getItem(), stack.stackSize, stack.getItemDamage());

18
src/main/java/WayofTime/bloodmagic/api/event/TeleposeEvent.java
View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.api.event;
import net.minecraft.block.Block;
import WayofTime.bloodmagic.api.BlockStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
@ -17,27 +17,21 @@ public class TeleposeEvent extends Event
{
public final World initalWorld;
public final BlockPos initialBlockPos;
public final Block initialBlock;
public final int initialMetadata;
public final BlockStack initialStack;
public final World finalWorld;
public final BlockPos finalBlockPos;
public final BlockStack finalStack;
public final Block finalBlock;
public final int finalMetadata;
public TeleposeEvent(World initialWorld, BlockPos initialBlockPos, Block initialBlock, int initialMetadata, World finalWorld, BlockPos finalBlockPos, Block finalBlock, int finalMetadata)
public TeleposeEvent(World initialWorld, BlockPos initialBlockPos, World finalWorld, BlockPos finalBlockPos)
{
this.initalWorld = initialWorld;
this.initialBlockPos = initialBlockPos;
this.initialBlock = initialBlock;
this.initialMetadata = initialMetadata;
this.initialStack = BlockStack.getStackFromPos(initialWorld, initialBlockPos);
this.finalWorld = finalWorld;
this.finalBlockPos = finalBlockPos;
this.finalBlock = finalBlock;
this.finalMetadata = finalMetadata;
this.finalStack = BlockStack.getStackFromPos(finalWorld, finalBlockPos);
}
public TileEntity getInitialTile()