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

Changed most of the BlockString blocks to a BlockEnum in order to solve a loading issue with schematics.

Browse source
This commit is contained in:
WayofTime 2016-10-15 22:02:16 -04:00
parent 3e0f3f5aa1
commit 5cb5ec4264
59 changed files with 727 additions and 843 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java
View file

@ -65,7 +65,7 @@ public class ItemInscriptionTool extends ItemBindableBase implements IVariantPro
stack = NBTHelper.checkNBT(stack);
int uses = stack.getTagCompound().getInteger(Constants.NBT.USES);
world.setBlockState(pos, state.withProperty(((BlockRitualStone) state.getBlock()).getProperty(), getType(stack).getName()));
world.setBlockState(pos, state.withProperty(((BlockRitualStone) state.getBlock()).getProperty(), getType(stack)));
if (!player.capabilities.isCreativeMode)
{
stack.getTagCompound().setInteger(Constants.NBT.USES, --uses);

27
src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodRune.java
View file

@ -1,27 +0,0 @@
package WayofTime.bloodmagic.item.block;
import WayofTime.bloodmagic.block.BlockBloodRune;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
public class ItemBlockBloodRune extends ItemBlock
{
public ItemBlockBloodRune(Block block)
{
super(block);
setHasSubtypes(true);
}
@Override
public String getUnlocalizedName(ItemStack stack)
{
return super.getUnlocalizedName(stack) + BlockBloodRune.names[stack.getItemDamage()];
}
@Override
public int getMetadata(int meta)
{
return meta;
}
}

27
src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodStoneBrick.java
View file

@ -1,27 +0,0 @@
package WayofTime.bloodmagic.item.block;
import WayofTime.bloodmagic.block.BlockBloodStoneBrick;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
public class ItemBlockBloodStoneBrick extends ItemBlock
{
public ItemBlockBloodStoneBrick(Block block)
{
super(block);
setHasSubtypes(true);
}
@Override
public String getUnlocalizedName(ItemStack stack)
{
return super.getUnlocalizedName(stack) + BlockBloodStoneBrick.names[stack.getItemDamage()];
}
@Override
public int getMetadata(int meta)
{
return meta;
}
}

27
src/main/java/WayofTime/bloodmagic/item/block/ItemBlockCrystal.java
View file

@ -1,27 +0,0 @@
package WayofTime.bloodmagic.item.block;
import WayofTime.bloodmagic.block.BlockCrystal;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
public class ItemBlockCrystal extends ItemBlock
{
public ItemBlockCrystal(Block block)
{
super(block);
setHasSubtypes(true);
}
@Override
public String getUnlocalizedName(ItemStack stack)
{
return super.getUnlocalizedName(stack) + BlockCrystal.names[stack.getItemDamage()];
}
@Override
public int getMetadata(int meta)
{
return meta;
}
}

29
src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonBase.java
View file

@ -1,29 +0,0 @@
package WayofTime.bloodmagic.item.block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import WayofTime.bloodmagic.block.BlockDemonBase;
public class ItemBlockDemonBase extends ItemBlock
{
public final BlockDemonBase demonBlock;
public ItemBlockDemonBase(BlockDemonBase block)
{
super(block);
setHasSubtypes(true);
demonBlock = block;
}
@Override
public String getUnlocalizedName(ItemStack stack)
{
return super.getUnlocalizedName(stack) + demonBlock.names[stack.getItemDamage()];
}
@Override
public int getMetadata(int meta)
{
return meta;
}
}

27
src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonLight.java
View file

@ -1,27 +0,0 @@
package WayofTime.bloodmagic.item.block;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import WayofTime.bloodmagic.block.BlockDemonLight;
public class ItemBlockDemonLight extends ItemBlock
{
public ItemBlockDemonLight(Block block)
{
super(block);
setHasSubtypes(true);
}
@Override
public String getUnlocalizedName(ItemStack stack)
{
return super.getUnlocalizedName(stack) + BlockDemonLight.names[stack.getItemDamage()];
}
@Override
public int getMetadata(int meta)
{
return meta;
}
}

29
src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonPillarBase.java
View file

@ -1,29 +0,0 @@
package WayofTime.bloodmagic.item.block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import WayofTime.bloodmagic.block.BlockDemonPillarBase;
public class ItemBlockDemonPillarBase extends ItemBlock
{
public final BlockDemonPillarBase demonBlock;
public ItemBlockDemonPillarBase(BlockDemonPillarBase block)
{
super(block);
setHasSubtypes(true);
demonBlock = block;
}
@Override
public String getUnlocalizedName(ItemStack stack)
{
return super.getUnlocalizedName(stack) + demonBlock.names[stack.getItemDamage() % demonBlock.names.length];
}
@Override
public int getMetadata(int meta)
{
return meta % demonBlock.names.length;
}
}

29
src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonPillarCapBase.java
View file

@ -1,29 +0,0 @@
package WayofTime.bloodmagic.item.block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import WayofTime.bloodmagic.block.BlockDemonPillarCapBase;
public class ItemBlockDemonPillarCapBase extends ItemBlock
{
public final BlockDemonPillarCapBase demonBlock;
public ItemBlockDemonPillarCapBase(BlockDemonPillarCapBase block)
{
super(block);
setHasSubtypes(true);
demonBlock = block;
}
@Override
public String getUnlocalizedName(ItemStack stack)
{
return super.getUnlocalizedName(stack) + demonBlock.names[stack.getItemDamage() % demonBlock.names.length];
}
@Override
public int getMetadata(int meta)
{
return meta % demonBlock.names.length;
}
}

29
src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonWallBase.java
View file

@ -1,29 +0,0 @@
package WayofTime.bloodmagic.item.block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import WayofTime.bloodmagic.block.BlockDemonWallBase;
public class ItemBlockDemonWallBase extends ItemBlock
{
public final BlockDemonWallBase demonBlock;
public ItemBlockDemonWallBase(BlockDemonWallBase block)
{
super(block);
setHasSubtypes(true);
demonBlock = block;
}
@Override
public String getUnlocalizedName(ItemStack stack)
{
return super.getUnlocalizedName(stack) + demonBlock.names[stack.getItemDamage() % demonBlock.names.length];
}
@Override
public int getMetadata(int meta)
{
return meta % demonBlock.names.length;
}
}

78
src/main/java/WayofTime/bloodmagic/item/block/ItemBlockInversionPillar.java
View file

@ -1,78 +0,0 @@
package WayofTime.bloodmagic.item.block;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import WayofTime.bloodmagic.block.BlockInversionPillar;
import WayofTime.bloodmagic.registry.ModBlocks;
public class ItemBlockInversionPillar extends ItemBlock
{
public ItemBlockInversionPillar(Block block)
{
super(block);
setHasSubtypes(true);
}
@Override
public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState)
{
if (!isBlockPillarBase(world.getBlockState(pos.offset(EnumFacing.DOWN)), newState) || !isBlockPillarCap(world.getBlockState(pos.offset(EnumFacing.UP)), newState))
{
return false;
}
return super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, newState);
}
public boolean isBlockPillarBase(IBlockState baseState, IBlockState newState)
{
Block block = baseState.getBlock();
if (block == ModBlocks.INVERSION_PILLAR_END)
{
int baseMeta = block.getMetaFromState(baseState);
int pillarMeta = newState.getBlock().getMetaFromState(newState);
if (pillarMeta == baseMeta / 2 && baseMeta % 2 == 0)
{
return true;
}
}
return false;
}
public boolean isBlockPillarCap(IBlockState capState, IBlockState newState)
{
Block block = capState.getBlock();
if (block == ModBlocks.INVERSION_PILLAR_END)
{
int capMeta = block.getMetaFromState(capState);
int pillarMeta = newState.getBlock().getMetaFromState(newState);
if (pillarMeta == capMeta / 2 && capMeta % 2 == 1)
{
return true;
}
}
return false;
}
@Override
public String getUnlocalizedName(ItemStack stack)
{
return super.getUnlocalizedName(stack) + BlockInversionPillar.names[stack.getItemDamage()];
}
@Override
public int getMetadata(int meta)
{
return meta;
}
}

27
src/main/java/WayofTime/bloodmagic/item/block/ItemBlockInversionPillarEnd.java
View file

@ -1,27 +0,0 @@
package WayofTime.bloodmagic.item.block;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import WayofTime.bloodmagic.block.BlockInversionPillarEnd;
public class ItemBlockInversionPillarEnd extends ItemBlock
{
public ItemBlockInversionPillarEnd(Block block)
{
super(block);
setHasSubtypes(true);
}
@Override
public String getUnlocalizedName(ItemStack stack)
{
return super.getUnlocalizedName(stack) + BlockInversionPillarEnd.names[stack.getItemDamage()];
}
@Override
public int getMetadata(int meta)
{
return meta;
}
}

139
src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java
View file

@ -1,139 +0,0 @@
package WayofTime.bloodmagic.item.block;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityChest;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import WayofTime.bloodmagic.block.BlockMimic;
import WayofTime.bloodmagic.tile.TileMimic;
public class ItemBlockMimic extends ItemBlock
{
public ItemBlockMimic(Block block)
{
super(block);
setHasSubtypes(true);
}
@Override
public String getUnlocalizedName(ItemStack stack)
{
return super.getUnlocalizedName(stack) + BlockMimic.names[stack.getItemDamage()];
}
@Override
public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ)
{
IBlockState iblockstate = world.getBlockState(pos);
Block block = iblockstate.getBlock();
if (!player.isSneaking())
{
return super.onItemUse(stack, player, world, pos, hand, facing, hitX, hitY, hitZ);
}
if (stack.stackSize != 0 && player.canPlayerEdit(pos, facing, stack))
{
int i = this.getMetadata(stack.getMetadata());
IBlockState iblockstate1 = this.block.onBlockPlaced(world, pos, facing, hitX, hitY, hitZ, i, player);
IBlockState blockReplaced = world.getBlockState(pos);
if (!canReplaceBlock(world, pos, blockReplaced))
{
return super.onItemUse(stack, player, world, pos, hand, facing, hitX, hitY, hitZ);
}
TileEntity tileReplaced = world.getTileEntity(pos);
if (!canReplaceTile(i, tileReplaced))
{
return EnumActionResult.FAIL;
}
ItemStack replacedStack = block.getItem(world, pos, iblockstate);
// ItemStack replacedStack = new ItemStack(block, 1, block.getMetaFromState(iblockstate));
NBTTagCompound tileTag = getTagFromTileEntity(tileReplaced);
if (tileReplaced != null)
{
NBTTagCompound voidTag = new NBTTagCompound();
voidTag.setInteger("x", pos.getX());
voidTag.setInteger("y", pos.getY());
voidTag.setInteger("z", pos.getZ());
tileReplaced.readFromNBT(voidTag);
}
if (placeBlockAt(stack, player, world, pos, facing, hitX, hitY, hitZ, iblockstate1))
{
SoundType soundtype = this.block.getSoundType();
world.playSound(player, pos, soundtype.getPlaceSound(), SoundCategory.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F);
--stack.stackSize;
TileEntity tile = world.getTileEntity(pos);
if (tile instanceof TileMimic)
{
TileMimic mimic = (TileMimic) tile;
mimic.metaOfReplacedBlock = block.getMetaFromState(iblockstate);
mimic.tileTag = tileTag;
mimic.setInventorySlotContents(0, replacedStack);
mimic.refreshTileEntity();
if (player.capabilities.isCreativeMode)
{
mimic.dropItemsOnBreak = false;
}
}
return EnumActionResult.SUCCESS;
} else
{
tileReplaced.readFromNBT(tileTag);
}
}
return EnumActionResult.FAIL;
}
public boolean canReplaceTile(int meta, TileEntity tile)
{
if (tile instanceof TileEntityChest)
{
return true;
}
return tile == null;
}
public boolean canReplaceBlock(World world, BlockPos pos, IBlockState state) {
return state.getBlockHardness(world, pos) != -1.0F;
}
public NBTTagCompound getTagFromTileEntity(TileEntity tile)
{
NBTTagCompound tag = new NBTTagCompound();
if (tile != null)
{
return tile.writeToNBT(tag);
}
return tag;
}
@Override
public int getMetadata(int meta)
{
return meta;
}
}

27
src/main/java/WayofTime/bloodmagic/item/block/ItemBlockPath.java
View file

@ -1,27 +0,0 @@
package WayofTime.bloodmagic.item.block;
import WayofTime.bloodmagic.block.BlockPath;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
public class ItemBlockPath extends ItemBlock
{
public ItemBlockPath(Block block)
{
super(block);
setHasSubtypes(true);
}
@Override
public String getUnlocalizedName(ItemStack stack)
{
return super.getUnlocalizedName(stack) + BlockPath.names[stack.getItemDamage()];
}
@Override
public int getMetadata(int meta)
{
return meta;
}
}

28
src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualController.java
View file

@ -1,28 +0,0 @@
package WayofTime.bloodmagic.item.block;
import WayofTime.bloodmagic.block.BlockRitualController;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
public class ItemBlockRitualController extends ItemBlock
{
public ItemBlockRitualController(Block block)
{
super(block);
setHasSubtypes(true);
}
@Override
public String getUnlocalizedName(ItemStack stack)
{
return super.getUnlocalizedName(stack) + BlockRitualController.names[stack.getItemDamage()];
}
@Override
public int getMetadata(int meta)
{
return meta;
}
}

27
src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualStone.java
View file

@ -1,27 +0,0 @@
package WayofTime.bloodmagic.item.block;
import WayofTime.bloodmagic.block.BlockRitualStone;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
public class ItemBlockRitualStone extends ItemBlock
{
public ItemBlockRitualStone(Block block)
{
super(block);
setHasSubtypes(true);
}
@Override
public String getUnlocalizedName(ItemStack stack)
{
return super.getUnlocalizedName(stack) + BlockRitualStone.names[stack.getItemDamage()];
}
@Override
public int getMetadata(int meta)
{
return meta;
}
}

29
src/main/java/WayofTime/bloodmagic/item/block/ItemDemonStairsBase.java
View file

@ -1,29 +0,0 @@
package WayofTime.bloodmagic.item.block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import WayofTime.bloodmagic.block.BlockDemonStairsBase;
public class ItemDemonStairsBase extends ItemBlock
{
public final BlockDemonStairsBase demonBlock;
public ItemDemonStairsBase(BlockDemonStairsBase block)
{
super(block);
setHasSubtypes(true);
demonBlock = block;
}
@Override
public String getUnlocalizedName(ItemStack stack)
{
return super.getUnlocalizedName(stack) + demonBlock.names[stack.getItemDamage() % demonBlock.names.length];
}
@Override
public int getMetadata(int meta)
{
return meta % demonBlock.names.length;
}
}

17
src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java
View file

@ -6,9 +6,11 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.math.MathHelper;
public class ItemBlockEnum<E extends Enum<E> & IStringSerializable> extends ItemBlock {
public class ItemBlockEnum<E extends Enum<E> & IStringSerializable> extends ItemBlock
{
public ItemBlockEnum(BlockEnum<E> block) {
public ItemBlockEnum(BlockEnum<E> block)
{
super(block);
if (block.getTypes().length > 1)
@ -17,17 +19,20 @@ public class ItemBlockEnum<E extends Enum<E> & IStringSerializable> extends Item
@SuppressWarnings("unchecked")
@Override
public BlockEnum<E> getBlock() {
public BlockEnum<E> getBlock()
{
return (BlockEnum<E>) super.getBlock();
}
@Override
public String getUnlocalizedName(ItemStack stack) {
return getBlock().getUnlocalizedName() + "." + getBlock().getTypes()[MathHelper.clamp_int(stack.getItemDamage(), 0, 15)].getName();
public String getUnlocalizedName(ItemStack stack)
{
return getBlock().getUnlocalizedName() + getBlock().getTypes()[MathHelper.clamp_int(stack.getItemDamage(), 0, 15)].getName();
}
@Override
public int getMetadata(int damage) {
public int getMetadata(int damage)
{
return damage;
}
}