mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 03:39:17 +00:00
The Mana Prism can now be turned off with a redstone signal.
This commit is contained in:
1 parent
e289216a53
commit
8aaca31627
4 files changed
+37
-17
No files matched your search
@@ -33,6 +33,7 @@ import vazkii.botania.client.core.helper.IconHelper;
|
||||
import vazkii.botania.common.block.BlockModContainer;
|
||||
import vazkii.botania.common.block.tile.TileSimpleInventory;
|
||||
import vazkii.botania.common.block.tile.mana.TilePrism;
|
||||
import vazkii.botania.common.block.tile.string.TileRedStringDispenser;
|
||||
import vazkii.botania.common.lexicon.LexiconData;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
|
||||
@@ -95,24 +96,39 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi
|
||||
ItemStack lens = prism.getStackInSlot(0);
|
||||
ItemStack heldItem = par5EntityPlayer.getCurrentEquippedItem();
|
||||
boolean isHeldItemLens = heldItem != null && heldItem.getItem() instanceof ILens;
|
||||
int meta = par1World.getBlockMetadata(par2, par3, par4);
|
||||
|
||||
if(lens == null && isHeldItemLens) {
|
||||
par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, null);
|
||||
prism.setInventorySlotContents(0, heldItem.copy());
|
||||
prism.markDirty();
|
||||
par1World.setBlockMetadataWithNotify(par2, par3, par4, 1, 1 | 2);
|
||||
par1World.setBlockMetadataWithNotify(par2, par3, par4, meta | 1, 1 | 2);
|
||||
} else if(lens != null) {
|
||||
ItemStack add = lens.copy();
|
||||
if(!par5EntityPlayer.inventory.addItemStackToInventory(add))
|
||||
par5EntityPlayer.dropPlayerItemWithRandomChoice(add, false);
|
||||
prism.setInventorySlotContents(0, null);
|
||||
prism.markDirty();
|
||||
par1World.setBlockMetadataWithNotify(par2, par3, par4, 0, 1 | 2);
|
||||
par1World.setBlockMetadataWithNotify(par2, par3, par4, meta & 14, 1 | 2);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNeighborBlockChange(World world, int x, int y, int z, Block block) {
|
||||
boolean power = world.isBlockIndirectlyGettingPowered(x, y, z) || world.isBlockIndirectlyGettingPowered(x, y + 1, z);
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
boolean powered = (meta & 8) != 0;
|
||||
|
||||
if(!world.isRemote) {
|
||||
if(power && !powered)
|
||||
world.setBlockMetadataWithNotify(x, y, z, meta | 8, 1 | 2);
|
||||
else if(!power && powered)
|
||||
world.setBlockMetadataWithNotify(x, y, z, meta & -9, 1 | 2);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) {
|
||||
TileEntity tile = par1World.getTileEntity(par2, par3, par4);
|
||||
|
||||
@@ -24,24 +24,27 @@ public class TilePrism extends TileSimpleInventory implements IManaCollisionGhos
|
||||
|
||||
public void onBurstCollision(IManaBurst burst) {
|
||||
ItemStack lens = getStackInSlot(0);
|
||||
boolean active = (getBlockMetadata() & 8) == 0;
|
||||
boolean valid = lens != null && lens.getItem() instanceof ILens;
|
||||
|
||||
burst.setSourceLens(valid ? lens.copy() : null);
|
||||
burst.setColor(0xFFFFFF);
|
||||
burst.setGravity(0F);
|
||||
if(active) {
|
||||
burst.setSourceLens(valid ? lens.copy() : null);
|
||||
burst.setColor(0xFFFFFF);
|
||||
burst.setGravity(0F);
|
||||
|
||||
if(valid) {
|
||||
Entity burstEntity = (Entity) burst;
|
||||
BurstProperties properties = new BurstProperties(burst.getStartingMana(), burst.getMinManaLoss(), burst.getManaLossPerTick(), burst.getGravity(), 1F, burst.getColor());
|
||||
if(valid) {
|
||||
Entity burstEntity = (Entity) burst;
|
||||
BurstProperties properties = new BurstProperties(burst.getStartingMana(), burst.getMinManaLoss(), burst.getManaLossPerTick(), burst.getGravity(), 1F, burst.getColor());
|
||||
|
||||
((ILens) lens.getItem()).apply(lens, properties);
|
||||
((ILens) lens.getItem()).apply(lens, properties);
|
||||
|
||||
burst.setColor(properties.color);
|
||||
burst.setStartingMana(properties.maxMana);
|
||||
burst.setMinManaLoss(properties.ticksBeforeManaLoss);
|
||||
burst.setManaLossPerTick(properties.manaLossPerTick);
|
||||
burst.setGravity(properties.gravity);
|
||||
burst.setMotion(burstEntity.motionX * properties.motionModifier, burstEntity.motionY * properties.motionModifier,burstEntity.motionZ * properties.motionModifier);
|
||||
burst.setColor(properties.color);
|
||||
burst.setStartingMana(properties.maxMana);
|
||||
burst.setMinManaLoss(properties.ticksBeforeManaLoss);
|
||||
burst.setManaLossPerTick(properties.manaLossPerTick);
|
||||
burst.setGravity(properties.gravity);
|
||||
burst.setMotion(burstEntity.motionX * properties.motionModifier, burstEntity.motionY * properties.motionModifier,burstEntity.motionZ * properties.motionModifier);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -316,7 +316,7 @@ public final class LexiconData {
|
||||
paintLens.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeLensPaint));
|
||||
|
||||
prism = new ALexiconEntry(LibLexicon.MANA_PRISM, categoryMana);
|
||||
prism.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipePrism));
|
||||
prism.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipePrism));
|
||||
|
||||
// FUNCTIONAL FLOWERS ENTRIES
|
||||
functionalIntro = new BLexiconEntry(LibLexicon.FFLOWER_INTRO, categoryFunctionalFlowers);
|
||||
|
||||
Reference in new issue
Block a user