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

Revamp altar to only use EnumAltarComponent

Browse source 
- Removes internal references in API
- Makes full use of the idea of the API
- No more special checks
This commit is contained in:
Nick 2015-12-02 16:02:18 -08:00
parent 6db9b51350
commit 96d94721c4
9 changed files with 104 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java
View file

@ -6,13 +6,14 @@ import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.altar.AltarComponent;
import WayofTime.bloodmagic.api.altar.EnumAltarTier;
import WayofTime.bloodmagic.api.altar.IAltarManipulator;
import WayofTime.bloodmagic.api.altar.IBloodAltar;
import WayofTime.bloodmagic.api.util.helper.NBTHelper;
import WayofTime.bloodmagic.block.BlockAltar;
import WayofTime.bloodmagic.util.ChatUtil;
import WayofTime.bloodmagic.util.Utils;
import WayofTime.bloodmagic.util.helper.TextHelper;
import net.minecraft.block.state.IBlockState;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
@ -91,17 +92,12 @@ public class ItemAltarMaker extends Item implements IAltarManipulator {
for (AltarComponent altarComponent : tierToBuild.getAltarComponents()) {
BlockPos componentPos = pos.add(altarComponent.getOffset());
IBlockState blockState = altarComponent.getBlockStack().getBlock().getStateFromMeta(altarComponent.getBlockStack().getMeta());
Block blockForComponent = Utils.getBlockForComponent(altarComponent.getComponent());
if (altarComponent.getBlockStack().getBlock().equals(Blocks.air))
world.setBlockState(componentPos, Blocks.stonebrick.getStateFromMeta(0));
else
world.setBlockState(componentPos, blockState);
world.markBlockForUpdate(componentPos);
world.setBlockState(componentPos, blockForComponent.getDefaultState(), 3);
}
world.markBlockForUpdate(pos);
((IBloodAltar) world.getTileEntity(pos)).checkTier();
}
public String destroyAltar(EntityPlayer player) {

9
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java
View file

@ -5,6 +5,8 @@ import WayofTime.bloodmagic.api.iface.IAltarReader;
import WayofTime.bloodmagic.api.iface.ISigil;
import WayofTime.bloodmagic.api.util.helper.BindableHelper;
import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import WayofTime.bloodmagic.tile.TileAltar;
import WayofTime.bloodmagic.util.ChatUtil;
import WayofTime.bloodmagic.util.helper.TextHelper;
import net.minecraft.entity.player.EntityPlayer;
@ -22,6 +24,10 @@ public class ItemSigilDivination extends ItemSigilBase implements ISigil, IAltar
@Override
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
if (PlayerHelper.isFakePlayer(player))
return stack;
super.onItemRightClick(stack, world, player);
if (!world.isRemote) {
@ -41,8 +47,9 @@ public class ItemSigilDivination extends ItemSigilBase implements ISigil, IAltar
int tier = altar.getTier().ordinal() + 1;
currentEssence = altar.getCurrentBlood();
int capacity = altar.getCapacity();
altar.checkTier();
ChatUtil.sendNoSpam(player, TextHelper.localize(tooltipBase + "currentAltarTier", tier), TextHelper.localize(tooltipBase + "currentEssence", currentEssence), TextHelper.localize(tooltipBase + "currentAltarCapacity", capacity));
} else {
ChatUtil.sendNoSpam(player, TextHelper.localize(tooltipBase + "currentEssence", currentEssence));
}