mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-22 13:09:42 +00:00
Merge branch 'capability' into MC18
This commit is contained in:
commit
0d9fe52f5d
48 files changed
+397
-612
No files matched your search
@@ -104,7 +104,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable {
|
||||
return false;
|
||||
|
||||
TilePrism prism = (TilePrism) tile;
|
||||
ItemStack lens = prism.getStackInSlot(0);
|
||||
ItemStack lens = prism.getItemHandler().getStackInSlot(0);
|
||||
ItemStack heldItem = par5EntityPlayer.getCurrentEquippedItem();
|
||||
boolean isHeldItemLens = heldItem != null && heldItem.getItem() instanceof ILens;
|
||||
|
||||
@@ -112,14 +112,14 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable {
|
||||
if(!par5EntityPlayer.capabilities.isCreativeMode)
|
||||
par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, null);
|
||||
|
||||
prism.setInventorySlotContents(0, heldItem.copy());
|
||||
prism.getItemHandler().setStackInSlot(0, heldItem.copy());
|
||||
prism.markDirty();
|
||||
par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, true), 1 | 2);
|
||||
} else if(lens != null) {
|
||||
ItemStack add = lens.copy();
|
||||
if(!par5EntityPlayer.inventory.addItemStackToInventory(add))
|
||||
par5EntityPlayer.dropPlayerItemWithRandomChoice(add, false);
|
||||
prism.setInventorySlotContents(0, null);
|
||||
prism.getItemHandler().setStackInSlot(0, null);
|
||||
prism.markDirty();
|
||||
par1World.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, false), 1 | 2);
|
||||
}
|
||||
@@ -150,7 +150,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable {
|
||||
|
||||
if (inv != null) {
|
||||
for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) {
|
||||
ItemStack itemstack = inv.getStackInSlot(j1);
|
||||
ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1);
|
||||
|
||||
if (itemstack != null) {
|
||||
float f = random.nextFloat() * 0.8F + 0.1F;
|
||||
|
||||
Reference in new issue
Block a user