Compare commits

..

No commits in common. "0349b88293baa080429553b11d4158cdb78ddba9" and "3db4a140e31a09e12375379962880f7a4d9cf52b" have entirely different histories.

3 changed files with 0 additions and 9 deletions

View file

@ -27,6 +27,4 @@ public interface ICrystal {
*/ */
void harvestShard(EntityPlayer player); void harvestShard(EntityPlayer player);
boolean canHarvest(EntityPlayer player);
} }

View file

@ -30,7 +30,6 @@ class SlotWorkbenchWand extends Slot {
!this.workbench.getWorldObj().isRemote && !this.workbench.getWorldObj().isRemote &&
this.inventory.getStackInSlot(this.getSlotIndex()) != null && this.inventory.getStackInSlot(this.getSlotIndex()) != null &&
this.inventory.getStackInSlot(this.getSlotIndex()).getItem() instanceof ItemWandCasting) { this.inventory.getStackInSlot(this.getSlotIndex()).getItem() instanceof ItemWandCasting) {
player.inventory.setItemStack(null);
player.openGui(Thaumcraft.instance, 13, this.workbench.getWorldObj(), this.workbench.xCoord, this.workbench.yCoord, this.workbench.zCoord); player.openGui(Thaumcraft.instance, 13, this.workbench.getWorldObj(), this.workbench.xCoord, this.workbench.yCoord, this.workbench.zCoord);
} }
} }

View file

@ -119,10 +119,4 @@ public abstract class MixinTileCrystal extends TileThaumcraft implements ICrysta
worldObj.spawnEntityInWorld(entity); worldObj.spawnEntityInWorld(entity);
} }
@Override
public boolean canHarvest(EntityPlayer player) {
int md = this.worldObj.getBlockMetadata(this.xCoord, this.yCoord, this.zCoord);
return md != 6 && md != 9 && count > 1;
}
} }