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

Teleposers and refractoring

Browse source
This commit is contained in:
Arcaratus 2016-01-01 12:08:17 -05:00
parent 1b9f72b494
commit a8a0ae6e8b
145 changed files with 594 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java
View file

@ -22,7 +22,6 @@ import WayofTime.bloodmagic.util.Utils;
public class BlockAlchemyArray extends BlockContainer
{
public BlockAlchemyArray()
{
super(Material.cloth);

1
src/main/java/WayofTime/bloodmagic/block/BlockAltar.java
View file

@ -18,7 +18,6 @@ import net.minecraft.world.World;
public class BlockAltar extends BlockContainer
{
public BlockAltar()
{
super(Material.rock);

1
src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java
View file

@ -7,7 +7,6 @@ import net.minecraft.block.material.Material;
public class BlockBloodStoneBrick extends BlockString
{
public static final String[] names = { "normal", "large" };
public BlockBloodStoneBrick()

1
src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java
View file

@ -17,7 +17,6 @@ import java.awt.*;
public class BlockLifeEssence extends BlockFluidClassic
{
@Getter
private static Fluid lifeEssence = new FluidLifeEssence();

1
src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java
View file

@ -16,7 +16,6 @@ import net.minecraft.world.World;
public class BlockPedestal extends BlockStringContainer
{
public static String[] names = { "pedestal", "plinth" };
public BlockPedestal()

1
src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java
View file

@ -19,7 +19,6 @@ import java.util.Random;
public class BlockPhantom extends BlockContainer
{
public BlockPhantom()
{
super(Material.cloth);

1
src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java
View file

@ -22,7 +22,6 @@ import WayofTime.bloodmagic.tile.TileMasterRitualStone;
public class BlockRitualController extends BlockStringContainer
{
public static final String[] names = { "master", "imperfect" };
public BlockRitualController()

1
src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java
View file

@ -11,7 +11,6 @@ import net.minecraft.world.World;
public class BlockRitualStone extends BlockString implements IRitualStone
{
public static final String[] names = { "blank", "water", "fire", "earth", "air", "dusk", "dawn" };
public BlockRitualStone()

1
src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java
View file

@ -12,7 +12,6 @@ import net.minecraft.world.World;
public class BlockSoulForge extends Block
{
public BlockSoulForge()
{
super(Material.iron);

1
src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java
View file

@ -20,7 +20,6 @@ import java.util.Random;
public class BlockSpectral extends BlockContainer
{
public BlockSpectral()
{
super(Material.cloth);

24
src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java
View file

@ -4,10 +4,12 @@ import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.util.helper.BindableHelper;
import WayofTime.bloodmagic.item.ItemTelepositionFocus;
import WayofTime.bloodmagic.tile.TileTeleposer;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.InventoryHelper;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
@ -16,7 +18,6 @@ import net.minecraft.world.World;
public class BlockTeleposer extends BlockContainer
{
public BlockTeleposer()
{
super(Material.rock);
@ -41,19 +42,30 @@ public class BlockTeleposer extends BlockContainer
if (playerItem != null && playerItem.getItem() instanceof ItemTelepositionFocus)
{
BindableHelper.checkAndSetItemOwner(playerItem, player);
((ItemTelepositionFocus) playerItem.getItem()).setBlockPos(playerItem, world, pos);
return true;
}
else if (world.getTileEntity(pos) instanceof TileTeleposer)
{
player.openGui(BloodMagic.instance, Constants.Gui.TELEPOSER_GUI, world, pos.getX(), pos.getY(), pos.getZ());
}
// player.openGui(AlchemicalWizardry.instance, 1, world, pos.getX(),
// pos.getY(), pos.getZ());
return true;
}
@Override
public void breakBlock(World worldIn, BlockPos pos, IBlockState state)
{
if (worldIn.getTileEntity(pos) != null && worldIn.getTileEntity(pos) instanceof TileTeleposer)
{
InventoryHelper.dropInventoryItems(worldIn, pos, (TileTeleposer) worldIn.getTileEntity(pos));
}
super.breakBlock(worldIn, pos, state);
}
@Override
public TileEntity createNewTileEntity(World worldIn, int meta)
{
return null;
return new TileTeleposer();
}
}

1
src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java
View file

@ -35,7 +35,6 @@ import java.util.List;
@Getter
public class BlockInteger extends Block
{
private final int maxMeta;
private final PropertyInteger metaProp;
private final IUnlistedProperty unlistedMetaProp;

1
src/main/java/WayofTime/bloodmagic/block/base/BlockIntegerContainer.java
View file

@ -9,7 +9,6 @@ import net.minecraft.world.World;
public abstract class BlockIntegerContainer extends BlockInteger implements ITileEntityProvider
{
public BlockIntegerContainer(Material material, int maxMeta, String propName)
{
super(material, maxMeta, propName);

1
src/main/java/WayofTime/bloodmagic/block/base/BlockString.java
View file

@ -38,7 +38,6 @@ import java.util.List;
@Getter
public class BlockString extends Block
{
private final int maxMeta;
private final List<String> values;
private final PropertyString stringProp;

1
src/main/java/WayofTime/bloodmagic/block/base/BlockStringContainer.java
View file

@ -9,7 +9,6 @@ import net.minecraft.world.World;
public abstract class BlockStringContainer extends BlockString implements ITileEntityProvider
{
public BlockStringContainer(Material material, String[] values, String propName)
{
super(material, values, propName);

1
src/main/java/WayofTime/bloodmagic/block/property/PropertyString.java
View file

@ -10,7 +10,6 @@ import java.util.HashSet;
public class PropertyString extends PropertyHelper
{
private final ImmutableSet allowedValues;
protected PropertyString(String name, String[] values)

1
src/main/java/WayofTime/bloodmagic/block/property/UnlistedPropertyInteger.java
View file

@ -4,7 +4,6 @@ import net.minecraftforge.common.property.IUnlistedProperty;
public class UnlistedPropertyInteger implements IUnlistedProperty<Integer>
{
private int maxMeta;
private String propName;

1
src/main/java/WayofTime/bloodmagic/block/property/UnlistedPropertyString.java
View file

@ -7,7 +7,6 @@ import java.util.List;
public class UnlistedPropertyString implements IUnlistedProperty<String>
{
private List values;
private String propName;